genxml: Normalize xml for 3DSTATE_MULTISAMPLE.

Name the options to "Pixel Location":
   - PIXLOC_CENTER -> CENTER
   - PIXLOC_UL_CORNER -> UL_CORNER

Signed-off-by: Rafael Antognolli <rafael.antognolli@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/intel/blorp/blorp_genX_exec.h b/src/intel/blorp/blorp_genX_exec.h
index bc829d026cbc2b0f053cf08545c9b21dab01525d..be22be09ab556c922e6d6cbadb709ee98d23b66f 100644 (file)
--- a/src/intel/blorp/blorp_genX_exec.h
+++ b/src/intel/blorp/blorp_genX_exec.h
@@ -1188,9 +1188,7 @@ blorp_emit_3dstate_multisample(struct blorp_batch *batch,
        *    should not have any effect by setting or not setting this bit.
        */
       ms.PixelPositionOffsetEnable  = false;
-      ms.PixelLocation              = CENTER;
 #elif GEN_GEN >= 7
-      ms.PixelLocation              = PIXLOC_CENTER;
 
       switch (params->num_samples) {
       case 1:
@@ -1209,9 +1207,9 @@ blorp_emit_3dstate_multisample(struct blorp_batch *batch,
          break;
       }
 #else
-      ms.PixelLocation              = PIXLOC_CENTER;
       GEN_SAMPLE_POS_4X(ms.Sample);
 #endif
+      ms.PixelLocation              = CENTER;
    }
 }
 

diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml
index 2cb9419473f75ee6e552e3e5fa3476498abbc826..a8ce7e06651bfe273494e696da41870b7a2f9ec0 100644 (file)
--- a/src/intel/genxml/gen6.xml
+++ b/src/intel/genxml/gen6.xml
@@ -1089,8 +1089,8 @@
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="13"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="1"/>
     <field name="Pixel Location" start="36" end="36" type="uint">
-      <value name="PIXLOC_CENTER" value="0"/>
-      <value name="PIXLOC_UL_CORNER" value="1"/>
+      <value name="CENTER" value="0"/>
+      <value name="UL_CORNER" value="1"/>
     </field>
     <field name="Number of Multisamples" start="33" end="35" type="uint">
       <value name="NUMSAMPLES_1" value="0"/>

diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml
index 75954fe56715e8482e991f84798d572e9a823785..fd70414f526f1cbae32b3327f21f1dce98af5825 100644 (file)
--- a/src/intel/genxml/gen7.xml
+++ b/src/intel/genxml/gen7.xml
@@ -1262,8 +1262,8 @@
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="13"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="2"/>
     <field name="Pixel Location" start="36" end="36" type="uint">
-      <value name="PIXLOC_CENTER" value="0"/>
-      <value name="PIXLOC_UL_CORNER" value="1"/>
+      <value name="CENTER" value="0"/>
+      <value name="UL_CORNER" value="1"/>
     </field>
     <field name="Number of Multisamples" start="33" end="35" type="uint">
       <value name="NUMSAMPLES_1" value="0"/>

diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml
index 1e64fef7d2fcca28422bd146cccdb455576e06b9..ac2dbc34c27b5940f541442ae514604ac922a2c6 100644 (file)
--- a/src/intel/genxml/gen75.xml
+++ b/src/intel/genxml/gen75.xml
@@ -1548,8 +1548,8 @@
     <field name="DWord Length" start="0" end="7" type="uint" default="2"/>
     <field name="Multi Sample Enable" start="37" end="37" type="bool"/>
     <field name="Pixel Location" start="36" end="36" type="uint">
-      <value name="PIXLOC_CENTER" value="0"/>
-      <value name="PIXLOC_UL_CORNER" value="1"/>
+      <value name="CENTER" value="0"/>
+      <value name="UL_CORNER" value="1"/>
     </field>
     <field name="Number of Multisamples" start="33" end="35" type="uint">
       <value name="NUMSAMPLES_1" value="0"/>

diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c
index d4e6182684e6cf96355f98c207889577df11cddb..a4d318ec3e9bb08d38e509e12bce8619e8491d43 100644 (file)
--- a/src/intel/vulkan/genX_pipeline.c
+++ b/src/intel/vulkan/genX_pipeline.c
@@ -552,6 +552,7 @@ emit_ms_state(struct anv_pipeline *pipeline,
    anv_batch_emit(&pipeline->batch, GENX(3DSTATE_MULTISAMPLE), ms) {
       ms.NumberofMultisamples       = log2_samples;
 
+      ms.PixelLocation              = CENTER;
 #if GEN_GEN >= 8
       /* The PRM says that this bit is valid only for DX9:
        *
@@ -559,9 +560,7 @@ emit_ms_state(struct anv_pipeline *pipeline,
        *    should not have any effect by setting or not setting this bit.
        */
       ms.PixelPositionOffsetEnable  = false;
-      ms.PixelLocation              = CENTER;
 #else
-      ms.PixelLocation              = PIXLOC_CENTER;
 
       switch (samples) {
       case 1: