Simplify Program by removing transient data

After some earlier refactorings it was only used on one code path, so
those variables are now directly declared where they're needed.

diff --git a/source/backends/opengl/program_backend.cpp b/source/backends/opengl/program_backend.cpp
index a9328488cedc9bc12b5399bf55d2b032771dd52a..e83a94844dc4e79e28986e0d8dcf8e835e9cad7e 100644 (file)
--- a/source/backends/opengl/program_backend.cpp
+++ b/source/backends/opengl/program_backend.cpp
@@ -99,7 +99,7 @@ unsigned OpenGLProgram::add_stage(Stage type)
        return stage_id;
 }
 
        return stage_id;
 }
 

-void OpenGLProgram::add_glsl_stages(const GlslModule &mod, const map<string, int> &spec_values, TransientData &transient)
+void OpenGLProgram::add_glsl_stages(const GlslModule &mod, const map<string, int> &spec_values)

 {
        SL::Compiler compiler(Device::get_current().get_info().glsl_features);
        compiler.set_source(mod.get_prepared_source(), "<module>");
 {
        SL::Compiler compiler(Device::get_current().get_info().glsl_features);
        compiler.set_source(mod.get_prepared_source(), "<module>");


@@ -146,11 +146,44 @@ void OpenGLProgram::add_glsl_stages(const GlslModule &mod, const map<string, int
                compile_glsl_stage(mod, stage_id);
        }
 
                compile_glsl_stage(mod, stage_id);
        }
 

-       transient.textures = compiler.get_texture_bindings();
-       transient.blocks = compiler.get_uniform_block_bindings();
-

        ReflectData &rd = static_cast<Program *>(this)->reflect_data;
        rd.n_clip_distances = compiler.get_n_clip_distances();
        ReflectData &rd = static_cast<Program *>(this)->reflect_data;
        rd.n_clip_distances = compiler.get_n_clip_distances();

+
+       link(mod);
+       query_uniforms();
+       query_attributes();
+
+       const map<string, unsigned> &block_bindings = compiler.get_uniform_block_bindings();
+       if(!block_bindings.empty())
+       {
+               for(unsigned i=0; i<rd.uniform_blocks.size(); ++i)
+               {
+                       auto j = block_bindings.find(rd.uniform_blocks[i].name);
+                       if(j!=block_bindings.end())
+                       {
+                               glUniformBlockBinding(id, i, j->second);
+                               rd.uniform_blocks[i].bind_point = j->second;
+                       }
+               }
+       }
+
+       const map<string, unsigned> &tex_bindings = compiler.get_texture_bindings();
+       if(!tex_bindings.empty())
+       {
+               if(!ARB_separate_shader_objects)
+                       glUseProgram(id);
+               for(const auto &kvp: tex_bindings)
+               {
+                       int location = static_cast<const Program *>(this)->get_uniform_location(kvp.first);
+                       if(location>=0)
+                       {
+                               if(ARB_separate_shader_objects)
+                                       glProgramUniform1i(id, location, kvp.second);
+                               else
+                                       glUniform1i(location, kvp.second);
+                       }
+               }
+       }

 }
 
 void OpenGLProgram::compile_glsl_stage(const GlslModule &mod, unsigned stage_id)
 }
 
 void OpenGLProgram::compile_glsl_stage(const GlslModule &mod, unsigned stage_id)


@@ -220,9 +253,11 @@ void OpenGLProgram::add_spirv_stages(const SpirVModule &mod, const map<string, i
        for(unsigned i=0; i<MAX_STAGES; ++i)
                if(stage_ids[i])
                        glSpecializeShader(stage_ids[i], j->name.c_str(), spec_id_array.size(), &spec_id_array[0], &spec_value_array[0]);
        for(unsigned i=0; i<MAX_STAGES; ++i)
                if(stage_ids[i])
                        glSpecializeShader(stage_ids[i], j->name.c_str(), spec_id_array.size(), &spec_id_array[0], &spec_value_array[0]);

+
+       link(mod);

 }
 
 }
 

