Mesa (10.2): radeonsi: add support for TXB2

[Carl Worth]

Module: Mesa
Branch: 10.2
Commit: 0273f22a103adbfe8be733a3690bf06e8f1b7ab7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0273f22a103adbfe8be733a3690bf06e8f1b7ab7

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Thu Jul 17 22:24:50 2014 +0200

radeonsi: add support for TXB2

This is needed by latest fixes for samplerCubeShadow with bias.
Otherwise, a crash occurs.

---

 src/gallium/drivers/radeonsi/si_shader.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 09c99eb..397b6ee 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -1539,6 +1539,8 @@ static void tex_fetch_args(
 	/* Pack LOD bias value */
 	if (opcode == TGSI_OPCODE_TXB)
 		address[count++] = coords[3];
+	if (opcode == TGSI_OPCODE_TXB2)
+		address[count++] = lp_build_emit_fetch(bld_base, inst, 1, 0);
 
 	/* Pack depth comparison value */
 	switch (target) {
@@ -2497,6 +2499,7 @@ int si_pipe_shader_create(
 
 	bld_base->op_actions[TGSI_OPCODE_TEX] = tex_action;
 	bld_base->op_actions[TGSI_OPCODE_TXB] = txb_action;
+	bld_base->op_actions[TGSI_OPCODE_TXB2] = txb_action;
 #if HAVE_LLVM >= 0x0304
 	bld_base->op_actions[TGSI_OPCODE_TXD] = txd_action;
 #endif