openharmony/third_party_mesa3d
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_mesa3d synced 2024-11-23 23:41:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pan/lower_framebuffer: Don't treat UNORM 4 special

Browse Source 
Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11383>
This commit is contained in:
Alyssa Rosenzweig 2021-06-15 12:38:19 -04:00 committed by Marge Bot
parent 0169f7aac8
commit 58e96e4aa2
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/panfrost/util/pan_lower_framebuffer.c
View File

@ -347,23 +347,6 @@ pan_linear_to_srgb(nir_builder *b, nir_ssa_def *linear)
/* Generic dispatches for un/pack regardless of format */
static bool
pan_is_unorm4(const struct util_format_description *desc)
{
switch (desc->format) {
case PIPE_FORMAT_B4G4R4A4_UNORM:
case PIPE_FORMAT_B4G4R4X4_UNORM:
case PIPE_FORMAT_A4R4_UNORM:
case PIPE_FORMAT_R4A4_UNORM:
case PIPE_FORMAT_A4B4G4R4_UNORM:
case PIPE_FORMAT_R4G4B4A4_UNORM:
return true;
default:
return false;
}
}
static nir_ssa_def *
pan_unpack(nir_builder *b,
const struct util_format_description *desc,
@ -412,9 +395,6 @@ pan_pack(nir_builder *b,
if (util_format_is_unorm8(desc))
return pan_pack_unorm(b, unpacked, 8, 8, 8, 8);
if (pan_is_unorm4(desc))
return pan_pack_unorm(b, unpacked, 4, 4, 4, 4);
if (desc->is_array) {
int c = util_format_get_first_non_void_channel(desc->format);
assert(c >= 0);
@ -436,6 +416,13 @@ pan_pack(nir_builder *b,
}
switch (desc->format) {
case PIPE_FORMAT_B4G4R4A4_UNORM:
case PIPE_FORMAT_B4G4R4X4_UNORM:
case PIPE_FORMAT_A4R4_UNORM:
case PIPE_FORMAT_R4A4_UNORM:
case PIPE_FORMAT_A4B4G4R4_UNORM:
case PIPE_FORMAT_R4G4B4A4_UNORM:
return pan_pack_unorm(b, unpacked, 4, 4, 4, 4);
case PIPE_FORMAT_B5G5R5A1_UNORM:
case PIPE_FORMAT_R5G5B5A1_UNORM:
return pan_pack_unorm(b, unpacked, 5, 6, 5, 1);