Use const void * for the object pointers in TransferQueue

[libs/gl.git] / source / core / pipelinestate.h

diff --git a/source/core/pipelinestate.h b/source/core/pipelinestate.h
index fda7ae1753853f43986a6d550fea58516c100120..d0ff349069cee04e69992d2c94fa76233b9f6f0d 100644 (file)
--- a/source/core/pipelinestate.h
+++ b/source/core/pipelinestate.h
@@ -33,21 +33,24 @@ class PipelineState: public PipelineStateBackend
 private:
        struct BoundTexture
        {
-               unsigned binding;
-               mutable bool changed;
-               const Texture *texture;
-               const Sampler *sampler;
+               unsigned binding = 0;
+               mutable bool changed = false;
+               mutable bool used = false;
+               const Texture *texture = 0;
+               const Sampler *sampler = 0;
+               int level = -1;
 
-               BoundTexture(unsigned);
+               BoundTexture(unsigned b): binding(b) { }
        };
 
        struct BoundUniformBlock
        {
-               int binding;
-               mutable bool changed;
-               const UniformBlock *block;
+               int binding = 0;
+               mutable bool changed = false;
+               mutable bool used = false;
+               const UniformBlock *block = 0;
 
-               BoundUniformBlock(int);
+               BoundUniformBlock(int b): binding(b) { }
        };
 
        enum ChangeMask
@@ -89,6 +92,7 @@ public:
        void set_shader_program(const Program *);
        void set_uniform_block(int, const UniformBlock *);
        void set_texture(unsigned, const Texture *, const Sampler *);
+       void set_texture(unsigned, const Texture *, int, const Sampler *);
        void set_vertex_setup(const VertexSetup *);
        void set_primitive_type(PrimitiveType);
        void set_front_face(FaceWinding);