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

mesa: add some casts to silence MSVC warnings

Browse Source 
Reviewed-by: José Fonseca <jfonseca@vmware.com>
This commit is contained in:
Brian Paul
2013-01-22 17:19:30 -07:00
parent ddb774ddf1
commit 701a0f6a76
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/mesa/program/program.c
View File

@@ -840,8 +840,8 @@ _mesa_find_used_registers(const struct gl_program *prog,
for (j = 0; j < n; j++) { for (j = 0; j < n; j++) {
if (inst->SrcReg[j].File == file) { if (inst->SrcReg[j].File == file) {
ASSERT(inst->SrcReg[j].Index < usedSize); ASSERT(inst->SrcReg[j].Index < (GLint) usedSize);
if(inst->SrcReg[j].Index < usedSize) if (inst->SrcReg[j].Index < (GLint) usedSize)
used[inst->SrcReg[j].Index] = GL_TRUE; used[inst->SrcReg[j].Index] = GL_TRUE;
} }
} }
@@ -908,23 +908,23 @@ _mesa_valid_register_index(const struct gl_context *ctx,
return GL_TRUE; /* XXX or maybe false? */ return GL_TRUE; /* XXX or maybe false? */
case PROGRAM_TEMPORARY: case PROGRAM_TEMPORARY:
return index >= 0 && index < c->MaxTemps; return index >= 0 && index < (GLint) c->MaxTemps;
case PROGRAM_ENV_PARAM: case PROGRAM_ENV_PARAM:
return index >= 0 && index < c->MaxEnvParams; return index >= 0 && index < (GLint) c->MaxEnvParams;
case PROGRAM_LOCAL_PARAM: case PROGRAM_LOCAL_PARAM:
return index >= 0 && index < c->MaxLocalParams; return index >= 0 && index < (GLint) c->MaxLocalParams;
case PROGRAM_UNIFORM: case PROGRAM_UNIFORM:
case PROGRAM_STATE_VAR: case PROGRAM_STATE_VAR:
/* aka constant buffer */ /* aka constant buffer */
return index >= 0 && index < c->MaxUniformComponents / 4; return index >= 0 && index < (GLint) c->MaxUniformComponents / 4;
case PROGRAM_CONSTANT: case PROGRAM_CONSTANT:
/* constant buffer w/ possible relative negative addressing */ /* constant buffer w/ possible relative negative addressing */
return (index > (int) c->MaxUniformComponents / -4 && return (index > (int) c->MaxUniformComponents / -4 &&
index < c->MaxUniformComponents / 4); index < (int) c->MaxUniformComponents / 4);
case PROGRAM_INPUT: case PROGRAM_INPUT:
if (index < 0) if (index < 0)
@@ -932,11 +932,11 @@ _mesa_valid_register_index(const struct gl_context *ctx,
switch (shaderType) { switch (shaderType) {
case MESA_SHADER_VERTEX: case MESA_SHADER_VERTEX:
return index < VERT_ATTRIB_GENERIC0 + c->MaxAttribs; return index < VERT_ATTRIB_GENERIC0 + (GLint) c->MaxAttribs;
case MESA_SHADER_FRAGMENT: case MESA_SHADER_FRAGMENT:
return index < FRAG_ATTRIB_VAR0 + ctx->Const.MaxVarying; return index < FRAG_ATTRIB_VAR0 + (GLint) ctx->Const.MaxVarying;
case MESA_SHADER_GEOMETRY: case MESA_SHADER_GEOMETRY:
return index < GEOM_ATTRIB_VAR0 + ctx->Const.MaxVarying; return index < GEOM_ATTRIB_VAR0 + (GLint) ctx->Const.MaxVarying;
default: default:
return GL_FALSE; return GL_FALSE;
} }
@@ -947,17 +947,17 @@ _mesa_valid_register_index(const struct gl_context *ctx,
switch (shaderType) { switch (shaderType) {
case MESA_SHADER_VERTEX: case MESA_SHADER_VERTEX:
return index < VERT_RESULT_VAR0 + ctx->Const.MaxVarying; return index < VERT_RESULT_VAR0 + (GLint) ctx->Const.MaxVarying;
case MESA_SHADER_FRAGMENT: case MESA_SHADER_FRAGMENT:
return index < FRAG_RESULT_DATA0 + ctx->Const.MaxDrawBuffers; return index < FRAG_RESULT_DATA0 + (GLint) ctx->Const.MaxDrawBuffers;
case MESA_SHADER_GEOMETRY: case MESA_SHADER_GEOMETRY:
return index < GEOM_RESULT_VAR0 + ctx->Const.MaxVarying; return index < GEOM_RESULT_VAR0 + (GLint) ctx->Const.MaxVarying;
default: default:
return GL_FALSE; return GL_FALSE;
} }
case PROGRAM_ADDRESS: case PROGRAM_ADDRESS:
return index >= 0 && index < c->MaxAddressRegs; return index >= 0 && index < (GLint) c->MaxAddressRegs;
default: default:
_mesa_problem(ctx, _mesa_problem(ctx,