<div dir="ltr">Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>><br></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Feb 21, 2018 at 1:45 PM, Rafael Antognolli <span dir="ltr"><<a href="mailto:rafael.antognolli@intel.com" target="_blank">rafael.antognolli@intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">genxml does not support having two address fields with different names<br>
but same position in the state struct. Both "Clear Color Address"<br>
and "Clear Depth Address Low" mean the same thing, only for different<br>
surface types.<br>
<br>
To workaround this genxml limitation, rename "Clear Color Address"<br>
to "Clear Value Address" and use it for both color and depth. Do the<br>
same for the high bits.<br>
<br>
TODO: add support for multiple addresses at the same position in the<br>
xml.<br>
<br>
v2: Combine high and low order bits into a single address field.<br>
<br>
Signed-off-by: Rafael Antognolli <<a href="mailto:rafael.antognolli@intel.com">rafael.antognolli@intel.com</a>><br>
---<br>
src/intel/genxml/gen10.xml | 7 +++----<br>
src/intel/genxml/gen11.xml | 7 +++----<br>
2 files changed, 6 insertions(+), 8 deletions(-)<br>
<br>
diff --git a/src/intel/genxml/gen10.xml b/src/intel/genxml/gen10.xml<br>
index 47c679a3fa9..b434d1b0f66 100644<br>
--- a/src/intel/genxml/gen10.xml<br>
+++ b/src/intel/genxml/gen10.xml<br>
@@ -800,12 +800,11 @@<br>
<field name="Clear Value Address Enable" start="330" end="330" type="bool"/><br>
<field name="Quilt Height" start="325" end="329" type="uint"/><br>
<field name="Quilt Width" start="320" end="324" type="uint"/><br>
+ <!-- This address points to the address of a Clear Color in the case of<br>
+ CCS_D and CCS_E surfaces, and Depth Color for HiZ surfaces --><br>
+ <field name="Clear Value Address" start="390" end="431" type="address"/><br>
<field name="Red Clear Color" start="384" end="415" type="int"/><br>
- <field name="Clear Color Address" start="390" end="415" type="address"/><br>
- <field name="Clear Depth Address Low" start="390" end="415" type="address"/><br>
<field name="Green Clear Color" start="416" end="447" type="int"/><br>
- <field name="Clear Color Address High" start="416" end="431" type="address"/><br>
- <field name="Clear Depth Address High" start="416" end="431" type="address"/><br>
<field name="Blue Clear Color" start="448" end="479" type="int"/><br>
<field name="Alpha Clear Color" start="480" end="511" type="int"/><br>
</struct><br>
diff --git a/src/intel/genxml/gen11.xml b/src/intel/genxml/gen11.xml<br>
index 9a8a2fe21e3..d8019e7390d 100644<br>
--- a/src/intel/genxml/gen11.xml<br>
+++ b/src/intel/genxml/gen11.xml<br>
@@ -801,13 +801,12 @@<br>
<field name="Clear Value Address Enable" start="330" end="330" type="bool"/><br>
<field name="Quilt Height" start="325" end="329" type="uint"/><br>
<field name="Quilt Width" start="320" end="324" type="uint"/><br>
+ <!-- This address points to the address of a Clear Color in the case of<br>
+ CCS_D and CCS_E surfaces, and Depth Color for HiZ surfaces --><br>
+ <field name="Clear Value Address" start="390" end="431" type="address"/><br>
<field name="Red Clear Color" start="384" end="415" type="int"/><br>
- <field name="Clear Color Address" start="390" end="415" type="address"/><br>
- <field name="Clear Depth Address Low" start="390" end="415" type="address"/><br>
<field name="Clear Color Conversion Enable" start="389" end="389" type="uint"/><br>
<field name="Green Clear Color" start="416" end="447" type="int"/><br>
- <field name="Clear Color Address High" start="416" end="431" type="address"/><br>
- <field name="Clear Depth Address High" start="416" end="431" type="address"/><br>
<field name="Blue Clear Color" start="448" end="479" type="int"/><br>
<field name="Alpha Clear Color" start="480" end="511" type="int"/><br>
</struct><br>
<span class="HOEnZb"><font color="#888888">--<br>
2.14.3<br>
<br>
______________________________<wbr>_________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/mesa-dev</a><br>
</font></span></blockquote></div><br></div>