From: Xiang, Haihao <haihao.xiang@intel.com>
Date: Wed, 3 Sep 2008 06:47:36 +0000 (+0800)
Subject: intel: Fix a crash if dri2 is disabled.
X-Git-Tag: 062012170305~18158
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3bb2a24921af0ec419afc928ee5b279982aa01ea;p=profile%2Fivi%2Fmesa.git

intel: Fix a crash if dri2 is disabled.
---

diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index f0ee96f..2975e4c 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -921,14 +921,14 @@ intelMakeCurrent(__DRIcontextPrivate * driContextPriv,
       struct intel_framebuffer *intel_fb =
 	 (struct intel_framebuffer *) driDrawPriv->driverPrivate;
       GLframebuffer *readFb = (GLframebuffer *) driReadPriv->driverPrivate;
-
-    intel_update_renderbuffers(driContextPriv, driDrawPriv);
-    if (driDrawPriv != driReadPriv)
-	intel_update_renderbuffers(driContextPriv, driReadPriv);
-
-      /* XXX FBO temporary fix-ups! */
-      /* if the renderbuffers don't have regions, init them from the context */
-      if (!driContextPriv->driScreenPriv->dri2.enabled) {
+ 
+      if (driContextPriv->driScreenPriv->dri2.enabled) {     
+          intel_update_renderbuffers(driContextPriv, driDrawPriv);
+          if (driDrawPriv != driReadPriv)
+              intel_update_renderbuffers(driContextPriv, driReadPriv);
+      } else {
+          /* XXX FBO temporary fix-ups! */
+          /* if the renderbuffers don't have regions, init them from the context */
          struct intel_renderbuffer *irbDepth
             = intel_get_renderbuffer(&intel_fb->Base, BUFFER_DEPTH);
          struct intel_renderbuffer *irbStencil