Build the list of glUniform* calls even for SPIR-V modules

[libs/gl.git] / source / backends / opengl / program_backend.h

diff --git a/source/backends/opengl/program_backend.h b/source/backends/opengl/program_backend.h
index 4ae729e2c95525cc2ef8e102991d0bc25e464632..dbf043e9c89ba39a808432f80a001c2e933d68cb 100644 (file)
--- a/source/backends/opengl/program_backend.h
+++ b/source/backends/opengl/program_backend.h
@@ -40,9 +40,9 @@ protected:
                UniformCall(unsigned l, unsigned s, FuncPtr f): location(l), size(s), func(f) { }
        };
 
-       unsigned id;
-       unsigned stage_ids[MAX_STAGES];
-       bool linked;
+       unsigned id = 0;
+       unsigned stage_ids[MAX_STAGES] = { };
+       bool linked = false;
        std::vector<UniformCall> uniform_calls;
        std::string debug_name;
 
@@ -55,11 +55,12 @@ protected:
        void compile_glsl_stage(const GlslModule &, unsigned);
        void add_spirv_stages(const SpirVModule &, const std::map<std::string, int> &, TransientData &);
 
-       void finalize(const Module &);
+       void finalize(const Module &, TransientData &);
        void query_uniforms();
        void query_uniform_blocks(const std::vector<ReflectData::UniformInfo *> &);
        void query_attributes();
        void apply_bindings(const TransientData &);
+       void finalize_uniforms();
 
        void set_debug_name(const std::string &);
        void set_stage_debug_name(unsigned, Stage);