[Mesa-dev] [PATCH] intel: Drop SURFACE_FORMAT enum from genxml.
Jason Ekstrand
jason at jlekstrand.net
Wed Feb 14 06:45:19 UTC 2018
Ack
On February 13, 2018 18:14:32 Kenneth Graunke <kenneth at whitecape.org> wrote:
> We want people to be using ISL_FORMAT_*, rather than the genxml format
> enumerations. This patch drops 9 separate copies, prevents a 10th from
> being added with Icelake support, and drops a bunch of ugly casting.
> ---
> src/intel/blorp/blorp_genX_exec.h | 10 +-
> src/intel/genxml/gen10.xml | 229 +-------------------------
> src/intel/genxml/gen4.xml | 222 +------------------------
> src/intel/genxml/gen45.xml | 222 +------------------------
> src/intel/genxml/gen5.xml | 226 +------------------------
> src/intel/genxml/gen6.xml | 228 +------------------------
> src/intel/genxml/gen7.xml | 228 +------------------------
> src/intel/genxml/gen75.xml | 228 +------------------------
> src/intel/genxml/gen8.xml | 228 +------------------------
> src/intel/genxml/gen9.xml | 228 +------------------------
> src/intel/isl/isl_surface_state.c | 6 +-
> src/intel/vulkan/genX_gpu_memcpy.c | 2 +-
> src/intel/vulkan/genX_pipeline.c | 6 +-
> src/mesa/drivers/dri/i965/genX_state_upload.c | 8 +-
> 14 files changed, 31 insertions(+), 2040 deletions(-)
>
> diff --git a/src/intel/blorp/blorp_genX_exec.h
> b/src/intel/blorp/blorp_genX_exec.h
> index 5e1312aa305..d3f49a5cff6 100644
> --- a/src/intel/blorp/blorp_genX_exec.h
> +++ b/src/intel/blorp/blorp_genX_exec.h
> @@ -385,7 +385,7 @@ blorp_emit_vertex_elements(struct blorp_batch *batch,
> ve[slot] = (struct GENX(VERTEX_ELEMENT_STATE)) {
> .VertexBufferIndex = 1,
> .Valid = true,
> - .SourceElementFormat = (enum GENX(SURFACE_FORMAT))
> ISL_FORMAT_R32G32B32A32_FLOAT,
> + .SourceElementFormat = ISL_FORMAT_R32G32B32A32_FLOAT,
> .SourceElementOffset = 0,
> .Component0Control = VFCOMP_STORE_SRC,
>
> @@ -417,7 +417,7 @@ blorp_emit_vertex_elements(struct blorp_batch *batch,
> ve[slot] = (struct GENX(VERTEX_ELEMENT_STATE)) {
> .VertexBufferIndex = 0,
> .Valid = true,
> - .SourceElementFormat = (enum GENX(SURFACE_FORMAT))
> ISL_FORMAT_R32G32B32_FLOAT,
> + .SourceElementFormat = ISL_FORMAT_R32G32B32_FLOAT,
> .SourceElementOffset = 0,
> .Component0Control = VFCOMP_STORE_SRC,
> .Component1Control = VFCOMP_STORE_SRC,
> @@ -431,7 +431,7 @@ blorp_emit_vertex_elements(struct blorp_batch *batch,
> ve[slot] = (struct GENX(VERTEX_ELEMENT_STATE)) {
> .VertexBufferIndex = 0,
> .Valid = true,
> - .SourceElementFormat = (enum GENX(SURFACE_FORMAT))
> ISL_FORMAT_R32G32B32_FLOAT,
> + .SourceElementFormat = ISL_FORMAT_R32G32B32_FLOAT,
> .SourceElementOffset = 0,
> .Component0Control = VFCOMP_STORE_SRC,
> .Component1Control = VFCOMP_STORE_SRC,
> @@ -447,7 +447,7 @@ blorp_emit_vertex_elements(struct blorp_batch *batch,
> ve[slot] = (struct GENX(VERTEX_ELEMENT_STATE)) {
> .VertexBufferIndex = 1,
> .Valid = true,
> - .SourceElementFormat = (enum GENX(SURFACE_FORMAT))
> ISL_FORMAT_R32G32B32A32_FLOAT,
> + .SourceElementFormat = ISL_FORMAT_R32G32B32A32_FLOAT,
> .SourceElementOffset = 16 + i * 4 * sizeof(float),
> .Component0Control = VFCOMP_STORE_SRC,
> .Component1Control = VFCOMP_STORE_SRC,
> @@ -1322,7 +1322,7 @@ blorp_emit_null_surface_state(struct blorp_batch *batch,
> {
> struct GENX(RENDER_SURFACE_STATE) ss = {
> .SurfaceType = SURFTYPE_NULL,
> - .SurfaceFormat = (enum GENX(SURFACE_FORMAT)) ISL_FORMAT_R8G8B8A8_UNORM,
> + .SurfaceFormat = ISL_FORMAT_R8G8B8A8_UNORM,
> .Width = surface->surf.logical_level0_px.width - 1,
> .Height = surface->surf.logical_level0_px.height - 1,
> .MIPCountLOD = surface->view.base_level,
> diff --git a/src/intel/genxml/gen10.xml b/src/intel/genxml/gen10.xml
> index 47c679a3fa9..2d36957c2a5 100644
> --- a/src/intel/genxml/gen10.xml
> +++ b/src/intel/genxml/gen10.xml
> @@ -180,231 +180,6 @@
> <value name="SET" value="15"/>
> </enum>
>
> - <enum name="SURFACE_FORMAT" prefix="SF">
> - <value name="R32G32B32A32_FLOAT" value="0"/>
> - <value name="R32G32B32A32_SINT" value="1"/>
> - <value name="R32G32B32A32_UINT" value="2"/>
> - <value name="R32G32B32A32_UNORM" value="3"/>
> - <value name="R32G32B32A32_SNORM" value="4"/>
> - <value name="R64G64_FLOAT" value="5"/>
> - <value name="R32G32B32X32_FLOAT" value="6"/>
> - <value name="R32G32B32A32_SSCALED" value="7"/>
> - <value name="R32G32B32A32_USCALED" value="8"/>
> - <value name="R32G32B32A32_SFIXED" value="32"/>
> - <value name="R64G64_PASSTHRU" value="33"/>
> - <value name="R32G32B32_FLOAT" value="64"/>
> - <value name="R32G32B32_SINT" value="65"/>
> - <value name="R32G32B32_UINT" value="66"/>
> - <value name="R32G32B32_UNORM" value="67"/>
> - <value name="R32G32B32_SNORM" value="68"/>
> - <value name="R32G32B32_SSCALED" value="69"/>
> - <value name="R32G32B32_USCALED" value="70"/>
> - <value name="R32G32B32_SFIXED" value="80"/>
> - <value name="R16G16B16A16_UNORM" value="128"/>
> - <value name="R16G16B16A16_SNORM" value="129"/>
> - <value name="R16G16B16A16_SINT" value="130"/>
> - <value name="R16G16B16A16_UINT" value="131"/>
> - <value name="R16G16B16A16_FLOAT" value="132"/>
> - <value name="R32G32_FLOAT" value="133"/>
> - <value name="R32G32_SINT" value="134"/>
> - <value name="R32G32_UINT" value="135"/>
> - <value name="R32_FLOAT_X8X24_TYPELESS" value="136"/>
> - <value name="X32_TYPELESS_G8X24_UINT" value="137"/>
> - <value name="L32A32_FLOAT" value="138"/>
> - <value name="R32G32_UNORM" value="139"/>
> - <value name="R32G32_SNORM" value="140"/>
> - <value name="R64_FLOAT" value="141"/>
> - <value name="R16G16B16X16_UNORM" value="142"/>
> - <value name="R16G16B16X16_FLOAT" value="143"/>
> - <value name="A32X32_FLOAT" value="144"/>
> - <value name="L32X32_FLOAT" value="145"/>
> - <value name="I32X32_FLOAT" value="146"/>
> - <value name="R16G16B16A16_SSCALED" value="147"/>
> - <value name="R16G16B16A16_USCALED" value="148"/>
> - <value name="R32G32_SSCALED" value="149"/>
> - <value name="R32G32_USCALED" value="150"/>
> - <value name="R32G32_SFIXED" value="160"/>
> - <value name="R64_PASSTHRU" value="161"/>
> - <value name="B8G8R8A8_UNORM" value="192"/>
> - <value name="B8G8R8A8_UNORM_SRGB" value="193"/>
> - <value name="R10G10B10A2_UNORM" value="194"/>
> - <value name="R10G10B10A2_UNORM_SRGB" value="195"/>
> - <value name="R10G10B10A2_UINT" value="196"/>
> - <value name="R10G10B10_SNORM_A2_UNORM" value="197"/>
> - <value name="R8G8B8A8_UNORM" value="199"/>
> - <value name="R8G8B8A8_UNORM_SRGB" value="200"/>
> - <value name="R8G8B8A8_SNORM" value="201"/>
> - <value name="R8G8B8A8_SINT" value="202"/>
> - <value name="R8G8B8A8_UINT" value="203"/>
> - <value name="R16G16_UNORM" value="204"/>
> - <value name="R16G16_SNORM" value="205"/>
> - <value name="R16G16_SINT" value="206"/>
> - <value name="R16G16_UINT" value="207"/>
> - <value name="R16G16_FLOAT" value="208"/>
> - <value name="B10G10R10A2_UNORM" value="209"/>
> - <value name="B10G10R10A2_UNORM_SRGB" value="210"/>
> - <value name="R11G11B10_FLOAT" value="211"/>
> - <value name="R32_SINT" value="214"/>
> - <value name="R32_UINT" value="215"/>
> - <value name="R32_FLOAT" value="216"/>
> - <value name="R24_UNORM_X8_TYPELESS" value="217"/>
> - <value name="X24_TYPELESS_G8_UINT" value="218"/>
> - <value name="L32_UNORM" value="221"/>
> - <value name="A32_UNORM" value="222"/>
> - <value name="L16A16_UNORM" value="223"/>
> - <value name="I24X8_UNORM" value="224"/>
> - <value name="L24X8_UNORM" value="225"/>
> - <value name="A24X8_UNORM" value="226"/>
> - <value name="I32_FLOAT" value="227"/>
> - <value name="L32_FLOAT" value="228"/>
> - <value name="A32_FLOAT" value="229"/>
> - <value name="X8B8_UNORM_G8R8_SNORM" value="230"/>
> - <value name="A8X8_UNORM_G8R8_SNORM" value="231"/>
> - <value name="B8X8_UNORM_G8R8_SNORM" value="232"/>
> - <value name="B8G8R8X8_UNORM" value="233"/>
> - <value name="B8G8R8X8_UNORM_SRGB" value="234"/>
> - <value name="R8G8B8X8_UNORM" value="235"/>
> - <value name="R8G8B8X8_UNORM_SRGB" value="236"/>
> - <value name="R9G9B9E5_SHAREDEXP" value="237"/>
> - <value name="B10G10R10X2_UNORM" value="238"/>
> - <value name="L16A16_FLOAT" value="240"/>
> - <value name="R32_UNORM" value="241"/>
> - <value name="R32_SNORM" value="242"/>
> - <value name="R10G10B10X2_USCALED" value="243"/>
> - <value name="R8G8B8A8_SSCALED" value="244"/>
> - <value name="R8G8B8A8_USCALED" value="245"/>
> - <value name="R16G16_SSCALED" value="246"/>
> - <value name="R16G16_USCALED" value="247"/>
> - <value name="R32_SSCALED" value="248"/>
> - <value name="R32_USCALED" value="249"/>
> - <value name="B5G6R5_UNORM" value="256"/>
> - <value name="B5G6R5_UNORM_SRGB" value="257"/>
> - <value name="B5G5R5A1_UNORM" value="258"/>
> - <value name="B5G5R5A1_UNORM_SRGB" value="259"/>
> - <value name="B4G4R4A4_UNORM" value="260"/>
> - <value name="B4G4R4A4_UNORM_SRGB" value="261"/>
> - <value name="R8G8_UNORM" value="262"/>
> - <value name="R8G8_SNORM" value="263"/>
> - <value name="R8G8_SINT" value="264"/>
> - <value name="R8G8_UINT" value="265"/>
> - <value name="R16_UNORM" value="266"/>
> - <value name="R16_SNORM" value="267"/>
> - <value name="R16_SINT" value="268"/>
> - <value name="R16_UINT" value="269"/>
> - <value name="R16_FLOAT" value="270"/>
> - <value name="A8P8_UNORM_PALETTE0" value="271"/>
> - <value name="A8P8_UNORM_PALETTE1" value="272"/>
> - <value name="I16_UNORM" value="273"/>
> - <value name="L16_UNORM" value="274"/>
> - <value name="A16_UNORM" value="275"/>
> - <value name="L8A8_UNORM" value="276"/>
> - <value name="I16_FLOAT" value="277"/>
> - <value name="L16_FLOAT" value="278"/>
> - <value name="A16_FLOAT" value="279"/>
> - <value name="L8A8_UNORM_SRGB" value="280"/>
> - <value name="R5G5_SNORM_B6_UNORM" value="281"/>
> - <value name="B5G5R5X1_UNORM" value="282"/>
> - <value name="B5G5R5X1_UNORM_SRGB" value="283"/>
> - <value name="R8G8_SSCALED" value="284"/>
> - <value name="R8G8_USCALED" value="285"/>
> - <value name="R16_SSCALED" value="286"/>
> - <value name="R16_USCALED" value="287"/>
> - <value name="P8A8_UNORM_PALETTE0" value="290"/>
> - <value name="P8A8_UNORM_PALETTE1" value="291"/>
> - <value name="A1B5G5R5_UNORM" value="292"/>
> - <value name="A4B4G4R4_UNORM" value="293"/>
> - <value name="L8A8_UINT" value="294"/>
> - <value name="L8A8_SINT" value="295"/>
> - <value name="R8_UNORM" value="320"/>
> - <value name="R8_SNORM" value="321"/>
> - <value name="R8_SINT" value="322"/>
> - <value name="R8_UINT" value="323"/>
> - <value name="A8_UNORM" value="324"/>
> - <value name="I8_UNORM" value="325"/>
> - <value name="L8_UNORM" value="326"/>
> - <value name="P4A4_UNORM_PALETTE0" value="327"/>
> - <value name="A4P4_UNORM_PALETTE0" value="328"/>
> - <value name="R8_SSCALED" value="329"/>
> - <value name="R8_USCALED" value="330"/>
> - <value name="P8_UNORM_PALETTE0" value="331"/>
> - <value name="L8_UNORM_SRGB" value="332"/>
> - <value name="P8_UNORM_PALETTE1" value="333"/>
> - <value name="P4A4_UNORM_PALETTE1" value="334"/>
> - <value name="A4P4_UNORM_PALETTE1" value="335"/>
> - <value name="Y8_UNORM" value="336"/>
> - <value name="L8_UINT" value="338"/>
> - <value name="L8_SINT" value="339"/>
> - <value name="I8_UINT" value="340"/>
> - <value name="I8_SINT" value="341"/>
> - <value name="DXT1_RGB_SRGB" value="384"/>
> - <value name="R1_UNORM" value="385"/>
> - <value name="YCRCB_NORMAL" value="386"/>
> - <value name="YCRCB_SWAPUVY" value="387"/>
> - <value name="P2_UNORM_PALETTE0" value="388"/>
> - <value name="P2_UNORM_PALETTE1" value="389"/>
> - <value name="BC1_UNORM" value="390"/>
> - <value name="BC2_UNORM" value="391"/>
> - <value name="BC3_UNORM" value="392"/>
> - <value name="BC4_UNORM" value="393"/>
> - <value name="BC5_UNORM" value="394"/>
> - <value name="BC1_UNORM_SRGB" value="395"/>
> - <value name="BC2_UNORM_SRGB" value="396"/>
> - <value name="BC3_UNORM_SRGB" value="397"/>
> - <value name="MONO8" value="398"/>
> - <value name="YCRCB_SWAPUV" value="399"/>
> - <value name="YCRCB_SWAPY" value="400"/>
> - <value name="DXT1_RGB" value="401"/>
> - <value name="FXT1" value="402"/>
> - <value name="R8G8B8_UNORM" value="403"/>
> - <value name="R8G8B8_SNORM" value="404"/>
> - <value name="R8G8B8_SSCALED" value="405"/>
> - <value name="R8G8B8_USCALED" value="406"/>
> - <value name="R64G64B64A64_FLOAT" value="407"/>
> - <value name="R64G64B64_FLOAT" value="408"/>
> - <value name="BC4_SNORM" value="409"/>
> - <value name="BC5_SNORM" value="410"/>
> - <value name="R16G16B16_FLOAT" value="411"/>
> - <value name="R16G16B16_UNORM" value="412"/>
> - <value name="R16G16B16_SNORM" value="413"/>
> - <value name="R16G16B16_SSCALED" value="414"/>
> - <value name="R16G16B16_USCALED" value="415"/>
> - <value name="BC6H_SF16" value="417"/>
> - <value name="BC7_UNORM" value="418"/>
> - <value name="BC7_UNORM_SRGB" value="419"/>
> - <value name="BC6H_UF16" value="420"/>
> - <value name="PLANAR_420_8" value="421"/>
> - <value name="PLANAR_420_16" value="422"/>
> - <value name="R8G8B8_UNORM_SRGB" value="424"/>
> - <value name="ETC1_RGB8" value="425"/>
> - <value name="ETC2_RGB8" value="426"/>
> - <value name="EAC_R11" value="427"/>
> - <value name="EAC_RG11" value="428"/>
> - <value name="EAC_SIGNED_R11" value="429"/>
> - <value name="EAC_SIGNED_RG11" value="430"/>
> - <value name="ETC2_SRGB8" value="431"/>
> - <value name="R16G16B16_UINT" value="432"/>
> - <value name="R16G16B16_SINT" value="433"/>
> - <value name="R32_SFIXED" value="434"/>
> - <value name="R10G10B10A2_SNORM" value="435"/>
> - <value name="R10G10B10A2_USCALED" value="436"/>
> - <value name="R10G10B10A2_SSCALED" value="437"/>
> - <value name="R10G10B10A2_SINT" value="438"/>
> - <value name="B10G10R10A2_SNORM" value="439"/>
> - <value name="B10G10R10A2_USCALED" value="440"/>
> - <value name="B10G10R10A2_SSCALED" value="441"/>
> - <value name="B10G10R10A2_UINT" value="442"/>
> - <value name="B10G10R10A2_SINT" value="443"/>
> - <value name="R64G64B64A64_PASSTHRU" value="444"/>
> - <value name="R64G64B64_PASSTHRU" value="445"/>
> - <value name="ETC2_RGB8_PTA" value="448"/>
> - <value name="ETC2_SRGB8_PTA" value="449"/>
> - <value name="ETC2_EAC_RGBA8" value="450"/>
> - <value name="ETC2_EAC_SRGB8_A8" value="451"/>
> - <value name="R8G8B8_UINT" value="456"/>
> - <value name="R8G8B8_SINT" value="457"/>
> - <value name="RAW" value="511"/>
> - </enum>
> -
> <enum name="Shader Channel Select" prefix="SCS">
> <value name="ZERO" value="0"/>
> <value name="ONE" value="1"/>
> @@ -462,7 +237,7 @@
> <struct name="VERTEX_ELEMENT_STATE" length="2">
> <field name="Vertex Buffer Index" start="26" end="31" type="uint"/>
> <field name="Valid" start="25" end="25" type="bool"/>
> - <field name="Source Element Format" start="16" end="24"
> type="SURFACE_FORMAT"/>
> + <field name="Source Element Format" start="16" end="24" type="uint"/>
> <field name="Edge Flag Enable" start="15" end="15" type="bool"/>
> <field name="Source Element Offset" start="0" end="11" type="uint"/>
> <field name="Component 0 Control" start="60" end="62"
> type="3D_Vertex_Component_Control"/>
> @@ -685,7 +460,7 @@
> <value name="SURFTYPE_NULL" value="7"/>
> </field>
> <field name="Surface Array" start="28" end="28" type="bool"/>
> - <field name="Surface Format" start="18" end="27" type="SURFACE_FORMAT"/>
> + <field name="Surface Format" start="18" end="27" type="uint"/>
> <field name="Surface Vertical Alignment" start="16" end="17" type="uint">
> <value name="VALIGN 4" value="1"/>
> <value name="VALIGN 8" value="2"/>
> diff --git a/src/intel/genxml/gen4.xml b/src/intel/genxml/gen4.xml
> index fc24329535d..e1ca810f236 100644
> --- a/src/intel/genxml/gen4.xml
> +++ b/src/intel/genxml/gen4.xml
> @@ -106,226 +106,6 @@
> <value name="SET" value="15"/>
> </enum>
>
> - <enum name="SURFACE_FORMAT" prefix="SF">
> - <value name="R32G32B32A32_FLOAT" value="0"/>
> - <value name="R32G32B32A32_SINT" value="1"/>
> - <value name="R32G32B32A32_UINT" value="2"/>
> - <value name="R32G32B32A32_UNORM" value="3"/>
> - <value name="R32G32B32A32_SNORM" value="4"/>
> - <value name="R64G64_FLOAT" value="5"/>
> - <value name="R32G32B32X32_FLOAT" value="6"/>
> - <value name="R32G32B32A32_SSCALED" value="7"/>
> - <value name="R32G32B32A32_USCALED" value="8"/>
> - <value name="R32G32B32_FLOAT" value="64"/>
> - <value name="R32G32B32_SINT" value="65"/>
> - <value name="R32G32B32_UINT" value="66"/>
> - <value name="R32G32B32_UNORM" value="67"/>
> - <value name="R32G32B32_SNORM" value="68"/>
> - <value name="R32G32B32_SSCALED" value="69"/>
> - <value name="R32G32B32_USCALED" value="70"/>
> - <value name="R32G32B32_SFIXED" value="80"/>
> - <value name="R16G16B16A16_UNORM" value="128"/>
> - <value name="R16G16B16A16_SNORM" value="129"/>
> - <value name="R16G16B16A16_SINT" value="130"/>
> - <value name="R16G16B16A16_UINT" value="131"/>
> - <value name="R16G16B16A16_FLOAT" value="132"/>
> - <value name="R32G32_FLOAT" value="133"/>
> - <value name="R32G32_SINT" value="134"/>
> - <value name="R32G32_UINT" value="135"/>
> - <value name="R32_FLOAT_X8X24_TYPELESS" value="136"/>
> - <value name="X32_TYPELESS_G8X24_UINT" value="137"/>
> - <value name="L32A32_FLOAT" value="138"/>
> - <value name="R32G32_UNORM" value="139"/>
> - <value name="R32G32_SNORM" value="140"/>
> - <value name="R64_FLOAT" value="141"/>
> - <value name="R16G16B16X16_UNORM" value="142"/>
> - <value name="R16G16B16X16_FLOAT" value="143"/>
> - <value name="A32X32_FLOAT" value="144"/>
> - <value name="L32X32_FLOAT" value="145"/>
> - <value name="I32X32_FLOAT" value="146"/>
> - <value name="R16G16B16A16_SSCALED" value="147"/>
> - <value name="R16G16B16A16_USCALED" value="148"/>
> - <value name="R32G32_SSCALED" value="149"/>
> - <value name="R32G32_USCALED" value="150"/>
> - <value name="B8G8R8A8_UNORM" value="192"/>
> - <value name="B8G8R8A8_UNORM_SRGB" value="193"/>
> - <value name="R10G10B10A2_UNORM" value="194"/>
> - <value name="R10G10B10A2_UNORM_SRGB" value="195"/>
> - <value name="R10G10B10A2_UINT" value="196"/>
> - <value name="R10G10B10_SNORM_A2_UNORM" value="197"/>
> - <value name="R8G8B8A8_UNORM" value="199"/>
> - <value name="R8G8B8A8_UNORM_SRGB" value="200"/>
> - <value name="R8G8B8A8_SNORM" value="201"/>
> - <value name="R8G8B8A8_SINT" value="202"/>
> - <value name="R8G8B8A8_UINT" value="203"/>
> - <value name="R16G16_UNORM" value="204"/>
> - <value name="R16G16_SNORM" value="205"/>
> - <value name="R16G16_SINT" value="206"/>
> - <value name="R16G16_UINT" value="207"/>
> - <value name="R16G16_FLOAT" value="208"/>
> - <value name="B10G10R10A2_UNORM" value="209"/>
> - <value name="B10G10R10A2_UNORM_SRGB" value="210"/>
> - <value name="R11G11B10_FLOAT" value="211"/>
> - <value name="R32_SINT" value="214"/>
> - <value name="R32_UINT" value="215"/>
> - <value name="R32_FLOAT" value="216"/>
> - <value name="R24_UNORM_X8_TYPELESS" value="217"/>
> - <value name="X24_TYPELESS_G8_UINT" value="218"/>
> - <value name="L32_UNORM" value="221"/>
> - <value name="A32_UNORM" value="222"/>
> - <value name="L16A16_UNORM" value="223"/>
> - <value name="I24X8_UNORM" value="224"/>
> - <value name="L24X8_UNORM" value="225"/>
> - <value name="A24X8_UNORM" value="226"/>
> - <value name="I32_FLOAT" value="227"/>
> - <value name="L32_FLOAT" value="228"/>
> - <value name="A32_FLOAT" value="229"/>
> - <value name="X8B8_UNORM_G8R8_SNORM" value="230"/>
> - <value name="A8X8_UNORM_G8R8_SNORM" value="231"/>
> - <value name="B8X8_UNORM_G8R8_SNORM" value="232"/>
> - <value name="B8G8R8X8_UNORM" value="233"/>
> - <value name="B8G8R8X8_UNORM_SRGB" value="234"/>
> - <value name="R8G8B8X8_UNORM" value="235"/>
> - <value name="R8G8B8X8_UNORM_SRGB" value="236"/>
> - <value name="R9G9B9E5_SHAREDEXP" value="237"/>
> - <value name="B10G10R10X2_UNORM" value="238"/>
> - <value name="L16A16_FLOAT" value="240"/>
> - <value name="R32_UNORM" value="241"/>
> - <value name="R32_SNORM" value="242"/>
> - <value name="R10G10B10X2_USCALED" value="243"/>
> - <value name="R8G8B8A8_SSCALED" value="244"/>
> - <value name="R8G8B8A8_USCALED" value="245"/>
> - <value name="R16G16_SSCALED" value="246"/>
> - <value name="R16G16_USCALED" value="247"/>
> - <value name="R32_SSCALED" value="248"/>
> - <value name="R32_USCALED" value="249"/>
> - <value name="B5G6R5_UNORM" value="256"/>
> - <value name="B5G6R5_UNORM_SRGB" value="257"/>
> - <value name="B5G5R5A1_UNORM" value="258"/>
> - <value name="B5G5R5A1_UNORM_SRGB" value="259"/>
> - <value name="B4G4R4A4_UNORM" value="260"/>
> - <value name="B4G4R4A4_UNORM_SRGB" value="261"/>
> - <value name="R8G8_UNORM" value="262"/>
> - <value name="R8G8_SNORM" value="263"/>
> - <value name="R8G8_SINT" value="264"/>
> - <value name="R8G8_UINT" value="265"/>
> - <value name="R16_UNORM" value="266"/>
> - <value name="R16_SNORM" value="267"/>
> - <value name="R16_SINT" value="268"/>
> - <value name="R16_UINT" value="269"/>
> - <value name="R16_FLOAT" value="270"/>
> - <value name="A8P8_UNORM_PALETTE0" value="271"/>
> - <value name="A8P8_UNORM_PALETTE1" value="272"/>
> - <value name="I16_UNORM" value="273"/>
> - <value name="L16_UNORM" value="274"/>
> - <value name="A16_UNORM" value="275"/>
> - <value name="L8A8_UNORM" value="276"/>
> - <value name="I16_FLOAT" value="277"/>
> - <value name="L16_FLOAT" value="278"/>
> - <value name="A16_FLOAT" value="279"/>
> - <value name="L8A8_UNORM_SRGB" value="280"/>
> - <value name="R5G5_SNORM_B6_UNORM" value="281"/>
> - <value name="B5G5R5X1_UNORM" value="282"/>
> - <value name="B5G5R5X1_UNORM_SRGB" value="283"/>
> - <value name="R8G8_SSCALED" value="284"/>
> - <value name="R8G8_USCALED" value="285"/>
> - <value name="R16_SSCALED" value="286"/>
> - <value name="R16_USCALED" value="287"/>
> - <value name="P8A8_UNORM_PALETTE0" value="290"/>
> - <value name="P8A8_UNORM_PALETTE1" value="291"/>
> - <value name="A1B5G5R5_UNORM" value="292"/>
> - <value name="A4B4G4R4_UNORM" value="293"/>
> - <value name="L8A8_UINT" value="294"/>
> - <value name="L8A8_SINT" value="295"/>
> - <value name="R8_UNORM" value="320"/>
> - <value name="R8_SNORM" value="321"/>
> - <value name="R8_SINT" value="322"/>
> - <value name="R8_UINT" value="323"/>
> - <value name="A8_UNORM" value="324"/>
> - <value name="I8_UNORM" value="325"/>
> - <value name="L8_UNORM" value="326"/>
> - <value name="P4A4_UNORM_PALETTE0" value="327"/>
> - <value name="A4P4_UNORM_PALETTE0" value="328"/>
> - <value name="R8_SSCALED" value="329"/>
> - <value name="R8_USCALED" value="330"/>
> - <value name="P8_UNORM_PALETTE0" value="331"/>
> - <value name="L8_UNORM_SRGB" value="332"/>
> - <value name="P8_UNORM_PALETTE1" value="333"/>
> - <value name="P4A4_UNORM_PALETTE1" value="334"/>
> - <value name="A4P4_UNORM_PALETTE1" value="335"/>
> - <value name="Y8_UNORM" value="336"/>
> - <value name="L8_UINT" value="338"/>
> - <value name="L8_SINT" value="339"/>
> - <value name="I8_UINT" value="340"/>
> - <value name="I8_SINT" value="341"/>
> - <value name="DXT1_RGB_SRGB" value="384"/>
> - <value name="R1_UNORM" value="385"/>
> - <value name="YCRCB_NORMAL" value="386"/>
> - <value name="YCRCB_SWAPUVY" value="387"/>
> - <value name="P2_UNORM_PALETTE0" value="388"/>
> - <value name="P2_UNORM_PALETTE1" value="389"/>
> - <value name="BC1_UNORM" value="390"/>
> - <value name="BC2_UNORM" value="391"/>
> - <value name="BC3_UNORM" value="392"/>
> - <value name="BC4_UNORM" value="393"/>
> - <value name="BC5_UNORM" value="394"/>
> - <value name="BC1_UNORM_SRGB" value="395"/>
> - <value name="BC2_UNORM_SRGB" value="396"/>
> - <value name="BC3_UNORM_SRGB" value="397"/>
> - <value name="MONO8" value="398"/>
> - <value name="YCRCB_SWAPUV" value="399"/>
> - <value name="YCRCB_SWAPY" value="400"/>
> - <value name="DXT1_RGB" value="401"/>
> - <value name="FXT1" value="402"/>
> - <value name="R8G8B8_UNORM" value="403"/>
> - <value name="R8G8B8_SNORM" value="404"/>
> - <value name="R8G8B8_SSCALED" value="405"/>
> - <value name="R8G8B8_USCALED" value="406"/>
> - <value name="R64G64B64A64_FLOAT" value="407"/>
> - <value name="R64G64B64_FLOAT" value="408"/>
> - <value name="BC4_SNORM" value="409"/>
> - <value name="BC5_SNORM" value="410"/>
> - <value name="R16G16B16_FLOAT" value="411"/>
> - <value name="R16G16B16_UNORM" value="412"/>
> - <value name="R16G16B16_SNORM" value="413"/>
> - <value name="R16G16B16_SSCALED" value="414"/>
> - <value name="R16G16B16_USCALED" value="415"/>
> - <value name="BC6H_SF16" value="417"/>
> - <value name="BC7_UNORM" value="418"/>
> - <value name="BC7_UNORM_SRGB" value="419"/>
> - <value name="BC6H_UF16" value="420"/>
> - <value name="PLANAR_420_8" value="421"/>
> - <value name="R8G8B8_UNORM_SRGB" value="424"/>
> - <value name="ETC1_RGB8" value="425"/>
> - <value name="ETC2_RGB8" value="426"/>
> - <value name="EAC_R11" value="427"/>
> - <value name="EAC_RG11" value="428"/>
> - <value name="EAC_SIGNED_R11" value="429"/>
> - <value name="EAC_SIGNED_RG11" value="430"/>
> - <value name="ETC2_SRGB8" value="431"/>
> - <value name="R16G16B16_UINT" value="432"/>
> - <value name="R16G16B16_SINT" value="433"/>
> - <value name="R32_SFIXED" value="434"/>
> - <value name="R10G10B10A2_SNORM" value="435"/>
> - <value name="R10G10B10A2_USCALED" value="436"/>
> - <value name="R10G10B10A2_SSCALED" value="437"/>
> - <value name="R10G10B10A2_SINT" value="438"/>
> - <value name="B10G10R10A2_SNORM" value="439"/>
> - <value name="B10G10R10A2_USCALED" value="440"/>
> - <value name="B10G10R10A2_SSCALED" value="441"/>
> - <value name="B10G10R10A2_UINT" value="442"/>
> - <value name="B10G10R10A2_SINT" value="443"/>
> - <value name="R64G64B64A64_PASSTHRU" value="444"/>
> - <value name="R64G64B64_PASSTHRU" value="445"/>
> - <value name="ETC2_RGB8_PTA" value="448"/>
> - <value name="ETC2_SRGB8_PTA" value="449"/>
> - <value name="ETC2_EAC_RGBA8" value="450"/>
> - <value name="ETC2_EAC_SRGB8_A8" value="451"/>
> - <value name="R8G8B8_UINT" value="456"/>
> - <value name="R8G8B8_SINT" value="457"/>
> - <value name="RAW" value="511"/>
> - </enum>
> -
> <enum name="Texture_Coordinate_Mode" prefix="TCM">
> <value name="WRAP" value="0"/>
> <value name="MIRROR" value="1"/>
> @@ -724,7 +504,7 @@
> <struct name="VERTEX_ELEMENT_STATE" length="2">
> <field name="Vertex Buffer Index" start="27" end="31" type="uint"/>
> <field name="Valid" start="26" end="26" type="bool"/>
> - <field name="Source Element Format" start="16" end="24"
> type="SURFACE_FORMAT"/>
> + <field name="Source Element Format" start="16" end="24" type="uint"/>
> <field name="Source Element Offset" start="0" end="10" type="uint"/>
> <field name="Destination Element Offset" start="32" end="39" type="uint"/>
> <field name="Component 0 Control" start="60" end="62"
> type="3D_Vertex_Component_Control"/>
> diff --git a/src/intel/genxml/gen45.xml b/src/intel/genxml/gen45.xml
> index 136cc6f68a3..91dc3634801 100644
> --- a/src/intel/genxml/gen45.xml
> +++ b/src/intel/genxml/gen45.xml
> @@ -106,226 +106,6 @@
> <value name="SET" value="15"/>
> </enum>
>
> - <enum name="SURFACE_FORMAT" prefix="SF">
> - <value name="R32G32B32A32_FLOAT" value="0"/>
> - <value name="R32G32B32A32_SINT" value="1"/>
> - <value name="R32G32B32A32_UINT" value="2"/>
> - <value name="R32G32B32A32_UNORM" value="3"/>
> - <value name="R32G32B32A32_SNORM" value="4"/>
> - <value name="R64G64_FLOAT" value="5"/>
> - <value name="R32G32B32X32_FLOAT" value="6"/>
> - <value name="R32G32B32A32_SSCALED" value="7"/>
> - <value name="R32G32B32A32_USCALED" value="8"/>
> - <value name="R32G32B32_FLOAT" value="64"/>
> - <value name="R32G32B32_SINT" value="65"/>
> - <value name="R32G32B32_UINT" value="66"/>
> - <value name="R32G32B32_UNORM" value="67"/>
> - <value name="R32G32B32_SNORM" value="68"/>
> - <value name="R32G32B32_SSCALED" value="69"/>
> - <value name="R32G32B32_USCALED" value="70"/>
> - <value name="R32G32B32_SFIXED" value="80"/>
> - <value name="R16G16B16A16_UNORM" value="128"/>
> - <value name="R16G16B16A16_SNORM" value="129"/>
> - <value name="R16G16B16A16_SINT" value="130"/>
> - <value name="R16G16B16A16_UINT" value="131"/>
> - <value name="R16G16B16A16_FLOAT" value="132"/>
> - <value name="R32G32_FLOAT" value="133"/>
> - <value name="R32G32_SINT" value="134"/>
> - <value name="R32G32_UINT" value="135"/>
> - <value name="R32_FLOAT_X8X24_TYPELESS" value="136"/>
> - <value name="X32_TYPELESS_G8X24_UINT" value="137"/>
> - <value name="L32A32_FLOAT" value="138"/>
> - <value name="R32G32_UNORM" value="139"/>
> - <value name="R32G32_SNORM" value="140"/>
> - <value name="R64_FLOAT" value="141"/>
> - <value name="R16G16B16X16_UNORM" value="142"/>
> - <value name="R16G16B16X16_FLOAT" value="143"/>
> - <value name="A32X32_FLOAT" value="144"/>
> - <value name="L32X32_FLOAT" value="145"/>
> - <value name="I32X32_FLOAT" value="146"/>
> - <value name="R16G16B16A16_SSCALED" value="147"/>
> - <value name="R16G16B16A16_USCALED" value="148"/>
> - <value name="R32G32_SSCALED" value="149"/>
> - <value name="R32G32_USCALED" value="150"/>
> - <value name="B8G8R8A8_UNORM" value="192"/>
> - <value name="B8G8R8A8_UNORM_SRGB" value="193"/>
> - <value name="R10G10B10A2_UNORM" value="194"/>
> - <value name="R10G10B10A2_UNORM_SRGB" value="195"/>
> - <value name="R10G10B10A2_UINT" value="196"/>
> - <value name="R10G10B10_SNORM_A2_UNORM" value="197"/>
> - <value name="R8G8B8A8_UNORM" value="199"/>
> - <value name="R8G8B8A8_UNORM_SRGB" value="200"/>
> - <value name="R8G8B8A8_SNORM" value="201"/>
> - <value name="R8G8B8A8_SINT" value="202"/>
> - <value name="R8G8B8A8_UINT" value="203"/>
> - <value name="R16G16_UNORM" value="204"/>
> - <value name="R16G16_SNORM" value="205"/>
> - <value name="R16G16_SINT" value="206"/>
> - <value name="R16G16_UINT" value="207"/>
> - <value name="R16G16_FLOAT" value="208"/>
> - <value name="B10G10R10A2_UNORM" value="209"/>
> - <value name="B10G10R10A2_UNORM_SRGB" value="210"/>
> - <value name="R11G11B10_FLOAT" value="211"/>
> - <value name="R32_SINT" value="214"/>
> - <value name="R32_UINT" value="215"/>
> - <value name="R32_FLOAT" value="216"/>
> - <value name="R24_UNORM_X8_TYPELESS" value="217"/>
> - <value name="X24_TYPELESS_G8_UINT" value="218"/>
> - <value name="L32_UNORM" value="221"/>
> - <value name="A32_UNORM" value="222"/>
> - <value name="L16A16_UNORM" value="223"/>
> - <value name="I24X8_UNORM" value="224"/>
> - <value name="L24X8_UNORM" value="225"/>
> - <value name="A24X8_UNORM" value="226"/>
> - <value name="I32_FLOAT" value="227"/>
> - <value name="L32_FLOAT" value="228"/>
> - <value name="A32_FLOAT" value="229"/>
> - <value name="X8B8_UNORM_G8R8_SNORM" value="230"/>
> - <value name="A8X8_UNORM_G8R8_SNORM" value="231"/>
> - <value name="B8X8_UNORM_G8R8_SNORM" value="232"/>
> - <value name="B8G8R8X8_UNORM" value="233"/>
> - <value name="B8G8R8X8_UNORM_SRGB" value="234"/>
> - <value name="R8G8B8X8_UNORM" value="235"/>
> - <value name="R8G8B8X8_UNORM_SRGB" value="236"/>
> - <value name="R9G9B9E5_SHAREDEXP" value="237"/>
> - <value name="B10G10R10X2_UNORM" value="238"/>
> - <value name="L16A16_FLOAT" value="240"/>
> - <value name="R32_UNORM" value="241"/>
> - <value name="R32_SNORM" value="242"/>
> - <value name="R10G10B10X2_USCALED" value="243"/>
> - <value name="R8G8B8A8_SSCALED" value="244"/>
> - <value name="R8G8B8A8_USCALED" value="245"/>
> - <value name="R16G16_SSCALED" value="246"/>
> - <value name="R16G16_USCALED" value="247"/>
> - <value name="R32_SSCALED" value="248"/>
> - <value name="R32_USCALED" value="249"/>
> - <value name="B5G6R5_UNORM" value="256"/>
> - <value name="B5G6R5_UNORM_SRGB" value="257"/>
> - <value name="B5G5R5A1_UNORM" value="258"/>
> - <value name="B5G5R5A1_UNORM_SRGB" value="259"/>
> - <value name="B4G4R4A4_UNORM" value="260"/>
> - <value name="B4G4R4A4_UNORM_SRGB" value="261"/>
> - <value name="R8G8_UNORM" value="262"/>
> - <value name="R8G8_SNORM" value="263"/>
> - <value name="R8G8_SINT" value="264"/>
> - <value name="R8G8_UINT" value="265"/>
> - <value name="R16_UNORM" value="266"/>
> - <value name="R16_SNORM" value="267"/>
> - <value name="R16_SINT" value="268"/>
> - <value name="R16_UINT" value="269"/>
> - <value name="R16_FLOAT" value="270"/>
> - <value name="A8P8_UNORM_PALETTE0" value="271"/>
> - <value name="A8P8_UNORM_PALETTE1" value="272"/>
> - <value name="I16_UNORM" value="273"/>
> - <value name="L16_UNORM" value="274"/>
> - <value name="A16_UNORM" value="275"/>
> - <value name="L8A8_UNORM" value="276"/>
> - <value name="I16_FLOAT" value="277"/>
> - <value name="L16_FLOAT" value="278"/>
> - <value name="A16_FLOAT" value="279"/>
> - <value name="L8A8_UNORM_SRGB" value="280"/>
> - <value name="R5G5_SNORM_B6_UNORM" value="281"/>
> - <value name="B5G5R5X1_UNORM" value="282"/>
> - <value name="B5G5R5X1_UNORM_SRGB" value="283"/>
> - <value name="R8G8_SSCALED" value="284"/>
> - <value name="R8G8_USCALED" value="285"/>
> - <value name="R16_SSCALED" value="286"/>
> - <value name="R16_USCALED" value="287"/>
> - <value name="P8A8_UNORM_PALETTE0" value="290"/>
> - <value name="P8A8_UNORM_PALETTE1" value="291"/>
> - <value name="A1B5G5R5_UNORM" value="292"/>
> - <value name="A4B4G4R4_UNORM" value="293"/>
> - <value name="L8A8_UINT" value="294"/>
> - <value name="L8A8_SINT" value="295"/>
> - <value name="R8_UNORM" value="320"/>
> - <value name="R8_SNORM" value="321"/>
> - <value name="R8_SINT" value="322"/>
> - <value name="R8_UINT" value="323"/>
> - <value name="A8_UNORM" value="324"/>
> - <value name="I8_UNORM" value="325"/>
> - <value name="L8_UNORM" value="326"/>
> - <value name="P4A4_UNORM_PALETTE0" value="327"/>
> - <value name="A4P4_UNORM_PALETTE0" value="328"/>
> - <value name="R8_SSCALED" value="329"/>
> - <value name="R8_USCALED" value="330"/>
> - <value name="P8_UNORM_PALETTE0" value="331"/>
> - <value name="L8_UNORM_SRGB" value="332"/>
> - <value name="P8_UNORM_PALETTE1" value="333"/>
> - <value name="P4A4_UNORM_PALETTE1" value="334"/>
> - <value name="A4P4_UNORM_PALETTE1" value="335"/>
> - <value name="Y8_UNORM" value="336"/>
> - <value name="L8_UINT" value="338"/>
> - <value name="L8_SINT" value="339"/>
> - <value name="I8_UINT" value="340"/>
> - <value name="I8_SINT" value="341"/>
> - <value name="DXT1_RGB_SRGB" value="384"/>
> - <value name="R1_UNORM" value="385"/>
> - <value name="YCRCB_NORMAL" value="386"/>
> - <value name="YCRCB_SWAPUVY" value="387"/>
> - <value name="P2_UNORM_PALETTE0" value="388"/>
> - <value name="P2_UNORM_PALETTE1" value="389"/>
> - <value name="BC1_UNORM" value="390"/>
> - <value name="BC2_UNORM" value="391"/>
> - <value name="BC3_UNORM" value="392"/>
> - <value name="BC4_UNORM" value="393"/>
> - <value name="BC5_UNORM" value="394"/>
> - <value name="BC1_UNORM_SRGB" value="395"/>
> - <value name="BC2_UNORM_SRGB" value="396"/>
> - <value name="BC3_UNORM_SRGB" value="397"/>
> - <value name="MONO8" value="398"/>
> - <value name="YCRCB_SWAPUV" value="399"/>
> - <value name="YCRCB_SWAPY" value="400"/>
> - <value name="DXT1_RGB" value="401"/>
> - <value name="FXT1" value="402"/>
> - <value name="R8G8B8_UNORM" value="403"/>
> - <value name="R8G8B8_SNORM" value="404"/>
> - <value name="R8G8B8_SSCALED" value="405"/>
> - <value name="R8G8B8_USCALED" value="406"/>
> - <value name="R64G64B64A64_FLOAT" value="407"/>
> - <value name="R64G64B64_FLOAT" value="408"/>
> - <value name="BC4_SNORM" value="409"/>
> - <value name="BC5_SNORM" value="410"/>
> - <value name="R16G16B16_FLOAT" value="411"/>
> - <value name="R16G16B16_UNORM" value="412"/>
> - <value name="R16G16B16_SNORM" value="413"/>
> - <value name="R16G16B16_SSCALED" value="414"/>
> - <value name="R16G16B16_USCALED" value="415"/>
> - <value name="BC6H_SF16" value="417"/>
> - <value name="BC7_UNORM" value="418"/>
> - <value name="BC7_UNORM_SRGB" value="419"/>
> - <value name="BC6H_UF16" value="420"/>
> - <value name="PLANAR_420_8" value="421"/>
> - <value name="R8G8B8_UNORM_SRGB" value="424"/>
> - <value name="ETC1_RGB8" value="425"/>
> - <value name="ETC2_RGB8" value="426"/>
> - <value name="EAC_R11" value="427"/>
> - <value name="EAC_RG11" value="428"/>
> - <value name="EAC_SIGNED_R11" value="429"/>
> - <value name="EAC_SIGNED_RG11" value="430"/>
> - <value name="ETC2_SRGB8" value="431"/>
> - <value name="R16G16B16_UINT" value="432"/>
> - <value name="R16G16B16_SINT" value="433"/>
> - <value name="R32_SFIXED" value="434"/>
> - <value name="R10G10B10A2_SNORM" value="435"/>
> - <value name="R10G10B10A2_USCALED" value="436"/>
> - <value name="R10G10B10A2_SSCALED" value="437"/>
> - <value name="R10G10B10A2_SINT" value="438"/>
> - <value name="B10G10R10A2_SNORM" value="439"/>
> - <value name="B10G10R10A2_USCALED" value="440"/>
> - <value name="B10G10R10A2_SSCALED" value="441"/>
> - <value name="B10G10R10A2_UINT" value="442"/>
> - <value name="B10G10R10A2_SINT" value="443"/>
> - <value name="R64G64B64A64_PASSTHRU" value="444"/>
> - <value name="R64G64B64_PASSTHRU" value="445"/>
> - <value name="ETC2_RGB8_PTA" value="448"/>
> - <value name="ETC2_SRGB8_PTA" value="449"/>
> - <value name="ETC2_EAC_RGBA8" value="450"/>
> - <value name="ETC2_EAC_SRGB8_A8" value="451"/>
> - <value name="R8G8B8_UINT" value="456"/>
> - <value name="R8G8B8_SINT" value="457"/>
> - <value name="RAW" value="511"/>
> - </enum>
> -
> <enum name="Texture_Coordinate_Mode" prefix="TCM">
> <value name="WRAP" value="0"/>
> <value name="MIRROR" value="1"/>
> @@ -738,7 +518,7 @@
> <struct name="VERTEX_ELEMENT_STATE" length="2">
> <field name="Vertex Buffer Index" start="27" end="31" type="uint"/>
> <field name="Valid" start="26" end="26" type="bool"/>
> - <field name="Source Element Format" start="16" end="24"
> type="SURFACE_FORMAT"/>
> + <field name="Source Element Format" start="16" end="24" type="uint"/>
> <field name="Source Element Offset" start="0" end="10" type="uint"/>
> <field name="Destination Element Offset" start="32" end="39" type="uint"/>
> <field name="Component 0 Control" start="60" end="62"
> type="3D_Vertex_Component_Control"/>
> diff --git a/src/intel/genxml/gen5.xml b/src/intel/genxml/gen5.xml
> index 82cda909572..650692f6bda 100644
> --- a/src/intel/genxml/gen5.xml
> +++ b/src/intel/genxml/gen5.xml
> @@ -106,230 +106,6 @@
> <value name="SET" value="15"/>
> </enum>
>
> - <enum name="SURFACE_FORMAT" prefix="SF">
> - <value name="R32G32B32A32_FLOAT" value="0"/>
> - <value name="R32G32B32A32_SINT" value="1"/>
> - <value name="R32G32B32A32_UINT" value="2"/>
> - <value name="R32G32B32A32_UNORM" value="3"/>
> - <value name="R32G32B32A32_SNORM" value="4"/>
> - <value name="R64G64_FLOAT" value="5"/>
> - <value name="R32G32B32X32_FLOAT" value="6"/>
> - <value name="R32G32B32A32_SSCALED" value="7"/>
> - <value name="R32G32B32A32_USCALED" value="8"/>
> - <value name="R32G32B32A32_SFIXED" value="32"/>
> - <value name="R64G64_PASSTHRU" value="33"/>
> - <value name="R32G32B32_FLOAT" value="64"/>
> - <value name="R32G32B32_SINT" value="65"/>
> - <value name="R32G32B32_UINT" value="66"/>
> - <value name="R32G32B32_UNORM" value="67"/>
> - <value name="R32G32B32_SNORM" value="68"/>
> - <value name="R32G32B32_SSCALED" value="69"/>
> - <value name="R32G32B32_USCALED" value="70"/>
> - <value name="R32G32B32_SFIXED" value="80"/>
> - <value name="R16G16B16A16_UNORM" value="128"/>
> - <value name="R16G16B16A16_SNORM" value="129"/>
> - <value name="R16G16B16A16_SINT" value="130"/>
> - <value name="R16G16B16A16_UINT" value="131"/>
> - <value name="R16G16B16A16_FLOAT" value="132"/>
> - <value name="R32G32_FLOAT" value="133"/>
> - <value name="R32G32_SINT" value="134"/>
> - <value name="R32G32_UINT" value="135"/>
> - <value name="R32_FLOAT_X8X24_TYPELESS" value="136"/>
> - <value name="X32_TYPELESS_G8X24_UINT" value="137"/>
> - <value name="L32A32_FLOAT" value="138"/>
> - <value name="R32G32_UNORM" value="139"/>
> - <value name="R32G32_SNORM" value="140"/>
> - <value name="R64_FLOAT" value="141"/>
> - <value name="R16G16B16X16_UNORM" value="142"/>
> - <value name="R16G16B16X16_FLOAT" value="143"/>
> - <value name="A32X32_FLOAT" value="144"/>
> - <value name="L32X32_FLOAT" value="145"/>
> - <value name="I32X32_FLOAT" value="146"/>
> - <value name="R16G16B16A16_SSCALED" value="147"/>
> - <value name="R16G16B16A16_USCALED" value="148"/>
> - <value name="R32G32_SSCALED" value="149"/>
> - <value name="R32G32_USCALED" value="150"/>
> - <value name="R32G32_SFIXED" value="160"/>
> - <value name="R64_PASSTHRU" value="161"/>
> - <value name="B8G8R8A8_UNORM" value="192"/>
> - <value name="B8G8R8A8_UNORM_SRGB" value="193"/>
> - <value name="R10G10B10A2_UNORM" value="194"/>
> - <value name="R10G10B10A2_UNORM_SRGB" value="195"/>
> - <value name="R10G10B10A2_UINT" value="196"/>
> - <value name="R10G10B10_SNORM_A2_UNORM" value="197"/>
> - <value name="R8G8B8A8_UNORM" value="199"/>
> - <value name="R8G8B8A8_UNORM_SRGB" value="200"/>
> - <value name="R8G8B8A8_SNORM" value="201"/>
> - <value name="R8G8B8A8_SINT" value="202"/>
> - <value name="R8G8B8A8_UINT" value="203"/>
> - <value name="R16G16_UNORM" value="204"/>
> - <value name="R16G16_SNORM" value="205"/>
> - <value name="R16G16_SINT" value="206"/>
> - <value name="R16G16_UINT" value="207"/>
> - <value name="R16G16_FLOAT" value="208"/>
> - <value name="B10G10R10A2_UNORM" value="209"/>
> - <value name="B10G10R10A2_UNORM_SRGB" value="210"/>
> - <value name="R11G11B10_FLOAT" value="211"/>
> - <value name="R32_SINT" value="214"/>
> - <value name="R32_UINT" value="215"/>
> - <value name="R32_FLOAT" value="216"/>
> - <value name="R24_UNORM_X8_TYPELESS" value="217"/>
> - <value name="X24_TYPELESS_G8_UINT" value="218"/>
> - <value name="L32_UNORM" value="221"/>
> - <value name="A32_UNORM" value="222"/>
> - <value name="L16A16_UNORM" value="223"/>
> - <value name="I24X8_UNORM" value="224"/>
> - <value name="L24X8_UNORM" value="225"/>
> - <value name="A24X8_UNORM" value="226"/>
> - <value name="I32_FLOAT" value="227"/>
> - <value name="L32_FLOAT" value="228"/>
> - <value name="A32_FLOAT" value="229"/>
> - <value name="X8B8_UNORM_G8R8_SNORM" value="230"/>
> - <value name="A8X8_UNORM_G8R8_SNORM" value="231"/>
> - <value name="B8X8_UNORM_G8R8_SNORM" value="232"/>
> - <value name="B8G8R8X8_UNORM" value="233"/>
> - <value name="B8G8R8X8_UNORM_SRGB" value="234"/>
> - <value name="R8G8B8X8_UNORM" value="235"/>
> - <value name="R8G8B8X8_UNORM_SRGB" value="236"/>
> - <value name="R9G9B9E5_SHAREDEXP" value="237"/>
> - <value name="B10G10R10X2_UNORM" value="238"/>
> - <value name="L16A16_FLOAT" value="240"/>
> - <value name="R32_UNORM" value="241"/>
> - <value name="R32_SNORM" value="242"/>
> - <value name="R10G10B10X2_USCALED" value="243"/>
> - <value name="R8G8B8A8_SSCALED" value="244"/>
> - <value name="R8G8B8A8_USCALED" value="245"/>
> - <value name="R16G16_SSCALED" value="246"/>
> - <value name="R16G16_USCALED" value="247"/>
> - <value name="R32_SSCALED" value="248"/>
> - <value name="R32_USCALED" value="249"/>
> - <value name="B5G6R5_UNORM" value="256"/>
> - <value name="B5G6R5_UNORM_SRGB" value="257"/>
> - <value name="B5G5R5A1_UNORM" value="258"/>
> - <value name="B5G5R5A1_UNORM_SRGB" value="259"/>
> - <value name="B4G4R4A4_UNORM" value="260"/>
> - <value name="B4G4R4A4_UNORM_SRGB" value="261"/>
> - <value name="R8G8_UNORM" value="262"/>
> - <value name="R8G8_SNORM" value="263"/>
> - <value name="R8G8_SINT" value="264"/>
> - <value name="R8G8_UINT" value="265"/>
> - <value name="R16_UNORM" value="266"/>
> - <value name="R16_SNORM" value="267"/>
> - <value name="R16_SINT" value="268"/>
> - <value name="R16_UINT" value="269"/>
> - <value name="R16_FLOAT" value="270"/>
> - <value name="A8P8_UNORM_PALETTE0" value="271"/>
> - <value name="A8P8_UNORM_PALETTE1" value="272"/>
> - <value name="I16_UNORM" value="273"/>
> - <value name="L16_UNORM" value="274"/>
> - <value name="A16_UNORM" value="275"/>
> - <value name="L8A8_UNORM" value="276"/>
> - <value name="I16_FLOAT" value="277"/>
> - <value name="L16_FLOAT" value="278"/>
> - <value name="A16_FLOAT" value="279"/>
> - <value name="L8A8_UNORM_SRGB" value="280"/>
> - <value name="R5G5_SNORM_B6_UNORM" value="281"/>
> - <value name="B5G5R5X1_UNORM" value="282"/>
> - <value name="B5G5R5X1_UNORM_SRGB" value="283"/>
> - <value name="R8G8_SSCALED" value="284"/>
> - <value name="R8G8_USCALED" value="285"/>
> - <value name="R16_SSCALED" value="286"/>
> - <value name="R16_USCALED" value="287"/>
> - <value name="P8A8_UNORM_PALETTE0" value="290"/>
> - <value name="P8A8_UNORM_PALETTE1" value="291"/>
> - <value name="A1B5G5R5_UNORM" value="292"/>
> - <value name="A4B4G4R4_UNORM" value="293"/>
> - <value name="L8A8_UINT" value="294"/>
> - <value name="L8A8_SINT" value="295"/>
> - <value name="R8_UNORM" value="320"/>
> - <value name="R8_SNORM" value="321"/>
> - <value name="R8_SINT" value="322"/>
> - <value name="R8_UINT" value="323"/>
> - <value name="A8_UNORM" value="324"/>
> - <value name="I8_UNORM" value="325"/>
> - <value name="L8_UNORM" value="326"/>
> - <value name="P4A4_UNORM_PALETTE0" value="327"/>
> - <value name="A4P4_UNORM_PALETTE0" value="328"/>
> - <value name="R8_SSCALED" value="329"/>
> - <value name="R8_USCALED" value="330"/>
> - <value name="P8_UNORM_PALETTE0" value="331"/>
> - <value name="L8_UNORM_SRGB" value="332"/>
> - <value name="P8_UNORM_PALETTE1" value="333"/>
> - <value name="P4A4_UNORM_PALETTE1" value="334"/>
> - <value name="A4P4_UNORM_PALETTE1" value="335"/>
> - <value name="Y8_UNORM" value="336"/>
> - <value name="L8_UINT" value="338"/>
> - <value name="L8_SINT" value="339"/>
> - <value name="I8_UINT" value="340"/>
> - <value name="I8_SINT" value="341"/>
> - <value name="DXT1_RGB_SRGB" value="384"/>
> - <value name="R1_UNORM" value="385"/>
> - <value name="YCRCB_NORMAL" value="386"/>
> - <value name="YCRCB_SWAPUVY" value="387"/>
> - <value name="P2_UNORM_PALETTE0" value="388"/>
> - <value name="P2_UNORM_PALETTE1" value="389"/>
> - <value name="BC1_UNORM" value="390"/>
> - <value name="BC2_UNORM" value="391"/>
> - <value name="BC3_UNORM" value="392"/>
> - <value name="BC4_UNORM" value="393"/>
> - <value name="BC5_UNORM" value="394"/>
> - <value name="BC1_UNORM_SRGB" value="395"/>
> - <value name="BC2_UNORM_SRGB" value="396"/>
> - <value name="BC3_UNORM_SRGB" value="397"/>
> - <value name="MONO8" value="398"/>
> - <value name="YCRCB_SWAPUV" value="399"/>
> - <value name="YCRCB_SWAPY" value="400"/>
> - <value name="DXT1_RGB" value="401"/>
> - <value name="FXT1" value="402"/>
> - <value name="R8G8B8_UNORM" value="403"/>
> - <value name="R8G8B8_SNORM" value="404"/>
> - <value name="R8G8B8_SSCALED" value="405"/>
> - <value name="R8G8B8_USCALED" value="406"/>
> - <value name="R64G64B64A64_FLOAT" value="407"/>
> - <value name="R64G64B64_FLOAT" value="408"/>
> - <value name="BC4_SNORM" value="409"/>
> - <value name="BC5_SNORM" value="410"/>
> - <value name="R16G16B16_FLOAT" value="411"/>
> - <value name="R16G16B16_UNORM" value="412"/>
> - <value name="R16G16B16_SNORM" value="413"/>
> - <value name="R16G16B16_SSCALED" value="414"/>
> - <value name="R16G16B16_USCALED" value="415"/>
> - <value name="BC6H_SF16" value="417"/>
> - <value name="BC7_UNORM" value="418"/>
> - <value name="BC7_UNORM_SRGB" value="419"/>
> - <value name="BC6H_UF16" value="420"/>
> - <value name="PLANAR_420_8" value="421"/>
> - <value name="R8G8B8_UNORM_SRGB" value="424"/>
> - <value name="ETC1_RGB8" value="425"/>
> - <value name="ETC2_RGB8" value="426"/>
> - <value name="EAC_R11" value="427"/>
> - <value name="EAC_RG11" value="428"/>
> - <value name="EAC_SIGNED_R11" value="429"/>
> - <value name="EAC_SIGNED_RG11" value="430"/>
> - <value name="ETC2_SRGB8" value="431"/>
> - <value name="R16G16B16_UINT" value="432"/>
> - <value name="R16G16B16_SINT" value="433"/>
> - <value name="R32_SFIXED" value="434"/>
> - <value name="R10G10B10A2_SNORM" value="435"/>
> - <value name="R10G10B10A2_USCALED" value="436"/>
> - <value name="R10G10B10A2_SSCALED" value="437"/>
> - <value name="R10G10B10A2_SINT" value="438"/>
> - <value name="B10G10R10A2_SNORM" value="439"/>
> - <value name="B10G10R10A2_USCALED" value="440"/>
> - <value name="B10G10R10A2_SSCALED" value="441"/>
> - <value name="B10G10R10A2_UINT" value="442"/>
> - <value name="B10G10R10A2_SINT" value="443"/>
> - <value name="R64G64B64A64_PASSTHRU" value="444"/>
> - <value name="R64G64B64_PASSTHRU" value="445"/>
> - <value name="ETC2_RGB8_PTA" value="448"/>
> - <value name="ETC2_SRGB8_PTA" value="449"/>
> - <value name="ETC2_EAC_RGBA8" value="450"/>
> - <value name="ETC2_EAC_SRGB8_A8" value="451"/>
> - <value name="R8G8B8_UINT" value="456"/>
> - <value name="R8G8B8_SINT" value="457"/>
> - <value name="RAW" value="511"/>
> - </enum>
> -
> <enum name="Texture_Coordinate_Mode" prefix="TCM">
> <value name="WRAP" value="0"/>
> <value name="MIRROR" value="1"/>
> @@ -834,7 +610,7 @@
> <struct name="VERTEX_ELEMENT_STATE" length="2">
> <field name="Vertex Buffer Index" start="27" end="31" type="uint"/>
> <field name="Valid" start="26" end="26" type="bool"/>
> - <field name="Source Element Format" start="16" end="24"
> type="SURFACE_FORMAT"/>
> + <field name="Source Element Format" start="16" end="24" type="uint"/>
> <field name="Source Element Offset" start="0" end="10" type="uint"/>
> <field name="Destination Element Offset" start="32" end="39" type="uint"/>
> <field name="Component 0 Control" start="60" end="62"
> type="3D_Vertex_Component_Control"/>
> diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml
> index 971cd48352e..088f46f05f1 100644
> --- a/src/intel/genxml/gen6.xml
> +++ b/src/intel/genxml/gen6.xml
> @@ -106,230 +106,6 @@
> <value name="SET" value="15"/>
> </enum>
>
> - <enum name="SURFACE_FORMAT" prefix="SF">
> - <value name="R32G32B32A32_FLOAT" value="0"/>
> - <value name="R32G32B32A32_SINT" value="1"/>
> - <value name="R32G32B32A32_UINT" value="2"/>
> - <value name="R32G32B32A32_UNORM" value="3"/>
> - <value name="R32G32B32A32_SNORM" value="4"/>
> - <value name="R64G64_FLOAT" value="5"/>
> - <value name="R32G32B32X32_FLOAT" value="6"/>
> - <value name="R32G32B32A32_SSCALED" value="7"/>
> - <value name="R32G32B32A32_USCALED" value="8"/>
> - <value name="R32G32B32A32_SFIXED" value="32"/>
> - <value name="R64G64_PASSTHRU" value="33"/>
> - <value name="R32G32B32_FLOAT" value="64"/>
> - <value name="R32G32B32_SINT" value="65"/>
> - <value name="R32G32B32_UINT" value="66"/>
> - <value name="R32G32B32_UNORM" value="67"/>
> - <value name="R32G32B32_SNORM" value="68"/>
> - <value name="R32G32B32_SSCALED" value="69"/>
> - <value name="R32G32B32_USCALED" value="70"/>
> - <value name="R32G32B32_SFIXED" value="80"/>
> - <value name="R16G16B16A16_UNORM" value="128"/>
> - <value name="R16G16B16A16_SNORM" value="129"/>
> - <value name="R16G16B16A16_SINT" value="130"/>
> - <value name="R16G16B16A16_UINT" value="131"/>
> - <value name="R16G16B16A16_FLOAT" value="132"/>
> - <value name="R32G32_FLOAT" value="133"/>
> - <value name="R32G32_SINT" value="134"/>
> - <value name="R32G32_UINT" value="135"/>
> - <value name="R32_FLOAT_X8X24_TYPELESS" value="136"/>
> - <value name="X32_TYPELESS_G8X24_UINT" value="137"/>
> - <value name="L32A32_FLOAT" value="138"/>
> - <value name="R32G32_UNORM" value="139"/>
> - <value name="R32G32_SNORM" value="140"/>
> - <value name="R64_FLOAT" value="141"/>
> - <value name="R16G16B16X16_UNORM" value="142"/>
> - <value name="R16G16B16X16_FLOAT" value="143"/>
> - <value name="A32X32_FLOAT" value="144"/>
> - <value name="L32X32_FLOAT" value="145"/>
> - <value name="I32X32_FLOAT" value="146"/>
> - <value name="R16G16B16A16_SSCALED" value="147"/>
> - <value name="R16G16B16A16_USCALED" value="148"/>
> - <value name="R32G32_SSCALED" value="149"/>
> - <value name="R32G32_USCALED" value="150"/>
> - <value name="R32G32_SFIXED" value="160"/>
> - <value name="R64_PASSTHRU" value="161"/>
> - <value name="B8G8R8A8_UNORM" value="192"/>
> - <value name="B8G8R8A8_UNORM_SRGB" value="193"/>
> - <value name="R10G10B10A2_UNORM" value="194"/>
> - <value name="R10G10B10A2_UNORM_SRGB" value="195"/>
> - <value name="R10G10B10A2_UINT" value="196"/>
> - <value name="R10G10B10_SNORM_A2_UNORM" value="197"/>
> - <value name="R8G8B8A8_UNORM" value="199"/>
> - <value name="R8G8B8A8_UNORM_SRGB" value="200"/>
> - <value name="R8G8B8A8_SNORM" value="201"/>
> - <value name="R8G8B8A8_SINT" value="202"/>
> - <value name="R8G8B8A8_UINT" value="203"/>
> - <value name="R16G16_UNORM" value="204"/>
> - <value name="R16G16_SNORM" value="205"/>
> - <value name="R16G16_SINT" value="206"/>
> - <value name="R16G16_UINT" value="207"/>
> - <value name="R16G16_FLOAT" value="208"/>
> - <value name="B10G10R10A2_UNORM" value="209"/>
> - <value name="B10G10R10A2_UNORM_SRGB" value="210"/>
> - <value name="R11G11B10_FLOAT" value="211"/>
> - <value name="R32_SINT" value="214"/>
> - <value name="R32_UINT" value="215"/>
> - <value name="R32_FLOAT" value="216"/>
> - <value name="R24_UNORM_X8_TYPELESS" value="217"/>
> - <value name="X24_TYPELESS_G8_UINT" value="218"/>
> - <value name="L32_UNORM" value="221"/>
> - <value name="A32_UNORM" value="222"/>
> - <value name="L16A16_UNORM" value="223"/>
> - <value name="I24X8_UNORM" value="224"/>
> - <value name="L24X8_UNORM" value="225"/>
> - <value name="A24X8_UNORM" value="226"/>
> - <value name="I32_FLOAT" value="227"/>
> - <value name="L32_FLOAT" value="228"/>
> - <value name="A32_FLOAT" value="229"/>
> - <value name="X8B8_UNORM_G8R8_SNORM" value="230"/>
> - <value name="A8X8_UNORM_G8R8_SNORM" value="231"/>
> - <value name="B8X8_UNORM_G8R8_SNORM" value="232"/>
> - <value name="B8G8R8X8_UNORM" value="233"/>
> - <value name="B8G8R8X8_UNORM_SRGB" value="234"/>
> - <value name="R8G8B8X8_UNORM" value="235"/>
> - <value name="R8G8B8X8_UNORM_SRGB" value="236"/>
> - <value name="R9G9B9E5_SHAREDEXP" value="237"/>
> - <value name="B10G10R10X2_UNORM" value="238"/>
> - <value name="L16A16_FLOAT" value="240"/>
> - <value name="R32_UNORM" value="241"/>
> - <value name="R32_SNORM" value="242"/>
> - <value name="R10G10B10X2_USCALED" value="243"/>
> - <value name="R8G8B8A8_SSCALED" value="244"/>
> - <value name="R8G8B8A8_USCALED" value="245"/>
> - <value name="R16G16_SSCALED" value="246"/>
> - <value name="R16G16_USCALED" value="247"/>
> - <value name="R32_SSCALED" value="248"/>
> - <value name="R32_USCALED" value="249"/>
> - <value name="B5G6R5_UNORM" value="256"/>
> - <value name="B5G6R5_UNORM_SRGB" value="257"/>
> - <value name="B5G5R5A1_UNORM" value="258"/>
> - <value name="B5G5R5A1_UNORM_SRGB" value="259"/>
> - <value name="B4G4R4A4_UNORM" value="260"/>
> - <value name="B4G4R4A4_UNORM_SRGB" value="261"/>
> - <value name="R8G8_UNORM" value="262"/>
> - <value name="R8G8_SNORM" value="263"/>
> - <value name="R8G8_SINT" value="264"/>
> - <value name="R8G8_UINT" value="265"/>
> - <value name="R16_UNORM" value="266"/>
> - <value name="R16_SNORM" value="267"/>
> - <value name="R16_SINT" value="268"/>
> - <value name="R16_UINT" value="269"/>
> - <value name="R16_FLOAT" value="270"/>
> - <value name="A8P8_UNORM_PALETTE0" value="271"/>
> - <value name="A8P8_UNORM_PALETTE1" value="272"/>
> - <value name="I16_UNORM" value="273"/>
> - <value name="L16_UNORM" value="274"/>
> - <value name="A16_UNORM" value="275"/>
> - <value name="L8A8_UNORM" value="276"/>
> - <value name="I16_FLOAT" value="277"/>
> - <value name="L16_FLOAT" value="278"/>
> - <value name="A16_FLOAT" value="279"/>
> - <value name="L8A8_UNORM_SRGB" value="280"/>
> - <value name="R5G5_SNORM_B6_UNORM" value="281"/>
> - <value name="B5G5R5X1_UNORM" value="282"/>
> - <value name="B5G5R5X1_UNORM_SRGB" value="283"/>
> - <value name="R8G8_SSCALED" value="284"/>
> - <value name="R8G8_USCALED" value="285"/>
> - <value name="R16_SSCALED" value="286"/>
> - <value name="R16_USCALED" value="287"/>
> - <value name="P8A8_UNORM_PALETTE0" value="290"/>
> - <value name="P8A8_UNORM_PALETTE1" value="291"/>
> - <value name="A1B5G5R5_UNORM" value="292"/>
> - <value name="A4B4G4R4_UNORM" value="293"/>
> - <value name="L8A8_UINT" value="294"/>
> - <value name="L8A8_SINT" value="295"/>
> - <value name="R8_UNORM" value="320"/>
> - <value name="R8_SNORM" value="321"/>
> - <value name="R8_SINT" value="322"/>
> - <value name="R8_UINT" value="323"/>
> - <value name="A8_UNORM" value="324"/>
> - <value name="I8_UNORM" value="325"/>
> - <value name="L8_UNORM" value="326"/>
> - <value name="P4A4_UNORM_PALETTE0" value="327"/>
> - <value name="A4P4_UNORM_PALETTE0" value="328"/>
> - <value name="R8_SSCALED" value="329"/>
> - <value name="R8_USCALED" value="330"/>
> - <value name="P8_UNORM_PALETTE0" value="331"/>
> - <value name="L8_UNORM_SRGB" value="332"/>
> - <value name="P8_UNORM_PALETTE1" value="333"/>
> - <value name="P4A4_UNORM_PALETTE1" value="334"/>
> - <value name="A4P4_UNORM_PALETTE1" value="335"/>
> - <value name="Y8_UNORM" value="336"/>
> - <value name="L8_UINT" value="338"/>
> - <value name="L8_SINT" value="339"/>
> - <value name="I8_UINT" value="340"/>
> - <value name="I8_SINT" value="341"/>
> - <value name="DXT1_RGB_SRGB" value="384"/>
> - <value name="R1_UNORM" value="385"/>
> - <value name="YCRCB_NORMAL" value="386"/>
> - <value name="YCRCB_SWAPUVY" value="387"/>
> - <value name="P2_UNORM_PALETTE0" value="388"/>
> - <value name="P2_UNORM_PALETTE1" value="389"/>
> - <value name="BC1_UNORM" value="390"/>
> - <value name="BC2_UNORM" value="391"/>
> - <value name="BC3_UNORM" value="392"/>
> - <value name="BC4_UNORM" value="393"/>
> - <value name="BC5_UNORM" value="394"/>
> - <value name="BC1_UNORM_SRGB" value="395"/>
> - <value name="BC2_UNORM_SRGB" value="396"/>
> - <value name="BC3_UNORM_SRGB" value="397"/>
> - <value name="MONO8" value="398"/>
> - <value name="YCRCB_SWAPUV" value="399"/>
> - <value name="YCRCB_SWAPY" value="400"/>
> - <value name="DXT1_RGB" value="401"/>
> - <value name="FXT1" value="402"/>
> - <value name="R8G8B8_UNORM" value="403"/>
> - <value name="R8G8B8_SNORM" value="404"/>
> - <value name="R8G8B8_SSCALED" value="405"/>
> - <value name="R8G8B8_USCALED" value="406"/>
> - <value name="R64G64B64A64_FLOAT" value="407"/>
> - <value name="R64G64B64_FLOAT" value="408"/>
> - <value name="BC4_SNORM" value="409"/>
> - <value name="BC5_SNORM" value="410"/>
> - <value name="R16G16B16_FLOAT" value="411"/>
> - <value name="R16G16B16_UNORM" value="412"/>
> - <value name="R16G16B16_SNORM" value="413"/>
> - <value name="R16G16B16_SSCALED" value="414"/>
> - <value name="R16G16B16_USCALED" value="415"/>
> - <value name="BC6H_SF16" value="417"/>
> - <value name="BC7_UNORM" value="418"/>
> - <value name="BC7_UNORM_SRGB" value="419"/>
> - <value name="BC6H_UF16" value="420"/>
> - <value name="PLANAR_420_8" value="421"/>
> - <value name="R8G8B8_UNORM_SRGB" value="424"/>
> - <value name="ETC1_RGB8" value="425"/>
> - <value name="ETC2_RGB8" value="426"/>
> - <value name="EAC_R11" value="427"/>
> - <value name="EAC_RG11" value="428"/>
> - <value name="EAC_SIGNED_R11" value="429"/>
> - <value name="EAC_SIGNED_RG11" value="430"/>
> - <value name="ETC2_SRGB8" value="431"/>
> - <value name="R16G16B16_UINT" value="432"/>
> - <value name="R16G16B16_SINT" value="433"/>
> - <value name="R32_SFIXED" value="434"/>
> - <value name="R10G10B10A2_SNORM" value="435"/>
> - <value name="R10G10B10A2_USCALED" value="436"/>
> - <value name="R10G10B10A2_SSCALED" value="437"/>
> - <value name="R10G10B10A2_SINT" value="438"/>
> - <value name="B10G10R10A2_SNORM" value="439"/>
> - <value name="B10G10R10A2_USCALED" value="440"/>
> - <value name="B10G10R10A2_SSCALED" value="441"/>
> - <value name="B10G10R10A2_UINT" value="442"/>
> - <value name="B10G10R10A2_SINT" value="443"/>
> - <value name="R64G64B64A64_PASSTHRU" value="444"/>
> - <value name="R64G64B64_PASSTHRU" value="445"/>
> - <value name="ETC2_RGB8_PTA" value="448"/>
> - <value name="ETC2_SRGB8_PTA" value="449"/>
> - <value name="ETC2_EAC_RGBA8" value="450"/>
> - <value name="ETC2_EAC_SRGB8_A8" value="451"/>
> - <value name="R8G8B8_UINT" value="456"/>
> - <value name="R8G8B8_SINT" value="457"/>
> - <value name="RAW" value="511"/>
> - </enum>
> -
> <enum name="Texture Coordinate Mode" prefix="TCM">
> <value name="WRAP" value="0"/>
> <value name="MIRROR" value="1"/>
> @@ -363,7 +139,7 @@
> <struct name="VERTEX_ELEMENT_STATE" length="2">
> <field name="Vertex Buffer Index" start="26" end="31" type="uint"/>
> <field name="Valid" start="25" end="25" type="bool"/>
> - <field name="Source Element Format" start="16" end="24"
> type="SURFACE_FORMAT"/>
> + <field name="Source Element Format" start="16" end="24" type="uint"/>
> <field name="Edge Flag Enable" start="15" end="15" type="bool"/>
> <field name="Source Element Offset" start="0" end="11" type="uint"/>
> <field name="Component 0 Control" start="60" end="62"
> type="3D_Vertex_Component_Control"/>
> @@ -552,7 +328,7 @@
> <field name="Data Return Format" start="27" end="27" type="uint">
> <value name="DATA_RETURN_FLOAT32" value="0"/>
> </field>
> - <field name="Surface Format" start="18" end="26" type="SURFACE_FORMAT"/>
> + <field name="Surface Format" start="18" end="26" type="uint"/>
> <field name="Vertical Line Stride" start="12" end="12" type="uint"/>
> <field name="Vertical Line Stride Offset" start="11" end="11" type="uint"/>
> <field name="MIP Map Layout Mode" start="10" end="10" type="uint">
> diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml
> index 9e34c169e23..430c2ba73a2 100644
> --- a/src/intel/genxml/gen7.xml
> +++ b/src/intel/genxml/gen7.xml
> @@ -138,230 +138,6 @@
> <value name="SET" value="15"/>
> </enum>
>
> - <enum name="SURFACE_FORMAT" prefix="SF">
> - <value name="R32G32B32A32_FLOAT" value="0"/>
> - <value name="R32G32B32A32_SINT" value="1"/>
> - <value name="R32G32B32A32_UINT" value="2"/>
> - <value name="R32G32B32A32_UNORM" value="3"/>
> - <value name="R32G32B32A32_SNORM" value="4"/>
> - <value name="R64G64_FLOAT" value="5"/>
> - <value name="R32G32B32X32_FLOAT" value="6"/>
> - <value name="R32G32B32A32_SSCALED" value="7"/>
> - <value name="R32G32B32A32_USCALED" value="8"/>
> - <value name="R32G32B32A32_SFIXED" value="32"/>
> - <value name="R64G64_PASSTHRU" value="33"/>
> - <value name="R32G32B32_FLOAT" value="64"/>
> - <value name="R32G32B32_SINT" value="65"/>
> - <value name="R32G32B32_UINT" value="66"/>
> - <value name="R32G32B32_UNORM" value="67"/>
> - <value name="R32G32B32_SNORM" value="68"/>
> - <value name="R32G32B32_SSCALED" value="69"/>
> - <value name="R32G32B32_USCALED" value="70"/>
> - <value name="R32G32B32_SFIXED" value="80"/>
> - <value name="R16G16B16A16_UNORM" value="128"/>
> - <value name="R16G16B16A16_SNORM" value="129"/>
> - <value name="R16G16B16A16_SINT" value="130"/>
> - <value name="R16G16B16A16_UINT" value="131"/>
> - <value name="R16G16B16A16_FLOAT" value="132"/>
> - <value name="R32G32_FLOAT" value="133"/>
> - <value name="R32G32_SINT" value="134"/>
> - <value name="R32G32_UINT" value="135"/>
> - <value name="R32_FLOAT_X8X24_TYPELESS" value="136"/>
> - <value name="X32_TYPELESS_G8X24_UINT" value="137"/>
> - <value name="L32A32_FLOAT" value="138"/>
> - <value name="R32G32_UNORM" value="139"/>
> - <value name="R32G32_SNORM" value="140"/>
> - <value name="R64_FLOAT" value="141"/>
> - <value name="R16G16B16X16_UNORM" value="142"/>
> - <value name="R16G16B16X16_FLOAT" value="143"/>
> - <value name="A32X32_FLOAT" value="144"/>
> - <value name="L32X32_FLOAT" value="145"/>
> - <value name="I32X32_FLOAT" value="146"/>
> - <value name="R16G16B16A16_SSCALED" value="147"/>
> - <value name="R16G16B16A16_USCALED" value="148"/>
> - <value name="R32G32_SSCALED" value="149"/>
> - <value name="R32G32_USCALED" value="150"/>
> - <value name="R32G32_SFIXED" value="160"/>
> - <value name="R64_PASSTHRU" value="161"/>
> - <value name="B8G8R8A8_UNORM" value="192"/>
> - <value name="B8G8R8A8_UNORM_SRGB" value="193"/>
> - <value name="R10G10B10A2_UNORM" value="194"/>
> - <value name="R10G10B10A2_UNORM_SRGB" value="195"/>
> - <value name="R10G10B10A2_UINT" value="196"/>
> - <value name="R10G10B10_SNORM_A2_UNORM" value="197"/>
> - <value name="R8G8B8A8_UNORM" value="199"/>
> - <value name="R8G8B8A8_UNORM_SRGB" value="200"/>
> - <value name="R8G8B8A8_SNORM" value="201"/>
> - <value name="R8G8B8A8_SINT" value="202"/>
> - <value name="R8G8B8A8_UINT" value="203"/>
> - <value name="R16G16_UNORM" value="204"/>
> - <value name="R16G16_SNORM" value="205"/>
> - <value name="R16G16_SINT" value="206"/>
> - <value name="R16G16_UINT" value="207"/>
> - <value name="R16G16_FLOAT" value="208"/>
> - <value name="B10G10R10A2_UNORM" value="209"/>
> - <value name="B10G10R10A2_UNORM_SRGB" value="210"/>
> - <value name="R11G11B10_FLOAT" value="211"/>
> - <value name="R32_SINT" value="214"/>
> - <value name="R32_UINT" value="215"/>
> - <value name="R32_FLOAT" value="216"/>
> - <value name="R24_UNORM_X8_TYPELESS" value="217"/>
> - <value name="X24_TYPELESS_G8_UINT" value="218"/>
> - <value name="L32_UNORM" value="221"/>
> - <value name="A32_UNORM" value="222"/>
> - <value name="L16A16_UNORM" value="223"/>
> - <value name="I24X8_UNORM" value="224"/>
> - <value name="L24X8_UNORM" value="225"/>
> - <value name="A24X8_UNORM" value="226"/>
> - <value name="I32_FLOAT" value="227"/>
> - <value name="L32_FLOAT" value="228"/>
> - <value name="A32_FLOAT" value="229"/>
> - <value name="X8B8_UNORM_G8R8_SNORM" value="230"/>
> - <value name="A8X8_UNORM_G8R8_SNORM" value="231"/>
> - <value name="B8X8_UNORM_G8R8_SNORM" value="232"/>
> - <value name="B8G8R8X8_UNORM" value="233"/>
> - <value name="B8G8R8X8_UNORM_SRGB" value="234"/>
> - <value name="R8G8B8X8_UNORM" value="235"/>
> - <value name="R8G8B8X8_UNORM_SRGB" value="236"/>
> - <value name="R9G9B9E5_SHAREDEXP" value="237"/>
> - <value name="B10G10R10X2_UNORM" value="238"/>
> - <value name="L16A16_FLOAT" value="240"/>
> - <value name="R32_UNORM" value="241"/>
> - <value name="R32_SNORM" value="242"/>
> - <value name="R10G10B10X2_USCALED" value="243"/>
> - <value name="R8G8B8A8_SSCALED" value="244"/>
> - <value name="R8G8B8A8_USCALED" value="245"/>
> - <value name="R16G16_SSCALED" value="246"/>
> - <value name="R16G16_USCALED" value="247"/>
> - <value name="R32_SSCALED" value="248"/>
> - <value name="R32_USCALED" value="249"/>
> - <value name="B5G6R5_UNORM" value="256"/>
> - <value name="B5G6R5_UNORM_SRGB" value="257"/>
> - <value name="B5G5R5A1_UNORM" value="258"/>
> - <value name="B5G5R5A1_UNORM_SRGB" value="259"/>
> - <value name="B4G4R4A4_UNORM" value="260"/>
> - <value name="B4G4R4A4_UNORM_SRGB" value="261"/>
> - <value name="R8G8_UNORM" value="262"/>
> - <value name="R8G8_SNORM" value="263"/>
> - <value name="R8G8_SINT" value="264"/>
> - <value name="R8G8_UINT" value="265"/>
> - <value name="R16_UNORM" value="266"/>
> - <value name="R16_SNORM" value="267"/>
> - <value name="R16_SINT" value="268"/>
> - <value name="R16_UINT" value="269"/>
> - <value name="R16_FLOAT" value="270"/>
> - <value name="A8P8_UNORM_PALETTE0" value="271"/>
> - <value name="A8P8_UNORM_PALETTE1" value="272"/>
> - <value name="I16_UNORM" value="273"/>
> - <value name="L16_UNORM" value="274"/>
> - <value name="A16_UNORM" value="275"/>
> - <value name="L8A8_UNORM" value="276"/>
> - <value name="I16_FLOAT" value="277"/>
> - <value name="L16_FLOAT" value="278"/>
> - <value name="A16_FLOAT" value="279"/>
> - <value name="L8A8_UNORM_SRGB" value="280"/>
> - <value name="R5G5_SNORM_B6_UNORM" value="281"/>
> - <value name="B5G5R5X1_UNORM" value="282"/>
> - <value name="B5G5R5X1_UNORM_SRGB" value="283"/>
> - <value name="R8G8_SSCALED" value="284"/>
> - <value name="R8G8_USCALED" value="285"/>
> - <value name="R16_SSCALED" value="286"/>
> - <value name="R16_USCALED" value="287"/>
> - <value name="P8A8_UNORM_PALETTE0" value="290"/>
> - <value name="P8A8_UNORM_PALETTE1" value="291"/>
> - <value name="A1B5G5R5_UNORM" value="292"/>
> - <value name="A4B4G4R4_UNORM" value="293"/>
> - <value name="L8A8_UINT" value="294"/>
> - <value name="L8A8_SINT" value="295"/>
> - <value name="R8_UNORM" value="320"/>
> - <value name="R8_SNORM" value="321"/>
> - <value name="R8_SINT" value="322"/>
> - <value name="R8_UINT" value="323"/>
> - <value name="A8_UNORM" value="324"/>
> - <value name="I8_UNORM" value="325"/>
> - <value name="L8_UNORM" value="326"/>
> - <value name="P4A4_UNORM_PALETTE0" value="327"/>
> - <value name="A4P4_UNORM_PALETTE0" value="328"/>
> - <value name="R8_SSCALED" value="329"/>
> - <value name="R8_USCALED" value="330"/>
> - <value name="P8_UNORM_PALETTE0" value="331"/>
> - <value name="L8_UNORM_SRGB" value="332"/>
> - <value name="P8_UNORM_PALETTE1" value="333"/>
> - <value name="P4A4_UNORM_PALETTE1" value="334"/>
> - <value name="A4P4_UNORM_PALETTE1" value="335"/>
> - <value name="Y8_UNORM" value="336"/>
> - <value name="L8_UINT" value="338"/>
> - <value name="L8_SINT" value="339"/>
> - <value name="I8_UINT" value="340"/>
> - <value name="I8_SINT" value="341"/>
> - <value name="DXT1_RGB_SRGB" value="384"/>
> - <value name="R1_UNORM" value="385"/>
> - <value name="YCRCB_NORMAL" value="386"/>
> - <value name="YCRCB_SWAPUVY" value="387"/>
> - <value name="P2_UNORM_PALETTE0" value="388"/>
> - <value name="P2_UNORM_PALETTE1" value="389"/>
> - <value name="BC1_UNORM" value="390"/>
> - <value name="BC2_UNORM" value="391"/>
> - <value name="BC3_UNORM" value="392"/>
> - <value name="BC4_UNORM" value="393"/>
> - <value name="BC5_UNORM" value="394"/>
> - <value name="BC1_UNORM_SRGB" value="395"/>
> - <value name="BC2_UNORM_SRGB" value="396"/>
> - <value name="BC3_UNORM_SRGB" value="397"/>
> - <value name="MONO8" value="398"/>
> - <value name="YCRCB_SWAPUV" value="399"/>
> - <value name="YCRCB_SWAPY" value="400"/>
> - <value name="DXT1_RGB" value="401"/>
> - <value name="FXT1" value="402"/>
> - <value name="R8G8B8_UNORM" value="403"/>
> - <value name="R8G8B8_SNORM" value="404"/>
> - <value name="R8G8B8_SSCALED" value="405"/>
> - <value name="R8G8B8_USCALED" value="406"/>
> - <value name="R64G64B64A64_FLOAT" value="407"/>
> - <value name="R64G64B64_FLOAT" value="408"/>
> - <value name="BC4_SNORM" value="409"/>
> - <value name="BC5_SNORM" value="410"/>
> - <value name="R16G16B16_FLOAT" value="411"/>
> - <value name="R16G16B16_UNORM" value="412"/>
> - <value name="R16G16B16_SNORM" value="413"/>
> - <value name="R16G16B16_SSCALED" value="414"/>
> - <value name="R16G16B16_USCALED" value="415"/>
> - <value name="BC6H_SF16" value="417"/>
> - <value name="BC7_UNORM" value="418"/>
> - <value name="BC7_UNORM_SRGB" value="419"/>
> - <value name="BC6H_UF16" value="420"/>
> - <value name="PLANAR_420_8" value="421"/>
> - <value name="R8G8B8_UNORM_SRGB" value="424"/>
> - <value name="ETC1_RGB8" value="425"/>
> - <value name="ETC2_RGB8" value="426"/>
> - <value name="EAC_R11" value="427"/>
> - <value name="EAC_RG11" value="428"/>
> - <value name="EAC_SIGNED_R11" value="429"/>
> - <value name="EAC_SIGNED_RG11" value="430"/>
> - <value name="ETC2_SRGB8" value="431"/>
> - <value name="R16G16B16_UINT" value="432"/>
> - <value name="R16G16B16_SINT" value="433"/>
> - <value name="R32_SFIXED" value="434"/>
> - <value name="R10G10B10A2_SNORM" value="435"/>
> - <value name="R10G10B10A2_USCALED" value="436"/>
> - <value name="R10G10B10A2_SSCALED" value="437"/>
> - <value name="R10G10B10A2_SINT" value="438"/>
> - <value name="B10G10R10A2_SNORM" value="439"/>
> - <value name="B10G10R10A2_USCALED" value="440"/>
> - <value name="B10G10R10A2_SSCALED" value="441"/>
> - <value name="B10G10R10A2_UINT" value="442"/>
> - <value name="B10G10R10A2_SINT" value="443"/>
> - <value name="R64G64B64A64_PASSTHRU" value="444"/>
> - <value name="R64G64B64_PASSTHRU" value="445"/>
> - <value name="ETC2_RGB8_PTA" value="448"/>
> - <value name="ETC2_SRGB8_PTA" value="449"/>
> - <value name="ETC2_EAC_RGBA8" value="450"/>
> - <value name="ETC2_EAC_SRGB8_A8" value="451"/>
> - <value name="R8G8B8_UINT" value="456"/>
> - <value name="R8G8B8_SINT" value="457"/>
> - <value name="RAW" value="511"/>
> - </enum>
> -
> <enum name="Texture Coordinate Mode" prefix="TCM">
> <value name="WRAP" value="0"/>
> <value name="MIRROR" value="1"/>
> @@ -407,7 +183,7 @@
> <struct name="VERTEX_ELEMENT_STATE" length="2">
> <field name="Vertex Buffer Index" start="26" end="31" type="uint"/>
> <field name="Valid" start="25" end="25" type="bool"/>
> - <field name="Source Element Format" start="16" end="24"
> type="SURFACE_FORMAT"/>
> + <field name="Source Element Format" start="16" end="24" type="uint"/>
> <field name="Edge Flag Enable" start="15" end="15" type="bool"/>
> <field name="Source Element Offset" start="0" end="11" type="uint"/>
> <field name="Component 0 Control" start="60" end="62"
> type="3D_Vertex_Component_Control"/>
> @@ -610,7 +386,7 @@
> <value name="SURFTYPE_NULL" value="7"/>
> </field>
> <field name="Surface Array" start="28" end="28" type="bool"/>
> - <field name="Surface Format" start="18" end="26" type="SURFACE_FORMAT"/>
> + <field name="Surface Format" start="18" end="26" type="uint"/>
> <field name="Surface Vertical Alignment" start="16" end="17" type="uint">
> <value name="VALIGN_2" value="0"/>
> <value name="VALIGN_4" value="1"/>
> diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml
> index be537aff0ae..e18a49ac4db 100644
> --- a/src/intel/genxml/gen75.xml
> +++ b/src/intel/genxml/gen75.xml
> @@ -138,230 +138,6 @@
> <value name="SET" value="15"/>
> </enum>
>
> - <enum name="SURFACE_FORMAT" prefix="SF">
> - <value name="R32G32B32A32_FLOAT" value="0"/>
> - <value name="R32G32B32A32_SINT" value="1"/>
> - <value name="R32G32B32A32_UINT" value="2"/>
> - <value name="R32G32B32A32_UNORM" value="3"/>
> - <value name="R32G32B32A32_SNORM" value="4"/>
> - <value name="R64G64_FLOAT" value="5"/>
> - <value name="R32G32B32X32_FLOAT" value="6"/>
> - <value name="R32G32B32A32_SSCALED" value="7"/>
> - <value name="R32G32B32A32_USCALED" value="8"/>
> - <value name="R32G32B32A32_SFIXED" value="32"/>
> - <value name="R64G64_PASSTHRU" value="33"/>
> - <value name="R32G32B32_FLOAT" value="64"/>
> - <value name="R32G32B32_SINT" value="65"/>
> - <value name="R32G32B32_UINT" value="66"/>
> - <value name="R32G32B32_UNORM" value="67"/>
> - <value name="R32G32B32_SNORM" value="68"/>
> - <value name="R32G32B32_SSCALED" value="69"/>
> - <value name="R32G32B32_USCALED" value="70"/>
> - <value name="R32G32B32_SFIXED" value="80"/>
> - <value name="R16G16B16A16_UNORM" value="128"/>
> - <value name="R16G16B16A16_SNORM" value="129"/>
> - <value name="R16G16B16A16_SINT" value="130"/>
> - <value name="R16G16B16A16_UINT" value="131"/>
> - <value name="R16G16B16A16_FLOAT" value="132"/>
> - <value name="R32G32_FLOAT" value="133"/>
> - <value name="R32G32_SINT" value="134"/>
> - <value name="R32G32_UINT" value="135"/>
> - <value name="R32_FLOAT_X8X24_TYPELESS" value="136"/>
> - <value name="X32_TYPELESS_G8X24_UINT" value="137"/>
> - <value name="L32A32_FLOAT" value="138"/>
> - <value name="R32G32_UNORM" value="139"/>
> - <value name="R32G32_SNORM" value="140"/>
> - <value name="R64_FLOAT" value="141"/>
> - <value name="R16G16B16X16_UNORM" value="142"/>
> - <value name="R16G16B16X16_FLOAT" value="143"/>
> - <value name="A32X32_FLOAT" value="144"/>
> - <value name="L32X32_FLOAT" value="145"/>
> - <value name="I32X32_FLOAT" value="146"/>
> - <value name="R16G16B16A16_SSCALED" value="147"/>
> - <value name="R16G16B16A16_USCALED" value="148"/>
> - <value name="R32G32_SSCALED" value="149"/>
> - <value name="R32G32_USCALED" value="150"/>
> - <value name="R32G32_SFIXED" value="160"/>
> - <value name="R64_PASSTHRU" value="161"/>
> - <value name="B8G8R8A8_UNORM" value="192"/>
> - <value name="B8G8R8A8_UNORM_SRGB" value="193"/>
> - <value name="R10G10B10A2_UNORM" value="194"/>
> - <value name="R10G10B10A2_UNORM_SRGB" value="195"/>
> - <value name="R10G10B10A2_UINT" value="196"/>
> - <value name="R10G10B10_SNORM_A2_UNORM" value="197"/>
> - <value name="R8G8B8A8_UNORM" value="199"/>
> - <value name="R8G8B8A8_UNORM_SRGB" value="200"/>
> - <value name="R8G8B8A8_SNORM" value="201"/>
> - <value name="R8G8B8A8_SINT" value="202"/>
> - <value name="R8G8B8A8_UINT" value="203"/>
> - <value name="R16G16_UNORM" value="204"/>
> - <value name="R16G16_SNORM" value="205"/>
> - <value name="R16G16_SINT" value="206"/>
> - <value name="R16G16_UINT" value="207"/>
> - <value name="R16G16_FLOAT" value="208"/>
> - <value name="B10G10R10A2_UNORM" value="209"/>
> - <value name="B10G10R10A2_UNORM_SRGB" value="210"/>
> - <value name="R11G11B10_FLOAT" value="211"/>
> - <value name="R32_SINT" value="214"/>
> - <value name="R32_UINT" value="215"/>
> - <value name="R32_FLOAT" value="216"/>
> - <value name="R24_UNORM_X8_TYPELESS" value="217"/>
> - <value name="X24_TYPELESS_G8_UINT" value="218"/>
> - <value name="L32_UNORM" value="221"/>
> - <value name="A32_UNORM" value="222"/>
> - <value name="L16A16_UNORM" value="223"/>
> - <value name="I24X8_UNORM" value="224"/>
> - <value name="L24X8_UNORM" value="225"/>
> - <value name="A24X8_UNORM" value="226"/>
> - <value name="I32_FLOAT" value="227"/>
> - <value name="L32_FLOAT" value="228"/>
> - <value name="A32_FLOAT" value="229"/>
> - <value name="X8B8_UNORM_G8R8_SNORM" value="230"/>
> - <value name="A8X8_UNORM_G8R8_SNORM" value="231"/>
> - <value name="B8X8_UNORM_G8R8_SNORM" value="232"/>
> - <value name="B8G8R8X8_UNORM" value="233"/>
> - <value name="B8G8R8X8_UNORM_SRGB" value="234"/>
> - <value name="R8G8B8X8_UNORM" value="235"/>
> - <value name="R8G8B8X8_UNORM_SRGB" value="236"/>
> - <value name="R9G9B9E5_SHAREDEXP" value="237"/>
> - <value name="B10G10R10X2_UNORM" value="238"/>
> - <value name="L16A16_FLOAT" value="240"/>
> - <value name="R32_UNORM" value="241"/>
> - <value name="R32_SNORM" value="242"/>
> - <value name="R10G10B10X2_USCALED" value="243"/>
> - <value name="R8G8B8A8_SSCALED" value="244"/>
> - <value name="R8G8B8A8_USCALED" value="245"/>
> - <value name="R16G16_SSCALED" value="246"/>
> - <value name="R16G16_USCALED" value="247"/>
> - <value name="R32_SSCALED" value="248"/>
> - <value name="R32_USCALED" value="249"/>
> - <value name="B5G6R5_UNORM" value="256"/>
> - <value name="B5G6R5_UNORM_SRGB" value="257"/>
> - <value name="B5G5R5A1_UNORM" value="258"/>
> - <value name="B5G5R5A1_UNORM_SRGB" value="259"/>
> - <value name="B4G4R4A4_UNORM" value="260"/>
> - <value name="B4G4R4A4_UNORM_SRGB" value="261"/>
> - <value name="R8G8_UNORM" value="262"/>
> - <value name="R8G8_SNORM" value="263"/>
> - <value name="R8G8_SINT" value="264"/>
> - <value name="R8G8_UINT" value="265"/>
> - <value name="R16_UNORM" value="266"/>
> - <value name="R16_SNORM" value="267"/>
> - <value name="R16_SINT" value="268"/>
> - <value name="R16_UINT" value="269"/>
> - <value name="R16_FLOAT" value="270"/>
> - <value name="A8P8_UNORM_PALETTE0" value="271"/>
> - <value name="A8P8_UNORM_PALETTE1" value="272"/>
> - <value name="I16_UNORM" value="273"/>
> - <value name="L16_UNORM" value="274"/>
> - <value name="A16_UNORM" value="275"/>
> - <value name="L8A8_UNORM" value="276"/>
> - <value name="I16_FLOAT" value="277"/>
> - <value name="L16_FLOAT" value="278"/>
> - <value name="A16_FLOAT" value="279"/>
> - <value name="L8A8_UNORM_SRGB" value="280"/>
> - <value name="R5G5_SNORM_B6_UNORM" value="281"/>
> - <value name="B5G5R5X1_UNORM" value="282"/>
> - <value name="B5G5R5X1_UNORM_SRGB" value="283"/>
> - <value name="R8G8_SSCALED" value="284"/>
> - <value name="R8G8_USCALED" value="285"/>
> - <value name="R16_SSCALED" value="286"/>
> - <value name="R16_USCALED" value="287"/>
> - <value name="P8A8_UNORM_PALETTE0" value="290"/>
> - <value name="P8A8_UNORM_PALETTE1" value="291"/>
> - <value name="A1B5G5R5_UNORM" value="292"/>
> - <value name="A4B4G4R4_UNORM" value="293"/>
> - <value name="L8A8_UINT" value="294"/>
> - <value name="L8A8_SINT" value="295"/>
> - <value name="R8_UNORM" value="320"/>
> - <value name="R8_SNORM" value="321"/>
> - <value name="R8_SINT" value="322"/>
> - <value name="R8_UINT" value="323"/>
> - <value name="A8_UNORM" value="324"/>
> - <value name="I8_UNORM" value="325"/>
> - <value name="L8_UNORM" value="326"/>
> - <value name="P4A4_UNORM_PALETTE0" value="327"/>
> - <value name="A4P4_UNORM_PALETTE0" value="328"/>
> - <value name="R8_SSCALED" value="329"/>
> - <value name="R8_USCALED" value="330"/>
> - <value name="P8_UNORM_PALETTE0" value="331"/>
> - <value name="L8_UNORM_SRGB" value="332"/>
> - <value name="P8_UNORM_PALETTE1" value="333"/>
> - <value name="P4A4_UNORM_PALETTE1" value="334"/>
> - <value name="A4P4_UNORM_PALETTE1" value="335"/>
> - <value name="Y8_UNORM" value="336"/>
> - <value name="L8_UINT" value="338"/>
> - <value name="L8_SINT" value="339"/>
> - <value name="I8_UINT" value="340"/>
> - <value name="I8_SINT" value="341"/>
> - <value name="DXT1_RGB_SRGB" value="384"/>
> - <value name="R1_UNORM" value="385"/>
> - <value name="YCRCB_NORMAL" value="386"/>
> - <value name="YCRCB_SWAPUVY" value="387"/>
> - <value name="P2_UNORM_PALETTE0" value="388"/>
> - <value name="P2_UNORM_PALETTE1" value="389"/>
> - <value name="BC1_UNORM" value="390"/>
> - <value name="BC2_UNORM" value="391"/>
> - <value name="BC3_UNORM" value="392"/>
> - <value name="BC4_UNORM" value="393"/>
> - <value name="BC5_UNORM" value="394"/>
> - <value name="BC1_UNORM_SRGB" value="395"/>
> - <value name="BC2_UNORM_SRGB" value="396"/>
> - <value name="BC3_UNORM_SRGB" value="397"/>
> - <value name="MONO8" value="398"/>
> - <value name="YCRCB_SWAPUV" value="399"/>
> - <value name="YCRCB_SWAPY" value="400"/>
> - <value name="DXT1_RGB" value="401"/>
> - <value name="FXT1" value="402"/>
> - <value name="R8G8B8_UNORM" value="403"/>
> - <value name="R8G8B8_SNORM" value="404"/>
> - <value name="R8G8B8_SSCALED" value="405"/>
> - <value name="R8G8B8_USCALED" value="406"/>
> - <value name="R64G64B64A64_FLOAT" value="407"/>
> - <value name="R64G64B64_FLOAT" value="408"/>
> - <value name="BC4_SNORM" value="409"/>
> - <value name="BC5_SNORM" value="410"/>
> - <value name="R16G16B16_FLOAT" value="411"/>
> - <value name="R16G16B16_UNORM" value="412"/>
> - <value name="R16G16B16_SNORM" value="413"/>
> - <value name="R16G16B16_SSCALED" value="414"/>
> - <value name="R16G16B16_USCALED" value="415"/>
> - <value name="BC6H_SF16" value="417"/>
> - <value name="BC7_UNORM" value="418"/>
> - <value name="BC7_UNORM_SRGB" value="419"/>
> - <value name="BC6H_UF16" value="420"/>
> - <value name="PLANAR_420_8" value="421"/>
> - <value name="R8G8B8_UNORM_SRGB" value="424"/>
> - <value name="ETC1_RGB8" value="425"/>
> - <value name="ETC2_RGB8" value="426"/>
> - <value name="EAC_R11" value="427"/>
> - <value name="EAC_RG11" value="428"/>
> - <value name="EAC_SIGNED_R11" value="429"/>
> - <value name="EAC_SIGNED_RG11" value="430"/>
> - <value name="ETC2_SRGB8" value="431"/>
> - <value name="R16G16B16_UINT" value="432"/>
> - <value name="R16G16B16_SINT" value="433"/>
> - <value name="R32_SFIXED" value="434"/>
> - <value name="R10G10B10A2_SNORM" value="435"/>
> - <value name="R10G10B10A2_USCALED" value="436"/>
> - <value name="R10G10B10A2_SSCALED" value="437"/>
> - <value name="R10G10B10A2_SINT" value="438"/>
> - <value name="B10G10R10A2_SNORM" value="439"/>
> - <value name="B10G10R10A2_USCALED" value="440"/>
> - <value name="B10G10R10A2_SSCALED" value="441"/>
> - <value name="B10G10R10A2_UINT" value="442"/>
> - <value name="B10G10R10A2_SINT" value="443"/>
> - <value name="R64G64B64A64_PASSTHRU" value="444"/>
> - <value name="R64G64B64_PASSTHRU" value="445"/>
> - <value name="ETC2_RGB8_PTA" value="448"/>
> - <value name="ETC2_SRGB8_PTA" value="449"/>
> - <value name="ETC2_EAC_RGBA8" value="450"/>
> - <value name="ETC2_EAC_SRGB8_A8" value="451"/>
> - <value name="R8G8B8_UINT" value="456"/>
> - <value name="R8G8B8_SINT" value="457"/>
> - <value name="RAW" value="511"/>
> - </enum>
> -
> <enum name="Shader Channel Select" prefix="SCS">
> <value name="ZERO" value="0"/>
> <value name="ONE" value="1"/>
> @@ -426,7 +202,7 @@
> <struct name="VERTEX_ELEMENT_STATE" length="2">
> <field name="Vertex Buffer Index" start="26" end="31" type="uint"/>
> <field name="Valid" start="25" end="25" type="bool"/>
> - <field name="Source Element Format" start="16" end="24"
> type="SURFACE_FORMAT"/>
> + <field name="Source Element Format" start="16" end="24" type="uint"/>
> <field name="Edge Flag Enable" start="15" end="15" type="bool"/>
> <field name="Source Element Offset" start="0" end="11" type="uint"/>
> <field name="Component 0 Control" start="60" end="62"
> type="3D_Vertex_Component_Control"/>
> @@ -629,7 +405,7 @@
> <value name="SURFTYPE_NULL" value="7"/>
> </field>
> <field name="Surface Array" start="28" end="28" type="bool"/>
> - <field name="Surface Format" start="18" end="26" type="SURFACE_FORMAT"/>
> + <field name="Surface Format" start="18" end="26" type="uint"/>
> <field name="Surface Vertical Alignment" start="16" end="17" type="uint">
> <value name="VALIGN_2" value="0"/>
> <value name="VALIGN_4" value="1"/>
> diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml
> index c075eecc34a..c0e837906ca 100644
> --- a/src/intel/genxml/gen8.xml
> +++ b/src/intel/genxml/gen8.xml
> @@ -154,230 +154,6 @@
> <value name="SET" value="15"/>
> </enum>
>
> - <enum name="SURFACE_FORMAT" prefix="SF">
> - <value name="R32G32B32A32_FLOAT" value="0"/>
> - <value name="R32G32B32A32_SINT" value="1"/>
> - <value name="R32G32B32A32_UINT" value="2"/>
> - <value name="R32G32B32A32_UNORM" value="3"/>
> - <value name="R32G32B32A32_SNORM" value="4"/>
> - <value name="R64G64_FLOAT" value="5"/>
> - <value name="R32G32B32X32_FLOAT" value="6"/>
> - <value name="R32G32B32A32_SSCALED" value="7"/>
> - <value name="R32G32B32A32_USCALED" value="8"/>
> - <value name="R32G32B32A32_SFIXED" value="32"/>
> - <value name="R64G64_PASSTHRU" value="33"/>
> - <value name="R32G32B32_FLOAT" value="64"/>
> - <value name="R32G32B32_SINT" value="65"/>
> - <value name="R32G32B32_UINT" value="66"/>
> - <value name="R32G32B32_UNORM" value="67"/>
> - <value name="R32G32B32_SNORM" value="68"/>
> - <value name="R32G32B32_SSCALED" value="69"/>
> - <value name="R32G32B32_USCALED" value="70"/>
> - <value name="R32G32B32_SFIXED" value="80"/>
> - <value name="R16G16B16A16_UNORM" value="128"/>
> - <value name="R16G16B16A16_SNORM" value="129"/>
> - <value name="R16G16B16A16_SINT" value="130"/>
> - <value name="R16G16B16A16_UINT" value="131"/>
> - <value name="R16G16B16A16_FLOAT" value="132"/>
> - <value name="R32G32_FLOAT" value="133"/>
> - <value name="R32G32_SINT" value="134"/>
> - <value name="R32G32_UINT" value="135"/>
> - <value name="R32_FLOAT_X8X24_TYPELESS" value="136"/>
> - <value name="X32_TYPELESS_G8X24_UINT" value="137"/>
> - <value name="L32A32_FLOAT" value="138"/>
> - <value name="R32G32_UNORM" value="139"/>
> - <value name="R32G32_SNORM" value="140"/>
> - <value name="R64_FLOAT" value="141"/>
> - <value name="R16G16B16X16_UNORM" value="142"/>
> - <value name="R16G16B16X16_FLOAT" value="143"/>
> - <value name="A32X32_FLOAT" value="144"/>
> - <value name="L32X32_FLOAT" value="145"/>
> - <value name="I32X32_FLOAT" value="146"/>
> - <value name="R16G16B16A16_SSCALED" value="147"/>
> - <value name="R16G16B16A16_USCALED" value="148"/>
> - <value name="R32G32_SSCALED" value="149"/>
> - <value name="R32G32_USCALED" value="150"/>
> - <value name="R32G32_SFIXED" value="160"/>
> - <value name="R64_PASSTHRU" value="161"/>
> - <value name="B8G8R8A8_UNORM" value="192"/>
> - <value name="B8G8R8A8_UNORM_SRGB" value="193"/>
> - <value name="R10G10B10A2_UNORM" value="194"/>
> - <value name="R10G10B10A2_UNORM_SRGB" value="195"/>
> - <value name="R10G10B10A2_UINT" value="196"/>
> - <value name="R10G10B10_SNORM_A2_UNORM" value="197"/>
> - <value name="R8G8B8A8_UNORM" value="199"/>
> - <value name="R8G8B8A8_UNORM_SRGB" value="200"/>
> - <value name="R8G8B8A8_SNORM" value="201"/>
> - <value name="R8G8B8A8_SINT" value="202"/>
> - <value name="R8G8B8A8_UINT" value="203"/>
> - <value name="R16G16_UNORM" value="204"/>
> - <value name="R16G16_SNORM" value="205"/>
> - <value name="R16G16_SINT" value="206"/>
> - <value name="R16G16_UINT" value="207"/>
> - <value name="R16G16_FLOAT" value="208"/>
> - <value name="B10G10R10A2_UNORM" value="209"/>
> - <value name="B10G10R10A2_UNORM_SRGB" value="210"/>
> - <value name="R11G11B10_FLOAT" value="211"/>
> - <value name="R32_SINT" value="214"/>
> - <value name="R32_UINT" value="215"/>
> - <value name="R32_FLOAT" value="216"/>
> - <value name="R24_UNORM_X8_TYPELESS" value="217"/>
> - <value name="X24_TYPELESS_G8_UINT" value="218"/>
> - <value name="L32_UNORM" value="221"/>
> - <value name="A32_UNORM" value="222"/>
> - <value name="L16A16_UNORM" value="223"/>
> - <value name="I24X8_UNORM" value="224"/>
> - <value name="L24X8_UNORM" value="225"/>
> - <value name="A24X8_UNORM" value="226"/>
> - <value name="I32_FLOAT" value="227"/>
> - <value name="L32_FLOAT" value="228"/>
> - <value name="A32_FLOAT" value="229"/>
> - <value name="X8B8_UNORM_G8R8_SNORM" value="230"/>
> - <value name="A8X8_UNORM_G8R8_SNORM" value="231"/>
> - <value name="B8X8_UNORM_G8R8_SNORM" value="232"/>
> - <value name="B8G8R8X8_UNORM" value="233"/>
> - <value name="B8G8R8X8_UNORM_SRGB" value="234"/>
> - <value name="R8G8B8X8_UNORM" value="235"/>
> - <value name="R8G8B8X8_UNORM_SRGB" value="236"/>
> - <value name="R9G9B9E5_SHAREDEXP" value="237"/>
> - <value name="B10G10R10X2_UNORM" value="238"/>
> - <value name="L16A16_FLOAT" value="240"/>
> - <value name="R32_UNORM" value="241"/>
> - <value name="R32_SNORM" value="242"/>
> - <value name="R10G10B10X2_USCALED" value="243"/>
> - <value name="R8G8B8A8_SSCALED" value="244"/>
> - <value name="R8G8B8A8_USCALED" value="245"/>
> - <value name="R16G16_SSCALED" value="246"/>
> - <value name="R16G16_USCALED" value="247"/>
> - <value name="R32_SSCALED" value="248"/>
> - <value name="R32_USCALED" value="249"/>
> - <value name="B5G6R5_UNORM" value="256"/>
> - <value name="B5G6R5_UNORM_SRGB" value="257"/>
> - <value name="B5G5R5A1_UNORM" value="258"/>
> - <value name="B5G5R5A1_UNORM_SRGB" value="259"/>
> - <value name="B4G4R4A4_UNORM" value="260"/>
> - <value name="B4G4R4A4_UNORM_SRGB" value="261"/>
> - <value name="R8G8_UNORM" value="262"/>
> - <value name="R8G8_SNORM" value="263"/>
> - <value name="R8G8_SINT" value="264"/>
> - <value name="R8G8_UINT" value="265"/>
> - <value name="R16_UNORM" value="266"/>
> - <value name="R16_SNORM" value="267"/>
> - <value name="R16_SINT" value="268"/>
> - <value name="R16_UINT" value="269"/>
> - <value name="R16_FLOAT" value="270"/>
> - <value name="A8P8_UNORM_PALETTE0" value="271"/>
> - <value name="A8P8_UNORM_PALETTE1" value="272"/>
> - <value name="I16_UNORM" value="273"/>
> - <value name="L16_UNORM" value="274"/>
> - <value name="A16_UNORM" value="275"/>
> - <value name="L8A8_UNORM" value="276"/>
> - <value name="I16_FLOAT" value="277"/>
> - <value name="L16_FLOAT" value="278"/>
> - <value name="A16_FLOAT" value="279"/>
> - <value name="L8A8_UNORM_SRGB" value="280"/>
> - <value name="R5G5_SNORM_B6_UNORM" value="281"/>
> - <value name="B5G5R5X1_UNORM" value="282"/>
> - <value name="B5G5R5X1_UNORM_SRGB" value="283"/>
> - <value name="R8G8_SSCALED" value="284"/>
> - <value name="R8G8_USCALED" value="285"/>
> - <value name="R16_SSCALED" value="286"/>
> - <value name="R16_USCALED" value="287"/>
> - <value name="P8A8_UNORM_PALETTE0" value="290"/>
> - <value name="P8A8_UNORM_PALETTE1" value="291"/>
> - <value name="A1B5G5R5_UNORM" value="292"/>
> - <value name="A4B4G4R4_UNORM" value="293"/>
> - <value name="L8A8_UINT" value="294"/>
> - <value name="L8A8_SINT" value="295"/>
> - <value name="R8_UNORM" value="320"/>
> - <value name="R8_SNORM" value="321"/>
> - <value name="R8_SINT" value="322"/>
> - <value name="R8_UINT" value="323"/>
> - <value name="A8_UNORM" value="324"/>
> - <value name="I8_UNORM" value="325"/>
> - <value name="L8_UNORM" value="326"/>
> - <value name="P4A4_UNORM_PALETTE0" value="327"/>
> - <value name="A4P4_UNORM_PALETTE0" value="328"/>
> - <value name="R8_SSCALED" value="329"/>
> - <value name="R8_USCALED" value="330"/>
> - <value name="P8_UNORM_PALETTE0" value="331"/>
> - <value name="L8_UNORM_SRGB" value="332"/>
> - <value name="P8_UNORM_PALETTE1" value="333"/>
> - <value name="P4A4_UNORM_PALETTE1" value="334"/>
> - <value name="A4P4_UNORM_PALETTE1" value="335"/>
> - <value name="Y8_UNORM" value="336"/>
> - <value name="L8_UINT" value="338"/>
> - <value name="L8_SINT" value="339"/>
> - <value name="I8_UINT" value="340"/>
> - <value name="I8_SINT" value="341"/>
> - <value name="DXT1_RGB_SRGB" value="384"/>
> - <value name="R1_UNORM" value="385"/>
> - <value name="YCRCB_NORMAL" value="386"/>
> - <value name="YCRCB_SWAPUVY" value="387"/>
> - <value name="P2_UNORM_PALETTE0" value="388"/>
> - <value name="P2_UNORM_PALETTE1" value="389"/>
> - <value name="BC1_UNORM" value="390"/>
> - <value name="BC2_UNORM" value="391"/>
> - <value name="BC3_UNORM" value="392"/>
> - <value name="BC4_UNORM" value="393"/>
> - <value name="BC5_UNORM" value="394"/>
> - <value name="BC1_UNORM_SRGB" value="395"/>
> - <value name="BC2_UNORM_SRGB" value="396"/>
> - <value name="BC3_UNORM_SRGB" value="397"/>
> - <value name="MONO8" value="398"/>
> - <value name="YCRCB_SWAPUV" value="399"/>
> - <value name="YCRCB_SWAPY" value="400"/>
> - <value name="DXT1_RGB" value="401"/>
> - <value name="FXT1" value="402"/>
> - <value name="R8G8B8_UNORM" value="403"/>
> - <value name="R8G8B8_SNORM" value="404"/>
> - <value name="R8G8B8_SSCALED" value="405"/>
> - <value name="R8G8B8_USCALED" value="406"/>
> - <value name="R64G64B64A64_FLOAT" value="407"/>
> - <value name="R64G64B64_FLOAT" value="408"/>
> - <value name="BC4_SNORM" value="409"/>
> - <value name="BC5_SNORM" value="410"/>
> - <value name="R16G16B16_FLOAT" value="411"/>
> - <value name="R16G16B16_UNORM" value="412"/>
> - <value name="R16G16B16_SNORM" value="413"/>
> - <value name="R16G16B16_SSCALED" value="414"/>
> - <value name="R16G16B16_USCALED" value="415"/>
> - <value name="BC6H_SF16" value="417"/>
> - <value name="BC7_UNORM" value="418"/>
> - <value name="BC7_UNORM_SRGB" value="419"/>
> - <value name="BC6H_UF16" value="420"/>
> - <value name="PLANAR_420_8" value="421"/>
> - <value name="R8G8B8_UNORM_SRGB" value="424"/>
> - <value name="ETC1_RGB8" value="425"/>
> - <value name="ETC2_RGB8" value="426"/>
> - <value name="EAC_R11" value="427"/>
> - <value name="EAC_RG11" value="428"/>
> - <value name="EAC_SIGNED_R11" value="429"/>
> - <value name="EAC_SIGNED_RG11" value="430"/>
> - <value name="ETC2_SRGB8" value="431"/>
> - <value name="R16G16B16_UINT" value="432"/>
> - <value name="R16G16B16_SINT" value="433"/>
> - <value name="R32_SFIXED" value="434"/>
> - <value name="R10G10B10A2_SNORM" value="435"/>
> - <value name="R10G10B10A2_USCALED" value="436"/>
> - <value name="R10G10B10A2_SSCALED" value="437"/>
> - <value name="R10G10B10A2_SINT" value="438"/>
> - <value name="B10G10R10A2_SNORM" value="439"/>
> - <value name="B10G10R10A2_USCALED" value="440"/>
> - <value name="B10G10R10A2_SSCALED" value="441"/>
> - <value name="B10G10R10A2_UINT" value="442"/>
> - <value name="B10G10R10A2_SINT" value="443"/>
> - <value name="R64G64B64A64_PASSTHRU" value="444"/>
> - <value name="R64G64B64_PASSTHRU" value="445"/>
> - <value name="ETC2_RGB8_PTA" value="448"/>
> - <value name="ETC2_SRGB8_PTA" value="449"/>
> - <value name="ETC2_EAC_RGBA8" value="450"/>
> - <value name="ETC2_EAC_SRGB8_A8" value="451"/>
> - <value name="R8G8B8_UINT" value="456"/>
> - <value name="R8G8B8_SINT" value="457"/>
> - <value name="RAW" value="511"/>
> - </enum>
> -
> <enum name="Shader Channel Select" prefix="SCS">
> <value name="ZERO" value="0"/>
> <value name="ONE" value="1"/>
> @@ -452,7 +228,7 @@
> <struct name="VERTEX_ELEMENT_STATE" length="2">
> <field name="Vertex Buffer Index" start="26" end="31" type="uint"/>
> <field name="Valid" start="25" end="25" type="bool"/>
> - <field name="Source Element Format" start="16" end="24"
> type="SURFACE_FORMAT"/>
> + <field name="Source Element Format" start="16" end="24" type="uint"/>
> <field name="Edge Flag Enable" start="15" end="15" type="bool"/>
> <field name="Source Element Offset" start="0" end="11" type="uint"/>
> <field name="Component 0 Control" start="60" end="62"
> type="3D_Vertex_Component_Control"/>
> @@ -651,7 +427,7 @@
> <value name="SURFTYPE_NULL" value="7"/>
> </field>
> <field name="Surface Array" start="28" end="28" type="bool"/>
> - <field name="Surface Format" start="18" end="26" type="SURFACE_FORMAT"/>
> + <field name="Surface Format" start="18" end="26" type="uint"/>
> <field name="Surface Vertical Alignment" start="16" end="17" type="uint">
> <value name="VALIGN 4" value="1"/>
> <value name="VALIGN 8" value="2"/>
> diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
> index 7eef4bee013..faee2acca15 100644
> --- a/src/intel/genxml/gen9.xml
> +++ b/src/intel/genxml/gen9.xml
> @@ -180,230 +180,6 @@
> <value name="SET" value="15"/>
> </enum>
>
> - <enum name="SURFACE_FORMAT" prefix="SF">
> - <value name="R32G32B32A32_FLOAT" value="0"/>
> - <value name="R32G32B32A32_SINT" value="1"/>
> - <value name="R32G32B32A32_UINT" value="2"/>
> - <value name="R32G32B32A32_UNORM" value="3"/>
> - <value name="R32G32B32A32_SNORM" value="4"/>
> - <value name="R64G64_FLOAT" value="5"/>
> - <value name="R32G32B32X32_FLOAT" value="6"/>
> - <value name="R32G32B32A32_SSCALED" value="7"/>
> - <value name="R32G32B32A32_USCALED" value="8"/>
> - <value name="R32G32B32A32_SFIXED" value="32"/>
> - <value name="R64G64_PASSTHRU" value="33"/>
> - <value name="R32G32B32_FLOAT" value="64"/>
> - <value name="R32G32B32_SINT" value="65"/>
> - <value name="R32G32B32_UINT" value="66"/>
> - <value name="R32G32B32_UNORM" value="67"/>
> - <value name="R32G32B32_SNORM" value="68"/>
> - <value name="R32G32B32_SSCALED" value="69"/>
> - <value name="R32G32B32_USCALED" value="70"/>
> - <value name="R32G32B32_SFIXED" value="80"/>
> - <value name="R16G16B16A16_UNORM" value="128"/>
> - <value name="R16G16B16A16_SNORM" value="129"/>
> - <value name="R16G16B16A16_SINT" value="130"/>
> - <value name="R16G16B16A16_UINT" value="131"/>
> - <value name="R16G16B16A16_FLOAT" value="132"/>
> - <value name="R32G32_FLOAT" value="133"/>
> - <value name="R32G32_SINT" value="134"/>
> - <value name="R32G32_UINT" value="135"/>
> - <value name="R32_FLOAT_X8X24_TYPELESS" value="136"/>
> - <value name="X32_TYPELESS_G8X24_UINT" value="137"/>
> - <value name="L32A32_FLOAT" value="138"/>
> - <value name="R32G32_UNORM" value="139"/>
> - <value name="R32G32_SNORM" value="140"/>
> - <value name="R64_FLOAT" value="141"/>
> - <value name="R16G16B16X16_UNORM" value="142"/>
> - <value name="R16G16B16X16_FLOAT" value="143"/>
> - <value name="A32X32_FLOAT" value="144"/>
> - <value name="L32X32_FLOAT" value="145"/>
> - <value name="I32X32_FLOAT" value="146"/>
> - <value name="R16G16B16A16_SSCALED" value="147"/>
> - <value name="R16G16B16A16_USCALED" value="148"/>
> - <value name="R32G32_SSCALED" value="149"/>
> - <value name="R32G32_USCALED" value="150"/>
> - <value name="R32G32_SFIXED" value="160"/>
> - <value name="R64_PASSTHRU" value="161"/>
> - <value name="B8G8R8A8_UNORM" value="192"/>
> - <value name="B8G8R8A8_UNORM_SRGB" value="193"/>
> - <value name="R10G10B10A2_UNORM" value="194"/>
> - <value name="R10G10B10A2_UNORM_SRGB" value="195"/>
> - <value name="R10G10B10A2_UINT" value="196"/>
> - <value name="R10G10B10_SNORM_A2_UNORM" value="197"/>
> - <value name="R8G8B8A8_UNORM" value="199"/>
> - <value name="R8G8B8A8_UNORM_SRGB" value="200"/>
> - <value name="R8G8B8A8_SNORM" value="201"/>
> - <value name="R8G8B8A8_SINT" value="202"/>
> - <value name="R8G8B8A8_UINT" value="203"/>
> - <value name="R16G16_UNORM" value="204"/>
> - <value name="R16G16_SNORM" value="205"/>
> - <value name="R16G16_SINT" value="206"/>
> - <value name="R16G16_UINT" value="207"/>
> - <value name="R16G16_FLOAT" value="208"/>
> - <value name="B10G10R10A2_UNORM" value="209"/>
> - <value name="B10G10R10A2_UNORM_SRGB" value="210"/>
> - <value name="R11G11B10_FLOAT" value="211"/>
> - <value name="R32_SINT" value="214"/>
> - <value name="R32_UINT" value="215"/>
> - <value name="R32_FLOAT" value="216"/>
> - <value name="R24_UNORM_X8_TYPELESS" value="217"/>
> - <value name="X24_TYPELESS_G8_UINT" value="218"/>
> - <value name="L32_UNORM" value="221"/>
> - <value name="A32_UNORM" value="222"/>
> - <value name="L16A16_UNORM" value="223"/>
> - <value name="I24X8_UNORM" value="224"/>
> - <value name="L24X8_UNORM" value="225"/>
> - <value name="A24X8_UNORM" value="226"/>
> - <value name="I32_FLOAT" value="227"/>
> - <value name="L32_FLOAT" value="228"/>
> - <value name="A32_FLOAT" value="229"/>
> - <value name="X8B8_UNORM_G8R8_SNORM" value="230"/>
> - <value name="A8X8_UNORM_G8R8_SNORM" value="231"/>
> - <value name="B8X8_UNORM_G8R8_SNORM" value="232"/>
> - <value name="B8G8R8X8_UNORM" value="233"/>
> - <value name="B8G8R8X8_UNORM_SRGB" value="234"/>
> - <value name="R8G8B8X8_UNORM" value="235"/>
> - <value name="R8G8B8X8_UNORM_SRGB" value="236"/>
> - <value name="R9G9B9E5_SHAREDEXP" value="237"/>
> - <value name="B10G10R10X2_UNORM" value="238"/>
> - <value name="L16A16_FLOAT" value="240"/>
> - <value name="R32_UNORM" value="241"/>
> - <value name="R32_SNORM" value="242"/>
> - <value name="R10G10B10X2_USCALED" value="243"/>
> - <value name="R8G8B8A8_SSCALED" value="244"/>
> - <value name="R8G8B8A8_USCALED" value="245"/>
> - <value name="R16G16_SSCALED" value="246"/>
> - <value name="R16G16_USCALED" value="247"/>
> - <value name="R32_SSCALED" value="248"/>
> - <value name="R32_USCALED" value="249"/>
> - <value name="B5G6R5_UNORM" value="256"/>
> - <value name="B5G6R5_UNORM_SRGB" value="257"/>
> - <value name="B5G5R5A1_UNORM" value="258"/>
> - <value name="B5G5R5A1_UNORM_SRGB" value="259"/>
> - <value name="B4G4R4A4_UNORM" value="260"/>
> - <value name="B4G4R4A4_UNORM_SRGB" value="261"/>
> - <value name="R8G8_UNORM" value="262"/>
> - <value name="R8G8_SNORM" value="263"/>
> - <value name="R8G8_SINT" value="264"/>
> - <value name="R8G8_UINT" value="265"/>
> - <value name="R16_UNORM" value="266"/>
> - <value name="R16_SNORM" value="267"/>
> - <value name="R16_SINT" value="268"/>
> - <value name="R16_UINT" value="269"/>
> - <value name="R16_FLOAT" value="270"/>
> - <value name="A8P8_UNORM_PALETTE0" value="271"/>
> - <value name="A8P8_UNORM_PALETTE1" value="272"/>
> - <value name="I16_UNORM" value="273"/>
> - <value name="L16_UNORM" value="274"/>
> - <value name="A16_UNORM" value="275"/>
> - <value name="L8A8_UNORM" value="276"/>
> - <value name="I16_FLOAT" value="277"/>
> - <value name="L16_FLOAT" value="278"/>
> - <value name="A16_FLOAT" value="279"/>
> - <value name="L8A8_UNORM_SRGB" value="280"/>
> - <value name="R5G5_SNORM_B6_UNORM" value="281"/>
> - <value name="B5G5R5X1_UNORM" value="282"/>
> - <value name="B5G5R5X1_UNORM_SRGB" value="283"/>
> - <value name="R8G8_SSCALED" value="284"/>
> - <value name="R8G8_USCALED" value="285"/>
> - <value name="R16_SSCALED" value="286"/>
> - <value name="R16_USCALED" value="287"/>
> - <value name="P8A8_UNORM_PALETTE0" value="290"/>
> - <value name="P8A8_UNORM_PALETTE1" value="291"/>
> - <value name="A1B5G5R5_UNORM" value="292"/>
> - <value name="A4B4G4R4_UNORM" value="293"/>
> - <value name="L8A8_UINT" value="294"/>
> - <value name="L8A8_SINT" value="295"/>
> - <value name="R8_UNORM" value="320"/>
> - <value name="R8_SNORM" value="321"/>
> - <value name="R8_SINT" value="322"/>
> - <value name="R8_UINT" value="323"/>
> - <value name="A8_UNORM" value="324"/>
> - <value name="I8_UNORM" value="325"/>
> - <value name="L8_UNORM" value="326"/>
> - <value name="P4A4_UNORM_PALETTE0" value="327"/>
> - <value name="A4P4_UNORM_PALETTE0" value="328"/>
> - <value name="R8_SSCALED" value="329"/>
> - <value name="R8_USCALED" value="330"/>
> - <value name="P8_UNORM_PALETTE0" value="331"/>
> - <value name="L8_UNORM_SRGB" value="332"/>
> - <value name="P8_UNORM_PALETTE1" value="333"/>
> - <value name="P4A4_UNORM_PALETTE1" value="334"/>
> - <value name="A4P4_UNORM_PALETTE1" value="335"/>
> - <value name="Y8_UNORM" value="336"/>
> - <value name="L8_UINT" value="338"/>
> - <value name="L8_SINT" value="339"/>
> - <value name="I8_UINT" value="340"/>
> - <value name="I8_SINT" value="341"/>
> - <value name="DXT1_RGB_SRGB" value="384"/>
> - <value name="R1_UNORM" value="385"/>
> - <value name="YCRCB_NORMAL" value="386"/>
> - <value name="YCRCB_SWAPUVY" value="387"/>
> - <value name="P2_UNORM_PALETTE0" value="388"/>
> - <value name="P2_UNORM_PALETTE1" value="389"/>
> - <value name="BC1_UNORM" value="390"/>
> - <value name="BC2_UNORM" value="391"/>
> - <value name="BC3_UNORM" value="392"/>
> - <value name="BC4_UNORM" value="393"/>
> - <value name="BC5_UNORM" value="394"/>
> - <value name="BC1_UNORM_SRGB" value="395"/>
> - <value name="BC2_UNORM_SRGB" value="396"/>
> - <value name="BC3_UNORM_SRGB" value="397"/>
> - <value name="MONO8" value="398"/>
> - <value name="YCRCB_SWAPUV" value="399"/>
> - <value name="YCRCB_SWAPY" value="400"/>
> - <value name="DXT1_RGB" value="401"/>
> - <value name="FXT1" value="402"/>
> - <value name="R8G8B8_UNORM" value="403"/>
> - <value name="R8G8B8_SNORM" value="404"/>
> - <value name="R8G8B8_SSCALED" value="405"/>
> - <value name="R8G8B8_USCALED" value="406"/>
> - <value name="R64G64B64A64_FLOAT" value="407"/>
> - <value name="R64G64B64_FLOAT" value="408"/>
> - <value name="BC4_SNORM" value="409"/>
> - <value name="BC5_SNORM" value="410"/>
> - <value name="R16G16B16_FLOAT" value="411"/>
> - <value name="R16G16B16_UNORM" value="412"/>
> - <value name="R16G16B16_SNORM" value="413"/>
> - <value name="R16G16B16_SSCALED" value="414"/>
> - <value name="R16G16B16_USCALED" value="415"/>
> - <value name="BC6H_SF16" value="417"/>
> - <value name="BC7_UNORM" value="418"/>
> - <value name="BC7_UNORM_SRGB" value="419"/>
> - <value name="BC6H_UF16" value="420"/>
> - <value name="PLANAR_420_8" value="421"/>
> - <value name="R8G8B8_UNORM_SRGB" value="424"/>
> - <value name="ETC1_RGB8" value="425"/>
> - <value name="ETC2_RGB8" value="426"/>
> - <value name="EAC_R11" value="427"/>
> - <value name="EAC_RG11" value="428"/>
> - <value name="EAC_SIGNED_R11" value="429"/>
> - <value name="EAC_SIGNED_RG11" value="430"/>
> - <value name="ETC2_SRGB8" value="431"/>
> - <value name="R16G16B16_UINT" value="432"/>
> - <value name="R16G16B16_SINT" value="433"/>
> - <value name="R32_SFIXED" value="434"/>
> - <value name="R10G10B10A2_SNORM" value="435"/>
> - <value name="R10G10B10A2_USCALED" value="436"/>
> - <value name="R10G10B10A2_SSCALED" value="437"/>
> - <value name="R10G10B10A2_SINT" value="438"/>
> - <value name="B10G10R10A2_SNORM" value="439"/>
> - <value name="B10G10R10A2_USCALED" value="440"/>
> - <value name="B10G10R10A2_SSCALED" value="441"/>
> - <value name="B10G10R10A2_UINT" value="442"/>
> - <value name="B10G10R10A2_SINT" value="443"/>
> - <value name="R64G64B64A64_PASSTHRU" value="444"/>
> - <value name="R64G64B64_PASSTHRU" value="445"/>
> - <value name="ETC2_RGB8_PTA" value="448"/>
> - <value name="ETC2_SRGB8_PTA" value="449"/>
> - <value name="ETC2_EAC_RGBA8" value="450"/>
> - <value name="ETC2_EAC_SRGB8_A8" value="451"/>
> - <value name="R8G8B8_UINT" value="456"/>
> - <value name="R8G8B8_SINT" value="457"/>
> - <value name="RAW" value="511"/>
> - </enum>
> -
> <enum name="Shader Channel Select" prefix="SCS">
> <value name="ZERO" value="0"/>
> <value name="ONE" value="1"/>
> @@ -461,7 +237,7 @@
> <struct name="VERTEX_ELEMENT_STATE" length="2">
> <field name="Vertex Buffer Index" start="26" end="31" type="uint"/>
> <field name="Valid" start="25" end="25" type="bool"/>
> - <field name="Source Element Format" start="16" end="24"
> type="SURFACE_FORMAT"/>
> + <field name="Source Element Format" start="16" end="24" type="uint"/>
> <field name="Edge Flag Enable" start="15" end="15" type="bool"/>
> <field name="Source Element Offset" start="0" end="11" type="uint"/>
> <field name="Component 0 Control" start="60" end="62"
> type="3D_Vertex_Component_Control"/>
> @@ -683,7 +459,7 @@
> <value name="SURFTYPE_NULL" value="7"/>
> </field>
> <field name="Surface Array" start="28" end="28" type="bool"/>
> - <field name="Surface Format" start="18" end="27" type="SURFACE_FORMAT"/>
> + <field name="Surface Format" start="18" end="27" type="uint"/>
> <field name="Surface Vertical Alignment" start="16" end="17" type="uint">
> <value name="VALIGN 4" value="1"/>
> <value name="VALIGN 8" value="2"/>
> diff --git a/src/intel/isl/isl_surface_state.c
> b/src/intel/isl/isl_surface_state.c
> index bfb27fa4a44..27644b3f11e 100644
> --- a/src/intel/isl/isl_surface_state.c
> +++ b/src/intel/isl/isl_surface_state.c
> @@ -268,7 +268,7 @@ isl_genX(surf_fill_state_s)(const struct isl_device
> *dev, void *state,
> assert(surf_fmtl->bh == view_fmtl->bh);
> }
>
> - s.SurfaceFormat = (enum GENX(SURFACE_FORMAT)) info->view->format;
> + s.SurfaceFormat = info->view->format;
>
> #if GEN_GEN <= 5
> s.ColorBufferComponentWriteDisables = info->write_disables;
> @@ -696,7 +696,7 @@ isl_genX(buffer_fill_state_s)(void *state,
> struct GENX(RENDER_SURFACE_STATE) s = { 0, };
>
> s.SurfaceType = SURFTYPE_BUFFER;
> - s.SurfaceFormat = (enum GENX(SURFACE_FORMAT)) info->format;
> + s.SurfaceFormat = info->format;
>
> #if GEN_GEN >= 6
> s.SurfaceVerticalAlignment = isl_to_gen_valign[4];
> @@ -754,7 +754,7 @@ isl_genX(null_fill_state)(void *state, struct
> isl_extent3d size)
> {
> struct GENX(RENDER_SURFACE_STATE) s = {
> .SurfaceType = SURFTYPE_NULL,
> - .SurfaceFormat = (enum GENX(SURFACE_FORMAT)) ISL_FORMAT_B8G8R8A8_UNORM,
> + .SurfaceFormat = ISL_FORMAT_B8G8R8A8_UNORM,
> #if GEN_GEN >= 7
> .SurfaceArray = size.depth > 0,
> #endif
> diff --git a/src/intel/vulkan/genX_gpu_memcpy.c
> b/src/intel/vulkan/genX_gpu_memcpy.c
> index f3ada93333b..fb7711e09cc 100644
> --- a/src/intel/vulkan/genX_gpu_memcpy.c
> +++ b/src/intel/vulkan/genX_gpu_memcpy.c
> @@ -150,7 +150,7 @@ genX(cmd_buffer_so_memcpy)(struct anv_cmd_buffer
> *cmd_buffer,
> &(struct GENX(VERTEX_ELEMENT_STATE)) {
> .VertexBufferIndex = 32,
> .Valid = true,
> - .SourceElementFormat = (enum GENX(SURFACE_FORMAT)) format,
> + .SourceElementFormat = format,
> .SourceElementOffset = 0,
> .Component0Control = (bs >= 4) ? VFCOMP_STORE_SRC : VFCOMP_STORE_0,
> .Component1Control = (bs >= 8) ? VFCOMP_STORE_SRC : VFCOMP_STORE_0,
> diff --git a/src/intel/vulkan/genX_pipeline.c
> b/src/intel/vulkan/genX_pipeline.c
> index 45ebe31de6b..57b3e2c784a 100644
> --- a/src/intel/vulkan/genX_pipeline.c
> +++ b/src/intel/vulkan/genX_pipeline.c
> @@ -138,7 +138,7 @@ emit_vertex_input(struct anv_pipeline *pipeline,
> struct GENX(VERTEX_ELEMENT_STATE) element = {
> .VertexBufferIndex = desc->binding,
> .Valid = true,
> - .SourceElementFormat = (enum GENX(SURFACE_FORMAT)) format,
> + .SourceElementFormat = format,
> .EdgeFlagEnable = false,
> .SourceElementOffset = desc->offset,
> .Component0Control = vertex_element_comp_control(format, 0),
> @@ -184,7 +184,7 @@ emit_vertex_input(struct anv_pipeline *pipeline,
> struct GENX(VERTEX_ELEMENT_STATE) element = {
> .VertexBufferIndex = ANV_SVGS_VB_INDEX,
> .Valid = true,
> - .SourceElementFormat = (enum GENX(SURFACE_FORMAT))
> ISL_FORMAT_R32G32_UINT,
> + .SourceElementFormat = ISL_FORMAT_R32G32_UINT,
> .Component0Control = base_ctrl,
> .Component1Control = base_ctrl,
> #if GEN_GEN >= 8
> @@ -214,7 +214,7 @@ emit_vertex_input(struct anv_pipeline *pipeline,
> struct GENX(VERTEX_ELEMENT_STATE) element = {
> .VertexBufferIndex = ANV_DRAWID_VB_INDEX,
> .Valid = true,
> - .SourceElementFormat = (enum GENX(SURFACE_FORMAT))
> ISL_FORMAT_R32_UINT,
> + .SourceElementFormat = ISL_FORMAT_R32_UINT,
> .Component0Control = VFCOMP_STORE_SRC,
> .Component1Control = VFCOMP_STORE_0,
> .Component2Control = VFCOMP_STORE_0,
> diff --git a/src/mesa/drivers/dri/i965/genX_state_upload.c
> b/src/mesa/drivers/dri/i965/genX_state_upload.c
> index 498c3979ad5..e51ecb50370 100644
> --- a/src/mesa/drivers/dri/i965/genX_state_upload.c
> +++ b/src/mesa/drivers/dri/i965/genX_state_upload.c
> @@ -542,7 +542,7 @@ genX(emit_vertices)(struct brw_context *brw)
> 1 + GENX(VERTEX_ELEMENT_STATE_length));
> struct GENX(VERTEX_ELEMENT_STATE) elem = {
> .Valid = true,
> - .SourceElementFormat = (enum GENX(SURFACE_FORMAT))
> ISL_FORMAT_R32G32B32A32_FLOAT,
> + .SourceElementFormat = ISL_FORMAT_R32G32B32A32_FLOAT,
> .Component0Control = VFCOMP_STORE_0,
> .Component1Control = VFCOMP_STORE_0,
> .Component2Control = VFCOMP_STORE_0,
> @@ -736,13 +736,13 @@ genX(emit_vertices)(struct brw_context *brw)
> if (vs_prog_data->uses_basevertex ||
> vs_prog_data->uses_baseinstance) {
> elem_state.VertexBufferIndex = brw->vb.nr_buffers;
> - elem_state.SourceElementFormat = (enum GENX(SURFACE_FORMAT))
> ISL_FORMAT_R32G32_UINT;
> + elem_state.SourceElementFormat = ISL_FORMAT_R32G32_UINT;
> elem_state.Component0Control = VFCOMP_STORE_SRC;
> elem_state.Component1Control = VFCOMP_STORE_SRC;
> }
> #else
> elem_state.VertexBufferIndex = brw->vb.nr_buffers;
> - elem_state.SourceElementFormat = (enum GENX(SURFACE_FORMAT))
> ISL_FORMAT_R32G32_UINT;
> + elem_state.SourceElementFormat = ISL_FORMAT_R32G32_UINT;
> if (vs_prog_data->uses_basevertex)
> elem_state.Component0Control = VFCOMP_STORE_SRC;
>
> @@ -764,7 +764,7 @@ genX(emit_vertices)(struct brw_context *brw)
> struct GENX(VERTEX_ELEMENT_STATE) elem_state = {
> .Valid = true,
> .VertexBufferIndex = brw->vb.nr_buffers + 1,
> - .SourceElementFormat = (enum GENX(SURFACE_FORMAT))
> ISL_FORMAT_R32_UINT,
> + .SourceElementFormat = ISL_FORMAT_R32_UINT,
> .Component0Control = VFCOMP_STORE_SRC,
> .Component1Control = VFCOMP_STORE_0,
> .Component2Control = VFCOMP_STORE_0,
> --
> 2.16.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
More information about the mesa-dev
mailing list