diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2013-01-15 18:47:05 +0000 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@intel.com> | 2013-03-04 15:54:36 +0000 |
| commit | 8fa561d4bbaec0ba0a4c9ccf2abe9131b893729a (patch) | |
| tree | d38a4c90d2c8dc239533f5c6267ddb4fb3c03ff3 /assembler/gram.y | |
| parent | 1f1ad5974655a241bcf202bcd79a3e2d236bcc1c (diff) | |
assembler: Rename dp_gen7 to gen7_dp and sync it with Mesa's
The purpose of this commit is to synchronize opcode definitions across
the gen4asm assembler and mesa.
I had to drop how mesa splits msg_control as the current assembly
language gives access the the whole msg_control field.
Recompiling the xorg and the intel driver of libva shaders doesn't show
any difference in the assembly created.
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Diffstat (limited to 'assembler/gram.y')
| -rw-r--r-- | assembler/gram.y | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/assembler/gram.y b/assembler/gram.y index df263937..1295d602 100644 --- a/assembler/gram.y +++ b/assembler/gram.y @@ -1253,9 +1253,9 @@ msgtarget: NULL_TOKEN $$.bits2.send_gen5.sfid = BRW_MESSAGE_TARGET_DP_SC; $$.bits3.generic_gen5.header_present = 1; - $$.bits3.dp_gen7.binding_table_index = $3; - $$.bits3.dp_gen7.msg_control = $7; - $$.bits3.dp_gen7.msg_type = $9; + $$.bits3.gen7_dp.binding_table_index = $3; + $$.bits3.gen7_dp.msg_control = $7; + $$.bits3.gen7_dp.msg_type = $9; } else if (IS_GENx(6)) { $$.bits2.send_gen5.sfid = BRW_MESSAGE_TARGET_DP_SC; @@ -1287,9 +1287,9 @@ msgtarget: NULL_TOKEN $$.bits2.send_gen5.sfid = BRW_MESSAGE_TARGET_DP_RC; $$.bits3.generic_gen5.header_present = 1; - $$.bits3.dp_gen7.binding_table_index = $3; - $$.bits3.dp_gen7.msg_control = $5; - $$.bits3.dp_gen7.msg_type = $7; + $$.bits3.gen7_dp.binding_table_index = $3; + $$.bits3.gen7_dp.msg_control = $5; + $$.bits3.gen7_dp.msg_type = $7; } else if (IS_GENx(6)) { $$.bits2.send_gen5.sfid = BRW_MESSAGE_TARGET_DP_RC; @@ -1332,9 +1332,9 @@ msgtarget: NULL_TOKEN $$.bits2.send_gen5.sfid = BRW_MESSAGE_TARGET_DP_RC; $$.bits3.generic_gen5.header_present = ($11 != 0); - $$.bits3.dp_gen7.binding_table_index = $3; - $$.bits3.dp_gen7.msg_control = $5; - $$.bits3.dp_gen7.msg_type = $7; + $$.bits3.gen7_dp.binding_table_index = $3; + $$.bits3.gen7_dp.msg_control = $5; + $$.bits3.gen7_dp.msg_type = $7; } else if (IS_GENx(6)) { $$.bits2.send_gen5.sfid = BRW_MESSAGE_TARGET_DP_RC; @@ -1459,10 +1459,10 @@ msgtarget: NULL_TOKEN YYERROR; } - $$.bits3.dp_gen7.category = $11; - $$.bits3.dp_gen7.binding_table_index = $9; - $$.bits3.dp_gen7.msg_control = $7; - $$.bits3.dp_gen7.msg_type = $5; + $$.bits3.gen7_dp.category = $11; + $$.bits3.gen7_dp.binding_table_index = $9; + $$.bits3.gen7_dp.msg_control = $7; + $$.bits3.gen7_dp.msg_type = $5; } else if (IS_GENx(6)) { if ($3 != BRW_MESSAGE_TARGET_DP_SC && $3 != BRW_MESSAGE_TARGET_DP_RC && |