On Monday, April 24, 2017 3:19:05 PM PDT Rafael Antognolli wrote:
> Rename that field name on genxml for:
> - 3DSTATE_GS - gen6+
> - 3DSTATE_DS - gen7+
> - 3DSTATE_HS - gen7+
>
> Signed-off-by: Rafael Antognolli <rafael.antogno...@intel.com>
> ---
> src/intel/genxml/gen6.xml | 2 +-
> src/intel/genxml/gen7.xml | 6 +++---
> src/intel/genxml/gen75.xml | 6 +++---
> src/intel/genxml/gen8.xml | 6 +++---
> src/intel/genxml/gen9.xml | 6 +++---
> src/intel/vulkan/genX_pipeline.c | 6 +++---
> 6 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml
> index 2173dbf..2cb9419 100644
> --- a/src/intel/genxml/gen6.xml
> +++ b/src/intel/genxml/gen6.xml
> @@ -1014,7 +1014,7 @@
> <field name="SVBI Payload Enable" start="220" end="220" type="bool"/>
> <field name="SVBI Post-Increment Enable" start="219" end="219"
> type="bool"/>
> <field name="SVBI Post-Increment Value" start="208" end="217"
> type="uint"/>
> - <field name="Function Enable" start="207" end="207" type="bool"/>
> + <field name="Enable" start="207" end="207" type="bool"/>
> </instruction>
>
> <instruction name="3DSTATE_GS_SVB_INDEX" bias="2" length="7">
> diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml
> index 6af1cbe..b4407d4 100644
> --- a/src/intel/genxml/gen7.xml
> +++ b/src/intel/genxml/gen7.xml
> @@ -1101,7 +1101,7 @@
> <field name="Statistics Enable" start="170" end="170" type="bool"/>
> <field name="Compute W Coordinate Enable" start="162" end="162"
> type="bool"/>
> <field name="DS Cache Disable" start="161" end="161" type="bool"/>
> - <field name="Function Enable" start="160" end="160" type="bool"/>
> + <field name="Enable" start="160" end="160" type="bool"/>
> </instruction>
>
> <instruction name="3DSTATE_GS" bias="2" length="7">
> @@ -1162,7 +1162,7 @@
> <value name="TRAILING" value="1"/>
> </field>
> <field name="Discard Adjacency" start="161" end="161" type="bool"/>
> - <field name="Function Enable" start="160" end="160" type="bool"/>
> + <field name="Enable" start="160" end="160" type="bool"/>
> <field name="Semaphore Handle" start="192" end="203" type="offset"/>
> </instruction>
>
> @@ -1199,7 +1199,7 @@
> <field name="Illegal Opcode Exception Enable" start="45" end="45"
> type="bool"/>
> <field name="Software Exception Enable" start="39" end="39" type="bool"/>
> <field name="Maximum Number of Threads" start="32" end="38" type="uint"/>
> - <field name="Function Enable" start="95" end="95" type="bool"/>
> + <field name="Enable" start="95" end="95" type="bool"/>
> <field name="Statistics Enable" start="93" end="93" type="bool"/>
> <field name="Instance Count" start="64" end="67" type="uint"/>
> <field name="Kernel Start Pointer" start="102" end="127" type="offset"/>
> diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml
> index 793f733..8c8b776 100644
> --- a/src/intel/genxml/gen75.xml
> +++ b/src/intel/genxml/gen75.xml
> @@ -1292,7 +1292,7 @@
> <field name="Statistics Enable" start="170" end="170" type="bool"/>
> <field name="Compute W Coordinate Enable" start="162" end="162"
> type="bool"/>
> <field name="DS Cache Disable" start="161" end="161" type="bool"/>
> - <field name="Function Enable" start="160" end="160" type="bool"/>
> + <field name="Enable" start="160" end="160" type="bool"/>
> </instruction>
>
> <instruction name="3DSTATE_GATHER_CONSTANT_DS" bias="2">
> @@ -1440,7 +1440,7 @@
> <value name="TRAILING" value="1"/>
> </field>
> <field name="Discard Adjacency" start="161" end="161" type="bool"/>
> - <field name="Function Enable" start="160" end="160" type="bool"/>
> + <field name="Enable" start="160" end="160" type="bool"/>
> <field name="Control Data Format" start="223" end="223" type="uint">
> <value name="GSCTL_CUT" value="0"/>
> <value name="GSCTL_SID" value="1"/>
> @@ -1484,7 +1484,7 @@
> <field name="Illegal Opcode Exception Enable" start="45" end="45"
> type="bool"/>
> <field name="Software Exception Enable" start="44" end="44" type="bool"/>
> <field name="Maximum Number of Threads" start="32" end="39" type="uint"/>
> - <field name="Function Enable" start="95" end="95" type="bool"/>
> + <field name="Enable" start="95" end="95" type="bool"/>
> <field name="Statistics Enable" start="93" end="93" type="bool"/>
> <field name="Instance Count" start="64" end="67" type="uint"/>
> <field name="Kernel Start Pointer" start="102" end="127" type="offset"/>
> diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml
> index a6c6d9d..f49c4a3 100644
> --- a/src/intel/genxml/gen8.xml
> +++ b/src/intel/genxml/gen8.xml
> @@ -1350,7 +1350,7 @@
> </field>
> <field name="Compute W Coordinate Enable" start="226" end="226"
> type="bool"/>
> <field name="Cache Disable" start="225" end="225" type="bool"/>
> - <field name="Function Enable" start="224" end="224" 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 Length" start="272" end="276"
> type="uint"/>
> <field name="User Clip Distance Clip Test Enable Bitmask" start="264"
> end="271" type="uint"/>
> @@ -1506,7 +1506,7 @@
> <value name="TRAILING" value="1"/>
> </field>
> <field name="Discard Adjacency" start="225" end="225" type="bool"/>
> - <field name="Function Enable" start="224" end="224" type="bool"/>
> + <field name="Enable" start="224" end="224" type="bool"/>
> <field name="Control Data Format" start="287" end="287" type="uint">
> <value name="CUT" value="0"/>
> <value name="SID" value="1"/>
> @@ -1555,7 +1555,7 @@
> </field>
> <field name="Illegal Opcode Exception Enable" start="45" end="45"
> type="bool"/>
> <field name="Software Exception Enable" start="44" end="44" type="bool"/>
> - <field name="Function Enable" start="95" end="95" type="bool"/>
> + <field name="Enable" start="95" end="95" type="bool"/>
> <field name="Statistics Enable" start="93" end="93" type="bool"/>
> <field name="Maximum Number of Threads" start="72" end="80" type="uint"/>
> <field name="Instance Count" start="64" end="67" type="uint"/>
> diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
> index 45eb454..178cf73 100644
> --- a/src/intel/genxml/gen9.xml
> +++ b/src/intel/genxml/gen9.xml
> @@ -1412,7 +1412,7 @@
> </field>
> <field name="Compute W Coordinate Enable" start="226" end="226"
> type="bool"/>
> <field name="Cache Disable" start="225" end="225" type="bool"/>
> - <field name="Function Enable" start="224" end="224" 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 Length" start="272" end="276"
> type="uint"/>
> <field name="User Clip Distance Clip Test Enable Bitmask" start="264"
> end="271" type="uint"/>
> @@ -1611,7 +1611,7 @@
> <value name="TRAILING" value="1"/>
> </field>
> <field name="Discard Adjacency" start="225" end="225" type="bool"/>
> - <field name="Function Enable" start="224" end="224" type="bool"/>
> + <field name="Enable" start="224" end="224" type="bool"/>
> <field name="Control Data Format" start="287" end="287" type="uint">
> <value name="CUT" value="0"/>
> <value name="SID" value="1"/>
> @@ -1661,7 +1661,7 @@
> </field>
> <field name="Illegal Opcode Exception Enable" start="45" end="45"
> type="bool"/>
> <field name="Software Exception Enable" start="44" end="44" type="bool"/>
> - <field name="Function Enable" start="95" end="95" type="bool"/>
> + <field name="Enable" start="95" end="95" type="bool"/>
> <field name="Statistics Enable" start="93" end="93" type="bool"/>
> <field name="Maximum Number of Threads" start="72" end="80" type="uint"/>
> <field name="Instance Count" start="64" end="67" type="uint"/>
> diff --git a/src/intel/vulkan/genX_pipeline.c
> b/src/intel/vulkan/genX_pipeline.c
> index 74d6f9a..2b38c34 100644
> --- a/src/intel/vulkan/genX_pipeline.c
> +++ b/src/intel/vulkan/genX_pipeline.c
> @@ -1192,7 +1192,7 @@ emit_3dstate_hs_te_ds(struct anv_pipeline *pipeline)
> const struct brw_tes_prog_data *tes_prog_data =
> get_tes_prog_data(pipeline);
>
> anv_batch_emit(&pipeline->batch, GENX(3DSTATE_HS), hs) {
> - hs.FunctionEnable = true;
> + hs.Enable = true;
> hs.StatisticsEnable = true;
> hs.KernelStartPointer = tcs_bin->kernel.offset;
>
> @@ -1222,7 +1222,7 @@ emit_3dstate_hs_te_ds(struct anv_pipeline *pipeline)
> }
>
> anv_batch_emit(&pipeline->batch, GENX(3DSTATE_DS), ds) {
> - ds.FunctionEnable = true;
> + ds.Enable = true;
> ds.StatisticsEnable = true;
> ds.KernelStartPointer = tes_bin->kernel.offset;
>
> @@ -1275,7 +1275,7 @@ emit_3dstate_gs(struct anv_pipeline *pipeline)
> const struct brw_gs_prog_data *gs_prog_data = get_gs_prog_data(pipeline);
>
> anv_batch_emit(&pipeline->batch, GENX(3DSTATE_GS), gs) {
> - gs.FunctionEnable = true;
> + gs.Enable = true;
> gs.StatisticsEnable = true;
> gs.KernelStartPointer = gs_bin->kernel.offset;
> gs.DispatchMode = gs_prog_data->base.dispatch_mode;
> Let's keep the spacing lined up here. Patches 3-5, 8-12 are: Reviewed-by: Kenneth Graunke <kenn...@whitecape.org>
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
