Mesa (master): intel/genxml: Use blend function and factor enums where applicable
Kristian Høgsberg
krh at kemper.freedesktop.org
Wed Nov 30 06:04:25 UTC 2016
Module: Mesa
Branch: master
Commit: 374d19ac005b1aa1e6d4fdb33a652ceb44ed63d0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=374d19ac005b1aa1e6d4fdb33a652ceb44ed63d0
Author: Kristian H. Kristensen <hoegsberg at gmail.com>
Date: Mon Nov 28 17:42:46 2016 -0800
intel/genxml: Use blend function and factor enums where applicable
Signed-off-by: Kristian H. Kristensen <hoegsberg at gmail.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
---
src/intel/genxml/gen6.xml | 74 ++++++++++++++++++++++------------------------
src/intel/genxml/gen7.xml | 74 ++++++++++++++++++++++------------------------
src/intel/genxml/gen75.xml | 74 ++++++++++++++++++++++------------------------
src/intel/genxml/gen8.xml | 12 ++++----
src/intel/genxml/gen9.xml | 20 ++++++-------
5 files changed, 124 insertions(+), 130 deletions(-)
diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml
index 69f11c4..de626a7 100644
--- a/src/intel/genxml/gen6.xml
+++ b/src/intel/genxml/gen6.xml
@@ -34,6 +34,36 @@
<value name="STORE_PID" value="7"/>
</enum>
+ <enum name="3D_Color_Buffer_Blend_Function" prefix="BLENDFUNCTION">
+ <value name="ADD" value="0"/>
+ <value name="SUBTRACT" value="1"/>
+ <value name="REVERSE_SUBTRACT" value="2"/>
+ <value name="MIN" value="3"/>
+ <value name="MAX" value="4"/>
+ </enum>
+
+ <enum name="3D_Color_Buffer_Blend_Factor" prefix="BLENDFACTOR">
+ <value name="ONE" value="1"/>
+ <value name="SRC_COLOR" value="2"/>
+ <value name="SRC_ALPHA" value="3"/>
+ <value name="DST_ALPHA" value="4"/>
+ <value name="DST_COLOR" value="5"/>
+ <value name="SRC_ALPHA_SATURATE" value="6"/>
+ <value name="CONST_COLOR" value="7"/>
+ <value name="CONST_ALPHA" value="8"/>
+ <value name="SRC1_COLOR" value="9"/>
+ <value name="SRC1_ALPHA" value="10"/>
+ <value name="ZERO" value="17"/>
+ <value name="INV_SRC_COLOR" value="18"/>
+ <value name="INV_SRC_ALPHA" value="19"/>
+ <value name="INV_DST_ALPHA" value="20"/>
+ <value name="INV_DST_COLOR" value="21"/>
+ <value name="INV_CONST_COLOR" value="23"/>
+ <value name="INV_CONST_ALPHA" value="24"/>
+ <value name="INV_SRC1_COLOR" value="25"/>
+ <value name="INV_SRC1_ALPHA" value="26"/>
+ </enum>
+
<enum name="3D_Compare_Function" prefix="COMPAREFUNCTION">
<value name="ALWAYS" value="0"/>
<value name="NEVER" value="1"/>
@@ -373,44 +403,12 @@
<struct name="BLEND_STATE_ENTRY" length="2">
<field name="Color Buffer Blend Enable" start="31" end="31" type="bool"/>
<field name="Independent Alpha Blend Enable" start="30" end="30" type="bool"/>
- <field name="Alpha Blend Function" start="26" end="28" type="uint">
- <value name="BLENDFUNCTION_ADD" value="0"/>
- <value name="BLENDFUNCTION_SUBTRACT" value="1"/>
- <value name="BLENDFUNCTION_REVERSE_SUBTRACT" value="2"/>
- <value name="BLENDFUNCTION_MIN" value="3"/>
- <value name="BLENDFUNCTION_MAX" value="4"/>
- </field>
- <field name="Source Alpha Blend Factor" start="20" end="24" type="uint">
- <value name="BLENDFACTOR_ONE" value="1"/>
- <value name="BLENDFACTOR_SRC_COLOR" value="2"/>
- <value name="BLENDFACTOR_SRC_ALPHA" value="3"/>
- <value name="BLENDFACTOR_DST_ALPHA" value="4"/>
- <value name="BLENDFACTOR_DST_COLOR" value="5"/>
- <value name="BLENDFACTOR_SRC_ALPHA_SATURATE" value="6"/>
- <value name="BLENDFACTOR_CONST_COLOR" value="7"/>
- <value name="BLENDFACTOR_CONST_ALPHA" value="8"/>
- <value name="BLENDFACTOR_SRC1_COLOR" value="9"/>
- <value name="BLENDFACTOR_SRC1_ALPHA" value="10"/>
- <value name="BLENDFACTOR_ZERO" value="17"/>
- <value name="BLENDFACTOR_INV_SRC_COLOR" value="18"/>
- <value name="BLENDFACTOR_INV_SRC_ALPHA" value="19"/>
- <value name="BLENDFACTOR_INV_DST_ALPHA" value="20"/>
- <value name="BLENDFACTOR_INV_DST_COLOR" value="21"/>
- <value name="BLENDFACTOR_INV_CONST_COLOR" value="23"/>
- <value name="BLENDFACTOR_INV_CONST_ALPHA" value="24"/>
- <value name="BLENDFACTOR_INV_SRC1_COLOR" value="25"/>
- <value name="BLENDFACTOR_INV_SRC1_ALPHA" value="26"/>
- </field>
- <field name="Destination Alpha Blend Factor" start="15" end="19" type="uint"/>
- <field name="Color Blend Function" start="11" end="13" type="uint">
- <value name="BLENDFUNCTION_ADD" value="0"/>
- <value name="BLENDFUNCTION_SUBTRACT" value="1"/>
- <value name="BLENDFUNCTION_REVERSE_SUBTRACT" value="2"/>
- <value name="BLENDFUNCTION_MIN " value="3"/>
- <value name="BLENDFUNCTION_MAX" value="4"/>
- </field>
- <field name="Source Blend Factor" start="5" end="9" type="uint"/>
- <field name="Destination Blend Factor" start="0" end="4" type="uint"/>
+ <field name="Alpha Blend Function" start="26" end="28" type="3D_Color_Buffer_Blend_Function"/>
+ <field name="Source Alpha Blend Factor" start="20" end="24" type="3D_Color_Buffer_Blend_Factor"/>
+ <field name="Destination Alpha Blend Factor" start="15" end="19" type="3D_Color_Buffer_Blend_Factor"/>
+ <field name="Color Blend Function" start="11" end="13" type="3D_Color_Buffer_Blend_Function"/>
+ <field name="Source Blend Factor" start="5" end="9" type="3D_Color_Buffer_Blend_Factor"/>
+ <field name="Destination Blend Factor" start="0" end="4" type="3D_Color_Buffer_Blend_Factor"/>
<field name="AlphaToCoverage Enable" start="63" end="63" type="bool"/>
<field name="AlphaToOne Enable" start="62" end="62" type="bool"/>
<field name="AlphaToCoverage Dither Enable" start="61" end="61" type="bool"/>
diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml
index 65e2240..2c269d4 100644
--- a/src/intel/genxml/gen7.xml
+++ b/src/intel/genxml/gen7.xml
@@ -77,6 +77,36 @@
<value name="INVERT" value="7"/>
</enum>
+ <enum name="3D_Color_Buffer_Blend_Factor" prefix="BLENDFACTOR">
+ <value name="ONE" value="1"/>
+ <value name="SRC_COLOR" value="2"/>
+ <value name="SRC_ALPHA" value="3"/>
+ <value name="DST_ALPHA" value="4"/>
+ <value name="DST_COLOR" value="5"/>
+ <value name="SRC_ALPHA_SATURATE" value="6"/>
+ <value name="CONST_COLOR" value="7"/>
+ <value name="CONST_ALPHA" value="8"/>
+ <value name="SRC1_COLOR" value="9"/>
+ <value name="SRC1_ALPHA" value="10"/>
+ <value name="ZERO" value="17"/>
+ <value name="INV_SRC_COLOR" value="18"/>
+ <value name="INV_SRC_ALPHA" value="19"/>
+ <value name="INV_DST_ALPHA" value="20"/>
+ <value name="INV_DST_COLOR" value="21"/>
+ <value name="INV_CONST_COLOR" value="23"/>
+ <value name="INV_CONST_ALPHA" value="24"/>
+ <value name="INV_SRC1_COLOR" value="25"/>
+ <value name="INV_SRC1_ALPHA" value="26"/>
+ </enum>
+
+ <enum name="3D_Color_Buffer_Blend_Function" prefix="BLENDFUNCTION">
+ <value name="ADD" value="0"/>
+ <value name="SUBTRACT" value="1"/>
+ <value name="REVERSE_SUBTRACT" value="2"/>
+ <value name="MIN" value="3"/>
+ <value name="MAX" value="4"/>
+ </enum>
+
<enum name="3D_Compare_Function" prefix="COMPAREFUNCTION">
<value name="ALWAYS" value="0"/>
<value name="NEVER" value="1"/>
@@ -428,44 +458,12 @@
<struct name="BLEND_STATE_ENTRY" length="2">
<field name="Color Buffer Blend Enable" start="31" end="31" type="bool"/>
<field name="Independent Alpha Blend Enable" start="30" end="30" type="bool"/>
- <field name="Alpha Blend Function" start="26" end="28" type="uint">
- <value name="BLENDFUNCTION_ADD" value="0"/>
- <value name="BLENDFUNCTION_SUBTRACT" value="1"/>
- <value name="BLENDFUNCTION_REVERSE_SUBTRACT" value="2"/>
- <value name="BLENDFUNCTION_MIN" value="3"/>
- <value name="BLENDFUNCTION_MAX" value="4"/>
- </field>
- <field name="Source Alpha Blend Factor" start="20" end="24" type="uint">
- <value name="BLENDFACTOR_ONE" value="1"/>
- <value name="BLENDFACTOR_SRC_COLOR" value="2"/>
- <value name="BLENDFACTOR_SRC_ALPHA" value="3"/>
- <value name="BLENDFACTOR_DST_ALPHA" value="4"/>
- <value name="BLENDFACTOR_DST_COLOR" value="5"/>
- <value name="BLENDFACTOR_SRC_ALPHA_SATURATE" value="6"/>
- <value name="BLENDFACTOR_CONST_COLOR" value="7"/>
- <value name="BLENDFACTOR_CONST_ALPHA" value="8"/>
- <value name="BLENDFACTOR_SRC1_COLOR" value="9"/>
- <value name="BLENDFACTOR_SRC1_ALPHA" value="10"/>
- <value name="BLENDFACTOR_ZERO" value="17"/>
- <value name="BLENDFACTOR_INV_SRC_COLOR" value="18"/>
- <value name="BLENDFACTOR_INV_SRC_ALPHA" value="19"/>
- <value name="BLENDFACTOR_INV_DST_ALPHA" value="20"/>
- <value name="BLENDFACTOR_INV_DST_COLOR" value="21"/>
- <value name="BLENDFACTOR_INV_CONST_COLOR" value="23"/>
- <value name="BLENDFACTOR_INV_CONST_ALPHA" value="24"/>
- <value name="BLENDFACTOR_INV_SRC1_COLOR" value="25"/>
- <value name="BLENDFACTOR_INV_SRC1_ALPHA" value="26"/>
- </field>
- <field name="Destination Alpha Blend Factor" start="15" end="19" type="uint"/>
- <field name="Color Blend Function" start="11" end="13" type="uint">
- <value name="BLENDFUNCTION_ADD" value="0"/>
- <value name="BLENDFUNCTION_SUBTRACT" value="1"/>
- <value name="BLENDFUNCTION_REVERSE_SUBTRACT" value="2"/>
- <value name="BLENDFUNCTION_MIN " value="3"/>
- <value name="BLENDFUNCTION_MAX" value="4"/>
- </field>
- <field name="Source Blend Factor" start="5" end="9" type="uint"/>
- <field name="Destination Blend Factor" start="0" end="4" type="uint"/>
+ <field name="Alpha Blend Function" start="26" end="28" type="3D_Color_Buffer_Blend_Function"/>
+ <field name="Source Alpha Blend Factor" start="20" end="24" type="3D_Color_Buffer_Blend_Factor"/>
+ <field name="Destination Alpha Blend Factor" start="15" end="19" type="3D_Color_Buffer_Blend_Factor"/>
+ <field name="Color Blend Function" start="11" end="13" type="3D_Color_Buffer_Blend_Function"/>
+ <field name="Source Blend Factor" start="5" end="9" type="3D_Color_Buffer_Blend_Factor"/>
+ <field name="Destination Blend Factor" start="0" end="4" type="3D_Color_Buffer_Blend_Factor"/>
<field name="AlphaToCoverage Enable" start="63" end="63" type="bool"/>
<field name="AlphaToOne Enable" start="62" end="62" type="bool"/>
<field name="AlphaToCoverage Dither Enable" start="61" end="61" type="bool"/>
diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml
index e5fbe15..0104236 100644
--- a/src/intel/genxml/gen75.xml
+++ b/src/intel/genxml/gen75.xml
@@ -77,6 +77,36 @@
<value name="INVERT" value="7"/>
</enum>
+ <enum name="3D_Color_Buffer_Blend_Factor" prefix="BLENDFACTOR">
+ <value name="ONE" value="1"/>
+ <value name="SRC_COLOR" value="2"/>
+ <value name="SRC_ALPHA" value="3"/>
+ <value name="DST_ALPHA" value="4"/>
+ <value name="DST_COLOR" value="5"/>
+ <value name="SRC_ALPHA_SATURATE" value="6"/>
+ <value name="CONST_COLOR" value="7"/>
+ <value name="CONST_ALPHA" value="8"/>
+ <value name="SRC1_COLOR" value="9"/>
+ <value name="SRC1_ALPHA" value="10"/>
+ <value name="ZERO" value="17"/>
+ <value name="INV_SRC_COLOR" value="18"/>
+ <value name="INV_SRC_ALPHA" value="19"/>
+ <value name="INV_DST_ALPHA" value="20"/>
+ <value name="INV_DST_COLOR" value="21"/>
+ <value name="INV_CONST_COLOR" value="23"/>
+ <value name="INV_CONST_ALPHA" value="24"/>
+ <value name="INV_SRC1_COLOR" value="25"/>
+ <value name="INV_SRC1_ALPHA" value="26"/>
+ </enum>
+
+ <enum name="3D_Color_Buffer_Blend_Function" prefix="BLENDFUNCTION">
+ <value name="ADD" value="0"/>
+ <value name="SUBTRACT" value="1"/>
+ <value name="REVERSE_SUBTRACT" value="2"/>
+ <value name="MIN" value="3"/>
+ <value name="MAX" value="4"/>
+ </enum>
+
<enum name="3D_Compare_Function" prefix="COMPAREFUNCTION">
<value name="ALWAYS" value="0"/>
<value name="NEVER" value="1"/>
@@ -438,44 +468,12 @@
<struct name="BLEND_STATE_ENTRY" length="2">
<field name="Color Buffer Blend Enable" start="31" end="31" type="bool"/>
<field name="Independent Alpha Blend Enable" start="30" end="30" type="bool"/>
- <field name="Alpha Blend Function" start="26" end="28" type="uint">
- <value name="BLENDFUNCTION_ADD" value="0"/>
- <value name="BLENDFUNCTION_SUBTRACT" value="1"/>
- <value name="BLENDFUNCTION_REVERSE_SUBTRACT" value="2"/>
- <value name="BLENDFUNCTION_MIN" value="3"/>
- <value name="BLENDFUNCTION_MAX" value="4"/>
- </field>
- <field name="Source Alpha Blend Factor" start="20" end="24" type="uint">
- <value name="BLENDFACTOR_ONE" value="1"/>
- <value name="BLENDFACTOR_SRC_COLOR" value="2"/>
- <value name="BLENDFACTOR_SRC_ALPHA" value="3"/>
- <value name="BLENDFACTOR_DST_ALPHA" value="4"/>
- <value name="BLENDFACTOR_DST_COLOR" value="5"/>
- <value name="BLENDFACTOR_SRC_ALPHA_SATURATE" value="6"/>
- <value name="BLENDFACTOR_CONST_COLOR" value="7"/>
- <value name="BLENDFACTOR_CONST_ALPHA" value="8"/>
- <value name="BLENDFACTOR_SRC1_COLOR" value="9"/>
- <value name="BLENDFACTOR_SRC1_ALPHA" value="10"/>
- <value name="BLENDFACTOR_ZERO" value="17"/>
- <value name="BLENDFACTOR_INV_SRC_COLOR" value="18"/>
- <value name="BLENDFACTOR_INV_SRC_ALPHA" value="19"/>
- <value name="BLENDFACTOR_INV_DST_ALPHA" value="20"/>
- <value name="BLENDFACTOR_INV_DST_COLOR" value="21"/>
- <value name="BLENDFACTOR_INV_CONST_COLOR" value="23"/>
- <value name="BLENDFACTOR_INV_CONST_ALPHA" value="24"/>
- <value name="BLENDFACTOR_INV_SRC1_COLOR" value="25"/>
- <value name="BLENDFACTOR_INV_SRC1_ALPHA" value="26"/>
- </field>
- <field name="Destination Alpha Blend Factor" start="15" end="19" type="uint"/>
- <field name="Color Blend Function" start="11" end="13" type="uint">
- <value name="BLENDFUNCTION_ADD" value="0"/>
- <value name="BLENDFUNCTION_SUBTRACT" value="1"/>
- <value name="BLENDFUNCTION_REVERSE_SUBTRACT" value="2"/>
- <value name="BLENDFUNCTION_MIN " value="3"/>
- <value name="BLENDFUNCTION_MAX" value="4"/>
- </field>
- <field name="Source Blend Factor" start="5" end="9" type="uint"/>
- <field name="Destination Blend Factor" start="0" end="4" type="uint"/>
+ <field name="Alpha Blend Function" start="26" end="28" type="3D_Color_Buffer_Blend_Function"/>
+ <field name="Source Alpha Blend Factor" start="20" end="24" type="3D_Color_Buffer_Blend_Factor"/>
+ <field name="Destination Alpha Blend Factor" start="15" end="19" type="3D_Color_Buffer_Blend_Factor"/>
+ <field name="Color Blend Function" start="11" end="13" type="3D_Color_Buffer_Blend_Function"/>
+ <field name="Source Blend Factor" start="5" end="9" type="3D_Color_Buffer_Blend_Factor"/>
+ <field name="Destination Blend Factor" start="0" end="4" type="3D_Color_Buffer_Blend_Factor"/>
<field name="AlphaToCoverage Enable" start="63" end="63" type="bool"/>
<field name="AlphaToOne Enable" start="62" end="62" type="bool"/>
<field name="AlphaToCoverage Dither Enable" start="61" end="61" type="bool"/>
diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml
index f55c121..f9c1ab3 100644
--- a/src/intel/genxml/gen8.xml
+++ b/src/intel/genxml/gen8.xml
@@ -533,12 +533,12 @@
<field name="Pre-Blend Color Clamp Enable" start="33" end="33" type="bool"/>
<field name="Post-Blend Color Clamp Enable" start="32" end="32" type="bool"/>
<field name="Color Buffer Blend Enable" start="31" end="31" type="bool"/>
- <field name="Source Blend Factor" start="26" end="30" type="uint"/>
- <field name="Destination Blend Factor" start="21" end="25" type="uint"/>
- <field name="Color Blend Function" start="18" end="20" type="uint"/>
- <field name="Source Alpha Blend Factor" start="13" end="17" type="uint"/>
- <field name="Destination Alpha Blend Factor" start="8" end="12" type="uint"/>
- <field name="Alpha Blend Function" start="5" end="7" type="uint"/>
+ <field name="Source Blend Factor" start="26" end="30" type="3D_Color_Buffer_Blend_Factor"/>
+ <field name="Destination Blend Factor" start="21" end="25" type="3D_Color_Buffer_Blend_Factor"/>
+ <field name="Color Blend Function" start="18" end="20" type="3D_Color_Buffer_Blend_Function"/>
+ <field name="Source Alpha Blend Factor" start="13" end="17" type="3D_Color_Buffer_Blend_Factor"/>
+ <field name="Destination Alpha Blend Factor" start="8" end="12" type="3D_Color_Buffer_Blend_Factor"/>
+ <field name="Alpha Blend Function" start="5" end="7" type="3D_Color_Buffer_Blend_Function"/>
<field name="Write Disable Alpha" start="3" end="3" type="bool"/>
<field name="Write Disable Red" start="2" end="2" type="bool"/>
<field name="Write Disable Green" start="1" end="1" type="bool"/>
diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
index 5c91074..5ba6ba1 100644
--- a/src/intel/genxml/gen9.xml
+++ b/src/intel/genxml/gen9.xml
@@ -542,12 +542,12 @@
<field name="Pre-Blend Color Clamp Enable" start="33" end="33" type="bool"/>
<field name="Post-Blend Color Clamp Enable" start="32" end="32" type="bool"/>
<field name="Color Buffer Blend Enable" start="31" end="31" type="bool"/>
- <field name="Source Blend Factor" start="26" end="30" type="uint"/>
- <field name="Destination Blend Factor" start="21" end="25" type="uint"/>
- <field name="Color Blend Function" start="18" end="20" type="uint"/>
- <field name="Source Alpha Blend Factor" start="13" end="17" type="uint"/>
- <field name="Destination Alpha Blend Factor" start="8" end="12" type="uint"/>
- <field name="Alpha Blend Function" start="5" end="7" type="uint"/>
+ <field name="Source Blend Factor" start="26" end="30" type="3D_Color_Buffer_Blend_Factor"/>
+ <field name="Destination Blend Factor" start="21" end="25" type="3D_Color_Buffer_Blend_Factor"/>
+ <field name="Color Blend Function" start="18" end="20" type="3D_Color_Buffer_Blend_Function"/>
+ <field name="Source Alpha Blend Factor" start="13" end="17" type="3D_Color_Buffer_Blend_Factor"/>
+ <field name="Destination Alpha Blend Factor" start="8" end="12" type="3D_Color_Buffer_Blend_Factor"/>
+ <field name="Alpha Blend Function" start="5" end="7" type="3D_Color_Buffer_Blend_Function"/>
<field name="Write Disable Alpha" start="3" end="3" type="bool"/>
<field name="Write Disable Red" start="2" end="2" type="bool"/>
<field name="Write Disable Green" start="1" end="1" type="bool"/>
@@ -1767,10 +1767,10 @@
<field name="Alpha To Coverage Enable" start="63" end="63" type="bool"/>
<field name="Has Writeable RT" start="62" end="62" type="bool"/>
<field name="Color Buffer Blend Enable" start="61" end="61" type="bool"/>
- <field name="Source Alpha Blend Factor" start="56" end="60" type="uint"/>
- <field name="Destination Alpha Blend Factor" start="51" end="55" type="uint"/>
- <field name="Source Blend Factor" start="46" end="50" type="uint"/>
- <field name="Destination Blend Factor" start="41" end="45" type="uint"/>
+ <field name="Source Alpha Blend Factor" start="56" end="60" type="3D_Color_Buffer_Blend_Factor"/>
+ <field name="Destination Alpha Blend Factor" start="51" end="55" type="3D_Color_Buffer_Blend_Factor"/>
+ <field name="Source Blend Factor" start="46" end="50" type="3D_Color_Buffer_Blend_Factor"/>
+ <field name="Destination Blend Factor" start="41" end="45" type="3D_Color_Buffer_Blend_Factor"/>
<field name="Alpha Test Enable" start="40" end="40" type="bool"/>
<field name="Independent Alpha Blend Enable" start="39" end="39" type="bool"/>
</instruction>
More information about the mesa-commit
mailing list