From f5191b87608f6607aa1dbd4b9409174db351984b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cle=CC=81ment=20Foucault?= Date: Wed, 20 Apr 2022 09:11:47 +0200 Subject: Fix GPU subdivision: Crash on adding subdivision surface modifier This was caused by the use of a reserved keyword macro that is not directly used but causes an error on some compiler. Change the occurences to not match the macros. --- .../opensubdiv/internal/evaluator/shaders/glsl_compute_kernel.glsl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'intern/opensubdiv') diff --git a/intern/opensubdiv/internal/evaluator/shaders/glsl_compute_kernel.glsl b/intern/opensubdiv/internal/evaluator/shaders/glsl_compute_kernel.glsl index 2f60aee0999..08ba1239cb9 100644 --- a/intern/opensubdiv/internal/evaluator/shaders/glsl_compute_kernel.glsl +++ b/intern/opensubdiv/internal/evaluator/shaders/glsl_compute_kernel.glsl @@ -329,10 +329,10 @@ void main() int current = int(gl_GlobalInvocationID.x); OsdPatchCoord coord = GetPatchCoord(current); - OsdPatchArray array = GetPatchArray(coord.arrayIndex); + OsdPatchArray arr = GetPatchArray(coord.arrayIndex); OsdPatchParam param = GetPatchParam(coord.patchIndex); - int patchType = OsdPatchParamIsRegular(param) ? array.regDesc : array.desc; + int patchType = OsdPatchParamIsRegular(param) ? arr.regDesc : arr.desc; float wP[20], wDu[20], wDv[20], wDuu[20], wDuv[20], wDvv[20]; int nPoints = OsdEvaluatePatchBasis( @@ -346,7 +346,7 @@ void main() clear(duv); clear(dvv); - int indexBase = array.indexBase + array.stride * (coord.patchIndex - array.primitiveIdBase); + int indexBase = arr.indexBase + arr.stride * (coord.patchIndex - arr.primitiveIdBase); for (int cv = 0; cv < nPoints; ++cv) { int index = patchIndexBuffer[indexBase + cv]; -- cgit v1.2.3