OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panfrost: v4 doesn't have Blend descriptors

Browse Source 
Drop the Blend descriptor definition in v4.xml, and adjust
pan_blitter accordingly.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27515>
This commit is contained in:
Boris Brezillon
2024-02-07 09:59:40 +01:00
committed by Marge Bot
parent 5f0226d82f
commit 0bc26efdc4
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/panfrost/lib/genxml/v4.xml
View File

@@ -462,19 +462,6 @@
<field name="Color Mask" size="4" start="0:28" type="uint"/>
</struct>
<struct name="Blend" size="4" align="16">
<field name="Load Destination" size="1" start="0:0" type="bool" default="false"/>
<field name="Blend Shader" size="1" start="0:1" type="bool" default="false"/>
<field name="Blend Shader Contains Discard" size="1" start="0:2" type="bool" default="false"/>
<field name="Alpha To One" size="1" start="0:8" type="bool"/>
<field name="Enable" size="1" start="0:9" type="bool" default="true"/>
<field name="sRGB" size="1" start="0:10" type="bool" default="false"/>
<field name="Round to FB precision" size="1" start="0:11" type="bool" default="false"/>
<field name="Shader PC" size="64" start="2:0" type="address"/>
<field name="Equation" size="32" start="2:0" type="Blend Equation"/>
<field name="Constant" size="32" start="3:0" type="float"/>
</struct>
<struct name="Invocation">
<!-- Dynamic bitfield containing WorkGroupSize.xyz, NumWorkGroups.xyz
The number of bits allocated for each number is based on the *_shift

5
src/panfrost/lib/pan_blitter.c
View File

@@ -756,10 +756,15 @@ pan_blitter_get_rsd(struct pan_blitter_cache *cache,
rsd = rzalloc(cache->rsds.rsds, struct pan_blit_rsd_data);
rsd->key = rsd_key;
#if PAN_ARCH == 4
struct panfrost_ptr rsd_ptr =
pan_pool_alloc_desc(cache->rsds.pool, RENDERER_STATE);
#else
unsigned bd_count = PAN_ARCH >= 5 ? MAX2(views->rt_count, 1) : 0;
struct panfrost_ptr rsd_ptr = pan_pool_alloc_desc_aggregate(
cache->rsds.pool, PAN_DESC(RENDERER_STATE),
PAN_DESC_ARRAY(bd_count, BLEND));
#endif
mali_ptr blend_shaders[8] = {0};