From 45412493603e41526cac4076d46527c538c99985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dietrich?= Date: Thu, 17 Feb 2022 15:15:46 +0100 Subject: Fix compile error on MSVC `uint` is POSIX type, use `GLuint` like for the rest of the code. --- intern/opensubdiv/internal/evaluator/gl_compute_evaluator.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'intern') diff --git a/intern/opensubdiv/internal/evaluator/gl_compute_evaluator.cc b/intern/opensubdiv/internal/evaluator/gl_compute_evaluator.cc index 0cab44518aa..ee4eaeaec5d 100644 --- a/intern/opensubdiv/internal/evaluator/gl_compute_evaluator.cc +++ b/intern/opensubdiv/internal/evaluator/gl_compute_evaluator.cc @@ -267,11 +267,11 @@ void GLComputeEvaluator::DispatchCompute(int totalDispatchSize) const glGetIntegeri_v(GL_MAX_COMPUTE_WORK_GROUP_COUNT, 0, &maxWorkGroupCount[0]); glGetIntegeri_v(GL_MAX_COMPUTE_WORK_GROUP_COUNT, 1, &maxWorkGroupCount[1]); - const uint maxResX = static_cast(maxWorkGroupCount[0]); + const GLuint maxResX = static_cast(maxWorkGroupCount[0]); const int dispatchSize = GetDispatchSize(totalDispatchSize); - uint dispatchRX = static_cast(dispatchSize); - uint dispatchRY = 1u; + GLuint dispatchRX = static_cast(dispatchSize); + GLuint dispatchRY = 1u; if (dispatchRX > maxResX) { /* Since there are some limitations with regards to the maximum work group size (could be as * low as 64k elements per call), we split the number elements into a "2d" number, with the @@ -290,7 +290,7 @@ void GLComputeEvaluator::DispatchCompute(int totalDispatchSize) const /* X and Y dimensions may have different limits so the above computation may not be right, but * even with the standard 64k minimum on all dimensions we still have a lot of room. Therefore, * we presume it all fits. */ - assert(dispatchRY < static_cast(maxWorkGroupCount[1])); + assert(dispatchRY < static_cast(maxWorkGroupCount[1])); glDispatchCompute(dispatchRX, dispatchRY, 1); } -- cgit v1.2.3