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/intern
diff options
context:
space:
mode:
authorKévin Dietrich <kevin.dietrich@mailoo.org>2022-02-17 17:15:46 +0300
committerKévin Dietrich <kevin.dietrich@mailoo.org>2022-02-17 17:15:46 +0300
commit45412493603e41526cac4076d46527c538c99985 (patch)
treeced24b2d49fdc0be6b8f778e439e54eb732f0d44 /intern
parentc5dcfb63d9e40138f03c135346bfa779abcb0e58 (diff)
Fix compile error on MSVC
`uint` is POSIX type, use `GLuint` like for the rest of the code.
Diffstat (limited to 'intern')
-rw-r--r--intern/opensubdiv/internal/evaluator/gl_compute_evaluator.cc8
1 files changed, 4 insertions, 4 deletions
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<uint>(maxWorkGroupCount[0]);
+ const GLuint maxResX = static_cast<GLuint>(maxWorkGroupCount[0]);
const int dispatchSize = GetDispatchSize(totalDispatchSize);
- uint dispatchRX = static_cast<uint>(dispatchSize);
- uint dispatchRY = 1u;
+ GLuint dispatchRX = static_cast<GLuint>(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<uint>(maxWorkGroupCount[1]));
+ assert(dispatchRY < static_cast<GLuint>(maxWorkGroupCount[1]));
glDispatchCompute(dispatchRX, dispatchRY, 1);
}