Move default uniform block sizing to OpenGL backend

diff --git a/source/backends/opengl/program_backend.cpp b/source/backends/opengl/program_backend.cpp
index 911ce34e69fbf591ccd1950adea30ed91d6fda83..a3603adc78ef6ed5f89cbfde56543004f417a00b 100644 (file)
--- a/source/backends/opengl/program_backend.cpp
+++ b/source/backends/opengl/program_backend.cpp
@@ -493,6 +493,12 @@ void OpenGLProgram::finalize_uniforms()
                                if(func)
                                        uniform_calls.push_back(UniformCall(u->location, u->array_size, func));
                        }
                                if(func)
                                        uniform_calls.push_back(UniformCall(u->location, u->array_size, func));
                        }

+
+               if(i->data_size<=0)
+               {
+                       const ReflectData::UniformInfo &last = *i->uniforms.back();
+                       i->data_size = last.location*16+last.array_size*get_type_size(last.type);
+               }

        }
 }
 
        }
 }
 

diff --git a/source/core/program.cpp b/source/core/program.cpp
index 9193cd7be155b54a4f8b1fc8a87de974cc3d72b4..2934d240c7ef0c3bda346636d51725c8729b7bd1 100644 (file)
--- a/source/core/program.cpp
+++ b/source/core/program.cpp
@@ -42,13 +42,6 @@ void Program::add_stages(const Module &mod, const map<string, int> &spec_values)
 
        finalize_uniforms();
 
 
        finalize_uniforms();
 

-       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)
        for(const ReflectData::UniformInfo &u: reflect_data.uniforms)
                require_type(u.type);
        for(const ReflectData::AttributeInfo &a: reflect_data.attributes)