diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-10-30 04:23:09 +0100 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-11-07 05:52:18 +0100 |
commit | f019817f8f6452dec784d8217ef102231319d26c (patch) | |
tree | d49542f0b9b4c26c651d1a3263b3a165c6a8b24b /src/video_core/renderer_opengl/gl_shader_manager.h | |
parent | Merge pull request #3078 from bunnei/azure-rename-partial (diff) | |
download | yuzu-f019817f8f6452dec784d8217ef102231319d26c.tar yuzu-f019817f8f6452dec784d8217ef102231319d26c.tar.gz yuzu-f019817f8f6452dec784d8217ef102231319d26c.tar.bz2 yuzu-f019817f8f6452dec784d8217ef102231319d26c.tar.lz yuzu-f019817f8f6452dec784d8217ef102231319d26c.tar.xz yuzu-f019817f8f6452dec784d8217ef102231319d26c.tar.zst yuzu-f019817f8f6452dec784d8217ef102231319d26c.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 | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_manager.h b/src/video_core/renderer_opengl/gl_shader_manager.h index 6961e702a..3703e7018 100644 --- a/src/video_core/renderer_opengl/gl_shader_manager.h +++ b/src/video_core/renderer_opengl/gl_shader_manager.h @@ -18,17 +18,12 @@ namespace OpenGL::GLShader { /// @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 Tegra::Engines::Maxwell3D& maxwell, std::size_t shader_stage); - - alignas(16) GLvec4 viewport_flip; - struct alignas(16) { - GLuint instance_id; - GLuint flip_stage; - GLfloat y_direction; - }; +struct alignas(16) MaxwellUniformData { + void SetFromRegs(const Tegra::Engines::Maxwell3D& maxwell); + + GLfloat y_direction; }; -static_assert(sizeof(MaxwellUniformData) == 32, "MaxwellUniformData structure size is incorrect"); +static_assert(sizeof(MaxwellUniformData) == 16, "MaxwellUniformData structure size is incorrect"); static_assert(sizeof(MaxwellUniformData) < 16384, "MaxwellUniformData structure must be less than 16kb as per the OpenGL spec"); |