diff options
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_blorp.c | 17 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_fbo.c | 66 |
2 files changed, 30 insertions, 53 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c b/src/mesa/drivers/dri/i965/brw_blorp.c index 7404606b9b6..8a7fea443f7 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp.c +++ b/src/mesa/drivers/dri/i965/brw_blorp.c @@ -584,12 +584,25 @@ try_blorp_blit(struct brw_context *brw, (dst_mt->format == MESA_FORMAT_Z24_UNORM_X8_UINT)) return false; + /* We also can't handle any combined depth-stencil formats because we + * have to reinterpret as a color format. + */ + if (_mesa_get_format_base_format(src_mt->format) == GL_DEPTH_STENCIL || + _mesa_get_format_base_format(dst_mt->format) == GL_DEPTH_STENCIL) + return false; + do_blorp_blit(brw, buffer_bit, src_irb, MESA_FORMAT_NONE, dst_irb, MESA_FORMAT_NONE, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, filter, mirror_x, mirror_y); break; case GL_STENCIL_BUFFER_BIT: + /* Blorp doesn't support combined depth stencil which is all we have + * prior to gen6. + */ + if (brw->gen < 6) + return false; + src_irb = intel_renderbuffer(read_fb->Attachment[BUFFER_STENCIL].Renderbuffer); dst_irb = @@ -737,10 +750,6 @@ brw_blorp_framebuffer(struct brw_context *brw, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) { - /* BLORP is not supported before Gen6. */ - if (brw->gen < 6) - return mask; - static GLbitfield buffer_bits[] = { GL_COLOR_BUFFER_BIT, GL_DEPTH_BUFFER_BIT, diff --git a/src/mesa/drivers/dri/i965/intel_fbo.c b/src/mesa/drivers/dri/i965/intel_fbo.c index 21e8e86d2c1..60a6d0f4554 100644 --- a/src/mesa/drivers/dri/i965/intel_fbo.c +++ b/src/mesa/drivers/dri/i965/intel_fbo.c @@ -886,6 +886,22 @@ intel_blit_framebuffer(struct gl_context *ctx, if (!_mesa_check_conditional_render(ctx)) return; + if (brw->gen < 6) { + /* On gen4-5, try BLT first. + * + * Gen4-5 have a single ring for both 3D and BLT operations, so there's + * no inter-ring synchronization issues like on Gen6+. It is apparently + * faster than using the 3D pipeline. Original Gen4 also has to rebase + * and copy miptree slices in order to render to unaligned locations. + */ + mask = intel_blit_framebuffer_with_blitter(ctx, readFb, drawFb, + srcX0, srcY0, srcX1, srcY1, + dstX0, dstY0, dstX1, dstY1, + mask); + if (mask == 0x0) + return; + } + mask = brw_blorp_framebuffer(brw, readFb, drawFb, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, @@ -919,51 +935,6 @@ intel_blit_framebuffer(struct gl_context *ctx, } /** - * Gen4-5 implementation of glBlitFrameBuffer(). - * - * Tries BLT, Meta, then swrast. - * - * Gen4-5 have a single ring for both 3D and BLT operations, so there's no - * inter-ring synchronization issues like on Gen6+. It is apparently faster - * than using the 3D pipeline. Original Gen4 also has to rebase and copy - * miptree slices in order to render to unaligned locations. - */ -static void -gen4_blit_framebuffer(struct gl_context *ctx, - struct gl_framebuffer *readFb, - struct gl_framebuffer *drawFb, - GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, - GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, - GLbitfield mask, GLenum filter) -{ - /* Page 679 of OpenGL 4.4 spec says: - * "Added BlitFramebuffer to commands affected by conditional rendering in - * section 10.10 (Bug 9562)." - */ - if (!_mesa_check_conditional_render(ctx)) - return; - - mask = intel_blit_framebuffer_with_blitter(ctx, readFb, drawFb, - srcX0, srcY0, srcX1, srcY1, - dstX0, dstY0, dstX1, dstY1, - mask); - if (mask == 0x0) - return; - - mask = _mesa_meta_BlitFramebuffer(ctx, readFb, drawFb, - srcX0, srcY0, srcX1, srcY1, - dstX0, dstY0, dstX1, dstY1, - mask, filter); - if (mask == 0x0) - return; - - _swrast_BlitFramebuffer(ctx, readFb, drawFb, - srcX0, srcY0, srcX1, srcY1, - dstX0, dstY0, dstX1, dstY1, - mask, filter); -} - -/** * Does the renderbuffer have hiz enabled? */ bool @@ -1110,10 +1081,7 @@ intel_fbo_init(struct brw_context *brw) dd->UnmapRenderbuffer = intel_unmap_renderbuffer; dd->RenderTexture = intel_render_texture; dd->ValidateFramebuffer = intel_validate_framebuffer; - if (brw->gen >= 6) - dd->BlitFramebuffer = intel_blit_framebuffer; - else - dd->BlitFramebuffer = gen4_blit_framebuffer; + dd->BlitFramebuffer = intel_blit_framebuffer; dd->EGLImageTargetRenderbufferStorage = intel_image_target_renderbuffer_storage; |