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

r600: silence various compiler warnings

Browse Source
This commit is contained in:
Brian Paul
2011-04-11 21:22:54 -06:00
parent 1ca5585459
commit 155a9670e6
7 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesa/drivers/dri/r600/evergreen_chip.c
View File

@@ -124,7 +124,7 @@ static void evergreenSendTexState(struct gl_context *ctx, struct radeon_state_at
context_t *context = EVERGREEN_CONTEXT(ctx); context_t *context = EVERGREEN_CONTEXT(ctx);
EVERGREEN_CHIP_CONTEXT *evergreen = GET_EVERGREEN_CHIP(context); EVERGREEN_CHIP_CONTEXT *evergreen = GET_EVERGREEN_CHIP(context);
struct evergreen_vertex_program *vp = context->selected_vp; struct evergreen_vertex_program *vp = (struct evergreen_vertex_program *) context->selected_vp;
struct radeon_bo *bo = NULL; struct radeon_bo *bo = NULL;
unsigned int i; unsigned int i;
@@ -379,6 +379,8 @@ static void evergreenSendVTX(struct gl_context *ctx, struct radeon_state_atom *a
struct evergreen_vertex_program *vp = (struct evergreen_vertex_program *)(context->selected_vp); struct evergreen_vertex_program *vp = (struct evergreen_vertex_program *)(context->selected_vp);
unsigned int i, j = 0; unsigned int i, j = 0;
BATCH_LOCALS(&context->radeon); BATCH_LOCALS(&context->radeon);
(void) b_l_rmesa; /* silence unused var warning */
radeon_print(RADEON_STATE, RADEON_VERBOSE, "%s\n", __func__); radeon_print(RADEON_STATE, RADEON_VERBOSE, "%s\n", __func__);
if (context->radeon.tcl.aos_count == 0) if (context->radeon.tcl.aos_count == 0)

6
src/mesa/drivers/dri/r600/evergreen_oglprog.c
View File

@@ -42,7 +42,7 @@
static void evergreen_freeVertProgCache(struct gl_context *ctx, struct r700_vertex_program_cont *cache) static void evergreen_freeVertProgCache(struct gl_context *ctx, struct r700_vertex_program_cont *cache)
{ {
struct evergreen_vertex_program *tmp, *vp = cache->progs; struct evergreen_vertex_program *tmp, *vp = (struct evergreen_vertex_program *) cache->progs;
while (vp) { while (vp) {
tmp = vp->next; tmp = vp->next;
@@ -121,7 +121,7 @@ static void evergreenDeleteProgram(struct gl_context * ctx, struct gl_program *p
{ {
case GL_VERTEX_STATE_PROGRAM_NV: case GL_VERTEX_STATE_PROGRAM_NV:
case GL_VERTEX_PROGRAM_ARB: case GL_VERTEX_PROGRAM_ARB:
evergreen_freeVertProgCache(ctx, vpc); evergreen_freeVertProgCache(ctx, (struct r700_vertex_program_cont *) vpc);
break; break;
case GL_FRAGMENT_PROGRAM_NV: case GL_FRAGMENT_PROGRAM_NV:
case GL_FRAGMENT_PROGRAM_ARB: case GL_FRAGMENT_PROGRAM_ARB:
@@ -154,7 +154,7 @@ evergreenProgramStringNotify(struct gl_context * ctx, GLenum target, struct gl_p
switch (target) { switch (target) {
case GL_VERTEX_PROGRAM_ARB: case GL_VERTEX_PROGRAM_ARB:
evergreen_freeVertProgCache(ctx, vpc); evergreen_freeVertProgCache(ctx, (struct r700_vertex_program_cont *) vpc);
vpc->progs = NULL; vpc->progs = NULL;
break; break;
case GL_FRAGMENT_PROGRAM_ARB: case GL_FRAGMENT_PROGRAM_ARB:

2
src/mesa/drivers/dri/r600/evergreen_render.c
View File

@@ -620,6 +620,7 @@ static void evergreenSetupIndexBuffer(struct gl_context *ctx, const struct _mesa
} }
} }
#if 0 /* unused */
static void evergreenAlignDataToDword(struct gl_context *ctx, static void evergreenAlignDataToDword(struct gl_context *ctx,
const struct gl_client_array *input, const struct gl_client_array *input,
int count, int count,
@@ -661,6 +662,7 @@ static void evergreenAlignDataToDword(struct gl_context *ctx,
attr->stride = dst_stride; attr->stride = dst_stride;
} }
#endif
static void evergreenSetupStreams(struct gl_context *ctx, const struct gl_client_array *input[], int count) static void evergreenSetupStreams(struct gl_context *ctx, const struct gl_client_array *input[], int count)
{ {

12
src/mesa/drivers/dri/r600/evergreen_vertprog.c
View File

@@ -405,7 +405,7 @@ void evergreenSelectVertexShader(struct gl_context *ctx)
} }
if (match) if (match)
{ {
context->selected_vp = vp; context->selected_vp = (struct r700_vertex_program *) vp;
return; return;
} }
} }
@@ -418,7 +418,7 @@ void evergreenSelectVertexShader(struct gl_context *ctx)
} }
vp->next = vpc->progs; vp->next = vpc->progs;
vpc->progs = vp; vpc->progs = vp;
context->selected_vp = vp; context->selected_vp = (struct r700_vertex_program *) vp;
return; return;
} }
@@ -566,7 +566,7 @@ void evergreenSetVertexFormat(struct gl_context *ctx, const struct gl_client_arr
void * evergreenGetActiveVpShaderBo(struct gl_context * ctx) void * evergreenGetActiveVpShaderBo(struct gl_context * ctx)
{ {
context_t *context = EVERGREEN_CONTEXT(ctx); context_t *context = EVERGREEN_CONTEXT(ctx);
struct evergreen_vertex_program *vp = context->selected_vp;; struct evergreen_vertex_program *vp = (struct evergreen_vertex_program *) context->selected_vp;
if (vp) if (vp)
return vp->shaderbo; return vp->shaderbo;
@@ -577,7 +577,7 @@ void * evergreenGetActiveVpShaderBo(struct gl_context * ctx)
void * evergreenGetActiveVpShaderConstBo(struct gl_context * ctx) void * evergreenGetActiveVpShaderConstBo(struct gl_context * ctx)
{ {
context_t *context = EVERGREEN_CONTEXT(ctx); context_t *context = EVERGREEN_CONTEXT(ctx);
struct evergreen_vertex_program *vp = context->selected_vp;; struct evergreen_vertex_program *vp = (struct evergreen_vertex_program *) context->selected_vp;
if (vp) if (vp)
return vp->constbo0; return vp->constbo0;
@@ -589,7 +589,7 @@ GLboolean evergreenSetupVertexProgram(struct gl_context * ctx)
{ {
context_t *context = EVERGREEN_CONTEXT(ctx); context_t *context = EVERGREEN_CONTEXT(ctx);
EVERGREEN_CHIP_CONTEXT *evergreen = GET_EVERGREEN_CHIP(context); EVERGREEN_CHIP_CONTEXT *evergreen = GET_EVERGREEN_CHIP(context);
struct evergreen_vertex_program *vp = context->selected_vp; struct evergreen_vertex_program *vp = (struct evergreen_vertex_program *) context->selected_vp;
if(GL_FALSE == vp->loaded) if(GL_FALSE == vp->loaded)
{ {
@@ -650,7 +650,7 @@ GLboolean evergreenSetupVPconstants(struct gl_context * ctx)
{ {
context_t *context = EVERGREEN_CONTEXT(ctx); context_t *context = EVERGREEN_CONTEXT(ctx);
EVERGREEN_CHIP_CONTEXT *evergreen = GET_EVERGREEN_CHIP(context); EVERGREEN_CHIP_CONTEXT *evergreen = GET_EVERGREEN_CHIP(context);
struct evergreen_vertex_program *vp = context->selected_vp; struct evergreen_vertex_program *vp = (struct evergreen_vertex_program *) context->selected_vp;
struct gl_program_parameter_list *paramList; struct gl_program_parameter_list *paramList;
unsigned int unNumParamData; unsigned int unNumParamData;

2
src/mesa/drivers/dri/r600/r700_assembler.c
View File

@@ -259,6 +259,7 @@ GLboolean is_reduction_opcode(PVSDWORD* dest)
return GL_FALSE; return GL_FALSE;
} }
#if 0 /* unused */
GLboolean EG_is_reduction_opcode(PVSDWORD* dest) GLboolean EG_is_reduction_opcode(PVSDWORD* dest)
{ {
if (dest->dst.op3 == 0) if (dest->dst.op3 == 0)
@@ -270,6 +271,7 @@ GLboolean EG_is_reduction_opcode(PVSDWORD* dest)
} }
return GL_FALSE; return GL_FALSE;
} }
#endif
GLuint GetSurfaceFormat(GLenum eType, GLuint nChannels, GLuint * pClient_size) GLuint GetSurfaceFormat(GLenum eType, GLuint nChannels, GLuint * pClient_size)
{ {

1
src/mesa/drivers/dri/r600/r700_chip.c
View File

@@ -249,6 +249,7 @@ static void r700SendVTXState(struct gl_context *ctx, struct radeon_state_atom *a
struct r700_vertex_program *vp = context->selected_vp; struct r700_vertex_program *vp = context->selected_vp;
unsigned int i, j = 0; unsigned int i, j = 0;
BATCH_LOCALS(&context->radeon); BATCH_LOCALS(&context->radeon);
(void) b_l_rmesa; /* silence unused var warning */
radeon_print(RADEON_STATE, RADEON_VERBOSE, "%s\n", __func__); radeon_print(RADEON_STATE, RADEON_VERBOSE, "%s\n", __func__);
if (context->radeon.tcl.aos_count == 0) if (context->radeon.tcl.aos_count == 0)

2
src/mesa/drivers/dri/r600/r700_render.c
View File

@@ -580,6 +580,7 @@ static void r700ConvertAttrib(struct gl_context *ctx, int count,
} }
} }
#if 0 /* unused */
static void r700AlignDataToDword(struct gl_context *ctx, static void r700AlignDataToDword(struct gl_context *ctx,
const struct gl_client_array *input, const struct gl_client_array *input,
int count, int count,
@@ -621,6 +622,7 @@ static void r700AlignDataToDword(struct gl_context *ctx,
attr->stride = dst_stride; attr->stride = dst_stride;
} }
#endif
static void r700SetupStreams(struct gl_context *ctx, const struct gl_client_array *input[], int count) static void r700SetupStreams(struct gl_context *ctx, const struct gl_client_array *input[], int count)
{ {