i965/gen9: Resolve SRGB color buffers when GL_FRAMEBUFFER_SRGB enabled

SKL can't cope with the CCS buffer for SRGB buffers. Normally the
hardware won't see the SRGB formats because when GL_FRAMEBUFFER_SRGB
is disabled these get mapped to their linear equivalents. In order to
avoid relying on the CCS buffer when it is enabled this patch now
makes it flush the renderbuffers.

Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
This commit is contained in:
Neil Roberts 2015-11-24 19:23:14 +01:00
parent eb291d7013
commit 82d459a423
1 changed files with 27 additions and 0 deletions

View File

@ -215,6 +215,33 @@ intel_update_state(struct gl_context * ctx, GLuint new_state)
}
}
/* If FRAMEBUFFER_SRGB is used on Gen9+ then we need to resolve any of the
* single-sampled color renderbuffers because the CCS buffer isn't
* supported for SRGB formats. This only matters if FRAMEBUFFER_SRGB is
* enabled because otherwise the surface state will be programmed with the
* linear equivalent format anyway.
*/
if (brw->gen >= 9 && ctx->Color.sRGBEnabled) {
struct gl_framebuffer *fb = ctx->DrawBuffer;
for (int i = 0; i < fb->_NumColorDrawBuffers; i++) {
struct gl_renderbuffer *rb = fb->_ColorDrawBuffers[i];
if (rb == NULL)
continue;
struct intel_renderbuffer *irb = intel_renderbuffer(rb);
struct intel_mipmap_tree *mt = irb->mt;
if (mt == NULL ||
mt->num_samples > 1 ||
_mesa_get_srgb_format_linear(mt->format) == mt->format)
continue;
intel_miptree_resolve_color(brw, mt);
brw_render_cache_set_check_flush(brw, mt->bo);
}
}
_mesa_lock_context_textures(ctx);
}