From ffec105109f5b16bfe8282bd477d4aa32b550015 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 31 Oct 2005 21:52:56 +0000 Subject: fix problems found with gcc 2.96 (bug 4934) --- src/mesa/drivers/dri/savage/savageioctl.c | 4 ++-- src/mesa/drivers/dri/savage/savagerender.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/mesa/drivers/dri/savage') diff --git a/src/mesa/drivers/dri/savage/savageioctl.c b/src/mesa/drivers/dri/savage/savageioctl.c index 1906c78cc3..244959d64f 100644 --- a/src/mesa/drivers/dri/savage/savageioctl.c +++ b/src/mesa/drivers/dri/savage/savageioctl.c @@ -632,18 +632,18 @@ void savageFlushCmdBuf( savageContextPtr imesa, GLboolean discard ) static void savageDDFlush( GLcontext *ctx ) { + savageContextPtr imesa = SAVAGE_CONTEXT(ctx); if (SAVAGE_DEBUG & DEBUG_VERBOSE_MSG) fprintf (stderr, "%s\n", __FUNCTION__); - savageContextPtr imesa = SAVAGE_CONTEXT(ctx); savageFlushVertices (imesa); savageFlushCmdBuf(imesa, GL_FALSE); } static void savageDDFinish( GLcontext *ctx ) { + savageContextPtr imesa = SAVAGE_CONTEXT(ctx); if (SAVAGE_DEBUG & DEBUG_VERBOSE_MSG) fprintf (stderr, "%s\n", __FUNCTION__); - savageContextPtr imesa = SAVAGE_CONTEXT(ctx); savageFlushVertices (imesa); savageFlushCmdBuf(imesa, GL_FALSE); WAIT_IDLE_EMPTY(imesa); diff --git a/src/mesa/drivers/dri/savage/savagerender.c b/src/mesa/drivers/dri/savage/savagerender.c index 9eda9a591e..22e3f13396 100644 --- a/src/mesa/drivers/dri/savage/savagerender.c +++ b/src/mesa/drivers/dri/savage/savagerender.c @@ -246,11 +246,6 @@ static GLboolean run_texnorm_stage( GLcontext *ctx, return GL_TRUE; for (i = 0 ; i < ctx->Const.MaxTextureUnits ; i++) { - if (!ctx->Texture.Unit[i]._ReallyEnabled || - VB->TexCoordPtr[i]->size == 4) - /* Never try to normalize homogenous tex coords! */ - continue; - GLuint reallyEnabled = ctx->Texture.Unit[i]._ReallyEnabled; struct gl_texture_object *texObj = ctx->Texture.Unit[i]._Current; GLboolean normalizeS = (texObj->WrapS == GL_REPEAT); @@ -261,6 +256,11 @@ static GLboolean run_texnorm_stage( GLcontext *ctx, GLfloat (*out)[4] = store->texcoord[i].data; GLint j; + if (!ctx->Texture.Unit[i]._ReallyEnabled || + VB->TexCoordPtr[i]->size == 4) + /* Never try to normalize homogenous tex coords! */ + continue; + if (normalizeS && normalizeT) { /* take first texcoords as rough estimate of mean value */ GLfloat correctionS = -floor(in[0]+0.5); -- cgit v1.2.3