diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2014-02-05 10:59:02 -0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2014-02-07 17:10:11 -0800 |
| commit | c79a7ef9a3d86116f8b8775d1f1960ef179198eb (patch) | |
| tree | 4705cd0c1f583124267dea64722b584e59d41710 | |
| parent | 17aeb3fdc9e453f7994ea31f7715e069e169a819 (diff) | |
i965: Move intel_prepare_render() above first buffer access
The driver is supposed to ensure buffers before any drawing operation, but in
do_blit_drawpixels() and do_blit_copypixels() we inspect the buffer format
before calling intel_prepare_render(). That was covered up by the
unconditional call to intel_prepare_render() in intelMakeCurrent(), but we
now only do this on the initial intelMakeCurrent call for a context
(to get the size for the initial viewport values).
https://bugs.freedesktop.org/show_bug.cgi?id=74083
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Tested-by: Alexander Monakov <amonakov@gmail.com>
(cherry picked from commit 44338cd826623ae0675861015a56c528261f3fd3)
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_pixel_copy.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_pixel_draw.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_pixel_copy.c b/src/mesa/drivers/dri/i965/intel_pixel_copy.c index b2795c62c14..486e3082533 100644 --- a/src/mesa/drivers/dri/i965/intel_pixel_copy.c +++ b/src/mesa/drivers/dri/i965/intel_pixel_copy.c @@ -66,6 +66,8 @@ do_blit_copypixels(struct gl_context * ctx, /* Update draw buffer bounds */ _mesa_update_state(ctx); + intel_prepare_render(brw); + switch (type) { case GL_COLOR: if (fb->_NumColorDrawBuffers != 1) { @@ -148,8 +150,6 @@ do_blit_copypixels(struct gl_context * ctx, return false; } - intel_prepare_render(brw); - intel_batchbuffer_flush(brw); /* Clip to destination buffer. */ diff --git a/src/mesa/drivers/dri/i965/intel_pixel_draw.c b/src/mesa/drivers/dri/i965/intel_pixel_draw.c index a09c139b866..2925b63192d 100644 --- a/src/mesa/drivers/dri/i965/intel_pixel_draw.c +++ b/src/mesa/drivers/dri/i965/intel_pixel_draw.c @@ -72,6 +72,8 @@ do_blit_drawpixels(struct gl_context * ctx, return false; } + intel_prepare_render(brw); + struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[0]; struct intel_renderbuffer *irb = intel_renderbuffer(rb); @@ -101,8 +103,6 @@ do_blit_drawpixels(struct gl_context * ctx, src_offset += _mesa_image_offset(2, unpack, width, height, format, type, 0, 0, 0); - intel_prepare_render(brw); - src_buffer = intel_bufferobj_buffer(brw, src, src_offset, width * height * irb->mt->cpp); |