Mesa (master): i965: Don' t assume that WPOS is always provided on gen6 in the new FS.

[Eric Anholt]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Oct  6 12:10:31 2010 -0700

i965: Don't assume that WPOS is always provided on gen6 in the new FS.

We sensibly only provide it if the FS asks for it.  We could actually
skip WPOS unless the FS needed WPOS.zw, but that's something for
later.

Fixes: glsl-texture2d and probably many others.

---

 src/mesa/drivers/dri/i965/brw_fs.cpp |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 1ccf695..b93c27e 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -2258,8 +2258,7 @@ fs_visitor::calculate_urb_setup()
    /* Figure out where each of the incoming setup attributes lands. */
    if (intel->gen >= 6) {
       for (unsigned int i = 0; i < FRAG_ATTRIB_MAX; i++) {
-	 if (i == FRAG_ATTRIB_WPOS ||
-	     (brw->fragment_program->Base.InputsRead & BITFIELD64_BIT(i))) {
+	 if (brw->fragment_program->Base.InputsRead & BITFIELD64_BIT(i)) {
 	    urb_setup[i] = urb_next++;
 	 }
       }