Mesa (master): vc4: Fix texture type masking.

[Eric Anholt]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Jan 13 16:43:16 2015 +1300

vc4: Fix texture type masking.

Everything from ETC1 to RGBA64 was getting its top bit dropped, but we
didn't use any of those formats.

---

 src/gallium/drivers/vc4/vc4_program.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/vc4/vc4_program.c b/src/gallium/drivers/vc4/vc4_program.c
index 0fa43e2..9f1f018 100644
--- a/src/gallium/drivers/vc4/vc4_program.c
+++ b/src/gallium/drivers/vc4/vc4_program.c
@@ -2570,7 +2570,7 @@ write_texture_p0(struct vc4_context *vc4,
                                texture->u.tex.first_level, VC4_TEX_P0_MIPLVLS) |
                  VC4_SET_FIELD(texture->target == PIPE_TEXTURE_CUBE,
                                VC4_TEX_P0_CMMODE) |
-                 VC4_SET_FIELD(rsc->vc4_format & 7, VC4_TEX_P0_TYPE));
+                 VC4_SET_FIELD(rsc->vc4_format & 15, VC4_TEX_P0_TYPE));
 }
 
 static void