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

i965: Fix blorp clear of layered framebuffers.

Browse source 
From section 4.4.7 (Layered Framebuffers) of the GLSL 3.2 spec:

    When the Clear or ClearBuffer* commands are used to clear a
    layered framebuffer attachment, all layers of the attachment are
    cleared.

This patch fixes the blorp clear path for color buffers.

Fixes piglit test "spec/!OpenGL 3.2/layered-rendering/clear-color".

Cc: "10.0" <mesa-stable@lists.freedesktop.org>

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Paul Berry 2013-11-19 12:58:02 -08:00
parent 1ec5365429
commit c1019670ea
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/mesa/drivers/dri/i965/brw_blorp_clear.cpp
View file

@ -67,7 +67,8 @@ public:
struct gl_framebuffer *fb, struct gl_framebuffer *fb,
struct gl_renderbuffer *rb, struct gl_renderbuffer *rb,
GLubyte *color_mask, GLubyte *color_mask,
bool partial_clear); bool partial_clear,
unsigned layer);
}; };
@ -183,12 +184,13 @@ brw_blorp_clear_params::brw_blorp_clear_params(struct brw_context *brw,
struct gl_framebuffer *fb, struct gl_framebuffer *fb,
struct gl_renderbuffer *rb, struct gl_renderbuffer *rb,
GLubyte *color_mask, GLubyte *color_mask,
bool partial_clear) bool partial_clear,
unsigned layer)
{ {
struct gl_context *ctx = &brw->ctx; struct gl_context *ctx = &brw->ctx;
struct intel_renderbuffer *irb = intel_renderbuffer(rb); struct intel_renderbuffer *irb = intel_renderbuffer(rb);
dst.set(brw, irb->mt, irb->mt_level, irb->mt_layer, true); dst.set(brw, irb->mt, irb->mt_level, layer, true);
/* Override the surface format according to the context's sRGB rules. */ /* Override the surface format according to the context's sRGB rules. */
gl_format format = _mesa_get_render_format(ctx, irb->mt->format); gl_format format = _mesa_get_render_format(ctx, irb->mt->format);
@ -443,13 +445,13 @@ brw_blorp_const_color_program::compile(struct brw_context *brw,
bool bool
do_single_blorp_clear(struct brw_context *brw, struct gl_framebuffer *fb, do_single_blorp_clear(struct brw_context *brw, struct gl_framebuffer *fb,
struct gl_renderbuffer *rb, unsigned buf, struct gl_renderbuffer *rb, unsigned buf,
bool partial_clear) bool partial_clear, unsigned layer)
{ {
struct gl_context *ctx = &brw->ctx; struct gl_context *ctx = &brw->ctx;
struct intel_renderbuffer *irb = intel_renderbuffer(rb); struct intel_renderbuffer *irb = intel_renderbuffer(rb);
brw_blorp_clear_params params(brw, fb, rb, ctx->Color.ColorMask[buf], brw_blorp_clear_params params(brw, fb, rb, ctx->Color.ColorMask[buf],
partial_clear); partial_clear, layer);
bool is_fast_clear = bool is_fast_clear =
(params.fast_clear_op == GEN7_FAST_CLEAR_OP_FAST_CLEAR); (params.fast_clear_op == GEN7_FAST_CLEAR_OP_FAST_CLEAR);
@ -525,6 +527,7 @@ brw_blorp_clear_color(struct brw_context *brw, struct gl_framebuffer *fb,
for (unsigned buf = 0; buf < fb->_NumColorDrawBuffers; buf++) { for (unsigned buf = 0; buf < fb->_NumColorDrawBuffers; buf++) {
struct gl_renderbuffer *rb = fb->_ColorDrawBuffers[buf]; struct gl_renderbuffer *rb = fb->_ColorDrawBuffers[buf];
struct intel_renderbuffer *irb = intel_renderbuffer(rb);
/* If this is an ES2 context or GL_ARB_ES2_compatibility is supported, /* If this is an ES2 context or GL_ARB_ES2_compatibility is supported,
* the framebuffer can be complete with some attachments missing. In * the framebuffer can be complete with some attachments missing. In
@ -533,8 +536,17 @@ brw_blorp_clear_color(struct brw_context *brw, struct gl_framebuffer *fb,
if (rb == NULL) if (rb == NULL)
continue; continue;
if (!do_single_blorp_clear(brw, fb, rb, buf, partial_clear)) if (fb->NumLayers > 0) {
return false; assert(fb->NumLayers == irb->mt->level[irb->mt_level].depth);
for (unsigned layer = 0; layer < fb->NumLayers; layer++) {
if (!do_single_blorp_clear(brw, fb, rb, buf, partial_clear, layer))
return false;
}
} else {
unsigned layer = irb->mt_layer;
if (!do_single_blorp_clear(brw, fb, rb, buf, partial_clear, layer))
return false;
}
} }
return true; return true;