OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Clean up various 'unused parameter' warnings in shaderapi

Browse Source
This commit is contained in:
Ian Romanick
2010-10-11 16:19:19 -07:00
parent ccc1c4c6d9
commit 7d8ba5f78f
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mesa/main/shaderapi.c
View File

@@ -966,7 +966,7 @@ _mesa_use_program(struct gl_context *ctx, GLuint program)
* \return GL_TRUE if valid, GL_FALSE if invalid * \return GL_TRUE if valid, GL_FALSE if invalid
*/ */
static GLboolean static GLboolean
validate_samplers(struct gl_context *ctx, const struct gl_program *prog, char *errMsg) validate_samplers(const struct gl_program *prog, char *errMsg)
{ {
static const char *targetName[] = { static const char *targetName[] = {
"TEXTURE_2D_ARRAY", "TEXTURE_2D_ARRAY",
@@ -1018,8 +1018,7 @@ validate_samplers(struct gl_context *ctx, const struct gl_program *prog, char *e
* \return GL_TRUE if valid, GL_FALSE if invalid (and set errMsg) * \return GL_TRUE if valid, GL_FALSE if invalid (and set errMsg)
*/ */
static GLboolean static GLboolean
validate_shader_program(struct gl_context *ctx, validate_shader_program(const struct gl_shader_program *shProg,
const struct gl_shader_program *shProg,
char *errMsg) char *errMsg)
{ {
const struct gl_vertex_program *vp = shProg->VertexProgram; const struct gl_vertex_program *vp = shProg->VertexProgram;
@@ -1049,10 +1048,10 @@ validate_shader_program(struct gl_context *ctx,
* Check: any two active samplers in the current program object are of * Check: any two active samplers in the current program object are of
* different types, but refer to the same texture image unit, * different types, but refer to the same texture image unit,
*/ */
if (vp && !validate_samplers(ctx, &vp->Base, errMsg)) { if (vp && !validate_samplers(&vp->Base, errMsg)) {
return GL_FALSE; return GL_FALSE;
} }
if (fp && !validate_samplers(ctx, &fp->Base, errMsg)) { if (fp && !validate_samplers(&fp->Base, errMsg)) {
return GL_FALSE; return GL_FALSE;
} }
@@ -1074,7 +1073,7 @@ validate_program(struct gl_context *ctx, GLuint program)
return; return;
} }
shProg->Validated = validate_shader_program(ctx, shProg, errMsg); shProg->Validated = validate_shader_program(shProg, errMsg);
if (!shProg->Validated) { if (!shProg->Validated) {
/* update info log */ /* update info log */
if (shProg->InfoLog) { if (shProg->InfoLog) {
@@ -1521,6 +1520,10 @@ _mesa_GetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype,
GLint* range, GLint* precision) GLint* range, GLint* precision)
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
(void) shadertype;
(void) precisiontype;
(void) range;
(void) precision;
_mesa_error(ctx, GL_INVALID_OPERATION, __FUNCTION__); _mesa_error(ctx, GL_INVALID_OPERATION, __FUNCTION__);
} }
@@ -1538,6 +1541,11 @@ _mesa_ShaderBinary(GLint n, const GLuint* shaders, GLenum binaryformat,
const void* binary, GLint length) const void* binary, GLint length)
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
(void) n;
(void) shaders;
(void) binaryformat;
(void) binary;
(void) length;
_mesa_error(ctx, GL_INVALID_OPERATION, __FUNCTION__); _mesa_error(ctx, GL_INVALID_OPERATION, __FUNCTION__);
} }