Commit e09f7a14 by Jamie Madill Committed by Commit Bot

Validation: Fix some function types.

These were slightly mismatching the header types. They seemed to link fine despite producing some warnings in a tool. Bug: angleproject:4598 Change-Id: I19cfe4d87eca409c82a7c8cf25fff6f8a4c83ca9 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2175057 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Reviewed-by: 's avatarCourtney Goeltzenleuchter <courtneygo@google.com>
parent 57d95828
...@@ -666,7 +666,7 @@ bool ValidateDrawElementsInstancedBase(const Context *context, ...@@ -666,7 +666,7 @@ bool ValidateDrawElementsInstancedBase(const Context *context,
PrimitiveMode mode, PrimitiveMode mode,
GLsizei count, GLsizei count,
DrawElementsType type, DrawElementsType type,
const GLvoid *indices, const void *indices,
GLsizei primcount) GLsizei primcount)
{ {
if (primcount <= 0) if (primcount <= 0)
......
...@@ -390,7 +390,6 @@ bool ValidateDrawElementsInstancedEXT(const Context *context, ...@@ -390,7 +390,6 @@ bool ValidateDrawElementsInstancedEXT(const Context *context,
GLsizei primcount); GLsizei primcount);
bool ValidateDrawInstancedANGLE(const Context *context); bool ValidateDrawInstancedANGLE(const Context *context);
bool ValidateDrawInstancedEXT(const Context *context);
bool ValidateFramebufferTextureBase(const Context *context, bool ValidateFramebufferTextureBase(const Context *context,
GLenum target, GLenum target,
......
...@@ -1851,7 +1851,7 @@ bool ValidateProgramBinary(const Context *context, ...@@ -1851,7 +1851,7 @@ bool ValidateProgramBinary(const Context *context,
ShaderProgramID program, ShaderProgramID program,
GLenum binaryFormat, GLenum binaryFormat,
const void *binary, const void *binary,
GLint length) GLsizei length)
{ {
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
...@@ -2452,33 +2452,35 @@ bool ValidateCompressedTexSubImage3DRobustANGLE(const Context *context, ...@@ -2452,33 +2452,35 @@ bool ValidateCompressedTexSubImage3DRobustANGLE(const Context *context,
height, depth, format, imageSize, data); height, depth, format, imageSize, data);
} }
bool ValidateGenQueries(const Context *context, GLint n, const QueryID *queries) bool ValidateGenQueries(const Context *context, GLsizei n, const QueryID *queries)
{ {
return ValidateGenOrDeleteES3(context, n); return ValidateGenOrDeleteES3(context, n);
} }
bool ValidateDeleteQueries(const Context *context, GLint n, const QueryID *queries) bool ValidateDeleteQueries(const Context *context, GLsizei n, const QueryID *queries)
{ {
return ValidateGenOrDeleteES3(context, n); return ValidateGenOrDeleteES3(context, n);
} }
bool ValidateGenSamplers(const Context *context, GLint count, const SamplerID *samplers) bool ValidateGenSamplers(const Context *context, GLsizei count, const SamplerID *samplers)
{ {
return ValidateGenOrDeleteCountES3(context, count); return ValidateGenOrDeleteCountES3(context, count);
} }
bool ValidateDeleteSamplers(const Context *context, GLint count, const SamplerID *samplers) bool ValidateDeleteSamplers(const Context *context, GLsizei count, const SamplerID *samplers)
{ {
return ValidateGenOrDeleteCountES3(context, count); return ValidateGenOrDeleteCountES3(context, count);
} }
bool ValidateGenTransformFeedbacks(const Context *context, GLint n, const TransformFeedbackID *ids) bool ValidateGenTransformFeedbacks(const Context *context,
GLsizei n,
const TransformFeedbackID *ids)
{ {
return ValidateGenOrDeleteES3(context, n); return ValidateGenOrDeleteES3(context, n);
} }
bool ValidateDeleteTransformFeedbacks(const Context *context, bool ValidateDeleteTransformFeedbacks(const Context *context,
GLint n, GLsizei n,
const TransformFeedbackID *ids) const TransformFeedbackID *ids)
{ {
if (!ValidateGenOrDeleteES3(context, n)) if (!ValidateGenOrDeleteES3(context, n))
...@@ -2498,12 +2500,12 @@ bool ValidateDeleteTransformFeedbacks(const Context *context, ...@@ -2498,12 +2500,12 @@ bool ValidateDeleteTransformFeedbacks(const Context *context,
return true; return true;
} }
bool ValidateGenVertexArrays(const Context *context, GLint n, const VertexArrayID *arrays) bool ValidateGenVertexArrays(const Context *context, GLsizei n, const VertexArrayID *arrays)
{ {
return ValidateGenOrDeleteES3(context, n); return ValidateGenOrDeleteES3(context, n);
} }
bool ValidateDeleteVertexArrays(const Context *context, GLint n, const VertexArrayID *arrays) bool ValidateDeleteVertexArrays(const Context *context, GLsizei n, const VertexArrayID *arrays)
{ {
return ValidateGenOrDeleteES3(context, n); return ValidateGenOrDeleteES3(context, n);
} }
......
...@@ -1684,14 +1684,14 @@ static bool ValidateGenOrDeleteES31(const Context *context, GLint n) ...@@ -1684,14 +1684,14 @@ static bool ValidateGenOrDeleteES31(const Context *context, GLint n)
} }
bool ValidateGenProgramPipelines(const Context *context, bool ValidateGenProgramPipelines(const Context *context,
GLint n, GLsizei n,
const ProgramPipelineID *pipelines) const ProgramPipelineID *pipelines)
{ {
return ValidateGenOrDeleteES31(context, n); return ValidateGenOrDeleteES31(context, n);
} }
bool ValidateDeleteProgramPipelines(const Context *context, bool ValidateDeleteProgramPipelines(const Context *context,
GLint n, GLsizei n,
const ProgramPipelineID *pipelines) const ProgramPipelineID *pipelines)
{ {
return ValidateGenOrDeleteES31(context, n); return ValidateGenOrDeleteES31(context, n);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment