[Mesa-dev,2/2] Revert "i965: Only update renderbuffers on initial intelMakeCurrent"

Submitted by Iago Toral Quiroga on April 8, 2014, 8:20 a.m.

Details

Message ID 1396945250-532-3-git-send-email-itoral@igalia.com
State Rejected
Headers show

Not browsing as part of any series.

Commit Message

Iago Toral Quiroga April 8, 2014, 8:20 a.m.
This reverts commit 05da4a7a5e7d5bd988cb31f94ed8e1f053d9ee39.
We should always call intel_prepare_render in MakeCurrent.
---
 src/mesa/drivers/dri/i965/brw_context.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

Patch hide | download patch | download mbox

diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index 7c6281a..1b77541 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -932,7 +932,6 @@  intelMakeCurrent(__DRIcontext * driContextPriv,
    if (driContextPriv) {
       struct gl_context *ctx = &brw->ctx;
       struct gl_framebuffer *fb, *readFb;
-      struct intel_renderbuffer *rb = NULL;
 
       if (driDrawPriv == NULL && driReadPriv == NULL) {
          fb = _mesa_get_incomplete_framebuffer();
@@ -940,7 +939,6 @@  intelMakeCurrent(__DRIcontext * driContextPriv,
       } else {
          fb = driDrawPriv->driverPrivate;
          readFb = driReadPriv->driverPrivate;
-         rb = intel_get_renderbuffer(fb, BUFFER_BACK_LEFT);
          driContextPriv->dri2.draw_stamp = driDrawPriv->dri2.stamp - 1;
          driContextPriv->dri2.read_stamp = driReadPriv->dri2.stamp - 1;
       }
@@ -952,12 +950,7 @@  intelMakeCurrent(__DRIcontext * driContextPriv,
       intel_gles3_srgb_workaround(brw, fb);
       intel_gles3_srgb_workaround(brw, readFb);
 
-      if (rb && !rb->mt) {
-         /* If we don't have buffers for the drawable yet, force a call to
-          * getbuffers here so we can have a default drawable size. */
-         intel_prepare_render(brw);
-      }
-
+      intel_prepare_render(brw);
       _mesa_make_current(ctx, fb, readFb);
    } else {
       _mesa_make_current(NULL, NULL, NULL);