diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2022-04-20 22:31:54 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2022-04-20 22:32:03 +0300 |
| commit | b67ccc333a5525f76f4e3adbb5b8115d5bba3c1a (patch) | |
| tree | 7ae9013fab42e8fc9589b5179448cda1a5680031 | |
| parent | 4a03c5acf9ab343d5542427d3fd90b4978f02c23 (diff) | |
GL: Change array macro to not conflict with opensubdiv variable names
Fix T97449 GPU subdivision: Crash on adding subdivision surface modifier
| -rw-r--r-- | source/blender/gpu/opengl/gl_shader.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/opengl/gl_shader.cc b/source/blender/gpu/opengl/gl_shader.cc index 9768318f3b6..51d470ef0c1 100644 --- a/source/blender/gpu/opengl/gl_shader.cc +++ b/source/blender/gpu/opengl/gl_shader.cc @@ -855,7 +855,7 @@ static char *glsl_patch_default_get() STR_CONCAT(patch, slen, "#define gpu_InstanceIndex (gl_InstanceID + gpu_BaseInstance)\n"); /* Array compat. */ - STR_CONCAT(patch, slen, "#define array(_type) _type[]\n"); + STR_CONCAT(patch, slen, "#define gpu_Array(_type) _type[]\n"); /* Derivative sign can change depending on implementation. */ STR_CONCATF(patch, slen, "#define DFDX_SIGN %1.1f\n", GLContext::derivative_signs[0]); @@ -882,7 +882,7 @@ static char *glsl_patch_compute_get() STR_CONCAT(patch, slen, "#extension GL_ARB_compute_shader :enable\n"); /* Array compat. */ - STR_CONCAT(patch, slen, "#define array(_type) _type[]\n"); + STR_CONCAT(patch, slen, "#define gpu_Array(_type) _type[]\n"); BLI_assert(slen < sizeof(patch)); return patch; |