fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 20:10:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel/genxml: rewrite the prefilterop xml to be more consistent.

Browse source 
This uses a prefix at Ken's suggestion and aligns it across gens

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10636>
This commit is contained in:
Dave Airlie 2021-05-05 11:18:23 +10:00 • committed by Marge Bot
parent 04ed882046
commit c6f34e9fda
14 changed files with 123 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/gallium/drivers/iris/iris_state.c
View file

@ -237,14 +237,14 @@ translate_shadow_func(enum pipe_compare_func pipe_func)
* So we need to flip the operator and also negate.
*/
static const unsigned map[] = {
[PIPE_FUNC_NEVER] = PREFILTEROPALWAYS,
[PIPE_FUNC_LESS] = PREFILTEROPLEQUAL,
[PIPE_FUNC_EQUAL] = PREFILTEROPNOTEQUAL,
[PIPE_FUNC_LEQUAL] = PREFILTEROPLESS,
[PIPE_FUNC_GREATER] = PREFILTEROPGEQUAL,
[PIPE_FUNC_NOTEQUAL] = PREFILTEROPEQUAL,
[PIPE_FUNC_GEQUAL] = PREFILTEROPGREATER,
[PIPE_FUNC_ALWAYS] = PREFILTEROPNEVER,
[PIPE_FUNC_NEVER] = PREFILTEROP_ALWAYS,
[PIPE_FUNC_LESS] = PREFILTEROP_LEQUAL,
[PIPE_FUNC_EQUAL] = PREFILTEROP_NOTEQUAL,
[PIPE_FUNC_LEQUAL] = PREFILTEROP_LESS,
[PIPE_FUNC_GREATER] = PREFILTEROP_GEQUAL,
[PIPE_FUNC_NOTEQUAL] = PREFILTEROP_EQUAL,
[PIPE_FUNC_GEQUAL] = PREFILTEROP_GREATER,
[PIPE_FUNC_ALWAYS] = PREFILTEROP_NEVER,
};
return map[pipe_func];
}

18
src/intel/genxml/gen11.xml
View file

@ -871,15 +871,15 @@
<value name="PROGRAMMED" value="0"/>
<value name="OVERRIDE" value="1"/>
</field>
<field name="Shadow Function" start="33" end="35" type="uint">
<value name="PREFILTEROP ALWAYS" value="0"/>
<value name="PREFILTEROP NEVER" value="1"/>
<value name="PREFILTEROP LESS" value="2"/>
<value name="PREFILTEROP EQUAL" value="3"/>
<value name="PREFILTEROP LEQUAL" value="4"/>
<value name="PREFILTEROP GREATER" value="5"/>
<value name="PREFILTEROP NOTEQUAL" value="6"/>
<value name="PREFILTEROP GEQUAL" value="7"/>
<field name="Shadow Function" start="33" end="35" type="uint" prefix="PREFILTEROP">
<value name="ALWAYS" value="0"/>
<value name="NEVER" value="1"/>
<value name="LESS" value="2"/>
<value name="EQUAL" value="3"/>
<value name="LEQUAL" value="4"/>
<value name="GREATER" value="5"/>
<value name="NOTEQUAL" value="6"/>
<value name="GEQUAL" value="7"/>
</field>
<field name="ChromaKey Mode" start="36" end="36" type="uint">
<value name="KEYFILTER_KILL_ON_ANY_MATCH" value="0"/>

18
src/intel/genxml/gen12.xml
View file

@ -910,15 +910,15 @@
<value name="PROGRAMMED" value="0"/>
<value name="OVERRIDE" value="1"/>
</field>
<field name="Shadow Function" start="33" end="35" type="uint">
<value name="PREFILTEROP ALWAYS" value="0"/>
<value name="PREFILTEROP NEVER" value="1"/>
<value name="PREFILTEROP LESS" value="2"/>
<value name="PREFILTEROP EQUAL" value="3"/>
<value name="PREFILTEROP LEQUAL" value="4"/>
<value name="PREFILTEROP GREATER" value="5"/>
<value name="PREFILTEROP NOTEQUAL" value="6"/>
<value name="PREFILTEROP GEQUAL" value="7"/>
<field name="Shadow Function" start="33" end="35" type="uint" prefix="PREFILTEROP">
<value name="ALWAYS" value="0"/>
<value name="NEVER" value="1"/>
<value name="LESS" value="2"/>
<value name="EQUAL" value="3"/>
<value name="LEQUAL" value="4"/>
<value name="GREATER" value="5"/>
<value name="NOTEQUAL" value="6"/>
<value name="GEQUAL" value="7"/>
</field>
<field name="ChromaKey Mode" start="36" end="36" type="uint">
<value name="KEYFILTER_KILL_ON_ANY_MATCH" value="0"/>

