From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Sat, 21 Oct 2006 22:56:21 +0000 (+0000)
Subject: fix another logic error in computing deferredTexture
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ed324db249d068f14646eced55d106b5fe6b889c;p=mesa.git

fix another logic error in computing deferredTexture
---

diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index 4fcd4d22517..ad55e1b10c3 100644
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -1423,11 +1423,15 @@ _swrast_write_rgba_span( GLcontext *ctx, SWspan *span)
       deferredTexture = GL_FALSE;
    }
    else if (shaderOrTexture) {
-      if (ctx->FragmentProgram._Enabled &&
-          (ctx->FragmentProgram.Current->Base.OutputsWritten
-           & (1 << FRAG_RESULT_DEPR))) {
-         /* Z comes from fragment program */
-         deferredTexture = GL_FALSE;
+      if (ctx->FragmentProgram._Enabled) {
+         if (ctx->FragmentProgram.Current->Base.OutputsWritten
+             & (1 << FRAG_RESULT_DEPR)) {
+            /* Z comes from fragment program */
+            deferredTexture = GL_FALSE;
+         }
+         else {
+            deferredTexture = GL_TRUE;
+         }
       }
       else if (ctx->ShaderObjects._FragmentShaderPresent) {
          /* XXX how do we test if Z is written by shader? */