Mesa (master): swrast: return (0, 0, 0, 1) when sampling incomplete textures, not (0,0,0,0)

Brian Paul brianp at kemper.freedesktop.org
Fri Feb 6 17:56:26 UTC 2009


Module: Mesa
Branch: master
Commit: 1df62651b2e9a8d0afd790738e2695a16ade1eeb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1df62651b2e9a8d0afd790738e2695a16ade1eeb

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Feb  6 10:47:31 2009 -0700

swrast: return (0,0,0,1) when sampling incomplete textures, not (0,0,0,0)

Fixes piglit shaders/fp-incomplete-tex test.

---

 src/mesa/swrast/s_fragprog.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c
index 58ef91e..bbb784c 100644
--- a/src/mesa/swrast/s_fragprog.c
+++ b/src/mesa/swrast/s_fragprog.c
@@ -84,7 +84,8 @@ fetch_texel_lod( GLcontext *ctx, const GLfloat texcoord[4], GLfloat lambda,
       swizzle_texel(rgba, color, texObj->_Swizzle);
    }
    else {
-      color[0] = color[1] = color[2] = color[3] = 0.0F;
+      color[0] = color[1] = color[2] = 0.0F;
+      color[3] = 1.0F;
    }
 }
 
@@ -126,7 +127,8 @@ fetch_texel_deriv( GLcontext *ctx, const GLfloat texcoord[4],
       swizzle_texel(rgba, color, texObj->_Swizzle);
    }
    else {
-      color[0] = color[1] = color[2] = color[3] = 0.0F;
+      color[0] = color[1] = color[2] = 0.0F;
+      color[3] = 1.0F;
    }
 }
 




More information about the mesa-commit mailing list