Mesa (master): swr: set an explicit clear_rect if scissor is not enabled.
Tim Rowley
torowley at kemper.freedesktop.org
Mon Jun 26 16:30:38 UTC 2017
Module: Mesa
Branch: master
Commit: 6fafba0e677ec9a6dfa551e34b59814e6f643e21
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6fafba0e677ec9a6dfa551e34b59814e6f643e21
Author: Bruce Cherniak <bruce.cherniak at intel.com>
Date: Mon Jun 26 10:26:26 2017 -0500
swr: set an explicit clear_rect if scissor is not enabled.
Fix regression of "no rendering" on simple apps like glxgears by
setting an explicit full surface clear_rect when scissor is not
enabled.
This regressed with commit 00173d91 "st/mesa: don't set 16
scissors and 16 viewports if they're unused" due to an assumption
that a default scissor rect is always set, which was the case prior
to this optimization.
Reviewed-by: Tim Rowley <timothy.o.rowley at intel.com>
---
src/gallium/drivers/swr/swr_clear.cpp | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/gallium/drivers/swr/swr_clear.cpp b/src/gallium/drivers/swr/swr_clear.cpp
index 53f4e02d45..3a35805a7a 100644
--- a/src/gallium/drivers/swr/swr_clear.cpp
+++ b/src/gallium/drivers/swr/swr_clear.cpp
@@ -68,11 +68,19 @@ swr_clear(struct pipe_context *pipe,
((union pipe_color_union *)color)->f[3] = 1.0; /* cast off your const'd-ness */
#endif
+ SWR_RECT clear_rect;
+ /* If enabled, clear to scissor; otherwise clear full surface */
+ if (ctx->rasterizer && ctx->rasterizer->scissor) {
+ clear_rect = ctx->swr_scissor;
+ } else {
+ clear_rect = {0, 0, (int32_t)fb->width, (int32_t)fb->height};
+ }
+
for (unsigned i = 0; i < layers; ++i) {
swr_update_draw_context(ctx);
SwrClearRenderTarget(ctx->swrContext, clearMask, i,
color->f, depth, stencil,
- ctx->swr_scissor);
+ clear_rect);
// Mask out the attachments that are out of layers.
if (fb->zsbuf &&
More information about the mesa-commit
mailing list