intel/genxml: Normalize URB Data field in WM_STATE.

On gen6+, this is called "Dispatch GRF Start Register For Constant/Setup Data
0", while on gen5 and lower it's called only "Dispatch GRF Start Register For
URB Data", but it's essentially the same thing (URB data), so rename it to
match newer gens and simplify the C code that handles it.

Signed-off-by: Rafael Antognolli <rafael.antognolli@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/intel/genxml/gen4.xml b/src/intel/genxml/gen4.xml
index f4ca3f09ec90d8319229f0190eaee0d6fa9d3f0a..6f6f1bfeb09ad576ed3a4ccea56eec879f5d96b5 100644 (file)
--- a/src/intel/genxml/gen4.xml
+++ b/src/intel/genxml/gen4.xml
@@ -783,7 +783,7 @@
     <field name="Constant URB Entry Read Offset" start="114" end="119" type="uint"/>
     <field name="Setup URB Entry Read Length" start="107" end="112" type="uint"/>
     <field name="Setup URB Entry Read Offset" start="100" end="105" type="uint"/>
-    <field name="Dispatch GRF Start Register For URB Data" start="96" end="99" type="uint"/>
+    <field name="Dispatch GRF Start Register For Constant/Setup Data 0" start="96" end="99" type="uint"/>
     <field name="Sampler State Pointer" start="133" end="159" type="address"/>
     <field name="Sampler Count" start="130" end="132" type="uint"/>
     <field name="Statistics Enable" start="128" end="128" type="bool"/>

diff --git a/src/intel/genxml/gen45.xml b/src/intel/genxml/gen45.xml
index 5c221b7843296c23bd8a72236a3af373c08e2bed..7b2f7698274b3ddf78fc2acfd44b9eb46f338bc3 100644 (file)
--- a/src/intel/genxml/gen45.xml
+++ b/src/intel/genxml/gen45.xml
@@ -798,7 +798,7 @@
     <field name="Constant URB Entry Read Offset" start="114" end="119" type="uint"/>
     <field name="Setup URB Entry Read Length" start="107" end="112" type="uint"/>
     <field name="Setup URB Entry Read Offset" start="100" end="105" type="uint"/>
-    <field name="Dispatch GRF Start Register For URB Data" start="96" end="99" type="uint"/>
+    <field name="Dispatch GRF Start Register For Constant/Setup Data 0" start="96" end="99" type="uint"/>
     <field name="Sampler State Pointer" start="133" end="159" type="address"/>
     <field name="Sampler Count" start="130" end="132" type="uint"/>
     <field name="Statistics Enable" start="128" end="128" type="bool"/>

diff --git a/src/intel/genxml/gen5.xml b/src/intel/genxml/gen5.xml
index 28d9dd501eb9ec954578fb36aef0972844bc6d33..44dd0d10aa3606b7363dc2fc848675f7dfe551de 100644 (file)
--- a/src/intel/genxml/gen5.xml
+++ b/src/intel/genxml/gen5.xml
@@ -893,7 +893,7 @@
     <field name="Constant URB Entry Read Offset" start="114" end="119" type="uint"/>
     <field name="Setup URB Entry Read Length" start="107" end="112" type="uint"/>
     <field name="Setup URB Entry Read Offset" start="100" end="105" type="uint"/>
-    <field name="Dispatch GRF Start Register For URB Data" start="96" end="99" type="uint"/>
+    <field name="Dispatch GRF Start Register For Constant/Setup Data 0" start="96" end="99" type="uint"/>
     <field name="Sampler State Pointer" start="133" end="159" type="address"/>
     <field name="Sampler Count" start="130" end="132" type="uint"/>
     <field name="Statistics Enable" start="128" end="128" type="bool"/>

diff --git a/src/mesa/drivers/dri/i965/gen4_blorp_exec.h b/src/mesa/drivers/dri/i965/gen4_blorp_exec.h
index f1d9394e243bbeb95eb796ab38a1a4b59212b3d0..764b1989aaad310c83bffcf5d505b27927503873 100644 (file)
--- a/src/mesa/drivers/dri/i965/gen4_blorp_exec.h
+++ b/src/mesa/drivers/dri/i965/gen4_blorp_exec.h
@@ -125,7 +125,7 @@ blorp_emit_wm_state(struct blorp_batch *batch,
       }
 
       if (prog_data) {
-         wm.DispatchGRFStartRegisterForURBData =
+         wm.DispatchGRFStartRegisterForConstantSetupData0 =
             prog_data->base.dispatch_grf_start_reg;
          wm.SetupURBEntryReadLength = prog_data->num_varying_inputs * 2;
          wm.SetupURBEntryReadOffset = 0;