-void OpenGLProgram::finalize(const Module &mod, TransientData &transient)
+void OpenGLProgram::link(const Module &mod)

 {
        glLinkProgram(id);
        int status = 0;
 {
        glLinkProgram(id);
        int status = 0;


@@ -243,13 +278,6 @@ void OpenGLProgram::finalize(const Module &mod, TransientData &transient)
        if(!info_log.empty())
                IO::print("Program link info log:\n%s", info_log);
 #endif
        if(!info_log.empty())
                IO::print("Program link info log:\n%s", info_log);
 #endif

-
-       if(mod.get_format()==Module::GLSL)
-       {
-               query_uniforms();
-               query_attributes();
-               apply_bindings(transient);
-       }

 }
 
 void OpenGLProgram::query_uniforms()
 }
 
 void OpenGLProgram::query_uniforms()


@@ -418,35 +446,6 @@ void OpenGLProgram::query_attributes()
        }
 }
 
        }
 }
 

-void OpenGLProgram::apply_bindings(const TransientData &transient)
-{
-       ReflectData &rd = static_cast<Program *>(this)->reflect_data;
-
-       for(unsigned i=0; i<rd.uniform_blocks.size(); ++i)
-       {
-               auto j = transient.blocks.find(rd.uniform_blocks[i].name);
-               if(j!=transient.blocks.end())
-               {
-                       glUniformBlockBinding(id, i, j->second);
-                       rd.uniform_blocks[i].bind_point = j->second;
-               }
-       }
-
-       if(!ARB_separate_shader_objects)
-               glUseProgram(id);
-       for(const auto &kvp: transient.textures)
-       {
-               int location = static_cast<const Program *>(this)->get_uniform_location(kvp.first);
-               if(location>=0)
-               {
-                       if(ARB_separate_shader_objects)
-                               glProgramUniform1i(id, location, kvp.second);
-                       else
-                               glUniform1i(location, kvp.second);
-               }
-       }
-}
-

 void OpenGLProgram::finalize_uniforms()
 {
        ReflectData &rd = static_cast<Program *>(this)->reflect_data;
 void OpenGLProgram::finalize_uniforms()
 {
        ReflectData &rd = static_cast<Program *>(this)->reflect_data;

diff --git a/source/backends/opengl/program_backend.h b/source/backends/opengl/program_backend.h
index 2a223ff5ae1b50ffc46fc343c4a45996a04208cc..14650708e32abe77ee8f3ac3e851212e4b2ce895 100644 (file)
--- a/source/backends/opengl/program_backend.h
+++ b/source/backends/opengl/program_backend.h
@@ -23,12 +23,6 @@ protected:
                MAX_STAGES
        };
 
                MAX_STAGES
        };
 

-       struct TransientData
-       {
-               std::map<std::string, unsigned> textures;
-               std::map<std::string, unsigned> blocks;
-       };
-

        struct UniformCall
        {
                using FuncPtr = void (*)(unsigned, unsigned, const void *);
        struct UniformCall
        {
                using FuncPtr = void (*)(unsigned, unsigned, const void *);


@@ -52,15 +46,14 @@ protected:
 
        bool has_stages() const;
        unsigned add_stage(Stage);
 
        bool has_stages() const;
        unsigned add_stage(Stage);

-       void add_glsl_stages(const GlslModule &, const std::map<std::string, int> &, TransientData &);
+       void add_glsl_stages(const GlslModule &, const std::map<std::string, int> &);

        void compile_glsl_stage(const GlslModule &, unsigned);
        void add_spirv_stages(const SpirVModule &, const std::map<std::string, int> &);
 
        void compile_glsl_stage(const GlslModule &, unsigned);
        void add_spirv_stages(const SpirVModule &, const std::map<std::string, int> &);
 

-       void finalize(const Module &, TransientData &);
+       void link(const Module &);

        void query_uniforms();
        void query_uniform_blocks(const std::vector<ReflectData::UniformInfo *> &);
        void query_attributes();
        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 finalize_uniforms();
 
        void set_debug_name(const std::string &);

diff --git a/source/backends/vulkan/program_backend.cpp b/source/backends/vulkan/program_backend.cpp
index 50d772639adbeaf83bf3fbea40be303622639c58..68ade90c7f2ef8e15f1f14298877c6d47d59b3f4 100644 (file)
--- a/source/backends/vulkan/program_backend.cpp
+++ b/source/backends/vulkan/program_backend.cpp
@@ -43,7 +43,7 @@ bool VulkanProgram::has_stages() const
        return n_stages;
 }
 
        return n_stages;
 }
 

