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

v3dv: restrict to channels when encoding border color

Browse Source 
Not all the formats have 4 channels, so let's restrict the border
encoding to the number of channels.

This has been detected by the Undefined Behaviour Sanitizer (UBSan).

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29911>
This commit is contained in:
Juan A. Suarez Romero
2024-06-26 10:20:11 +02:00
committed by Marge Bot
parent 3ee47dc6d9
commit 9696fd378a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,18 +117,18 @@ static union pipe_color_union encode_border_color(
border.f[0] = CLAMP(border.f[0], 0, 1);
border.ui[1] = CLAMP(border.ui[1], 0, 0xff);
} else if (vk_format_is_unorm(bc_info->format)) {
for (int i = 0; i < 4; i++)
for (int i = 0; i < desc->nr_channels; i++)
border.f[i] = CLAMP(border.f[i], 0, 1);
} else if (vk_format_is_snorm(bc_info->format)) {
for (int i = 0; i < 4; i++)
for (int i = 0; i < desc->nr_channels; i++)
border.f[i] = CLAMP(border.f[i], -1, 1);
} else if (vk_format_is_uint(bc_info->format) &&
desc->channel[0].size < 32) {
for (int i = 0; i < 4; i++)
for (int i = 0; i < desc->nr_channels; i++)
border.ui[i] = CLAMP(border.ui[i], 0, (1 << desc->channel[i].size));
} else if (vk_format_is_sint(bc_info->format) &&
desc->channel[0].size < 32) {
for (int i = 0; i < 4; i++)
for (int i = 0; i < desc->nr_channels; i++)
border.i[i] = CLAMP(border.i[i],
-(1 << (desc->channel[i].size - 1)),
(1 << (desc->channel[i].size - 1)) - 1);