Redesign asynchronous buffer uploads

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

diff --git a/source/core/pipelinestate.h b/source/core/pipelinestate.h
index 105003d1750de54720d9071360eaf7f1236a9cb7..bc6087c780ea625d029bc5752c6fc80c3b4bdba0 100644 (file)
--- a/source/core/pipelinestate.h
+++ b/source/core/pipelinestate.h
@@ -11,6 +11,7 @@ namespace Msp {
 namespace GL {
 
 class Blend;
+class Buffer;
 class DepthTest;
 class Framebuffer;
 class Program;
@@ -35,8 +36,10 @@ private:
        {
                unsigned binding = 0;
                mutable bool changed = false;
+               mutable bool used = false;
                const Texture *texture = 0;
                const Sampler *sampler = 0;
+               int level = -1;
 
                BoundTexture(unsigned b): binding(b) { }
        };
@@ -45,7 +48,9 @@ private:
        {
                int binding = 0;
                mutable bool changed = false;
+               mutable bool used = false;
                const UniformBlock *block = 0;
+               const Buffer *buffer = 0;
 
                BoundUniformBlock(int b): binding(b) { }
        };
@@ -89,6 +94,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);