OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/genxml: Make some VS/GS fields consistent across gens

Browse Source 
We use the names from gen8+

Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
This commit is contained in:
Jason Ekstrand
2016-10-21 13:08:48 -07:00
parent 623e1e06d8
commit bda247d3fd
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/intel/genxml/gen6.xml
View File

@@ -1047,7 +1047,7 @@
<field name="Per-Thread Scratch Space" start="96" end="99" type="uint"/> <field name="Per-Thread Scratch Space" start="96" end="99" type="uint"/>
<field name="Vertex URB Entry Read Length" start="139" end="144" type="uint"/> <field name="Vertex URB Entry Read Length" start="139" end="144" type="uint"/>
<field name="Vertex URB Entry Read Offset" start="132" end="137" type="uint"/> <field name="Vertex URB Entry Read Offset" start="132" end="137" type="uint"/>
<field name="Dispatch GRF Start Register for URB Data" start="128" end="131" type="uint"/> <field name="Dispatch GRF Start Register For URB Data" start="128" end="131" type="uint"/>
<field name="Maximum Number of Threads" start="185" end="191" type="uint"/> <field name="Maximum Number of Threads" start="185" end="191" type="uint"/>
<field name="GS Statistics Enable" start="170" end="170" type="bool"/> <field name="GS Statistics Enable" start="170" end="170" type="bool"/>
<field name="SO Statistics Enable" start="169" end="169" type="bool"/> <field name="SO Statistics Enable" start="169" end="169" type="bool"/>
@@ -1423,13 +1423,13 @@
<field name="Software Exception Enable" start="71" end="71" type="bool"/> <field name="Software Exception Enable" start="71" end="71" type="bool"/>
<field name="Scratch Space Base Pointer" start="106" end="127" type="address"/> <field name="Scratch Space Base Pointer" start="106" end="127" type="address"/>
<field name="Per-Thread Scratch Space" start="96" end="99" type="uint"/> <field name="Per-Thread Scratch Space" start="96" end="99" type="uint"/>
<field name="Dispatch GRF Start Register for URB Data" start="148" end="152" type="uint"/> <field name="Dispatch GRF Start Register For URB Data" start="148" end="152" type="uint"/>
<field name="Vertex URB Entry Read Length" start="139" end="144" type="uint"/> <field name="Vertex URB Entry Read Length" start="139" end="144" type="uint"/>
<field name="Vertex URB Entry Read Offset" start="132" end="137" type="uint"/> <field name="Vertex URB Entry Read Offset" start="132" end="137" type="uint"/>
<field name="Maximum Number of Threads" start="185" end="191" type="uint"/> <field name="Maximum Number of Threads" start="185" end="191" type="uint"/>
<field name="Statistics Enable" start="170" end="170" type="bool"/> <field name="Statistics Enable" start="170" end="170" type="bool"/>
<field name="Vertex Cache Disable" start="161" end="161" type="bool"/> <field name="Vertex Cache Disable" start="161" end="161" type="bool"/>
<field name="VS Function Enable" start="160" end="160" type="bool"/> <field name="Function Enable" start="160" end="160" type="bool"/>
</instruction> </instruction>
<instruction name="3DSTATE_WM" bias="2" length="9"> <instruction name="3DSTATE_WM" bias="2" length="9">

6
src/intel/genxml/gen7.xml
View File

@@ -1181,7 +1181,7 @@
<field name="Vertex URB Entry Read Length" start="139" end="144" type="uint"/> <field name="Vertex URB Entry Read Length" start="139" end="144" type="uint"/>
<field name="Include Vertex Handles" start="138" end="138" type="bool"/> <field name="Include Vertex Handles" start="138" end="138" type="bool"/>
<field name="Vertex URB Entry Read Offset" start="132" end="137" type="uint"/> <field name="Vertex URB Entry Read Offset" start="132" end="137" type="uint"/>
<field name="Dispatch GRF Start Register for URB Data" start="128" end="131" type="uint"/> <field name="Dispatch GRF Start Register For URB Data" start="128" end="131" type="uint"/>
<field name="Maximum Number of Threads" start="185" end="191" type="uint"/> <field name="Maximum Number of Threads" start="185" end="191" type="uint"/>
<field name="Control Data Format" start="184" end="184" type="uint"> <field name="Control Data Format" start="184" end="184" type="uint">
<value name="GSCTL_CUT" value="0"/> <value name="GSCTL_CUT" value="0"/>
@@ -1886,13 +1886,13 @@
<field name="Software Exception Enable" start="71" end="71" type="bool"/> <field name="Software Exception Enable" start="71" end="71" type="bool"/>
<field name="Scratch Space Base Pointer" start="106" end="127" type="address"/> <field name="Scratch Space Base Pointer" start="106" end="127" type="address"/>
<field name="Per-Thread Scratch Space" start="96" end="99" type="uint"/> <field name="Per-Thread Scratch Space" start="96" end="99" type="uint"/>
<field name="Dispatch GRF Start Register for URB Data" start="148" end="152" type="uint"/> <field name="Dispatch GRF Start Register For URB Data" start="148" end="152" type="uint"/>
<field name="Vertex URB Entry Read Length" start="139" end="144" type="uint"/> <field name="Vertex URB Entry Read Length" start="139" end="144" type="uint"/>
<field name="Vertex URB Entry Read Offset" start="132" end="137" type="uint"/> <field name="Vertex URB Entry Read Offset" start="132" end="137" type="uint"/>
<field name="Maximum Number of Threads" start="185" end="191" type="uint"/> <field name="Maximum Number of Threads" start="185" end="191" type="uint"/>
<field name="Statistics Enable" start="170" end="170" type="bool"/> <field name="Statistics Enable" start="170" end="170" type="bool"/>
<field name="Vertex Cache Disable" start="161" end="161" type="bool"/> <field name="Vertex Cache Disable" start="161" end="161" type="bool"/>
<field name="VS Function Enable" start="160" end="160" type="bool"/> <field name="Function Enable" start="160" end="160" type="bool"/>
</instruction> </instruction>
<instruction name="3DSTATE_WM" bias="2" length="3"> <instruction name="3DSTATE_WM" bias="2" length="3">

