Support overriding uniforms in inherited Techniques

[libs/gl.git] / source / texturing.h

diff --git a/source/texturing.h b/source/texturing.h
index c51782bbf237959558af379998d5f4bab504d962..0b3a9751b5f98ebe17f6e55a48fe3d4a998b92c1 100644 (file)
--- a/source/texturing.h
+++ b/source/texturing.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_TEXTURING_H_
 #define MSP_GL_TEXTURING_H_
 
@@ -14,30 +7,24 @@ Distributed under the LGPL
 namespace Msp {
 namespace GL {
 
-class TexEnv;
 class Texture;
 
 class Texturing: public Bindable<Texturing>
 {
 private:
-       struct Attachment
-       {
-               const Texture *tex;
-               const TexEnv *env;
-
-               Attachment();
-       };
-
-       std::vector<Attachment> attachments;
+       std::vector<const Texture *> attachments;
 
 public:
        ~Texturing();
 
        void attach(unsigned, const Texture &);
-       void attach(unsigned, const Texture &, const TexEnv &);
        void detach(unsigned);
 private:
-       void set_attachment(unsigned, const Texture *, const TexEnv *);
+       void set_attachment(unsigned, const Texture *);
+public:
+       const Texture *get_attached_texture(unsigned) const;
+
+private:
        void bind_attachment(unsigned) const;
 
        static void unbind_attachment(unsigned);