From df243d009485703cd9980207ef9bcc2da6bc16e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Pi=C3=B1eiro?= Date: Tue, 20 Jul 2021 12:46:16 +0200 Subject: [PATCH] broadcom: don't define internal BPP values twice 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 Part-of: --- src/broadcom/cle/v3d_packet_v33.xml | 12 ++---------- src/broadcom/vulkan/v3dvx_device.c | 4 ++-- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/broadcom/cle/v3d_packet_v33.xml b/src/broadcom/cle/v3d_packet_v33.xml index 2fdc685ae51..de80a6b64a1 100644 --- a/src/broadcom/cle/v3d_packet_v33.xml +++ b/src/broadcom/cle/v3d_packet_v33.xml @@ -950,11 +950,7 @@ - - - - - + @@ -992,11 +988,7 @@ - - - - - + diff --git a/src/broadcom/vulkan/v3dvx_device.c b/src/broadcom/vulkan/v3dvx_device.c index 026ceaa20b8..d54c0a37d9f 100644 --- a/src/broadcom/vulkan/v3dvx_device.c +++ b/src/broadcom/vulkan/v3dvx_device.c @@ -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) {