18
src/intel/genxml/gen125.xml
View file

@ -925,15 +925,15 @@
<value name="PROGRAMMED" value="0"/>
<value name="OVERRIDE" value="1"/>
</field>
<field name="Shadow Function" start="33" end="35" type="uint">
<value name="PREFILTEROP ALWAYS" value="0"/>
<value name="PREFILTEROP NEVER" value="1"/>
<value name="PREFILTEROP LESS" value="2"/>
<value name="PREFILTEROP EQUAL" value="3"/>
<value name="PREFILTEROP LEQUAL" value="4"/>
<value name="PREFILTEROP GREATER" value="5"/>
<value name="PREFILTEROP NOTEQUAL" value="6"/>
<value name="PREFILTEROP GEQUAL" value="7"/>
<field name="Shadow Function" start="33" end="35" type="uint" prefix="PREFILTEROP">
<value name="ALWAYS" value="0"/>
<value name="NEVER" value="1"/>
<value name="LESS" value="2"/>
<value name="EQUAL" value="3"/>
<value name="LEQUAL" value="4"/>
<value name="GREATER" value="5"/>
<value name="NOTEQUAL" value="6"/>
<value name="GEQUAL" value="7"/>
</field>
<field name="ChromaKey Mode" start="36" end="36" type="uint">
<value name="KEYFILTER_KILL_ON_ANY_MATCH" value="0"/>

18
src/intel/genxml/gen4.xml
View file

@ -330,15 +330,15 @@
</struct>
<struct name="SAMPLER_STATE" length="4">
<field name="Shadow Function" start="0" end="2" type="uint">
<value name="PREFILTEROP_ALWAYS" value="0"/>
<value name="PREFILTEROP_NEVER" value="1"/>
<value name="PREFILTEROP_LESS" value="2"/>
<value name="PREFILTEROP_EQUAL" value="3"/>
<value name="PREFILTEROP_LEQUAL" value="4"/>
<value name="PREFILTEROP_GREATER" value="5"/>
<value name="PREFILTEROP_NOTEQUAL" value="6"/>
<value name="PREFILTEROP_GEQUAL" value="7"/>
<field name="Shadow Function" start="0" end="2" type="uint" prefix="PREFILTEROP">
<value name="ALWAYS" value="0"/>
<value name="NEVER" value="1"/>
<value name="LESS" value="2"/>
<value name="EQUAL" value="3"/>
<value name="LEQUAL" value="4"/>
<value name="GREATER" value="5"/>
<value name="NOTEQUAL" value="6"/>
<value name="GEQUAL" value="7"/>
</field>
<field name="Texture LOD Bias" start="3" end="13" type="s4.6"/>
<field name="Min Mode Filter" start="14" end="16" type="uint" prefix="MAPFILTER"/>

18
src/intel/genxml/gen45.xml
View file

@ -337,15 +337,15 @@
</struct>
<struct name="SAMPLER_STATE" length="4">
<field name="Shadow Function" start="0" end="2" type="uint">
<value name="PREFILTEROP_ALWAYS" value="0"/>
<value name="PREFILTEROP_NEVER" value="1"/>
<value name="PREFILTEROP_LESS" value="2"/>
<value name="PREFILTEROP_EQUAL" value="3"/>
<value name="PREFILTEROP_LEQUAL" value="4"/>
<value name="PREFILTEROP_GREATER" value="5"/>
<value name="PREFILTEROP_NOTEQUAL" value="6"/>
<value name="PREFILTEROP_GEQUAL" value="7"/>
<field name="Shadow Function" start="0" end="2" type="uint" prefix="PREFILTEROP">
<value name="ALWAYS" value="0"/>
<value name="NEVER" value="1"/>
<value name="LESS" value="2"/>
<value name="EQUAL" value="3"/>
<value name="LEQUAL" value="4"/>
<value name="GREATER" value="5"/>
<value name="NOTEQUAL" value="6"/>
<value name="GEQUAL" value="7"/>
</field>
<field name="Texture LOD Bias" start="3" end="13" type="s4.6"/>
<field name="Min Mode Filter" start="14" end="16" type="uint" prefix="MAPFILTER"/>

