[08/90] assembler: Rename dp_read_gen6 to gen6_dp_sampler_const_cache

Commit Message

Lespiau, Damien Feb. 4, 2013, 3:27 p.m. UTC

The purpose of this commit is to synchronize opcode definitions across
the gen4asm assembler and mesa.

Signed-off-by: Damien Lespiau <[e-mail]>
---
 assembler/brw_structs.h |   27 ++++++++++++++++-----------
 assembler/gram.y        |    6 +++---
 2 files changed, 19 insertions(+), 14 deletions(-)

Patch

diff --git a/assembler/brw_structs.h b/assembler/brw_structs.h
index e4fdb51..e2be147 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 9380f44..70caeb4 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;