Use PathID in place of GLuint handle
Bug: angleproject:3804
Change-Id: Ibadfc2c33e4af1cca22caa1dbe96ac48a4a85ffa
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1766822
Reviewed-by: Jiacheng Lu <lujc@google.com>
Commit-Queue: Jiacheng Lu <lujc@google.com>
diff --git a/src/libANGLE/validationES2.cpp b/src/libANGLE/validationES2.cpp
index 1b16173..edef271 100644
--- a/src/libANGLE/validationES2.cpp
+++ b/src/libANGLE/validationES2.cpp
@@ -70,14 +70,14 @@
bool ValidatePathInstances(gl::Context *context,
GLsizei numPaths,
const void *paths,
- GLuint pathBase)
+ PathID pathBase)
{
const auto *array = static_cast<const T *>(paths);
for (GLsizei i = 0; i < numPaths; ++i)
{
- const GLuint pathName = array[i] + pathBase;
- if (context->isPathGenerated(pathName) && !context->isPath(pathName))
+ const GLuint pathName = array[i] + pathBase.value;
+ if (context->isPathGenerated({pathName}) && !context->isPath({pathName}))
{
context->validationError(GL_INVALID_OPERATION, kNoSuchPath);
return false;
@@ -90,7 +90,7 @@
GLsizei numPaths,
GLenum pathNameType,
const void *paths,
- GLuint pathBase,
+ PathID pathBase,
GLenum transformType,
const GLfloat *transformValues)
{
@@ -3700,7 +3700,7 @@
return true;
}
-bool ValidateDeletePathsCHROMIUM(Context *context, GLuint path, GLsizei range)
+bool ValidateDeletePathsCHROMIUM(Context *context, PathID path, GLsizei range)
{
if (!context->getExtensions().pathRendering)
{
@@ -3716,7 +3716,7 @@
return false;
}
- angle::CheckedNumeric<std::uint32_t> checkedRange(path);
+ angle::CheckedNumeric<std::uint32_t> checkedRange(path.value);
checkedRange += range;
if (!angle::IsValueInRangeForNumericType<std::uint32_t>(range) || !checkedRange.IsValid())
@@ -3728,7 +3728,7 @@
}
bool ValidatePathCommandsCHROMIUM(Context *context,
- GLuint path,
+ PathID path,
GLsizei numCommands,
const GLubyte *commands,
GLsizei numCoords,
@@ -3849,7 +3849,7 @@
return true;
}
-bool ValidatePathParameterfCHROMIUM(Context *context, GLuint path, GLenum pname, GLfloat value)
+bool ValidatePathParameterfCHROMIUM(Context *context, PathID path, GLenum pname, GLfloat value)
{
if (!context->getExtensions().pathRendering)
{
@@ -3914,13 +3914,13 @@
return true;
}
-bool ValidatePathParameteriCHROMIUM(Context *context, GLuint path, GLenum pname, GLint value)
+bool ValidatePathParameteriCHROMIUM(Context *context, PathID path, GLenum pname, GLint value)
{
// TODO(jmadill): Use proper clamping cast.
return ValidatePathParameterfCHROMIUM(context, path, pname, static_cast<GLfloat>(value));
}
-bool ValidateGetPathParameterfvCHROMIUM(Context *context, GLuint path, GLenum pname, GLfloat *value)
+bool ValidateGetPathParameterfvCHROMIUM(Context *context, PathID path, GLenum pname, GLfloat *value)
{
if (!context->getExtensions().pathRendering)
{
@@ -3957,7 +3957,7 @@
return true;
}
-bool ValidateGetPathParameterivCHROMIUM(Context *context, GLuint path, GLenum pname, GLint *value)
+bool ValidateGetPathParameterivCHROMIUM(Context *context, PathID path, GLenum pname, GLint *value)
{
return ValidateGetPathParameterfvCHROMIUM(context, path, pname,
reinterpret_cast<GLfloat *>(value));
@@ -3996,7 +3996,7 @@
// However if the path object exists but has not been specified any
// commands then an error is generated.
-bool ValidateStencilFillPathCHROMIUM(Context *context, GLuint path, GLenum fillMode, GLuint mask)
+bool ValidateStencilFillPathCHROMIUM(Context *context, PathID path, GLenum fillMode, GLuint mask)
{
if (!context->getExtensions().pathRendering)
{
@@ -4029,7 +4029,7 @@
return true;
}
-bool ValidateStencilStrokePathCHROMIUM(Context *context, GLuint path, GLint reference, GLuint mask)
+bool ValidateStencilStrokePathCHROMIUM(Context *context, PathID path, GLint reference, GLuint mask)
{
if (!context->getExtensions().pathRendering)
{
@@ -4046,7 +4046,7 @@
return true;
}
-bool ValidateCoverPathCHROMIUM(Context *context, GLuint path, GLenum coverMode)
+bool ValidateCoverPathCHROMIUM(Context *context, PathID path, GLenum coverMode)
{
if (!context->getExtensions().pathRendering)
{
@@ -4071,18 +4071,18 @@
return true;
}
-bool ValidateCoverFillPathCHROMIUM(Context *context, GLuint path, GLenum coverMode)
+bool ValidateCoverFillPathCHROMIUM(Context *context, PathID path, GLenum coverMode)
{
return ValidateCoverPathCHROMIUM(context, path, coverMode);
}
-bool ValidateCoverStrokePathCHROMIUM(Context *context, GLuint path, GLenum coverMode)
+bool ValidateCoverStrokePathCHROMIUM(Context *context, PathID path, GLenum coverMode)
{
return ValidateCoverPathCHROMIUM(context, path, coverMode);
}
bool ValidateStencilThenCoverFillPathCHROMIUM(Context *context,
- GLuint path,
+ PathID path,
GLenum fillMode,
GLuint mask,
GLenum coverMode)
@@ -4092,7 +4092,7 @@
}
bool ValidateStencilThenCoverStrokePathCHROMIUM(Context *context,
- GLuint path,
+ PathID path,
GLint reference,
GLuint mask,
GLenum coverMode)
@@ -4101,7 +4101,7 @@
ValidateCoverPathCHROMIUM(context, path, coverMode);
}
-bool ValidateIsPathCHROMIUM(Context *context, GLuint path)
+bool ValidateIsPathCHROMIUM(Context *context, PathID path)
{
if (!context->getExtensions().pathRendering)
{
@@ -4115,7 +4115,7 @@
GLsizei numPaths,
GLenum pathNameType,
const void *paths,
- GLuint pathBase,
+ PathID pathBase,
GLenum coverMode,
GLenum transformType,
const GLfloat *transformValues)
@@ -4142,7 +4142,7 @@
GLsizei numPaths,
GLenum pathNameType,
const void *paths,
- GLuint pathBase,
+ PathID pathBase,
GLenum coverMode,
GLenum transformType,
const GLfloat *transformValues)
@@ -4169,7 +4169,7 @@
GLsizei numPaths,
GLenum pathNameType,
const void *paths,
- GLuint pathBase,
+ PathID pathBase,
GLenum fillMode,
GLuint mask,
GLenum transformType,
@@ -4202,7 +4202,7 @@
GLsizei numPaths,
GLenum pathNameType,
const void *paths,
- GLuint pathBase,
+ PathID pathBase,
GLint reference,
GLuint mask,
GLenum transformType,
@@ -4221,7 +4221,7 @@
GLsizei numPaths,
GLenum pathNameType,
const void *paths,
- GLuint pathBase,
+ PathID pathBase,
GLenum fillMode,
GLuint mask,
GLenum coverMode,
@@ -4266,7 +4266,7 @@
GLsizei numPaths,
GLenum pathNameType,
const void *paths,
- GLuint pathBase,
+ PathID pathBase,
GLint reference,
GLuint mask,
GLenum coverMode,