Mesa (7.9): i965: Allow OPCODE_SWZ to put immediates in the first arg.

Ian Romanick idr at kemper.freedesktop.org
Wed Dec 15 22:06:30 UTC 2010


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

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Nov  9 16:19:34 2010 -0800

i965: Allow OPCODE_SWZ to put immediates in the first arg.

Fixes assertion failure with texture swizzling in the GLSL path when
it's triggered (such as gen6 FF or ARB_fp shadow comparisons).

Fixes:
texdepth
texSwizzle
fp1-DST test
fp1-LIT test 3
(cherry picked from commit f00929cbddf2ea5794bebf01ac45f4070416d334)

---

 src/mesa/drivers/dri/i965/brw_wm_emit.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_wm_emit.c b/src/mesa/drivers/dri/i965/brw_wm_emit.c
index f52372e..0f9431a 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_emit.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_emit.c
@@ -83,6 +83,7 @@ brw_wm_arg_can_be_immediate(enum prog_opcode opcode, int arg)
       [OPCODE_SLE] = 2,
       [OPCODE_SLT] = 2,
       [OPCODE_SNE] = 2,
+      [OPCODE_SWZ] = 1,
       [OPCODE_XPD] = 2,
    };
 




More information about the mesa-commit mailing list