From ff92d7d4b0fa7356cc802eec4422f453cce30be1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 24 Aug 2022 10:51:35 +0200 Subject: [PATCH] Remove duplicate uniform queries --- GPU/GLES/ShaderManagerGLES.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/GPU/GLES/ShaderManagerGLES.cpp b/GPU/GLES/ShaderManagerGLES.cpp index 858052f43e..2b865cc818 100644 --- a/GPU/GLES/ShaderManagerGLES.cpp +++ b/GPU/GLES/ShaderManagerGLES.cpp @@ -96,8 +96,9 @@ LinkedShader::LinkedShader(GLRenderManager *render, VShaderID VSID, Shader *vs, std::vector queries; queries.push_back({ &u_tex, "tex" }); - queries.push_back({ &u_proj, "u_proj" }); - queries.push_back({ &u_proj_through, "u_proj_through" }); + queries.push_back({ &u_pal, "pal" }); + queries.push_back({ &u_testtex, "testtex" }); + queries.push_back({ &u_fbotex, "fbotex" }); queries.push_back({ &u_proj, "u_proj" }); queries.push_back({ &u_proj_through, "u_proj_through" }); @@ -108,13 +109,9 @@ LinkedShader::LinkedShader(GLRenderManager *render, VShaderID VSID, Shader *vs, queries.push_back({ &u_alphacolormask, "u_alphacolormask" }); queries.push_back({ &u_colorWriteMask, "u_colorWriteMask" }); queries.push_back({ &u_stencilReplaceValue, "u_stencilReplaceValue" }); - queries.push_back({ &u_testtex, "testtex" }); - - queries.push_back({ &u_fbotex, "fbotex" }); queries.push_back({ &u_blendFixA, "u_blendFixA" }); queries.push_back({ &u_blendFixB, "u_blendFixB" }); queries.push_back({ &u_fbotexSize, "u_fbotexSize" }); - queries.push_back({ &u_pal, "pal" }); // Transform queries.push_back({ &u_view, "u_view" });