diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2013-01-15 20:24:51 +0000 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@intel.com> | 2013-03-04 15:54:36 +0000 |
| commit | fe0bd3776e522c6a30060562cf57c6fc75196461 (patch) | |
| tree | bb7488b886cc975ec8114bdcf025495b7eb57f2b /assembler | |
| parent | 8fa561d4bbaec0ba0a4c9ccf2abe9131b893729a (diff) | |
assembler: Remove struct dp_write_gen6 and struct use gen6_dp
We ended up with 2 structures that where exactly the same, so just use
one, which happens to be the one Mesa has.
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Diffstat (limited to 'assembler')
| -rw-r--r-- | assembler/brw_structs.h | 13 | ||||
| -rw-r--r-- | assembler/gram.y | 16 |
2 files changed, 8 insertions, 21 deletions
diff --git a/assembler/brw_structs.h b/assembler/brw_structs.h index cfb3028c..0e3c430a 100644 --- a/assembler/brw_structs.h +++ b/assembler/brw_structs.h @@ -1500,19 +1500,6 @@ struct brw_instruction GLuint end_of_thread:1; } dp_write_gen5; - struct { - GLuint binding_table_index:8; - GLuint msg_control:5; - GLuint msg_type:4; - GLuint send_commit_msg:1; - GLuint pad0:1; - GLuint header_present:1; - GLuint response_length:5; - GLuint msg_length:4; - GLuint pad1:2; - GLuint end_of_thread:1; - } dp_write_gen6; - /** * Message for the Sandybridge Render Cache Data Port. * diff --git a/assembler/gram.y b/assembler/gram.y index 1295d602..538f8f79 100644 --- a/assembler/gram.y +++ b/assembler/gram.y @@ -1298,10 +1298,10 @@ msgtarget: NULL_TOKEN * message header */ $$.bits3.generic_gen5.header_present = 1; - $$.bits3.dp_write_gen6.binding_table_index = $3; - $$.bits3.dp_write_gen6.msg_control = $5; - $$.bits3.dp_write_gen6.msg_type = $7; - $$.bits3.dp_write_gen6.send_commit_msg = $9; + $$.bits3.gen6_dp.binding_table_index = $3; + $$.bits3.gen6_dp.msg_control = $5; + $$.bits3.gen6_dp.msg_type = $7; + $$.bits3.gen6_dp.send_commit_msg = $9; } else if (IS_GENx(5)) { $$.bits2.send_gen5.sfid = BRW_MESSAGE_TARGET_DATAPORT_WRITE; @@ -1339,10 +1339,10 @@ msgtarget: NULL_TOKEN $$.bits2.send_gen5.sfid = BRW_MESSAGE_TARGET_DP_RC; $$.bits3.generic_gen5.header_present = ($11 != 0); - $$.bits3.dp_write_gen6.binding_table_index = $3; - $$.bits3.dp_write_gen6.msg_control = $5; - $$.bits3.dp_write_gen6.msg_type = $7; - $$.bits3.dp_write_gen6.send_commit_msg = $9; + $$.bits3.gen6_dp.binding_table_index = $3; + $$.bits3.gen6_dp.msg_control = $5; + $$.bits3.gen6_dp.msg_type = $7; + $$.bits3.gen6_dp.send_commit_msg = $9; } else if (IS_GENx(5)) { $$.bits2.send_gen5.sfid = BRW_MESSAGE_TARGET_DATAPORT_WRITE; |