[Mesa-dev] [PATCH 03/35] !UPSTREAM: Disable non-meta paths

[Ian Romanick]

From: Ian Romanick <ian.d.romanick at intel.com>

This is a temporary commit so that i965 will hit the paths in meta that
are modified by later patches in this series.
---
 src/mesa/drivers/dri/i965/brw_clear.c        | 3 ++-
 src/mesa/drivers/dri/i965/intel_fbo.c        | 3 +++
 src/mesa/drivers/dri/i965/intel_pixel_copy.c | 2 ++
 src/mesa/drivers/dri/i965/intel_pixel_draw.c | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/brw_clear.c b/src/mesa/drivers/dri/i965/brw_clear.c
index 953e9ba..a9c20d2 100644
--- a/src/mesa/drivers/dri/i965/brw_clear.c
+++ b/src/mesa/drivers/dri/i965/brw_clear.c
@@ -230,6 +230,7 @@ brw_clear(struct gl_context *ctx, GLbitfield mask)
    intel_prepare_render(brw);
    brw_workaround_depthstencil_alignment(brw, partial_clear ? 0 : mask);
 
+#if 0
    if (mask & BUFFER_BIT_DEPTH) {
       if (brw_fast_clear_depth(ctx)) {
 	 DBG("fast clear: depth\n");
@@ -246,7 +247,7 @@ brw_clear(struct gl_context *ctx, GLbitfield mask)
          }
       }
    }
-
+#endif
    GLbitfield tri_mask = mask & (BUFFER_BITS_COLOR |
 				 BUFFER_BIT_STENCIL |
 				 BUFFER_BIT_DEPTH);
diff --git a/src/mesa/drivers/dri/i965/intel_fbo.c b/src/mesa/drivers/dri/i965/intel_fbo.c
index d99f9a6..246d55c 100644
--- a/src/mesa/drivers/dri/i965/intel_fbo.c
+++ b/src/mesa/drivers/dri/i965/intel_fbo.c
@@ -775,6 +775,8 @@ intel_blit_framebuffer(struct gl_context *ctx,
                        GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
                        GLbitfield mask, GLenum filter)
 {
+   if (ctx->DrawBuffer->Visual.samples > 1
+       || ctx->ReadBuffer->Visual.samples > 1) {
    mask = brw_blorp_framebuffer(brw_context(ctx),
                                 srcX0, srcY0, srcX1, srcY1,
                                 dstX0, dstY0, dstX1, dstY1,
@@ -789,6 +791,7 @@ intel_blit_framebuffer(struct gl_context *ctx,
                                               mask, filter);
    if (mask == 0x0)
       return;
+   }
 
 
    _mesa_meta_BlitFramebuffer(ctx,
diff --git a/src/mesa/drivers/dri/i965/intel_pixel_copy.c b/src/mesa/drivers/dri/i965/intel_pixel_copy.c
index b2795c6..eee9ad6 100644
--- a/src/mesa/drivers/dri/i965/intel_pixel_copy.c
+++ b/src/mesa/drivers/dri/i965/intel_pixel_copy.c
@@ -208,8 +208,10 @@ intelCopyPixels(struct gl_context * ctx,
    if (!_mesa_check_conditional_render(ctx))
       return;
 
+#if 0
    if (do_blit_copypixels(ctx, srcx, srcy, width, height, destx, desty, type))
       return;
+#endif
 
    /* this will use swrast if needed */
    _mesa_meta_CopyPixels(ctx, srcx, srcy, width, height, destx, desty, type);
diff --git a/src/mesa/drivers/dri/i965/intel_pixel_draw.c b/src/mesa/drivers/dri/i965/intel_pixel_draw.c
index a09c139..0c6d374 100644
--- a/src/mesa/drivers/dri/i965/intel_pixel_draw.c
+++ b/src/mesa/drivers/dri/i965/intel_pixel_draw.c
@@ -159,6 +159,7 @@ intelDrawPixels(struct gl_context * ctx,
       return;
    }
 
+#if 0
    if (_mesa_is_bufferobj(unpack->BufferObj)) {
       if (do_blit_drawpixels(ctx, x, y, width, height, format, type, unpack,
 			     pixels)) {
@@ -167,6 +168,7 @@ intelDrawPixels(struct gl_context * ctx,
 
       perf_debug("%s: fallback to generic code in PBO case\n", __FUNCTION__);
    }
+#endif
 
    _mesa_meta_DrawPixels(ctx, x, y, width, height, format, type,
                          unpack, pixels);
-- 
1.8.1.4