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

turnip: call packing functions directly for pack_gmem_clear_value

Browse source 
This involves rolling our own int packing functions, because the u_format
versions do clamping which differs from VK spec requirement.

This reduces the size of libvulkan_freedreno.so significantly.

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6304>
This commit is contained in:
Jonathan Marek 2020-07-09 20:18:38 -04:00 • committed by Marge Bot
parent 201331edbf
commit ddac5933f8
2 changed files with 83 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
src/freedreno/vulkan/tu_clear_blit.c
View file

@ -1939,8 +1939,6 @@ tu_clear_sysmem_attachments(struct tu_cmd_buffer *cmd,
static void
pack_gmem_clear_value(const VkClearValue *val, VkFormat format, uint32_t clear_value[4])
{
enum pipe_format pformat = vk_format_to_pipe_format(format);
switch (format) {
case VK_FORMAT_X8_D24_UNORM_PACK32:
case VK_FORMAT_D24_UNORM_S8_UINT:
@ -1956,27 +1954,63 @@ pack_gmem_clear_value(const VkClearValue *val, VkFormat format, uint32_t clear_v
case VK_FORMAT_S8_UINT:
clear_value[0] = val->depthStencil.stencil;
return;
/* these formats use a different base format when tiled
* the same format can be used for both because GMEM is always in WZYX order
*/
case VK_FORMAT_R5G5B5A1_UNORM_PACK16:
case VK_FORMAT_B5G5R5A1_UNORM_PACK16:
pformat = PIPE_FORMAT_B5G5R5A1_UNORM;
default:
break;
}
VkClearColorValue color;
float tmp[4];
memcpy(tmp, val->color.float32, 4 * sizeof(float));
if (vk_format_is_srgb(format)) {
for (int i = 0; i < 4; i++)
tmp[i] = util_format_linear_to_srgb_float(tmp[i]);
}
/**
* GMEM is tiled and wants the components in WZYX order,
* apply swizzle to the color before packing, to counteract
* deswizzling applied by packing functions
*/
pipe_swizzle_4f(color.float32, val->color.float32,
util_format_description(pformat)->swizzle);
util_format_pack_rgba(pformat, clear_value, color.uint32, 1);
#define PACK_F(type) util_format_##type##_pack_rgba_float \
( (uint8_t*) &clear_value[0], 0, tmp, 0, 1, 1)
switch (vk_format_get_component_bits(format, UTIL_FORMAT_COLORSPACE_RGB, PIPE_SWIZZLE_X)) {
case 4:
PACK_F(r4g4b4a4_unorm);
break;
case 5:
if (vk_format_get_component_bits(format, UTIL_FORMAT_COLORSPACE_RGB, PIPE_SWIZZLE_Y) == 6)
PACK_F(r5g6b5_unorm);
else
PACK_F(r5g5b5a1_unorm);
break;
case 8:
if (vk_format_is_snorm(format))
PACK_F(r8g8b8a8_snorm);
else if (vk_format_is_unorm(format))
PACK_F(r8g8b8a8_unorm);
else
pack_int8(clear_value, val->color.uint32);
break;
case 10:
if (vk_format_is_int(format))
pack_int10_2(clear_value, val->color.uint32);
else
PACK_F(r10g10b10a2_unorm);
break;
case 11:
clear_value[0] = float3_to_r11g11b10f(val->color.float32);
break;
case 16:
if (vk_format_is_snorm(format))
PACK_F(r16g16b16a16_snorm);
else if (vk_format_is_unorm(format))
PACK_F(r16g16b16a16_unorm);
else if (vk_format_is_float(format))
PACK_F(r16g16b16a16_float);
else
pack_int16(clear_value, val->color.uint32);
break;
case 32:
memcpy(clear_value, val->color.float32, 4 * sizeof(float));
break;
default:
unreachable("unexpected channel size");
}
#undef PACK_F
}
static void

34
src/freedreno/vulkan/tu_util.h
View file

@ -269,14 +269,42 @@ struct bcolor_entry {
uint8_t __pad1[56];
} __attribute__((aligned(128)));
/* vulkan does not want clamping of integer clear values, differs from u_format
* see spec for VkClearColorValue
*/
static inline void
pack_int8(uint32_t *dst, const uint32_t *val)
{
*dst = (val[0] & 0xff) |
(val[1] & 0xff) << 8 |
(val[2] & 0xff) << 16 |
(val[3] & 0xff) << 24;
}
static inline void
pack_int10_2(uint32_t *dst, const uint32_t *val)
{
*dst = (val[0] & 0x3ff) |
(val[1] & 0x3ff) << 10 |
(val[2] & 0x3ff) << 20 |
(val[3] & 0x3) << 30;
}
static inline void
pack_int16(uint32_t *dst, const uint32_t *val)
{
dst[0] = (val[0] & 0xffff) |
(val[1] & 0xffff) << 16;
dst[1] = (val[2] & 0xffff) |
(val[3] & 0xffff) << 16;
}
static inline void
tu6_pack_border_color(struct bcolor_entry *bcolor, const VkClearColorValue *val, bool is_int)
{
memcpy(bcolor->fp32, val, 4 * sizeof(float));
if (is_int) {
/* TODO: clamp? */
util_format_r16g16b16a16_uint_pack_unsigned((uint8_t*) &bcolor->fp16,
0, val->uint32, 0, 1, 1);
pack_int16((uint32_t*) &bcolor->fp16, val->uint32);
return;
}
#define PACK_F(x, type) util_format_##type##_pack_rgba_float \