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

mesa: when blitting between formats clear any unused components

Browse Source 
If the state tracker chooses to implement one format with a more
general one (e.g. GL_ALPHA implemented with GL_RGBA) we end up
in a situation where some components should be ignored. Readpix
handles this correctly, but blit does not, which means that if
we blit between different formats we can end up writing garbage
into some components. Work around this by adding an explicit
swizzle to the pipe_blit_info struct, which can re-arrange elements
and/or put 0 or 1 into appropriate channels, and use this to
set the appropriate values into unused channels via the sampler
view.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31378>
This commit is contained in:
Eric R. Smith
2024-09-25 15:12:32 -03:00
committed by Marge Bot
parent 9f69f7a66d
commit b81aefcc19
4 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/mesa/main/blit.c
View File

@@ -482,6 +482,7 @@ do_blit_framebuffer(struct gl_context *ctx,
struct gl_renderbuffer_attachment *srcAtt =
&readFB->Attachment[readFB->_ColorReadBufferIndex];
GLuint i;
GLenum src_base_fmt, dst_base_fmt;
blit.mask = PIPE_MASK_RGBA;
@@ -497,6 +498,7 @@ do_blit_framebuffer(struct gl_context *ctx,
if (!srcObj || !srcObj->pt) {
return;
}
src_base_fmt = srcObj->Image[0][0]->_BaseFormat;
blit.src.resource = srcObj->pt;
blit.src.level = srcAtt->TextureLevel;
@@ -519,7 +521,7 @@ do_blit_framebuffer(struct gl_context *ctx,
return;
srcSurf = srcRb->surface;
src_base_fmt = srcRb->_BaseFormat;
blit.src.resource = srcSurf->texture;
blit.src.level = srcSurf->u.tex.level;
blit.src.box.z = srcSurf->u.tex.first_layer;
@@ -532,6 +534,7 @@ do_blit_framebuffer(struct gl_context *ctx,
if (dstRb) {
struct pipe_surface *dstSurf;
dst_base_fmt = dstRb->_BaseFormat;
_mesa_update_renderbuffer_surface(ctx, dstRb);
dstSurf = dstRb->surface;
@@ -542,6 +545,22 @@ do_blit_framebuffer(struct gl_context *ctx,
blit.dst.box.z = dstSurf->u.tex.first_layer;
blit.dst.format = dstSurf->format;
if (dst_base_fmt != src_base_fmt) {
uint8_t map[6];
/* we may have to add a swizzle to the blit */
_mesa_compute_component_mapping(src_base_fmt, dst_base_fmt, map);
for (int i = 0; i < 4; i++) {
if (map[i] > MESA_FORMAT_SWIZZLE_W) {
blit.swizzle_enable = true;
blit.swizzle[i] = map[i];
} else {
/* the swizzle has already been mostly applied,
so don't un-do it; we only want the 0's and 1's
inserted */
blit.swizzle[i] = i;
}
}
}
ctx->pipe->blit(ctx->pipe, &blit);
dstRb->defined = true; /* front buffer tracking */
}