[Bf-blender-cvs] [02c3428e0c7] blender-v2.83-release: Fix T79246 GPUShader: compile error on AWS Elastic Graphics

[Clément Foucault]

Commit: 02c3428e0c7544cc3631a88757226e8956367f1a
Author: Clément Foucault
Date:   Sun Aug 9 14:07:00 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB02c3428e0c7544cc3631a88757226e8956367f1a

Fix T79246 GPUShader: compile error on AWS Elastic Graphics

===================================================================

M       source/blender/draw/intern/shaders/common_view_lib.glsl
M       source/blender/gpu/intern/gpu_shader.c

===================================================================

diff --git a/source/blender/draw/intern/shaders/common_view_lib.glsl 
b/source/blender/draw/intern/shaders/common_view_lib.glsl
index 1054f4d11c9..2079721f9cd 100644
--- a/source/blender/draw/intern/shaders/common_view_lib.glsl
+++ b/source/blender/draw/intern/shaders/common_view_lib.glsl
@@ -71,7 +71,7 @@ vec4 pack_line_data(vec2 frag_co, vec2 edge_start, vec2 
edge_pos)
 uniform int resourceChunk;
 
 #ifdef GPU_VERTEX_SHADER
-#  ifdef GL_ARB_shader_draw_parameters
+#  ifdef GPU_ARB_shader_draw_parameters
 #    define baseInstance gl_BaseInstanceARB
 #  else /* no ARB_shader_draw_parameters */
 uniform int baseInstance;
diff --git a/source/blender/gpu/intern/gpu_shader.c 
b/source/blender/gpu/intern/gpu_shader.c
index 8dfc992ae9f..1754c804e1a 100644
--- a/source/blender/gpu/intern/gpu_shader.c
+++ b/source/blender/gpu/intern/gpu_shader.c
@@ -232,6 +232,7 @@ static void gpu_shader_standard_extensions(char 
defines[MAX_EXT_DEFINE_LENGTH])
   }
   if (GLEW_ARB_shader_draw_parameters) {
     strcat(defines, "#extension GL_ARB_shader_draw_parameters : enable\n");
+    strcat(defines, "#define GPU_ARB_shader_draw_parameters\n");
   }
   if (GPU_arb_texture_cube_map_array_is_supported()) {
     strcat(defines, "#extension GL_ARB_texture_cube_map_array : enable\n");

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs