Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2022-01-26 02:02:06 +0300
committerClément Foucault <foucault.clem@gmail.com>2022-01-26 02:03:27 +0300
commitc4bedeb0186b520a5fdb578ab25035ff908a22f4 (patch)
tree167e755294648d4c462312e9f5dd53df778f9bb9
parent83094d9a0d43a95fa0ac2ec79234e54bb1c88675 (diff)
GLShader: Fix crash caused by redundant uniform declaration
This slipped through during a rebase.
-rw-r--r--source/blender/gpu/opengl/gl_shader.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/source/blender/gpu/opengl/gl_shader.cc b/source/blender/gpu/opengl/gl_shader.cc
index ac9aec5af04..f7ef5c037c9 100644
--- a/source/blender/gpu/opengl/gl_shader.cc
+++ b/source/blender/gpu/opengl/gl_shader.cc
@@ -595,11 +595,6 @@ static char *glsl_patch_default_get()
STR_CONCAT(patch, slen, "#extension GL_ARB_shading_language_420pack: enable\n");
}
- if (!GLContext::shader_draw_parameters_support) {
- /* Fallback: Emulate base instance using a uniform. */
- STR_CONCAT(patch, slen, "uniform int gpu_BaseInstance;\n");
- }
-
/* Fallbacks. */
if (!GLContext::shader_draw_parameters_support) {
STR_CONCAT(patch, slen, "uniform int gpu_BaseInstance;\n");