diff options
author | Pierre de La Morinerie <kemenaran@gmail.com> | 2015-11-25 11:56:11 +0100 |
---|---|---|
committer | Pierre de La Morinerie <kemenaran@gmail.com> | 2015-11-25 11:56:11 +0100 |
commit | 0735630744f5bcc93d8310d592dab91b94d26652 (patch) | |
tree | 035af9b541e6de8437a76fa18842aa26f30d4001 /src/video_core/renderer_opengl/gl_shader_gen.cpp | |
parent | Merge pull request #1248 from polaris-/add-ssl-stubs (diff) | |
download | yuzu-0735630744f5bcc93d8310d592dab91b94d26652.tar yuzu-0735630744f5bcc93d8310d592dab91b94d26652.tar.gz yuzu-0735630744f5bcc93d8310d592dab91b94d26652.tar.bz2 yuzu-0735630744f5bcc93d8310d592dab91b94d26652.tar.lz yuzu-0735630744f5bcc93d8310d592dab91b94d26652.tar.xz yuzu-0735630744f5bcc93d8310d592dab91b94d26652.tar.zst yuzu-0735630744f5bcc93d8310d592dab91b94d26652.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 | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_gen.cpp b/src/video_core/renderer_opengl/gl_shader_gen.cpp index 3f1cf7a6f..0f781805c 100644 --- a/src/video_core/renderer_opengl/gl_shader_gen.cpp +++ b/src/video_core/renderer_opengl/gl_shader_gen.cpp @@ -321,8 +321,6 @@ static void WriteTevStage(std::string& out, const PicaShaderConfig& config, unsi std::string GenerateFragmentShader(const PicaShaderConfig& config) { std::string out = R"( #version 330 -#extension GL_ARB_explicit_uniform_location : require - #define NUM_TEV_STAGES 6 in vec4 primary_color; @@ -338,9 +336,7 @@ layout (std140) uniform shader_data { )"; - using Uniform = RasterizerOpenGL::PicaShader::Uniform; - out += "layout(location = " + std::to_string((int)Uniform::Texture0) + ") uniform sampler2D tex[3];\n"; - + out += "uniform sampler2D tex[3];\n"; out += "void main() {\n"; out += "vec4 combiner_buffer = tev_combiner_buffer_color;\n"; out += "vec4 last_tex_env_out = vec4(0.0);\n"; |