From 0186f1bc8356bc3c2946d4ffcb5e6d7b61b84e02 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 11 Jun 2007 16:04:36 -0600
Subject: Temporarily disable the calls to
 _mesa_update_texture_compare_function().

This fixes the depth-peel regression reported by Brad King.
---
 src/mesa/swrast/s_fragprog.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/mesa/swrast/s_fragprog.c')

diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c
index a36c1ba491..1cbcde3c0a 100644
--- a/src/mesa/swrast/s_fragprog.c
+++ b/src/mesa/swrast/s_fragprog.c
@@ -209,6 +209,7 @@ _swrast_exec_fragment_program( GLcontext *ctx, SWspan *span )
 
    ctx->_CurrentProgram = GL_FRAGMENT_PROGRAM_ARB; /* or NV, doesn't matter */
 
+#if 0
    for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {
       if (ctx->Texture.Unit[i]._Current != NULL) {
          const GLboolean enable_shadow = ((1 << i) & program->Base.ShadowSamplers);
@@ -216,15 +217,18 @@ _swrast_exec_fragment_program( GLcontext *ctx, SWspan *span )
                                                !enable_shadow);
       }
    }
+#endif
 
    run_program(ctx, span, 0, span->end);
 
+#if 0
    for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {
       if (ctx->Texture.Unit[i]._Current != NULL) {
          _mesa_update_texture_compare_function(ctx->Texture.Unit[i]._Current,
                                                GL_FALSE);
       }
    }
+#endif
 
    if (program->Base.OutputsWritten & (1 << FRAG_RESULT_COLR)) {
       span->interpMask &= ~SPAN_RGBA;
-- 
cgit v1.2.3


From 0fbc4c51a07a5980956d62b3f70c46c65f6c7a57 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 11 Jun 2007 17:16:18 -0600
Subject: Rework _mesa_update_texture_compare_function() to only be called
 during state validation/update.

Note that we're still temporarily skipping the test for an active fragment
program.  Need to fix shadow2D() ...
---
 src/mesa/swrast/s_fragprog.c | 20 --------------------
 1 file changed, 20 deletions(-)

(limited to 'src/mesa/swrast/s_fragprog.c')

diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c
index 1cbcde3c0a..923b67e78e 100644
--- a/src/mesa/swrast/s_fragprog.c
+++ b/src/mesa/swrast/s_fragprog.c
@@ -200,7 +200,6 @@ void
 _swrast_exec_fragment_program( GLcontext *ctx, SWspan *span )
 {
    const struct gl_fragment_program *program = ctx->FragmentProgram._Current;
-   GLuint i;
 
    /* incoming colors should be floats */
    if (program->Base.InputsRead & FRAG_BIT_COL0) {
@@ -209,27 +208,8 @@ _swrast_exec_fragment_program( GLcontext *ctx, SWspan *span )
 
    ctx->_CurrentProgram = GL_FRAGMENT_PROGRAM_ARB; /* or NV, doesn't matter */
 
-#if 0
-   for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {
-      if (ctx->Texture.Unit[i]._Current != NULL) {
-         const GLboolean enable_shadow = ((1 << i) & program->Base.ShadowSamplers);
-         _mesa_update_texture_compare_function(ctx->Texture.Unit[i]._Current,
-                                               !enable_shadow);
-      }
-   }
-#endif
-
    run_program(ctx, span, 0, span->end);
 
-#if 0
-   for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {
-      if (ctx->Texture.Unit[i]._Current != NULL) {
-         _mesa_update_texture_compare_function(ctx->Texture.Unit[i]._Current,
-                                               GL_FALSE);
-      }
-   }
-#endif
-
    if (program->Base.OutputsWritten & (1 << FRAG_RESULT_COLR)) {
       span->interpMask &= ~SPAN_RGBA;
       span->arrayMask |= SPAN_RGBA;
-- 
cgit v1.2.3


From c223c6b663cd5db39ba19c2be74b88cc3b8f53f3 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Wed, 4 Jul 2007 13:15:20 -0600
Subject: Be more consistant with paths in #includes.  Eventually, eliminate a
 bunch of -I flags.

---
 src/mesa/swrast/s_fragprog.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/mesa/swrast/s_fragprog.c')

diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c
index 923b67e78e..14c9868c18 100644
--- a/src/mesa/swrast/s_fragprog.c
+++ b/src/mesa/swrast/s_fragprog.c
@@ -22,11 +22,11 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "glheader.h"
-#include "colormac.h"
-#include "context.h"
-#include "prog_instruction.h"
-#include "texstate.h"
+#include "main/glheader.h"
+#include "main/colormac.h"
+#include "main/context.h"
+#include "main/texstate.h"
+#include "shader/prog_instruction.h"
 
 #include "s_fragprog.h"
 #include "s_span.h"
-- 
cgit v1.2.3