summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Cencora <m.cencora@gmail.com>2009-03-19 21:17:01 +0100
committerIan Romanick <ian.d.romanick@intel.com>2009-03-25 12:41:28 -0700
commit7860b0886c2f650152e5fb56e2a31ed6079665c1 (patch)
tree7c71acac60e6cd063435a3fbb93f7936ecbf30f0
parent26e27ba30884be927cf1bc21d39f32d6096a6678 (diff)
r300: cleanup swtcl a little
- remove disabled code - silence compiler warnings (uinitialized values) - remove unneeded code
-rw-r--r--src/mesa/drivers/dri/r300/r300_swtcl.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_swtcl.c b/src/mesa/drivers/dri/r300/r300_swtcl.c
index d463ab3a2d..ba3621b16b 100644
--- a/src/mesa/drivers/dri/r300/r300_swtcl.c
+++ b/src/mesa/drivers/dri/r300/r300_swtcl.c
@@ -504,7 +504,7 @@ do { \
#define LOCAL_VARS(n) \
r300ContextPtr rmesa = R300_CONTEXT(ctx); \
- GLuint color[n], spec[n]; \
+ GLuint color[n] = { 0, }, spec[n] = { 0, }; \
GLuint coloroffset = rmesa->swtcl.coloroffset; \
GLuint specoffset = rmesa->swtcl.specoffset; \
(void) color; (void) spec; (void) coloroffset; (void) specoffset;
@@ -629,7 +629,6 @@ static void r300ChooseRenderState( GLcontext *ctx )
static void r300RenderStart(GLcontext *ctx)
{
r300ContextPtr rmesa = R300_CONTEXT( ctx );
- // fprintf(stderr, "%s\n", __FUNCTION__);
r300ChooseRenderState(ctx);
r300SetVertexFormat(ctx);
@@ -669,8 +668,6 @@ static void r300RenderPrimitive(GLcontext *ctx, GLenum prim)
return;
r300RasterPrimitive( ctx, reduced_prim[prim] );
- // fprintf(stderr, "%s\n", __FUNCTION__);
-
}
static void r300ResetLineStipple(GLcontext *ctx)
@@ -713,11 +710,6 @@ void r300InitSwtcl(GLcontext *ctx)
_tnl_need_projected_coords( ctx, GL_FALSE );
r300ChooseRenderState(ctx);
-
- _mesa_validate_all_lighting_tables( ctx );
-
- tnl->Driver.NotifyMaterialChange =
- _mesa_validate_all_lighting_tables;
}
void r300DestroySwtcl(GLcontext *ctx)