summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <anholt@FreeBSD.org>2005-10-24 08:27:30 +0000
committerEric Anholt <anholt@FreeBSD.org>2005-10-24 08:27:30 +0000
commit9e87119d873f3cde8b2b4d73155c315059a36ed1 (patch)
treedea2cfbba5c1fbadba88154b173dc94be7d409e8
parent9192ab3f5d90d27d852fbd23dc44f5062e399f62 (diff)
Fix texenv by moving a misplaced check for being in fallback (should cover only
render state, not texture state). While here, move a SIS_FIREVERTICES to a more appropriate location, though it was harmless.
-rw-r--r--src/mesa/drivers/dri/sis/sis_tris.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/sis/sis_tris.c b/src/mesa/drivers/dri/sis/sis_tris.c
index 7deaa634d1..1c6d85a86a 100644
--- a/src/mesa/drivers/dri/sis/sis_tris.c
+++ b/src/mesa/drivers/dri/sis/sis_tris.c
@@ -622,6 +622,9 @@ static void sisChooseRenderState(GLcontext *ctx)
GLuint flags = ctx->_TriangleCaps;
GLuint index = 0;
+ if (smesa->Fallback)
+ return;
+
if (flags & (ANY_RASTER_FLAGS|ANY_FALLBACK_FLAGS)) {
if (flags & ANY_RASTER_FLAGS) {
@@ -716,9 +719,9 @@ static void sisRunPipeline( GLcontext *ctx )
{
sisContextPtr smesa = SIS_CONTEXT( ctx );
- if (!smesa->Fallback && smesa->NewGLState) {
+ if (smesa->NewGLState) {
+ SIS_FIREVERTICES(smesa);
if (smesa->NewGLState & _NEW_TEXTURE) {
- SIS_FIREVERTICES(smesa);
sisUpdateTextureState(ctx);
}