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

st/mesa: simplify conditionals in Clear

Browse source 
just check depth and stencil separately, the outcome is the same

Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Marek Olšák 2013-01-14 08:16:18 +01:00
parent 01b7124788
commit f94ea25a4a
1 changed files with 12 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/mesa/state_tracker/st_cb_clear.c
View file

@ -380,8 +380,6 @@ is_stencil_masked(struct gl_context *ctx, struct gl_renderbuffer *rb)
static void static void
st_Clear(struct gl_context *ctx, GLbitfield mask) st_Clear(struct gl_context *ctx, GLbitfield mask)
{ {
static const GLbitfield BUFFER_BITS_DS
= (BUFFER_BIT_DEPTH | BUFFER_BIT_STENCIL);
struct st_context *st = st_context(ctx); struct st_context *st = st_context(ctx);
struct gl_renderbuffer *depthRb struct gl_renderbuffer *depthRb
= ctx->DrawBuffer->Attachment[BUFFER_DEPTH].Renderbuffer; = ctx->DrawBuffer->Attachment[BUFFER_DEPTH].Renderbuffer;
@ -416,41 +414,25 @@ st_Clear(struct gl_context *ctx, GLbitfield mask)
} }
} }
if ((mask & BUFFER_BITS_DS) == BUFFER_BITS_DS && depthRb == stencilRb) { if (mask & BUFFER_BIT_DEPTH) {
/* clearing combined depth + stencil */
struct st_renderbuffer *strb = st_renderbuffer(depthRb); struct st_renderbuffer *strb = st_renderbuffer(depthRb);
if (strb->surface) { if (strb->surface) {
if (is_scissor_enabled(ctx, depthRb) || if (is_scissor_enabled(ctx, depthRb))
is_stencil_masked(ctx, depthRb)) quad_buffers |= PIPE_CLEAR_DEPTH;
quad_buffers |= PIPE_CLEAR_DEPTHSTENCIL;
else else
clear_buffers |= PIPE_CLEAR_DEPTHSTENCIL; clear_buffers |= PIPE_CLEAR_DEPTH;
} }
} }
else { if (mask & BUFFER_BIT_STENCIL) {
/* separate depth/stencil clears */ struct st_renderbuffer *strb = st_renderbuffer(stencilRb);
/* I don't think truly separate buffers are actually possible in gallium or hw? */
if (mask & BUFFER_BIT_DEPTH) {
struct st_renderbuffer *strb = st_renderbuffer(depthRb);
if (strb->surface) { if (strb->surface) {
if (is_scissor_enabled(ctx, depthRb)) if (is_scissor_enabled(ctx, stencilRb) ||
quad_buffers |= PIPE_CLEAR_DEPTH; is_stencil_masked(ctx, stencilRb))
else quad_buffers |= PIPE_CLEAR_STENCIL;
clear_buffers |= PIPE_CLEAR_DEPTH; else
} clear_buffers |= PIPE_CLEAR_STENCIL;
}
if (mask & BUFFER_BIT_STENCIL) {
struct st_renderbuffer *strb = st_renderbuffer(stencilRb);
if (strb->surface) {
if (is_scissor_enabled(ctx, stencilRb) ||
is_stencil_masked(ctx, stencilRb))
quad_buffers |= PIPE_CLEAR_STENCIL;
else
clear_buffers |= PIPE_CLEAR_STENCIL;
}
} }
} }