18
src/intel/genxml/gen5.xml
View file

@ -368,15 +368,15 @@
</struct>
<struct name="SAMPLER_STATE" length="4">
<field name="Shadow Function" start="0" end="2" type="uint">
<value name="PREFILTEROP_ALWAYS" value="0"/>
<value name="PREFILTEROP_NEVER" value="1"/>
<value name="PREFILTEROP_LESS" value="2"/>
<value name="PREFILTEROP_EQUAL" value="3"/>
<value name="PREFILTEROP_LEQUAL" value="4"/>
<value name="PREFILTEROP_GREATER" value="5"/>
<value name="PREFILTEROP_NOTEQUAL" value="6"/>
<value name="PREFILTEROP_GEQUAL" value="7"/>
<field name="Shadow Function" start="0" end="2" type="uint" prefix="PREFILTEROP">
<value name="ALWAYS" value="0"/>
<value name="NEVER" value="1"/>
<value name="LESS" value="2"/>
<value name="EQUAL" value="3"/>
<value name="LEQUAL" value="4"/>
<value name="GREATER" value="5"/>
<value name="NOTEQUAL" value="6"/>
<value name="GEQUAL" value="7"/>
</field>
<field name="Texture LOD Bias" start="3" end="13" type="s4.6"/>
<field name="Min Mode Filter" start="14" end="16" type="uint" prefix="MAPFILTER"/>

18
src/intel/genxml/gen6.xml
View file

@ -360,15 +360,15 @@
</struct>
<struct name="SAMPLER_STATE" length="4">
<field name="Shadow Function" start="0" end="2" type="uint">
<value name="PREFILTEROP_ALWAYS" value="0"/>
<value name="PREFILTEROP_NEVER" value="1"/>
<value name="PREFILTEROP_LESS" value="2"/>
<value name="PREFILTEROP_EQUAL" value="3"/>
<value name="PREFILTEROP_LEQUAL" value="4"/>
<value name="PREFILTEROP_GREATER" value="5"/>
<value name="PREFILTEROP_NOTEQUAL" value="6"/>
<value name="PREFILTEROP_GEQUAL" value="7"/>
<field name="Shadow Function" start="0" end="2" type="uint" prefix="PREFILTEROP">
<value name="ALWAYS" value="0"/>
<value name="NEVER" value="1"/>
<value name="LESS" value="2"/>
<value name="EQUAL" value="3"/>
<value name="LEQUAL" value="4"/>
<value name="GREATER" value="5"/>
<value name="NOTEQUAL" value="6"/>
<value name="GEQUAL" value="7"/>
</field>
<field name="Texture LOD Bias" start="3" end="13" type="s4.6"/>
<field name="Min Mode Filter" start="14" end="16" type="uint" prefix="MAPFILTER"/>

18
src/intel/genxml/gen7.xml
View file

@ -473,15 +473,15 @@
<value name="PROGRAMMED" value="0"/>
<value name="OVERRIDE" value="1"/>
</field>
<field name="Shadow Function" start="33" end="35" type="uint">
<value name="PREFILTEROP ALWAYS" value="0"/>
<value name="PREFILTEROP NEVER" value="1"/>
<value name="PREFILTEROP LESS" value="2"/>
<value name="PREFILTEROP EQUAL" value="3"/>
<value name="PREFILTEROP LEQUAL" value="4"/>
<value name="PREFILTEROP GREATER" value="5"/>
<value name="PREFILTEROP NOTEQUAL" value="6"/>
<value name="PREFILTEROP GEQUAL" value="7"/>
<field name="Shadow Function" start="33" end="35" type="uint" prefix="PREFILTEROP">
<value name="ALWAYS" value="0"/>
<value name="NEVER" value="1"/>
<value name="LESS" value="2"/>
<value name="EQUAL" value="3"/>
<value name="LEQUAL" value="4"/>
<value name="GREATER" value="5"/>
<value name="NOTEQUAL" value="6"/>
<value name="GEQUAL" value="7"/>
</field>
<field name="Max LOD" start="40" end="51" type="u4.8"/>
<field name="Min LOD" start="52" end="63" type="u4.8"/>

18
src/intel/genxml/gen75.xml
View file

@ -577,15 +577,15 @@
<value name="PROGRAMMED" value="0"/>
<value name="OVERRIDE" value="1"/>
</field>
<field name="Shadow Function" start="33" end="35" type="uint">
<value name="PREFILTEROP ALWAYS" value="0"/>
<value name="PREFILTEROP NEVER" value="1"/>
<value name="PREFILTEROP LESS" value="2"/>
<value name="PREFILTEROP EQUAL" value="3"/>
<value name="PREFILTEROP LEQUAL" value="4"/>
<value name="PREFILTEROP GREATER" value="5"/>
<value name="PREFILTEROP NOTEQUAL" value="6"/>
<value name="PREFILTEROP GEQUAL" value="7"/>
<field name="Shadow Function" start="33" end="35" type="uint" prefix="PREFILTEROP">
<value name="ALWAYS" value="0"/>
<value name="NEVER" value="1"/>
<value name="LESS" value="2"/>
<value name="EQUAL" value="3"/>
<value name="LEQUAL" value="4"/>
<value name="GREATER" value="5"/>
<value name="NOTEQUAL" value="6"/>
<value name="GEQUAL" value="7"/>
</field>
<field name="Max LOD" start="40" end="51" type="u4.8"/>
<field name="Min LOD" start="52" end="63" type="u4.8"/>

18
src/intel/genxml/gen8.xml
View file

@ -625,15 +625,15 @@
<value name="PROGRAMMED" value="0"/>
<value name="OVERRIDE" value="1"/>
</field>
<field name="Shadow Function" start="33" end="35" type="uint">
<value name="PREFILTEROP ALWAYS" value="0"/>
<value name="PREFILTEROP NEVER" value="1"/>
<value name="PREFILTEROP LESS" value="2"/>
<value name="PREFILTEROP EQUAL" value="3"/>
<value name="PREFILTEROP LEQUAL" value="4"/>
<value name="PREFILTEROP GREATER" value="5"/>
<value name="PREFILTEROP NOTEQUAL" value="6"/>
<value name="PREFILTEROP GEQUAL" value="7"/>
<field name="Shadow Function" start="33" end="35" type="uint" prefix="PREFILTEROP">
<value name="ALWAYS" value="0"/>
<value name="NEVER" value="1"/>
<value name="LESS" value="2"/>
<value name="EQUAL" value="3"/>
<value name="LEQUAL" value="4"/>
<value name="GREATER" value="5"/>
<value name="NOTEQUAL" value="6"/>
<value name="GEQUAL" value="7"/>
</field>
<field name="ChromaKey Mode" start="36" end="36" type="uint">
<value name="KEYFILTER_KILL_ON_ANY_MATCH" value="0"/>

18
src/intel/genxml/gen9.xml
View file

@ -787,15 +787,15 @@
<value name="PROGRAMMED" value="0"/>
<value name="OVERRIDE" value="1"/>
</field>
<field name="Shadow Function" start="33" end="35" type="uint">
<value name="PREFILTEROP ALWAYS" value="0"/>
<value name="PREFILTEROP NEVER" value="1"/>
<value name="PREFILTEROP LESS" value="2"/>
<value name="PREFILTEROP EQUAL" value="3"/>
<value name="PREFILTEROP LEQUAL" value="4"/>
<value name="PREFILTEROP GREATER" value="5"/>
<value name="PREFILTEROP NOTEQUAL" value="6"/>
<value name="PREFILTEROP GEQUAL" value="7"/>
<field name="Shadow Function" start="33" end="35" type="uint" prefix="PREFILTEROP">
<value name="ALWAYS" value="0"/>
<value name="NEVER" value="1"/>
<value name="LESS" value="2"/>
<value name="EQUAL" value="3"/>
<value name="LEQUAL" value="4"/>
<value name="GREATER" value="5"/>
<value name="NOTEQUAL" value="6"/>
<value name="GEQUAL" value="7"/>
</field>
<field name="ChromaKey Mode" start="36" end="36" type="uint">
<value name="KEYFILTER_KILL_ON_ANY_MATCH" value="0"/>

