blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Fix T79246 GPUShader: compile error on AWS Elastic Graphics

This commit is contained in:
Clément Foucault 2020-08-09 14:07:00 +02:00 committed by Jeroen Bakker
parent c15352dd67
commit 02c3428e0c
Notes: blender-bot 2023-02-13 22:19:31 +01:00 
Referenced by issue #79246, Blender won't start - GPUShader: compile error - AWS Elastic Graphics
Referenced by issue #77348, Blender LTS: Maintenance Task 2.83
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/draw/intern/shaders/common_view_lib.glsl
View File

@ -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;

1
source/blender/gpu/intern/gpu_shader.c
View File

@ -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");