summaryrefslogtreecommitdiffstats
path: root/src/video_core/renderer_opengl/gl_shader_gen.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-11-26 02:50:29 +0100
committerbunnei <bunneidev@gmail.com>2015-11-26 02:50:29 +0100
commitff502a51c58f9cad98a67cc86f2cfec2a5c1988a (patch)
tree035af9b541e6de8437a76fa18842aa26f30d4001 /src/video_core/renderer_opengl/gl_shader_gen.cpp
parentMerge pull request #1248 from polaris-/add-ssl-stubs (diff)
parentUse regular uniform location (diff)
downloadyuzu-ff502a51c58f9cad98a67cc86f2cfec2a5c1988a.tar
yuzu-ff502a51c58f9cad98a67cc86f2cfec2a5c1988a.tar.gz
yuzu-ff502a51c58f9cad98a67cc86f2cfec2a5c1988a.tar.bz2
yuzu-ff502a51c58f9cad98a67cc86f2cfec2a5c1988a.tar.lz
yuzu-ff502a51c58f9cad98a67cc86f2cfec2a5c1988a.tar.xz
yuzu-ff502a51c58f9cad98a67cc86f2cfec2a5c1988a.tar.zst
yuzu-ff502a51c58f9cad98a67cc86f2cfec2a5c1988a.zip
Diffstat (limited to 'src/video_core/renderer_opengl/gl_shader_gen.cpp')
-rw-r--r--src/video_core/renderer_opengl/gl_shader_gen.cpp6
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";