summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-05-24 17:07:48 -0600
committerBrian <brian.paul@tungstengraphics.com>2007-05-24 17:07:48 -0600
commite4b037051e79a607044ed233b7eda66cf1873245 (patch)
tree97b0e7ce4e9b4f300f1eed76374ec5fc57bb834a
parent98d2a4a2445bae3597e29472ebcf6deeef35a313 (diff)
fix logic for calling _swrast_update_deferred_texture()
-rw-r--r--src/mesa/swrast/s_context.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index f373fde781..cb3bc756a4 100644
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -1,6 +1,6 @@
/*
* Mesa 3-D graphics library
- * Version: 6.5.3
+ * Version: 7.1
*
* Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
*
@@ -663,16 +663,14 @@ _swrast_validate_derived( GLcontext *ctx )
_NEW_PROGRAM))
_swrast_update_fragment_program( ctx, swrast->NewState );
- if (swrast->NewState & (_NEW_TEXTURE | _NEW_PROGRAM))
- _swrast_update_texture_samplers( ctx );
-
if (swrast->NewState & (_NEW_TEXTURE | _NEW_PROGRAM)) {
+ _swrast_update_texture_samplers( ctx );
_swrast_validate_texture_images(ctx);
- if (swrast->NewState & (_NEW_COLOR)) {
- _swrast_update_deferred_texture(ctx);
- }
}
+ if (swrast->NewState & (_NEW_COLOR | _NEW_PROGRAM))
+ _swrast_update_deferred_texture(ctx);
+
if (swrast->NewState & _SWRAST_NEW_RASTERMASK)
_swrast_update_rasterflags( ctx );