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

broadcom: don't define internal BPP values twice

Browse Source 
We have a "maximum bpp of all render targets" field for several
packets. For them we were defining manually the possible values. But
all the possible values are the ones defined at the already defined
type "Internal BPP". So in practice we were defining the possible BPP
values twice.

Also for those fields, sometimes we were using the "Internal BPP" type
and in some other cases we were not, so this commit also adds some
consistency.

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11976>
This commit is contained in:
Alejandro Piñeiro
2021-07-20 12:46:16 +02:00
committed by Marge Bot
parent dc40157888
commit df243d0094
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/broadcom/cle/v3d_packet_v33.xml
View File

@@ -950,11 +950,7 @@
<field name="Double-buffer in non-ms mode" size="1" start="15" type="bool"/>
<field name="Multisample Mode (4x)" size="1" start="14" type="bool"/>
<field name="Maximum BPP of all render targets" size="2" start="12" type="uint">
<value name="Render target maximum 32bpp" value="0"/>
<value name="Render target maximum 64bpp" value="1"/>
<value name="Render target maximum 128bpp" value="2"/>
</field>
<field name="Maximum BPP of all render targets" size="2" start="12" type="Internal BPP"/>
<field name="Number of Render Targets" size="4" start="8" type="uint" minus_one="true"/>
@@ -992,11 +988,7 @@
<field name="Double-buffer in non-ms mode" size="1" start="43" type="bool"/>
<field name="Multisample Mode (4x)" size="1" start="42" type="bool"/>
<field name="Maximum BPP of all render targets" size="2" start="40" type="uint">
<value name="Render target maximum 32bpp" value="0"/>
<value name="Render target maximum 64bpp" value="1"/>
<value name="Render target maximum 128bpp" value="2"/>
</field>
<field name="Maximum BPP of all render targets" size="2" start="40" type="Internal BPP"/>
<field name="Image Height (pixels)" size="16" start="24" type="uint"/>
<field name="Image Width (pixels)" size="16" start="8" type="uint"/>

4
src/broadcom/vulkan/v3dvx_device.c
View File

@@ -136,8 +136,8 @@ v3dX(framebuffer_compute_internal_bpp_msaa)(
uint8_t *max_bpp,
bool *msaa)
{
STATIC_ASSERT(RENDER_TARGET_MAXIMUM_32BPP == 0);
*max_bpp = RENDER_TARGET_MAXIMUM_32BPP;
STATIC_ASSERT(V3D_INTERNAL_BPP_32 == 0);
*max_bpp = V3D_INTERNAL_BPP_32;
*msaa = false;
if (subpass) {