From c4bedeb0186b520a5fdb578ab25035ff908a22f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Wed, 26 Jan 2022 00:02:06 +0100 Subject: [PATCH] GLShader: Fix crash caused by redundant uniform declaration This slipped through during a rebase. --- source/blender/gpu/opengl/gl_shader.cc | 5 ----- 1 file changed, 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");