diff options
author | Subv <subv2112@gmail.com> | 2015-11-10 17:58:53 +0100 |
---|---|---|
committer | Subv <subv2112@gmail.com> | 2015-11-19 03:03:56 +0100 |
commit | 823ce62f2fead8e436c2c916ed7ce5c8b949d1c6 (patch) | |
tree | bf0c4bded40858a0db81e993503e2f90f2b9b400 /src/video_core/renderer_opengl/gl_shader_gen.cpp | |
parent | Merge pull request #1236 from Subv/log_overflow (diff) | |
download | yuzu-823ce62f2fead8e436c2c916ed7ce5c8b949d1c6.tar yuzu-823ce62f2fead8e436c2c916ed7ce5c8b949d1c6.tar.gz yuzu-823ce62f2fead8e436c2c916ed7ce5c8b949d1c6.tar.bz2 yuzu-823ce62f2fead8e436c2c916ed7ce5c8b949d1c6.tar.lz yuzu-823ce62f2fead8e436c2c916ed7ce5c8b949d1c6.tar.xz yuzu-823ce62f2fead8e436c2c916ed7ce5c8b949d1c6.tar.zst yuzu-823ce62f2fead8e436c2c916ed7ce5c8b949d1c6.zip |
Diffstat (limited to 'src/video_core/renderer_opengl/gl_shader_gen.cpp')
-rw-r--r-- | src/video_core/renderer_opengl/gl_shader_gen.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_gen.cpp b/src/video_core/renderer_opengl/gl_shader_gen.cpp index d19d15e75..3f1cf7a6f 100644 --- a/src/video_core/renderer_opengl/gl_shader_gen.cpp +++ b/src/video_core/renderer_opengl/gl_shader_gen.cpp @@ -329,13 +329,17 @@ in vec4 primary_color; in vec2 texcoord[3]; out vec4 color; + +layout (std140) uniform shader_data { + vec4 const_color[NUM_TEV_STAGES]; + vec4 tev_combiner_buffer_color; + int alphatest_ref; +}; + )"; using Uniform = RasterizerOpenGL::PicaShader::Uniform; - out += "layout(location = " + std::to_string((int)Uniform::AlphaTestRef) + ") uniform int alphatest_ref;\n"; - out += "layout(location = " + std::to_string((int)Uniform::TevConstColors) + ") uniform vec4 const_color[NUM_TEV_STAGES];\n"; out += "layout(location = " + std::to_string((int)Uniform::Texture0) + ") uniform sampler2D tex[3];\n"; - out += "layout(location = " + std::to_string((int)Uniform::TevCombinerBufferColor) + ") uniform vec4 tev_combiner_buffer_color;\n"; out += "void main() {\n"; out += "vec4 combiner_buffer = tev_combiner_buffer_color;\n"; |