Combine OpenGL uniforms into batches

Author: drops

src/Layers/xrRender/R_Backend.h

@@ -23,6 +23,7 @@
 #endif
 #ifdef USE_OGL
 #include <glm/glm.hpp>
+#include "gl_backend_uniforms.h"
 #endif
 
 #include "FVF.h"
@@ -63,6 +64,9 @@ struct R_statistics
 #pragma warning(push)
 #pragma warning(disable:4324)
 class ECORE_API CBackend
+#ifdef USE_OGL
+    : public CBackendUniforms
+#endif
 {
 public:
     enum
@@ -103,13 +107,6 @@ class ECORE_API CBackend
     GLuint pFB;
     GLuint pRT[4];
     GLuint pZB;
-
-    template<typename TYPE>
-    void _set_uniforms(GLuint program, GLint location, xr_vector<TYPE>& uniforms);
-
-public:
-    void set_uniforms(GLuint program, GLint location, xr_vector<glm::vec4>& uniforms);
-private:
 #else
 #   error No graphics API selected or enabled!
 #endif

src/Layers/xrRender/R_Backend_Runtime.cpp

@@ -470,6 +470,10 @@ void CBackend::OnDeviceCreate()
 
     // invalidate caching
     Invalidate();
+
+#ifdef USE_OGL
+    initializeUniforms();
+#endif
 }
 
 void CBackend::OnDeviceDestroy()

src/Layers/xrRenderPC_GL/gl_backend_uniforms.cpp

@@ -3,7 +3,6 @@
 
 #include <glm/glm.hpp>
 
-
 namespace xray::render::RENDER_NAMESPACE
 {
 void CBackendUniforms::uniformBufferObjectGenerate(UniformBufferObject& info)
@@ -21,9 +20,9 @@ void CBackendUniforms::uniformBufferObjectRegisterWithProgram(Program& program,
 {
     // Only single bit is 1
     VERIFY(blockBinding != 0 && (blockBinding & (blockBinding - 1)) == 0);
-    //VERIFY(program.blockBindingSlots & 1 << blockBinding == 0);
+    //VERIFY(program.bindingSlots & 1 << blockBinding == 0);
 
-    if (program.blockBindingSlots & 1 << blockBinding)
+    if (program.bindingSlots & 1 << blockBinding)
     {
         // UBO already registered with this program
         return;
@@ -34,15 +33,15 @@ void CBackendUniforms::uniformBufferObjectRegisterWithProgram(Program& program,
     CHK_GL(glUniformBlockBinding(program.id, blockIndex, blockBinding));
     CHK_GL(glBindBufferRange(GL_UNIFORM_BUFFER, blockBinding, ubo.id, 0,ubo.size));
 
-    program.blockBindingSlots |= 1 << blockBinding;
+    program.bindingSlots |= 1 << blockBinding;
 
     CHK_GL(glBindBuffer(GL_UNIFORM_BUFFER, ubo.id));
 }
 
-void CBackendUniforms::uniformBufferObjectPushToDevice(const UniformBufferObject& ubo)
+void CBackendUniforms::uniformBufferObjectPushToDevice(const UniformBufferObject& ubo, GLsizeiptr size, void* data)
 {
     CHK_GL(glBindBuffer(GL_UNIFORM_BUFFER, ubo.id));
-    CHK_GL(glBufferSubData(GL_UNIFORM_BUFFER, 0, ubo.size, ubo.data));
+    CHK_GL(glBufferSubData(GL_UNIFORM_BUFFER, 0, size, data));
     //CHK_GL(glBindBuffer(GL_UNIFORM_BUFFER, 0));
 }
 
@@ -59,4 +58,10 @@ void CBackendUniforms::_set_uniforms(GLuint program, GLint location, xr_vector<T
         CHK_GL(glProgramUniform4fv(program, location, uniforms.size(), reinterpret_cast<GLfloat*>(uniforms.data())));
     }
 }
+
+void CBackendUniforms::initializeUniforms()
+{
+    CHK_GL(glGetIntegerv(GL_MAX_VERTEX_UNIFORM_COMPONENTS, &maxUniformVertexSize));
+    CHK_GL(glGetIntegerv(GL_MAX_UNIFORM_BLOCK_SIZE, &maxUniformBlockSize));
+}
 }

src/Layers/xrRenderPC_GL/gl_backend_uniforms.h

@@ -3,6 +3,9 @@
 #include "xrCommon/xr_vector.h"
 #include <glm/glm.hpp>
 #include <glad/gl.h>
+#include <string_view>
+
+#include "gl_program.h"
 
 namespace xray::render::RENDER_NAMESPACE
 {
@@ -16,26 +19,35 @@ struct UniformBufferObject
     void* data = nullptr;
 };
 
-struct Program
-{
-    GLuint id = GL_NONE;
-    uint32_t blockBindingSlots = 0;
-};
 
 class CBackendUniforms
 {
+protected:
+    void initializeUniforms();
 public:
+
     void set_uniforms(GLuint program, GLint location, xr_vector<glm::vec4>& uniforms);
 
     static void uniformBufferObjectGenerate(UniformBufferObject& ubo);
     static void uniformBufferObjectRegisterWithProgram(Program& program, std::string_view location, uint32_t blockBinding, const UniformBufferObject& ubo);
 
-    static void uniformBufferObjectPushToDevice(const UniformBufferObject& ubo);
+    static void uniformBufferObjectPushToDevice(const UniformBufferObject& ubo)
+    {
+        uniformBufferObjectPushToDevice(ubo, ubo.size, ubo.data);
+    }
+    static void uniformBufferObjectPushToDevice(const UniformBufferObject& ubo, GLsizeiptr size, void* data);
+
+    [[nodiscard]] uint calculateMaxUniformVertexSize(size_t sizeOfElement, uint max) const
+    {
+        return std::min(static_cast<uint>(maxUniformVertexSize / std::max(sizeOfElement, sizeof(float))), max);
+    }
 
 private:
+    GLint maxUniformVertexSize = GL_NONE;
+    GLint maxUniformBlockSize = GL_NONE;
+
     template<typename TYPE>
     void _set_uniforms(GLuint program, GLint location, xr_vector<TYPE>& uniforms);
-
 };
 
 }

src/Layers/xrRenderPC_GL/gl_program.h

@@ -0,0 +1,13 @@
+#pragma once
+#include "../../../sdk/include/glad/gl.h"
+#include "xrCommon/xr_string.h"
+
+struct Program
+{
+    GLuint id = GL_NONE;
+    uint32_t bindingSlots = 0;
+
+#ifdef DEBUG
+    xr_string name;
+#endif
+};