diff options
author | bunnei <bunneidev@gmail.com> | 2018-08-17 06:07:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-17 06:07:06 +0200 |
commit | 727136a9c941e11f98ada3a972e860d2d945d96f (patch) | |
tree | 6ee9b1dfda590eaa0cc8bf906c262a07ff82de9f /src/video_core/renderer_opengl/gl_shader_manager.h | |
parent | Merge pull request #1087 from MerryMage/dynarmic (diff) | |
parent | Rasterizer: Implemented instanced rendering. (diff) | |
download | yuzu-727136a9c941e11f98ada3a972e860d2d945d96f.tar yuzu-727136a9c941e11f98ada3a972e860d2d945d96f.tar.gz yuzu-727136a9c941e11f98ada3a972e860d2d945d96f.tar.bz2 yuzu-727136a9c941e11f98ada3a972e860d2d945d96f.tar.lz yuzu-727136a9c941e11f98ada3a972e860d2d945d96f.tar.xz yuzu-727136a9c941e11f98ada3a972e860d2d945d96f.tar.zst yuzu-727136a9c941e11f98ada3a972e860d2d945d96f.zip |
Diffstat (limited to 'src/video_core/renderer_opengl/gl_shader_manager.h')
-rw-r--r-- | src/video_core/renderer_opengl/gl_shader_manager.h | 5 |
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"); |