From: Axel Davy Date: Mon, 24 Nov 2014 23:38:05 +0000 (+0100) Subject: st/nine: propertly declare constants (v2) X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=890f963d649cd85a0b0199f49384a41cc0e3636e;p=mesa.git 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" Tested-by: David Heidelberg Reviewed-by: Ilia Mirkin Signed-off-by: Axel Davy --- diff --git a/src/gallium/state_trackers/nine/nine_ff.c b/src/gallium/state_trackers/nine/nine_ff.c index 689093319a5..184c4113026 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)