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.antogno...@intel.com>
---
src/intel/genxml/gen4.xml | 2 +-
src/intel/genxml/gen45.xml | 2 +-
src/intel/genxml/gen5.xml | 2 +-
src/mesa/drivers/dri/i965/gen4_blorp_exec.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/intel/genxml/gen4.xml b/src/intel/genxml/gen4.xml
index f4ca3f0..6f6f1bf 100644
--- 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 5c221b7..7b2f769 100644
--- 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 28d9dd5..44dd0d1 100644
--- 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 f1d9394..764b198 100644
--- 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;
--
2.9.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
