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
path: root/source
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2020-08-09 15:07:00 +0300
committerJeroen Bakker <jeroen@blender.org>2020-08-12 10:19:53 +0300
commit02c3428e0c7544cc3631a88757226e8956367f1a (patch)
tree8dba74b84102d24d924a3e8573a7df100b5c658a /source
parentc15352dd67f551f559c40d7d5e0402dc6ec2e913 (diff)
Fix T79246 GPUShader: compile error on AWS Elastic Graphics
Diffstat (limited to 'source')
-rw-r--r--source/blender/draw/intern/shaders/common_view_lib.glsl2
-rw-r--r--source/blender/gpu/intern/gpu_shader.c1
2 files changed, 2 insertions, 1 deletions
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");