-void VulkanProgram::add_glsl_stages(const GlslModule &, const map<string, int> &, TransientData &)
+void VulkanProgram::add_glsl_stages(const GlslModule &, const map<string, int> &)

 {
        throw invalid_operation("VulkanProgram::add_glsl_stages");
 }
 {
        throw invalid_operation("VulkanProgram::add_glsl_stages");
 }

diff --git a/source/backends/vulkan/program_backend.h b/source/backends/vulkan/program_backend.h
index c01a5361197b09c0947b027671f0ed7ac17df8df..1454b40bdedf6b881e84450e4aca8ecf45bf573f 100644 (file)
--- a/source/backends/vulkan/program_backend.h
+++ b/source/backends/vulkan/program_backend.h
@@ -32,10 +32,9 @@ protected:
        ~VulkanProgram();
 
        bool has_stages() const;
        ~VulkanProgram();
 
        bool has_stages() const;

-       void add_glsl_stages(const GlslModule &, const std::map<std::string, int> &, TransientData &);
+       void add_glsl_stages(const GlslModule &, const std::map<std::string, int> &);

        void add_spirv_stages(const SpirVModule &, const std::map<std::string, int> &);
 
        void add_spirv_stages(const SpirVModule &, const std::map<std::string, int> &);
 

-       void finalize(const Module &, TransientData &) { }

        void finalize_uniforms();
 
        void set_debug_name(const std::string &) { }
        void finalize_uniforms();
 
        void set_debug_name(const std::string &) { }

diff --git a/source/core/program.cpp b/source/core/program.cpp
index e146c7acd7eed8db385f2176492ed1a504fdb4e0..881872212bebc224209f020d24aae0b4cc64c485 100644 (file)
--- a/source/core/program.cpp
+++ b/source/core/program.cpp
@@ -33,11 +33,10 @@ void Program::add_stages(const Module &mod, const map<string, int> &spec_values)
        reflect_data = ReflectData();
        const Module *final_module = &mod;
 
        reflect_data = ReflectData();
        const Module *final_module = &mod;
 

-       TransientData transient;

        switch(mod.get_format())
        {
        case Module::GLSL:
        switch(mod.get_format())
        {
        case Module::GLSL:

-               add_glsl_stages(static_cast<const GlslModule &>(mod), spec_values, transient);
+               add_glsl_stages(static_cast<const GlslModule &>(mod), spec_values);

                break;
        case Module::SPIR_V:
                if(!spec_values.empty())
                break;
        case Module::SPIR_V:
                if(!spec_values.empty())


@@ -51,8 +50,6 @@ void Program::add_stages(const Module &mod, const map<string, int> &spec_values)
                throw invalid_argument("Program::add_stages");
        }
 
                throw invalid_argument("Program::add_stages");
        }
 

-       finalize(*final_module, transient);
-

        if(final_module->get_format()==Module::SPIR_V)
        {
                const SpirVModule &spirv_mod = *static_cast<const SpirVModule *>(final_module);
        if(final_module->get_format()==Module::SPIR_V)
        {
                const SpirVModule &spirv_mod = *static_cast<const SpirVModule *>(final_module);