"Output Read Offset" is a bit non-sensical, let's just make this match "Output Length".
Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> --- src/intel/genxml/gen10.xml | 6 +++--- src/intel/genxml/gen8.xml | 6 +++--- src/intel/genxml/gen9.xml | 6 +++--- src/mesa/drivers/dri/i965/genX_state_upload.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/intel/genxml/gen10.xml b/src/intel/genxml/gen10.xml index 5bb46f819a8..d94c6e4ecc2 100644 --- a/src/intel/genxml/gen10.xml +++ b/src/intel/genxml/gen10.xml @@ -1447,7 +1447,7 @@ <field name="Compute W Coordinate Enable" start="226" end="226" type="bool"/> <field name="Cache Disable" start="225" end="225" type="bool"/> <field name="Enable" start="224" end="224" type="bool"/> - <field name="Vertex URB Entry Output Read Offset" start="277" end="282" type="uint"/> + <field name="Vertex URB Entry Output Offset" start="277" end="282" type="uint"/> <field name="Vertex URB Entry Output Length" start="272" end="276" type="uint"/> <field name="User Clip Distance Clip Test Enable Bitmask" start="264" end="271" type="uint"/> <field name="User Clip Distance Cull Test Enable Bitmask" start="256" end="263" type="uint"/> @@ -1653,7 +1653,7 @@ <field name="Static Output" start="286" end="286" type="bool"/> <field name="Static Output Vertex Count" start="272" end="282" type="uint"/> <field name="Maximum Number of Threads" start="256" end="264" type="uint"/> - <field name="Vertex URB Entry Output Read Offset" start="309" end="314" type="uint"/> + <field name="Vertex URB Entry Output Offset" start="309" end="314" type="uint"/> <field name="Vertex URB Entry Output Length" start="304" end="308" type="uint"/> <field name="User Clip Distance Clip Test Enable Bitmask" start="296" end="303" type="uint"/> <field name="User Clip Distance Cull Test Enable Bitmask" start="288" end="295" type="uint"/> @@ -2669,7 +2669,7 @@ <field name="SIMD8 Dispatch Enable" start="226" end="226" type="bool"/> <field name="Vertex Cache Disable" start="225" end="225" type="bool"/> <field name="Enable" start="224" end="224" type="bool"/> - <field name="Vertex URB Entry Output Read Offset" start="277" end="282" type="uint"/> + <field name="Vertex URB Entry Output Offset" start="277" end="282" type="uint"/> <field name="Vertex URB Entry Output Length" start="272" end="276" type="uint"/> <field name="User Clip Distance Clip Test Enable Bitmask" start="264" end="271" type="uint"/> <field name="User Clip Distance Cull Test Enable Bitmask" start="256" end="263" type="uint"/> diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml index 7ccb8046796..4511e3d3749 100644 --- a/src/intel/genxml/gen8.xml +++ b/src/intel/genxml/gen8.xml @@ -1349,7 +1349,7 @@ <field name="Compute W Coordinate Enable" start="226" end="226" type="bool"/> <field name="Cache Disable" start="225" end="225" type="bool"/> <field name="Enable" start="224" end="224" type="bool"/> - <field name="Vertex URB Entry Output Read Offset" start="277" end="282" type="uint"/> + <field name="Vertex URB Entry Output Offset" start="277" end="282" type="uint"/> <field name="Vertex URB Entry Output Length" start="272" end="276" type="uint"/> <field name="User Clip Distance Clip Test Enable Bitmask" start="264" end="271" type="uint"/> <field name="User Clip Distance Cull Test Enable Bitmask" start="256" end="263" type="uint"/> @@ -1511,7 +1511,7 @@ </field> <field name="Static Output" start="286" end="286" type="bool"/> <field name="Static Output Vertex Count" start="272" end="282" type="uint"/> - <field name="Vertex URB Entry Output Read Offset" start="309" end="314" type="uint"/> + <field name="Vertex URB Entry Output Offset" start="309" end="314" type="uint"/> <field name="Vertex URB Entry Output Length" start="304" end="308" type="uint"/> <field name="User Clip Distance Clip Test Enable Bitmask" start="296" end="303" type="uint"/> <field name="User Clip Distance Cull Test Enable Bitmask" start="288" end="295" type="uint"/> @@ -2353,7 +2353,7 @@ <field name="SIMD8 Dispatch Enable" start="226" end="226" type="bool"/> <field name="Vertex Cache Disable" start="225" end="225" type="bool"/> <field name="Enable" start="224" end="224" type="bool"/> - <field name="Vertex URB Entry Output Read Offset" start="277" end="282" type="uint"/> + <field name="Vertex URB Entry Output Offset" start="277" end="282" type="uint"/> <field name="Vertex URB Entry Output Length" start="272" end="276" type="uint"/> <field name="User Clip Distance Clip Test Enable Bitmask" start="264" end="271" type="uint"/> <field name="User Clip Distance Cull Test Enable Bitmask" start="256" end="263" type="uint"/> diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml index db4b608f61f..87fff9e7ba0 100644 --- a/src/intel/genxml/gen9.xml +++ b/src/intel/genxml/gen9.xml @@ -1411,7 +1411,7 @@ <field name="Compute W Coordinate Enable" start="226" end="226" type="bool"/> <field name="Cache Disable" start="225" end="225" type="bool"/> <field name="Enable" start="224" end="224" type="bool"/> - <field name="Vertex URB Entry Output Read Offset" start="277" end="282" type="uint"/> + <field name="Vertex URB Entry Output Offset" start="277" end="282" type="uint"/> <field name="Vertex URB Entry Output Length" start="272" end="276" type="uint"/> <field name="User Clip Distance Clip Test Enable Bitmask" start="264" end="271" type="uint"/> <field name="User Clip Distance Cull Test Enable Bitmask" start="256" end="263" type="uint"/> @@ -1617,7 +1617,7 @@ <field name="Static Output" start="286" end="286" type="bool"/> <field name="Static Output Vertex Count" start="272" end="282" type="uint"/> <field name="Maximum Number of Threads" start="256" end="264" type="uint"/> - <field name="Vertex URB Entry Output Read Offset" start="309" end="314" type="uint"/> + <field name="Vertex URB Entry Output Offset" start="309" end="314" type="uint"/> <field name="Vertex URB Entry Output Length" start="304" end="308" type="uint"/> <field name="User Clip Distance Clip Test Enable Bitmask" start="296" end="303" type="uint"/> <field name="User Clip Distance Cull Test Enable Bitmask" start="288" end="295" type="uint"/> @@ -2585,7 +2585,7 @@ <field name="SIMD8 Dispatch Enable" start="226" end="226" type="bool"/> <field name="Vertex Cache Disable" start="225" end="225" type="bool"/> <field name="Enable" start="224" end="224" type="bool"/> - <field name="Vertex URB Entry Output Read Offset" start="277" end="282" type="uint"/> + <field name="Vertex URB Entry Output Offset" start="277" end="282" type="uint"/> <field name="Vertex URB Entry Output Length" start="272" end="276" type="uint"/> <field name="User Clip Distance Clip Test Enable Bitmask" start="264" end="271" type="uint"/> <field name="User Clip Distance Cull Test Enable Bitmask" start="256" end="263" type="uint"/> diff --git a/src/mesa/drivers/dri/i965/genX_state_upload.c b/src/mesa/drivers/dri/i965/genX_state_upload.c index b7a6cd73619..17c1e9e8421 100644 --- a/src/mesa/drivers/dri/i965/genX_state_upload.c +++ b/src/mesa/drivers/dri/i965/genX_state_upload.c @@ -2649,7 +2649,7 @@ genX(upload_gs_state)(struct brw_context *brw) DIV_ROUND_UP(vue_prog_data->vue_map.num_slots, 2) - urb_entry_write_offset; - gs.VertexURBEntryOutputReadOffset = urb_entry_write_offset; + gs.VertexURBEntryOutputOffset = urb_entry_write_offset; gs.VertexURBEntryOutputLength = MAX2(urb_entry_output_length, 1); #endif } -- 2.15.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev