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

genxml/gen8,9: Prefix the multisample format enum with MSFMT

Browse Source 
This is what gen7 does and it's nice to have a prefix

Reviewed-by: Chad Versace <chad.versace@intel.com>
Cc: "12.0" <mesa-stable@lists.freedesktop.org>
This commit is contained in:
Jason Ekstrand
2016-06-02 18:43:59 -07:00
parent 320de71858
commit de1d194856
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/intel/genxml/gen8.xml
View File

@@ -307,8 +307,8 @@
<field name="Minimum Array Element" start="146" end="156" type="uint"/>
<field name="Render Target View Extent" start="135" end="145" type="uint"/>
<field name="Multisampled Surface Storage Format" start="134" end="134" type="uint">
<value name="MSS" value="0"/>
<value name="DEPTH_STENCIL" value="1"/>
<value name="MSFMT_MSS" value="0"/>
<value name="MSFMT_DEPTH_STENCIL" value="1"/>
</field>
<field name="Number of Multisamples" start="131" end="133" type="uint">
<value name="MULTISAMPLECOUNT_1" value="0"/>

4
src/intel/genxml/gen9.xml
View File

@@ -313,8 +313,8 @@
<field name="Minimum Array Element" start="146" end="156" type="uint"/>
<field name="Render Target View Extent" start="135" end="145" type="uint"/>
<field name="Multisampled Surface Storage Format" start="134" end="134" type="uint">
<value name="MSS" value="0"/>
<value name="DEPTH_STENCIL" value="1"/>
<value name="MSFMT_MSS" value="0"/>
<value name="MSFMT_DEPTH_STENCIL" value="1"/>
</field>
<field name="Number of Multisamples" start="131" end="133" type="uint">
<value name="MULTISAMPLECOUNT_1" value="0"/>

8
src/intel/isl/isl_surface_state.c
View File

@@ -76,19 +76,11 @@ static const uint8_t isl_to_gen_tiling[] = {
};
#endif
#if GEN_GEN >= 8
static const uint32_t isl_to_gen_multisample_layout[] = {
[ISL_MSAA_LAYOUT_NONE] = MSS,
[ISL_MSAA_LAYOUT_INTERLEAVED] = DEPTH_STENCIL,
[ISL_MSAA_LAYOUT_ARRAY] = MSS,
};
#else
static const uint32_t isl_to_gen_multisample_layout[] = {
[ISL_MSAA_LAYOUT_NONE] = MSFMT_MSS,
[ISL_MSAA_LAYOUT_INTERLEAVED] = MSFMT_DEPTH_STENCIL,
[ISL_MSAA_LAYOUT_ARRAY] = MSFMT_MSS,
};
#endif
static uint8_t
get_surftype(enum isl_surf_dim dim, isl_surf_usage_flags_t usage)