6
src/intel/genxml/gen75.xml
View File

@@ -1400,7 +1400,7 @@
<field name="Vertex URB Entry Read Length" start="139" end="144" type="uint"/> <field name="Vertex URB Entry Read Length" start="139" end="144" type="uint"/>
<field name="Include Vertex Handles" start="138" end="138" type="bool"/> <field name="Include Vertex Handles" start="138" end="138" type="bool"/>
<field name="Vertex URB Entry Read Offset" start="132" end="137" type="uint"/> <field name="Vertex URB Entry Read Offset" start="132" end="137" type="uint"/>
<field name="Dispatch GRF Start Register for URB Data" start="128" end="131" type="uint"/> <field name="Dispatch GRF Start Register For URB Data" start="128" end="131" type="uint"/>
<field name="Maximum Number of Threads" start="184" end="191" type="uint"/> <field name="Maximum Number of Threads" start="184" end="191" type="uint"/>
<field name="Control Data Header Size" start="180" end="183" type="uint"/> <field name="Control Data Header Size" start="180" end="183" type="uint"/>
<field name="Instance Control" start="175" end="179" type="uint"/> <field name="Instance Control" start="175" end="179" type="uint"/>
@@ -2159,13 +2159,13 @@
<field name="Software Exception Enable" start="71" end="71" type="bool"/> <field name="Software Exception Enable" start="71" end="71" type="bool"/>
<field name="Scratch Space Base Pointer" start="106" end="127" type="address"/> <field name="Scratch Space Base Pointer" start="106" end="127" type="address"/>
<field name="Per-Thread Scratch Space" start="96" end="99" type="uint"/> <field name="Per-Thread Scratch Space" start="96" end="99" type="uint"/>
<field name="Dispatch GRF Start Register for URB Data" start="148" end="152" type="uint"/> <field name="Dispatch GRF Start Register For URB Data" start="148" end="152" type="uint"/>
<field name="Vertex URB Entry Read Length" start="139" end="144" type="uint"/> <field name="Vertex URB Entry Read Length" start="139" end="144" type="uint"/>
<field name="Vertex URB Entry Read Offset" start="132" end="137" type="uint"/> <field name="Vertex URB Entry Read Offset" start="132" end="137" type="uint"/>
<field name="Maximum Number of Threads" start="183" end="191" type="uint"/> <field name="Maximum Number of Threads" start="183" end="191" type="uint"/>
<field name="Statistics Enable" start="170" end="170" type="bool"/> <field name="Statistics Enable" start="170" end="170" type="bool"/>
<field name="Vertex Cache Disable" start="161" end="161" type="bool"/> <field name="Vertex Cache Disable" start="161" end="161" type="bool"/>
<field name="VS Function Enable" start="160" end="160" type="bool"/> <field name="Function Enable" start="160" end="160" type="bool"/>
</instruction> </instruction>
<instruction name="3DSTATE_WM" bias="2" length="3"> <instruction name="3DSTATE_WM" bias="2" length="3">

6
src/intel/vulkan/gen7_pipeline.c
View File

@@ -123,7 +123,7 @@ genX(graphics_pipeline_create)(
}; };
vs.PerThreadScratchSpace = scratch_space(&vs_prog_data->base.base); vs.PerThreadScratchSpace = scratch_space(&vs_prog_data->base.base);
vs.DispatchGRFStartRegisterforURBData = vs.DispatchGRFStartRegisterForURBData =
vs_prog_data->base.base.dispatch_grf_start_reg; vs_prog_data->base.base.dispatch_grf_start_reg;
vs.SamplerCount = get_sampler_count(vs_bin); vs.SamplerCount = get_sampler_count(vs_bin);
@@ -133,7 +133,7 @@ genX(graphics_pipeline_create)(
vs.VertexURBEntryReadOffset = 0; vs.VertexURBEntryReadOffset = 0;
vs.MaximumNumberofThreads = devinfo->max_vs_threads - 1; vs.MaximumNumberofThreads = devinfo->max_vs_threads - 1;
vs.StatisticsEnable = true; vs.StatisticsEnable = true;
vs.VSFunctionEnable = true; vs.FunctionEnable = true;
} }
} }
@@ -161,7 +161,7 @@ genX(graphics_pipeline_create)(
gs.VertexURBEntryReadLength = gs_prog_data->base.urb_read_length; gs.VertexURBEntryReadLength = gs_prog_data->base.urb_read_length;
gs.IncludeVertexHandles = gs_prog_data->base.include_vue_handles; gs.IncludeVertexHandles = gs_prog_data->base.include_vue_handles;
gs.DispatchGRFStartRegisterforURBData = gs.DispatchGRFStartRegisterForURBData =
gs_prog_data->base.base.dispatch_grf_start_reg; gs_prog_data->base.base.dispatch_grf_start_reg;
gs.SamplerCount = get_sampler_count(gs_bin); gs.SamplerCount = get_sampler_count(gs_bin);