Set the type of some fields, instead of prefix. Also fix the
SAMPLER_BORDER_COLOR_STATE fields of gen5.xml.
Signed-off-by: Rafael Antognolli <rafael.antogno...@intel.com>
---
src/intel/genxml/gen4.xml | 13 +++++-----
src/intel/genxml/gen45.xml | 12 ++++-----
src/intel/genxml/gen5.xml | 52 +++++++++++++++++++--------------------
3 files changed, 39 insertions(+), 38 deletions(-)
diff --git a/src/intel/genxml/gen4.xml b/src/intel/genxml/gen4.xml
index 1cdae22..0ea66e5 100644
--- a/src/intel/genxml/gen4.xml
+++ b/src/intel/genxml/gen4.xml
@@ -375,12 +375,12 @@
<value name="NDCSPACE" value="0"/>
<value name="SCREENSPACE" value="1"/>
</field>
- <field name="Viewport XY ClipTest Enable" start="188" end="188"
prefix="bool"/>
- <field name="Viewport Z ClipTest Enable" start="187" end="187"
prefix="bool"/>
- <field name="Guardband ClipTest Enable" start="186" end="186"
prefix="bool"/>
- <field name="UserClipFlags MustClip Enable" start="184" end="184"
prefix="bool"/>
- <field name="UserClipFlags ClipTest Enable Bitmask" start="176" end="183"
prefix="bool"/>
- <field name="Clip Mode" start="173" end="175" prefix="CLIPMODE">
+ <field name="Viewport XY ClipTest Enable" start="188" end="188"
type="bool"/>
+ <field name="Viewport Z ClipTest Enable" start="187" end="187"
type="bool"/>
+ <field name="Guardband ClipTest Enable" start="186" end="186" type="bool"/>
+ <field name="UserClipFlags MustClip Enable" start="184" end="184"
type="bool"/>
+ <field name="UserClipFlags ClipTest Enable Bitmask" start="176" end="183"
type="bool"/>
+ <field name="Clip Mode" start="173" end="175" type="uint"
prefix="CLIPMODE">
<value name="NORMAL" value="0"/>
<value name="ALL" value="1"/>
<value name="CLIP_NON_REJECTED" value="2"/>
@@ -708,6 +708,7 @@
<field name="Buffer Pitch" start="0" end="10" type="uint"/>
<field name="Buffer Starting Address" start="32" end="63" type="address"/>
<field name="Max Index" start="64" end="95" type="uint"/>
+ <field name="Instance Data Step Rate" start="96" end="127" type="uint"/>
</struct>
<struct name="VERTEX_ELEMENT_STATE" length="2">
diff --git a/src/intel/genxml/gen45.xml b/src/intel/genxml/gen45.xml
index 1bf6840..bff32f9 100644
--- a/src/intel/genxml/gen45.xml
+++ b/src/intel/genxml/gen45.xml
@@ -376,12 +376,12 @@
<value name="NDCSPACE" value="0"/>
<value name="SCREENSPACE" value="1"/>
</field>
- <field name="Viewport XY ClipTest Enable" start="188" end="188"
prefix="bool"/>
- <field name="Viewport Z ClipTest Enable" start="187" end="187"
prefix="bool"/>
- <field name="Guardband ClipTest Enable" start="186" end="186"
prefix="bool"/>
- <field name="UserClipFlags MustClip Enable" start="184" end="184"
prefix="bool"/>
- <field name="UserClipFlags ClipTest Enable Bitmask" start="176" end="183"
prefix="bool"/>
- <field name="Clip Mode" start="173" end="175" prefix="CLIPMODE">
+ <field name="Viewport XY ClipTest Enable" start="188" end="188"
type="bool"/>
+ <field name="Viewport Z ClipTest Enable" start="187" end="187"
type="bool"/>
+ <field name="Guardband ClipTest Enable" start="186" end="186" type="bool"/>
+ <field name="UserClipFlags MustClip Enable" start="184" end="184"
type="bool"/>
+ <field name="UserClipFlags ClipTest Enable Bitmask" start="176" end="183"
type="bool"/>
+ <field name="Clip Mode" start="173" end="175" type="uint"
prefix="CLIPMODE">
<value name="NORMAL" value="0"/>
<value name="ALL" value="1"/>
<value name="CLIP_NON_REJECTED" value="2"/>
diff --git a/src/intel/genxml/gen5.xml b/src/intel/genxml/gen5.xml
index db0ae46..fc6f248 100644
--- a/src/intel/genxml/gen5.xml
+++ b/src/intel/genxml/gen5.xml
@@ -374,12 +374,12 @@
<value name="NDCSPACE" value="0"/>
<value name="SCREENSPACE" value="1"/>
</field>
- <field name="Viewport XY ClipTest Enable" start="188" end="188"
prefix="bool"/>
- <field name="Viewport Z ClipTest Enable" start="187" end="187"
prefix="bool"/>
- <field name="Guardband ClipTest Enable" start="186" end="186"
prefix="bool"/>
- <field name="UserClipFlags MustClip Enable" start="184" end="184"
prefix="bool"/>
- <field name="UserClipFlags ClipTest Enable Bitmask" start="176" end="183"
prefix="bool"/>
- <field name="Clip Mode" start="173" end="175" prefix="CLIPMODE">
+ <field name="Viewport XY ClipTest Enable" start="188" end="188"
type="bool"/>
+ <field name="Viewport Z ClipTest Enable" start="187" end="187"
type="bool"/>
+ <field name="Guardband ClipTest Enable" start="186" end="186" type="bool"/>
+ <field name="UserClipFlags MustClip Enable" start="184" end="184"
type="bool"/>
+ <field name="UserClipFlags ClipTest Enable Bitmask" start="176" end="183"
type="bool"/>
+ <field name="Clip Mode" start="173" end="175" type="uint"
prefix="CLIPMODE">
<value name="NORMAL" value="0"/>
<value name="ALL" value="1"/>
<value name="CLIP_NON_REJECTED" value="2"/>
@@ -497,30 +497,30 @@
<field name="Border Color Unorm Blue" start="16" end="23" type="uint"/>
<field name="Border Color Unorm Alpha" start="24" end="31" type="uint"/>
- <field name="Border Color Unorm Red" start="32" end="39" type="int"/>
- <field name="Border Color Unorm Green" start="40" end="47" type="int"/>
- <field name="Border Color Unorm Blue" start="48" end="55" type="int"/>
- <field name="Border Color Unorm Alpha" start="56" end="63" type="int"/>
+ <field name="Border Color Float Red" start="32" end="39" type="int"/>
+ <field name="Border Color Float Green" start="40" end="47" type="int"/>
+ <field name="Border Color Float Blue" start="48" end="55" type="int"/>
+ <field name="Border Color Float Alpha" start="56" end="63" type="int"/>
- <field name="Border Color Float Red" start="64" end="95" type="float"/>
- <field name="Border Color Float Green" start="96" end="127" type="float"/>
- <field name="Border Color Float Blue" start="128" end="159" type="float"/>
- <field name="Border Color Float Alpha" start="160" end="191" type="float"/>
+ <field name="Border Color Float16 Red" start="64" end="95" type="float"/>
+ <field name="Border Color Float16 Green" start="96" end="127"
type="float"/>
+ <field name="Border Color Float16 Blue" start="128" end="159"
type="float"/>
+ <field name="Border Color Float16 Alpha" start="160" end="191"
type="float"/>
- <field name="Border Color Float16 Red" start="192" end="207" type="uint"/>
- <field name="Border Color Float16 Green" start="208" end="223"
type="uint"/>
- <field name="Border Color Float16 Blue" start="224" end="239" type="uint"/>
- <field name="Border Color Float16 Alpha" start="240" end="255"
type="uint"/>
+ <field name="Border Color Unorm16 Red" start="192" end="207" type="uint"/>
+ <field name="Border Color Unorm16 Green" start="208" end="223"
type="uint"/>
+ <field name="Border Color Unorm16 Blue" start="224" end="239" type="uint"/>
+ <field name="Border Color Unorm16 Alpha" start="240" end="255"
type="uint"/>
- <field name="Border Color Unorm16 Red" start="256" end="271" type="uint"/>
- <field name="Border Color Unorm16 Green" start="272" end="287"
type="uint"/>
- <field name="Border Color Unorm16 Blue" start="288" end="303" type="uint"/>
- <field name="Border Color Unorm16 Alpha" start="304" end="319"
type="uint"/>
+ <field name="Border Color Snorm16 Red" start="256" end="271" type="uint"/>
+ <field name="Border Color Snorm16 Green" start="272" end="287"
type="uint"/>
+ <field name="Border Color Snorm16 Blue" start="288" end="303" type="uint"/>
+ <field name="Border Color Snorm16 Alpha" start="304" end="319"
type="uint"/>
- <field name="Border Color Snorm16 Red" start="320" end="335" type="int"/>
- <field name="Border Color Snorm16 Green" start="336" end="351" type="int"/>
- <field name="Border Color Snorm16 Blue" start="352" end="367" type="int"/>
- <field name="Border Color Snorm16 Alpha" start="368" end="383" type="int"/>
+ <field name="Border Color Snorm8 Red" start="320" end="335" type="int"/>
+ <field name="Border Color Snorm8 Green" start="336" end="351" type="int"/>
+ <field name="Border Color Snorm8 Blue" start="352" end="367" type="int"/>
+ <field name="Border Color Snorm8 Alpha" start="368" end="383" type="int"/>
</struct>
<struct name="SAMPLER_STATE" length="4">
--
git-series 0.9.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
