From: Dave Airlie <airliedfreedesktop.org>
Date: Mon, 8 Aug 2005 04:17:52 +0000 (+0000)
Subject: fix miniglx setting virtual size of 832 for 800x600
X-Git-Tag: android-x86-1.6~4789
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ac54de021a8f54b52cdb6d67fbdba5958de76f24;p=android-x86%2Fexternal-mesa.git

fix miniglx setting virtual size of 832 for 800x600
---

diff --git a/src/glx/mini/miniglx.c b/src/glx/mini/miniglx.c
index 1dd21bd1f0e..c1c4446ab71 100644
--- a/src/glx/mini/miniglx.c
+++ b/src/glx/mini/miniglx.c
@@ -437,6 +437,8 @@ SetupFBDev( Display *dpy )
    width = dpy->driverContext.shared.virtualWidth;
    height = dpy->driverContext.shared.virtualHeight;
    
+   if (width==832)
+	width=800;
    /* Bump size up to next supported mode.
     */
    if (width <= 720 && height <= 480) { 
@@ -459,8 +461,6 @@ SetupFBDev( Display *dpy )
    } 
 
 
-   dpy->driverContext.shared.virtualHeight = height;
-   dpy->driverContext.shared.virtualWidth = width;
    dpy->driverContext.shared.fbStride = width * (dpy->driverContext.bpp / 8);
    
    /* set the depth, resolution, etc */