This is what gen7 does and it's nice to have a prefix
---
src/intel/genxml/gen8.xml | 4 ++--
src/intel/genxml/gen9.xml | 4 ++--
src/intel/isl/isl_surface_state.c | 8 --------
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml
index 1d6a43f..09671ba 100644
--- a/src/intel/genxml/gen8.xml
+++ b/src/intel/genxml/gen8.xml
@@ -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"/>
diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
index 2c01c56..f527838 100644
--- a/src/intel/genxml/gen9.xml
+++ b/src/intel/genxml/gen9.xml
@@ -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"/>
diff --git a/src/intel/isl/isl_surface_state.c
b/src/intel/isl/isl_surface_state.c
index e96d3b0..51c5953 100644
--- a/src/intel/isl/isl_surface_state.c
+++ b/src/intel/isl/isl_surface_state.c
@@ -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)
--
2.5.0.400.gff86faf
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
