fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 05:08:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

u_transfer: refactor out code to check interleave/deinterleave path.

Browse source 
The checks were reproduced making adding another one not so fun.

rework the deinterleave path code to match the interleave path code.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15516>
This commit is contained in:
Dave Airlie 2022-03-23 16:24:32 +10:00 • committed by Marge Bot
parent 783cab811d
commit 90a6947632
1 changed files with 30 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/gallium/auxiliary/util/u_transfer_helper.c
View file

@ -39,6 +39,16 @@ struct u_transfer_helper {
bool msaa_map;
};
static inline bool need_interleave_path(struct u_transfer_helper *helper,
enum pipe_format format)
{
if (helper->separate_stencil && util_format_is_depth_and_stencil(format))
return true;
if (helper->separate_z32s8 && format == PIPE_FORMAT_Z32_FLOAT_S8X24_UINT)
return true;
return false;
}
static inline bool handle_transfer(struct pipe_resource *prsc)
{
struct u_transfer_helper *helper = prsc->screen->transfer_helper;
@ -567,8 +577,7 @@ u_transfer_helper_deinterleave_transfer_map(struct pipe_context *pctx,
unsigned width = box->width;
unsigned height = box->height;
if (!((helper->separate_stencil && util_format_is_depth_and_stencil(format)) ||
(format == PIPE_FORMAT_Z32_FLOAT_S8X24_UINT && helper->separate_z32s8)))
if (!need_interleave_path(helper, format))
return helper->vtbl->transfer_map(pctx, prsc, level, usage, box, pptrans);
debug_assert(box->depth == 1);
@ -645,25 +654,25 @@ u_transfer_helper_deinterleave_transfer_unmap(struct pipe_context *pctx,
struct u_transfer_helper *helper = pctx->screen->transfer_helper;
enum pipe_format format = ptrans->resource->format;
if ((helper->separate_stencil && util_format_is_depth_and_stencil(format)) ||
(format == PIPE_FORMAT_Z32_FLOAT_S8X24_UINT && helper->separate_z32s8)) {
struct u_transfer *trans = (struct u_transfer *)ptrans;
if (!(ptrans->usage & PIPE_MAP_FLUSH_EXPLICIT)) {
struct pipe_box box;
u_box_2d(0, 0, ptrans->box.width, ptrans->box.height, &box);
flush_region(pctx, ptrans, &box);
}
helper->vtbl->transfer_unmap(pctx, trans->trans);
if (trans->trans2)
helper->vtbl->transfer_unmap(pctx, trans->trans2);
pipe_resource_reference(&ptrans->resource, NULL);
free(trans->staging);
free(trans);
} else {
if (!need_interleave_path(helper, format)) {
helper->vtbl->transfer_unmap(pctx, ptrans);
return;
}
struct u_transfer *trans = (struct u_transfer *)ptrans;
if (!(ptrans->usage & PIPE_MAP_FLUSH_EXPLICIT)) {
struct pipe_box box;
u_box_2d(0, 0, ptrans->box.width, ptrans->box.height, &box);
flush_region(pctx, ptrans, &box);
}
helper->vtbl->transfer_unmap(pctx, trans->trans);
if (trans->trans2)
helper->vtbl->transfer_unmap(pctx, trans->trans2);
pipe_resource_reference(&ptrans->resource, NULL);
free(trans->staging);
free(trans);
}