From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Fri, 3 Jun 2016 01:43:59 +0000 (-0700)
Subject: genxml/gen8,9: Prefix the multisample format enum with MSFMT
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=de1d194856ddcfc946df2df0f076cb42ff1c165d;p=mesa.git

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

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>
---

diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml
index 1d6a43f9ed1..09671ba5181 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 2c01c568988..f527838fbfd 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 e96d3b05c3c..51c5953af25 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)