diff options
author | RSDuck <rsduck@users.noreply.github.com> | 2021-01-17 17:15:03 +0100 |
---|---|---|
committer | RSDuck <rsduck@users.noreply.github.com> | 2021-01-17 17:15:03 +0100 |
commit | 53d5def9192d1217e8d0e0cc3ce90f7060ba74db (patch) | |
tree | 49340655f25e868e97eae325b893edbab1f27f0c /src | |
parent | 8829b0511c57bf33045db8f463703286d028cc61 (diff) |
pad ShaderConfig to a multiple of 16
Diffstat (limited to 'src')
-rw-r--r-- | src/GPU3D_OpenGL.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/GPU3D_OpenGL.cpp b/src/GPU3D_OpenGL.cpp index eb8fa62..adb0ddf 100644 --- a/src/GPU3D_OpenGL.cpp +++ b/src/GPU3D_OpenGL.cpp @@ -65,7 +65,7 @@ struct float uFogDensity[34][4]; // float[34] 168 / 136 u32 uFogOffset; // int 304 / 1 u32 uFogShift; // int 305 / 1 - + u32 _pad1[2]; // int 306 / 2 } ShaderConfig; GLuint ShaderConfigUBO; @@ -284,7 +284,8 @@ bool Init() glGenBuffers(1, &ShaderConfigUBO); glBindBuffer(GL_UNIFORM_BUFFER, ShaderConfigUBO); - glBufferData(GL_UNIFORM_BUFFER, (sizeof(ShaderConfig) + 15) & ~15, &ShaderConfig, GL_STATIC_DRAW); + static_assert((sizeof(ShaderConfig) & 15) == 0); + glBufferData(GL_UNIFORM_BUFFER, sizeof(ShaderConfig), &ShaderConfig, GL_STATIC_DRAW); glBindBufferBase(GL_UNIFORM_BUFFER, 0, ShaderConfigUBO); |