summaryrefslogtreecommitdiffstats
path: root/src/video_core/renderer_opengl/gl_shader_manager.h
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2018-08-12 02:21:31 +0200
committerSubv <subv2112@gmail.com>2018-08-15 05:25:07 +0200
commitc5284efd4f04bca05b1f5c61dce59090a7edf61e (patch)
treea4bf294444c67058812f010d01a60e44aa1c80b6 /src/video_core/renderer_opengl/gl_shader_manager.h
parentMerge pull request #1069 from bunnei/vtx-sz (diff)
downloadyuzu-c5284efd4f04bca05b1f5c61dce59090a7edf61e.tar
yuzu-c5284efd4f04bca05b1f5c61dce59090a7edf61e.tar.gz
yuzu-c5284efd4f04bca05b1f5c61dce59090a7edf61e.tar.bz2
yuzu-c5284efd4f04bca05b1f5c61dce59090a7edf61e.tar.lz
yuzu-c5284efd4f04bca05b1f5c61dce59090a7edf61e.tar.xz
yuzu-c5284efd4f04bca05b1f5c61dce59090a7edf61e.tar.zst
yuzu-c5284efd4f04bca05b1f5c61dce59090a7edf61e.zip
Diffstat (limited to 'src/video_core/renderer_opengl/gl_shader_manager.h')
-rw-r--r--src/video_core/renderer_opengl/gl_shader_manager.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_manager.h b/src/video_core/renderer_opengl/gl_shader_manager.h
index 716933a0b..75fa73605 100644
--- a/src/video_core/renderer_opengl/gl_shader_manager.h
+++ b/src/video_core/renderer_opengl/gl_shader_manager.h
@@ -24,14 +24,15 @@ void SetShaderUniformBlockBindings(GLuint shader);
} // namespace Impl
/// Uniform structure for the Uniform Buffer Object, all vectors must be 16-byte aligned
-// NOTE: Always keep a vec4 at the end. The GL spec is not clear wether the alignment at
+// NOTE: Always keep a vec4 at the end. The GL spec is not clear whether the alignment at
// the end of a uniform block is included in UNIFORM_BLOCK_DATA_SIZE or not.
// Not following that rule will cause problems on some AMD drivers.
struct MaxwellUniformData {
void SetFromRegs(const Maxwell3D::State::ShaderStageInfo& shader_stage);
alignas(16) GLvec4 viewport_flip;
+ alignas(16) GLuvec4 instance_id;
};
-static_assert(sizeof(MaxwellUniformData) == 16, "MaxwellUniformData structure size is incorrect");
+static_assert(sizeof(MaxwellUniformData) == 32, "MaxwellUniformData structure size is incorrect");
static_assert(sizeof(MaxwellUniformData) < 16384,
"MaxwellUniformData structure must be less than 16kb as per the OpenGL spec");