16
src/intel/vulkan/genX_pipeline.c
View file

@ -903,14 +903,14 @@ static const uint32_t vk_to_intel_blend_op[] = {
};
const uint32_t genX(vk_to_intel_compare_op)[] = {
[VK_COMPARE_OP_NEVER] = PREFILTEROPNEVER,
[VK_COMPARE_OP_LESS] = PREFILTEROPLESS,
[VK_COMPARE_OP_EQUAL] = PREFILTEROPEQUAL,
[VK_COMPARE_OP_LESS_OR_EQUAL] = PREFILTEROPLEQUAL,
[VK_COMPARE_OP_GREATER] = PREFILTEROPGREATER,
[VK_COMPARE_OP_NOT_EQUAL] = PREFILTEROPNOTEQUAL,
[VK_COMPARE_OP_GREATER_OR_EQUAL] = PREFILTEROPGEQUAL,
[VK_COMPARE_OP_ALWAYS] = PREFILTEROPALWAYS,
[VK_COMPARE_OP_NEVER] = PREFILTEROP_NEVER,
[VK_COMPARE_OP_LESS] = PREFILTEROP_LESS,
[VK_COMPARE_OP_EQUAL] = PREFILTEROP_EQUAL,
[VK_COMPARE_OP_LESS_OR_EQUAL] = PREFILTEROP_LEQUAL,
[VK_COMPARE_OP_GREATER] = PREFILTEROP_GREATER,
[VK_COMPARE_OP_NOT_EQUAL] = PREFILTEROP_NOTEQUAL,
[VK_COMPARE_OP_GREATER_OR_EQUAL] = PREFILTEROP_GEQUAL,
[VK_COMPARE_OP_ALWAYS] = PREFILTEROP_ALWAYS,
};
const uint32_t genX(vk_to_intel_stencil_op)[] = {

16
src/intel/vulkan/genX_state.c
View file

@ -661,14 +661,14 @@ static const uint32_t vk_to_intel_tex_address[] = {
* and swapping of the arguments involved.
*/
static const uint32_t vk_to_intel_shadow_compare_op[] = {
[VK_COMPARE_OP_NEVER] = PREFILTEROPALWAYS,
[VK_COMPARE_OP_LESS] = PREFILTEROPLEQUAL,
[VK_COMPARE_OP_EQUAL] = PREFILTEROPNOTEQUAL,
[VK_COMPARE_OP_LESS_OR_EQUAL] = PREFILTEROPLESS,
[VK_COMPARE_OP_GREATER] = PREFILTEROPGEQUAL,
[VK_COMPARE_OP_NOT_EQUAL] = PREFILTEROPEQUAL,
[VK_COMPARE_OP_GREATER_OR_EQUAL] = PREFILTEROPGREATER,
[VK_COMPARE_OP_ALWAYS] = PREFILTEROPNEVER,
[VK_COMPARE_OP_NEVER] = PREFILTEROP_ALWAYS,
[VK_COMPARE_OP_LESS] = PREFILTEROP_LEQUAL,
[VK_COMPARE_OP_EQUAL] = PREFILTEROP_NOTEQUAL,
[VK_COMPARE_OP_LESS_OR_EQUAL] = PREFILTEROP_LESS,
[VK_COMPARE_OP_GREATER] = PREFILTEROP_GEQUAL,
[VK_COMPARE_OP_NOT_EQUAL] = PREFILTEROP_EQUAL,
[VK_COMPARE_OP_GREATER_OR_EQUAL] = PREFILTEROP_GREATER,
[VK_COMPARE_OP_ALWAYS] = PREFILTEROP_NEVER,
};
#if GFX_VER >= 9