fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-11 11:20:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'pan-stencil-fix' into 'main'

Browse source 
panfrost: a few stencil cleanups

See merge request mesa/mesa!40260
This commit is contained in:
Erik Faye-Lund 2026-03-11 05:23:54 +01:00
commit 46845f31fb
2 changed files with 2 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/gallium/drivers/panfrost/pan_fb_preload.c
View file

@ -708,19 +708,7 @@ pan_preload_get_views(const struct pan_fb_info *fb, bool zs,
if (fb->zs.preload.s) {
const struct pan_image_view *view = fb->zs.view.s ?: fb->zs.view.zs;
enum pipe_format fmt = util_format_get_depth_only(view->format);
switch (view->format) {
case PIPE_FORMAT_Z24_UNORM_S8_UINT:
fmt = PIPE_FORMAT_X24S8_UINT;
break;
case PIPE_FORMAT_Z32_FLOAT_S8X24_UINT:
fmt = PIPE_FORMAT_X32_S8X24_UINT;
break;
default:
fmt = view->format;
break;
}
enum pipe_format fmt = util_format_stencil_only(view->format);
if (fmt != view->format) {
*patched_s = *view;
@ -864,19 +852,7 @@ pan_preload_emit_textures(struct pan_pool *pool, const struct pan_fb_info *fb,
if (fb->zs.preload.s) {
const struct pan_image_view *view = fb->zs.view.s ?: fb->zs.view.zs;
enum pipe_format fmt = util_format_get_depth_only(view->format);
switch (view->format) {
case PIPE_FORMAT_Z24_UNORM_S8_UINT:
fmt = PIPE_FORMAT_X24S8_UINT;
break;
case PIPE_FORMAT_Z32_FLOAT_S8X24_UINT:
fmt = PIPE_FORMAT_X32_S8X24_UINT;
break;
default:
fmt = view->format;
break;
}
enum pipe_format fmt = util_format_stencil_only(view->format);
#if PAN_ARCH >= 7
struct pan_image_view *pview = &patched_views[patched_count++];

1
src/panfrost/lib/pan_desc.c
View file

@ -194,7 +194,6 @@ translate_s_format(enum pipe_format in)
return MALI_S_FORMAT_X24S8;
#if PAN_ARCH < 9
case PIPE_FORMAT_S8_UINT_Z24_UNORM:
case PIPE_FORMAT_S8X24_UINT:
return MALI_S_FORMAT_S8X24;
case PIPE_FORMAT_Z32_FLOAT_S8X24_UINT: