diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2013-01-15 16:40:06 +0000 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@intel.com> | 2013-03-04 15:54:36 +0000 |
| commit | 668e0dff7da8a604e626c1c5fefe65a3a8f2be19 (patch) | |
| tree | e67cf43435394ba70ae1f35198bc85726b316ac5 | |
| parent | 31259c5edc51d16afcfd453f7abaf81601a62a15 (diff) | |
assembler: Rename dp_read_gen6 to gen6_dp_sampler_const_cache
The purpose of this commit is to synchronize opcode definitions across
the gen4asm assembler and mesa.
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
| -rw-r--r-- | assembler/brw_structs.h | 27 | ||||
| -rw-r--r-- | assembler/gram.y | 6 |
2 files changed, 19 insertions, 14 deletions
diff --git a/assembler/brw_structs.h b/assembler/brw_structs.h index e4fdb515..e2be147c 100644 --- a/assembler/brw_structs.h +++ b/assembler/brw_structs.h @@ -1469,17 +1469,22 @@ struct brw_instruction GLuint end_of_thread:1; } dp_read_gen5; - struct { - GLuint binding_table_index:8; - GLuint msg_control:5; - GLuint msg_type:3; - GLuint pad0:3; - GLuint header_present:1; - GLuint response_length:5; - GLuint msg_length:4; - GLuint pad1:2; - GLuint end_of_thread:1; - } dp_read_gen6; + /** + * Message for the Sandybridge Sampler Cache or Constant Cache Data Port. + * + * See the Sandybridge PRM, Volume 4 Part 1, Section 3.9.2.1.1. + **/ + struct { + GLuint binding_table_index:8; + GLuint msg_control:5; + GLuint msg_type:3; + GLuint pad0:3; + GLuint header_present:1; + GLuint response_length:5; + GLuint msg_length:4; + GLuint pad1:2; + GLuint end_of_thread:1; + } gen6_dp_sampler_const_cache; struct { GLuint binding_table_index:8; diff --git a/assembler/gram.y b/assembler/gram.y index 9380f445..70caeb41 100644 --- a/assembler/gram.y +++ b/assembler/gram.y @@ -1260,9 +1260,9 @@ msgtarget: NULL_TOKEN $$.bits2.send_gen5.sfid = BRW_MESSAGE_TARGET_DP_SC; $$.bits3.generic_gen5.header_present = 1; - $$.bits3.dp_read_gen6.binding_table_index = $3; - $$.bits3.dp_read_gen6.msg_control = $7; - $$.bits3.dp_read_gen6.msg_type = $9; + $$.bits3.gen6_dp_sampler_const_cache.binding_table_index = $3; + $$.bits3.gen6_dp_sampler_const_cache.msg_control = $7; + $$.bits3.gen6_dp_sampler_const_cache.msg_type = $9; } else if (IS_GENx(5)) { $$.bits2.send_gen5.sfid = BRW_MESSAGE_TARGET_DATAPORT_READ; |