diff options
| author | Topi Pohjolainen <topi.pohjolainen@intel.com> | 2016-08-29 10:16:40 +0300 |
|---|---|---|
| committer | Topi Pohjolainen <topi.pohjolainen@intel.com> | 2016-09-12 11:48:30 +0300 |
| commit | b712aa2614447985cacabdd375ab99ff18bd1e71 (patch) | |
| tree | a402ee4c99266a052e645599b9252a53f9a73edf /src/mesa/drivers/dri/i965/brw_blorp.c | |
| parent | a1c7de09dc2b00cc990903ebee52228315e5d4e5 (diff) | |
| download | external_mesa3d-b712aa2614447985cacabdd375ab99ff18bd1e71.zip external_mesa3d-b712aa2614447985cacabdd375ab99ff18bd1e71.tar.gz external_mesa3d-b712aa2614447985cacabdd375ab99ff18bd1e71.tar.bz2 | |
i965/blorp: Sanity check all layers before actual clear
Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_blorp.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_blorp.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c b/src/mesa/drivers/dri/i965/brw_blorp.c index dc2be1e..703e547 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp.c +++ b/src/mesa/drivers/dri/i965/brw_blorp.c @@ -720,7 +720,6 @@ do_single_blorp_clear(struct brw_context *brw, struct gl_framebuffer *fb, } } - intel_miptree_check_level_layer(irb->mt, irb->mt_level, layer); intel_miptree_used_for_rendering(irb->mt); /* We can't setup the blorp_surf until we've allocated the MCS above */ @@ -790,12 +789,16 @@ brw_blorp_clear_color(struct brw_context *brw, struct gl_framebuffer *fb, if (rb == NULL) continue; + const unsigned num_layers = fb->MaxNumLayers ? irb->layer_count : 1; + for (unsigned layer = 0; layer < num_layers; layer++) { + intel_miptree_check_level_layer(irb->mt, irb->mt_level, layer); + } + if (fb->MaxNumLayers > 0) { unsigned layer_multiplier = (irb->mt->msaa_layout == INTEL_MSAA_LAYOUT_UMS || irb->mt->msaa_layout == INTEL_MSAA_LAYOUT_CMS) ? irb->mt->num_samples : 1; - unsigned num_layers = irb->layer_count; for (unsigned layer = 0; layer < num_layers; layer++) { if (!do_single_blorp_clear( brw, fb, rb, buf, partial_clear, encode_srgb, |