Refactor Renderer's texture management to make it more extensible

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

diff --git a/source/render/renderer.h b/source/render/renderer.h
index 4e70204240f3de2591d987d65551cc44379f97d5..9335164b38477993d9202db61f9f140e67cfb232 100644 (file)
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -63,14 +63,25 @@ public:
        };
 
 private:
-       struct BoundTexture
+       struct SampledTexture
        {
-               Tag tag;
-               mutable int binding = -1;
                const Texture *texture = 0;
                const Sampler *sampler = 0;
                int level = -1;
+
+               SampledTexture() = default;
+               SampledTexture(const Texture *t, const Sampler *s, int l): texture(t), sampler(s), level(l) { }
+
+               bool operator==(const SampledTexture &o) const { return texture==o.texture && sampler==o.sampler && level==o.level; }
+       };
+
+       template<typename T>
+       struct BoundResource
+       {
+               Tag tag;
+               mutable int binding = -1;
                int replaced = -1;
+               T resource;
        };
 
        struct BoundProgramData
@@ -115,7 +126,7 @@ private:
        State *current_state = 0;
        ProgramData standard_shdata;
        std::vector<BoundProgramData> shdata_stack;
-       std::vector<BoundTexture> texture_stack;
+       std::vector<BoundResource<SampledTexture>> texture_stack;
        const Texture &placeholder_texture;
        const Sampler &default_sampler;
        PipelineState *last_pipeline = 0;
@@ -188,8 +199,13 @@ public:
        void set_texture(Tag, const Texture *, int, const Sampler * = 0);
 
 private:
+       template<typename T>
+       static void set_resource(std::vector<BoundResource<T>> &, unsigned &, Tag, const T &);
+
        void flush_shader_data();
-       void flush_textures();
+
+       template<typename T>
+       static void flush_resources(std::vector<BoundResource<T>> &, unsigned &);
 
 public:
        void set_vertex_setup(const VertexSetup *);