fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 02:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

-O -Wall warnings cleanups in r200.

Browse source
This commit is contained in:
Eric Anholt 2004-09-24 04:20:58 +00:00
parent cddd5c99e5
commit 303c342d53
5 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/r200/r200_cmdbuf.c
View file

@ -109,7 +109,7 @@ void r200SetUpAtomList( r200ContextPtr rmesa )
void r200EmitState( r200ContextPtr rmesa )
{
char *dest;
int i, mtu;
int mtu;
struct r200_state_atom *atom;
if (R200_DEBUG & (DEBUG_STATE|DEBUG_PRIMS))

2
src/mesa/drivers/dri/r200/r200_ioctl.c
View file

@ -87,8 +87,6 @@ static void r200BackUpAndEmitLostStateLocked( r200ContextPtr rmesa )
{
GLuint nr_released_bufs;
struct r200_store store;
struct r200_hw_state temp_state;
static int count = 0;
rmesa->lost_context = GL_FALSE;

2
src/mesa/drivers/dri/r200/r200_tcl.c
View file

@ -101,7 +101,7 @@ static GLboolean discrete_prim[0x10] = {
};
#define LOCAL_VARS r200ContextPtr rmesa = R200_CONTEXT(ctx)
#define LOCAL_VARS r200ContextPtr rmesa = R200_CONTEXT(ctx); (void)rmesa
#define ELT_TYPE GLushort
#define ELT_INIT(prim, hw_prim) \

1
src/mesa/drivers/dri/r200/r200_texstate.c
View file

@ -1272,7 +1272,6 @@ void r200UpdateTextureState( GLcontext *ctx )
r200ContextPtr rmesa = R200_CONTEXT(ctx);
GLboolean ok;
GLuint dbg;
int i;
ok = (r200UpdateTextureUnit( ctx, 0 ) &&
r200UpdateTextureUnit( ctx, 1 ) &&

11
src/mesa/drivers/dri/r200/r200_vtxfmt_c.c
View file

@ -122,6 +122,7 @@ static void r200_Vertex2fv( const GLfloat *v )
/* Color for ubyte (packed) color formats:
*/
#if 0
static void r200_Color3ub_ub( GLubyte r, GLubyte g, GLubyte b )
{
GET_CURRENT_CONTEXT(ctx);
@ -161,7 +162,7 @@ static void r200_Color4ubv_ub( const GLubyte *v )
r200ContextPtr rmesa = R200_CONTEXT(ctx);
*(GLuint *)rmesa->vb.colorptr = LE32_TO_CPU(*(GLuint *)v);
}
#endif /* 0 */
static void r200_Color3f_ub( GLfloat r, GLfloat g, GLfloat b )
{
@ -210,6 +211,7 @@ static void r200_Color4fv_ub( const GLfloat *v )
/* Color for float color+alpha formats:
*/
#if 0
static void r200_Color3ub_4f( GLubyte r, GLubyte g, GLubyte b )
{
GET_CURRENT_CONTEXT(ctx);
@ -253,6 +255,7 @@ static void r200_Color4ubv_4f( const GLubyte *v )
dest[2] = UBYTE_TO_FLOAT(v[2]);
dest[3] = UBYTE_TO_FLOAT(v[3]);
}
#endif /* 0 */
static void r200_Color3f_4f( GLfloat r, GLfloat g, GLfloat b )
@ -302,6 +305,7 @@ static void r200_Color4fv_4f( const GLfloat *v )
/* Color for float color formats:
*/
#if 0
static void r200_Color3ub_3f( GLubyte r, GLubyte g, GLubyte b )
{
GET_CURRENT_CONTEXT(ctx);
@ -343,6 +347,7 @@ static void r200_Color4ubv_3f( const GLubyte *v )
dest[2] = UBYTE_TO_FLOAT(v[2]);
ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3] = UBYTE_TO_FLOAT(v[3]);
}
#endif /* 0 */
static void r200_Color3f_3f( GLfloat r, GLfloat g, GLfloat b )
@ -390,6 +395,7 @@ static void r200_Color4fv_3f( const GLfloat *v )
/* Secondary Color:
*/
#if 0
static void r200_SecondaryColor3ubEXT_ub( GLubyte r, GLubyte g, GLubyte b )
{
GET_CURRENT_CONTEXT(ctx);
@ -411,6 +417,7 @@ static void r200_SecondaryColor3ubvEXT_ub( const GLubyte *v )
dest->blue = v[2];
dest->alpha = 0xff;
}
#endif /* 0 */
static void r200_SecondaryColor3fEXT_ub( GLfloat r, GLfloat g, GLfloat b )
{
@ -434,6 +441,7 @@ static void r200_SecondaryColor3fvEXT_ub( const GLfloat *v )
dest->alpha = 255;
}
#if 0
static void r200_SecondaryColor3ubEXT_3f( GLubyte r, GLubyte g, GLubyte b )
{
GET_CURRENT_CONTEXT(ctx);
@ -455,6 +463,7 @@ static void r200_SecondaryColor3ubvEXT_3f( const GLubyte *v )
dest[2] = UBYTE_TO_FLOAT(v[2]);
dest[3] = 1.0;
}
#endif /* 0 */
static void r200_SecondaryColor3fEXT_3f( GLfloat r, GLfloat g, GLfloat b )
{