Determine the default uniform block size regardless of module format

diff --git a/source/backends/opengl/program_backend.cpp b/source/backends/opengl/program_backend.cpp
index 4dbf38a7197e5bd40e58f1f5c4151bbfafe2a594..86235ebe45c6d769b4367c0328f56dd26b43a418 100644 (file)
--- a/source/backends/opengl/program_backend.cpp
+++ b/source/backends/opengl/program_backend.cpp
@@ -334,11 +334,6 @@ void OpenGLProgram::query_uniforms()
                }
 
        default_block.sort_uniforms();
-       if(!default_block.uniforms.empty())
-       {
-               const ReflectData::UniformInfo &uni = *default_block.uniforms.back();
-               default_block.data_size = uni.location*16+uni.array_size*get_type_size(uni.type);
-       }
        default_block.update_layout_hash();
        rd.update_layout_hash();
 }

diff --git a/source/core/program.cpp b/source/core/program.cpp
index 6458b4779d396ae3fe5072f4ec9381c1ba4b05e3..5c8257b2fc60de50bf0e767beb90a5f8da5784e2 100644 (file)
--- a/source/core/program.cpp
+++ b/source/core/program.cpp
@@ -46,6 +46,13 @@ void Program::add_stages(const Module &mod, const map<string, int> &spec_values)
                collect_attributes(static_cast<const SpirVModule &>(mod));
        }
 
+       for(ReflectData::UniformBlockInfo &b: reflect_data.uniform_blocks)
+               if(!b.data_size && !b.uniforms.empty())
+               {
+                       const ReflectData::UniformInfo &uni = *b.uniforms.back();
+                       b.data_size = uni.location*16+uni.array_size*get_type_size(uni.type);
+               }
+
        for(const ReflectData::UniformInfo &u: reflect_data.uniforms)
                require_type(u.type);
        for(const ReflectData::AttributeInfo &a: reflect_data.attributes)