From 881afff297835faf67f55ed1e9db596e57fb4cd7 Mon Sep 17 00:00:00 2001 From: "Xiang, Haihao" Date: Tue, 25 Mar 2014 13:41:25 +0800 Subject: assembler: switch the order of swizzle and regtype to match the BNF of the assembly Fortunately our existing source didn't use swizzle. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75631 Tested-by: Matt Turner Signed-off-by: Xiang, Haihao Signed-off-by: Damien Lespiau --- assembler/gram.y | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'assembler') diff --git a/assembler/gram.y b/assembler/gram.y index f4d270d3..e56533d7 100644 --- a/assembler/gram.y +++ b/assembler/gram.y @@ -2262,21 +2262,21 @@ directsrcoperand: negate abs symbol_reg region regtype $$.reg.type = $3.type; } } - | negate abs directgenreg region regtype swizzle + | negate abs directgenreg region swizzle regtype { memset (&$$, '\0', sizeof ($$)); $$.reg.address_mode = BRW_ADDRESS_DIRECT; $$.reg.file = $3.file; $$.reg.nr = $3.nr; $$.reg.subnr = $3.subnr; - $$.reg.type = $5.type; + $$.reg.type = $6.type; $$.reg.vstride = $4.vert_stride; $$.reg.width = $4.width; $$.reg.hstride = $4.horiz_stride; $$.default_region = $4.is_default; $$.reg.negate = $1; $$.reg.abs = $2; - $$.reg.dw1.bits.swizzle = $6.reg.dw1.bits.swizzle; + $$.reg.dw1.bits.swizzle = $5.reg.dw1.bits.swizzle; } | srcarchoperandex ; -- cgit v1.2.3