diff options
| author | Axel Davy <axel.davy@ens.fr> | 2014-11-25 00:38:05 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-12-03 22:58:49 +0000 |
| commit | 41906e97640503c46832646ffbad9c45fb2b1262 (patch) | |
| tree | 2137af9750afe83fa5f7a1706ba1575b1f31547b | |
| parent | 56572002fcc404f072bd9882aaab264441f202fe (diff) | |
st/nine: propertly declare constants (v2)
Fixes "Error : CONST[20]: Undeclared source register" when running
dx9_alpha_blending_material. Also artifacts on ilo.
v2: also remove unused MISC_CONST
Cc: "10.4" <mesa-stable@lists.freedesktop.org>
Tested-by: David Heidelberg <david@ixit.cz>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Axel Davy <axel.davy@ens.fr>
(cherry picked from commit 890f963d649cd85a0b0199f49384a41cc0e3636e)
| -rw-r--r-- | src/gallium/state_trackers/nine/nine_ff.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/gallium/state_trackers/nine/nine_ff.c b/src/gallium/state_trackers/nine/nine_ff.c index d6cb5b2c0ec..06328de707a 100644 --- a/src/gallium/state_trackers/nine/nine_ff.c +++ b/src/gallium/state_trackers/nine/nine_ff.c @@ -189,13 +189,10 @@ static void nine_ureg_tgsi_dump(struct ureg_program *ureg, boolean override) /* AL should contain base address of lights table. */ #define LIGHT_CONST(i) \ - ureg_src_indirect(ureg_src_register(TGSI_FILE_CONSTANT, (i)), _X(AL)) + ureg_src_indirect(ureg_DECL_constant(ureg, i), _X(AL)) #define MATERIAL_CONST(i) \ - ureg_src_register(TGSI_FILE_CONSTANT, 19 + (i)) - -#define MISC_CONST(i) \ - ureg_src_register(TGSI_FILE_CONSTANT, (i)) + ureg_DECL_constant(ureg, 19 + (i)) #define _CONST(n) ureg_DECL_constant(ureg, n) |