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

gallium: add pipe cap for scissored clears and pass scissor state to clear() hook

Browse Source 
this adds a new pipe cap that drivers can support which enables passing buffer
clears with scissor test enabled through to be handled by the driver instead
of having mesa draw a quad

also adjust all existing clear() hooks to have the new parameter

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Vasily Khoruzhick <anarsoul@gmail.com>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4310>
This commit is contained in:
Mike Blumenkrantz
2020-03-24 12:02:51 -04:00
committed by Marge Bot
parent 882928dcaa
commit 1c8bcad81a
63 changed files with 114 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/mesa/state_tracker/st_cb_clear.c
View File

@@ -432,6 +432,7 @@ st_Clear(struct gl_context *ctx, GLbitfield mask)
= ctx->DrawBuffer->Attachment[BUFFER_STENCIL].Renderbuffer;
GLbitfield quad_buffers = 0x0;
GLbitfield clear_buffers = 0x0;
bool have_scissor_buffers = false;
GLuint i;
st_flush_bitmap_cache(st);
@@ -462,12 +463,14 @@ st_Clear(struct gl_context *ctx, GLbitfield mask)
unsigned surf_colormask =
util_format_colormask(util_format_description(strb->surface->format));
if (is_scissor_enabled(ctx, rb) ||
bool scissor = is_scissor_enabled(ctx, rb);
if ((scissor && !st->can_scissor_clear) ||
is_window_rectangle_enabled(ctx) ||
((colormask & surf_colormask) != surf_colormask))
quad_buffers |= PIPE_CLEAR_COLOR0 << i;
else
clear_buffers |= PIPE_CLEAR_COLOR0 << i;
have_scissor_buffers |= scissor && st->can_scissor_clear;
}
}
}
@@ -510,10 +513,31 @@ st_Clear(struct gl_context *ctx, GLbitfield mask)
* renderbuffers, because it's likely to be faster.
*/
if (clear_buffers) {
const struct gl_scissor_rect *scissor = &ctx->Scissor.ScissorArray[0];
struct pipe_scissor_state scissor_state = {
.minx = MAX2(scissor->X, 0),
.miny = MAX2(scissor->Y, 0),
.maxx = MAX2(scissor->X + scissor->Width, 0),
.maxy = MAX2(scissor->Y + scissor->Height, 0),
};
/* Now invert Y if needed.
* Gallium drivers use the convention Y=0=top for surfaces.
*/
if (st->state.fb_orientation == Y_0_TOP) {
const struct gl_framebuffer *fb = ctx->DrawBuffer;
/* use intermediate variables to avoid uint underflow */
GLint miny, maxy;
miny = fb->Height - scissor_state.maxy;
maxy = fb->Height - scissor_state.miny;
scissor_state.miny = MAX2(miny, 0);
scissor_state.maxy = MAX2(maxy, 0);
}
/* We can't translate the clear color to the colorbuffer format,
* because different colorbuffers may have different formats.
*/
st->pipe->clear(st->pipe, clear_buffers,
st->pipe->clear(st->pipe, clear_buffers, have_scissor_buffers ? &scissor_state : NULL,
(union pipe_color_union*)&ctx->Color.ClearColor,
ctx->Depth.Clear, ctx->Stencil.Clear);
}