From 00162e6b7b0fbb6f11d6913362b7ae5209ea381b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Sun, 9 Aug 2020 14:07:00 +0200 Subject: Fix T79246 GPUShader: compile error on AWS Elastic Graphics --- source/blender/draw/intern/shaders/common_view_lib.glsl | 2 +- source/blender/gpu/intern/gpu_shader.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'source') diff --git a/source/blender/draw/intern/shaders/common_view_lib.glsl b/source/blender/draw/intern/shaders/common_view_lib.glsl index 095bc64a19e..c77537bbe48 100644 --- a/source/blender/draw/intern/shaders/common_view_lib.glsl +++ b/source/blender/draw/intern/shaders/common_view_lib.glsl @@ -75,7 +75,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 9ea798e5669..1578e0e19ce 100644 --- a/source/blender/gpu/intern/gpu_shader.c +++ b/source/blender/gpu/intern/gpu_shader.c @@ -230,6 +230,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"); -- cgit v1.2.3