From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 9 Apr 2004 18:11:45 +0000 (+0000)
Subject: fix max buffer size test (Kyle Bateman, bug 912828)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=089645799cad23784d02db229cec44422c46cdce;p=mesa.git

fix max buffer size test (Kyle Bateman, bug 912828)
---

diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c
index b58188e2003..ebd75cd3bc9 100644
--- a/src/mesa/drivers/x11/xm_dd.c
+++ b/src/mesa/drivers/x11/xm_dd.c
@@ -105,14 +105,8 @@ get_buffer_size( GLframebuffer *buffer, GLuint *width, GLuint *height )
    unsigned int winwidth, winheight;
 #ifdef XFree86Server
    /* XFree86 GLX renderer */
-   if (xmBuffer->frontbuffer->width > MAX_WIDTH ||
-       xmBuffer->frontbuffer->height > MAX_HEIGHT) {
-     winwidth = buffer->Width;
-     winheight = buffer->Height;
-   } else {
-     winwidth = xmBuffer->frontbuffer->width;
-     winheight = xmBuffer->frontbuffer->height;
-   }
+   winwidth = MIN2(xmBuffer->frontbuffer->width, MAX_WIDTH);
+   winheight = MIN2(xmBuffer->frontbuffer->height, MAX_HEIGHT);
 #else
    Window root;
    int winx, winy;