Store simpler states by value in PipelineState

[libs/gl.git] / source / render / renderer.h

diff --git a/source/render/renderer.h b/source/render/renderer.h
index ffaa917dd4f5b8dd772ba5ce008c7f9d1fc372f7..c176f87aa231664f5eccfb442317421737004f47 100644 (file)
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -64,6 +64,7 @@ private:
                mutable int binding = -1;
                const Texture *texture = 0;
                const Sampler *sampler = 0;
+               int level = -1;
                int replaced = -1;
        };
 
@@ -107,6 +108,7 @@ private:
        ProgramData standard_shdata;
        std::vector<BoundProgramData> shdata_stack;
        std::vector<BoundTexture> texture_stack;
+       const Texture &placeholder_texture;
        Commands commands;
 
 public:
@@ -160,6 +162,7 @@ public:
        void add_shader_data(const ProgramData &data);
 
        void set_texture(Tag, const Texture *, const Sampler * = 0);
+       void set_texture(Tag, const Texture *, int, const Sampler * = 0);
 
 private:
        void flush_shader_data();
@@ -177,7 +180,10 @@ public:
        void set_object_lod_bias(unsigned);
        unsigned get_object_lod_bias() const { return get_state().object_lod_bias; }
 
-       void clear(const ClearValue *);
+       /** Clears framebuffer contents.  If values is not null, it must contain one
+       element for each attachment.  Otherwise the framebuffer contents are
+       discarded and become undefined. */
+       void clear(const ClearValue *values);
 
        /** Draws a batch of primitives.  A shader must be active. */
        void draw(const Batch &);
@@ -193,6 +199,7 @@ public:
        void end_query(const QueryPool &, unsigned);
 
 private:
+       void apply_framebuffer();
        void apply_state();
 };