From: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri, 5 Feb 2010 00:15:45 +0000 (-0800)
Subject: glx: Fix interval test in glXSwapIntervalMESA
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=68fef184390da2fd67acfd99fba0a2dbe4a3b875;p=mesa.git

glx: Fix interval test in glXSwapIntervalMESA

It appears that, in spite of what the spec says, the interval
parameter to glXSwapIntervalMESA has been an unsigned int since
day-1.  This made the 'if (interval < 0)' test useless.  The test is
removed and the spec is updated to note that the interval is an
unsigned value.
---

diff --git a/docs/MESA_swap_control.spec b/docs/MESA_swap_control.spec
index ecc674649e2..856978b535b 100644
--- a/docs/MESA_swap_control.spec
+++ b/docs/MESA_swap_control.spec
@@ -43,7 +43,7 @@ Issues
 
 New Procedures and Functions
 
-    int glXSwapIntervalMESA(int interval)
+    int glXSwapIntervalMESA(unsigned int interval)
     int glXGetSwapIntervalMESA(void)
 
 New Tokens
@@ -103,11 +103,8 @@ Additions to the GLX 1.3 Specification
 
 Errors
 
-    glXSwapIntervalMESA returns GLX_BAD_VALUE if parameter <interval> is
-    less than zero.
-
     glXSwapIntervalMESA returns GLX_BAD_CONTEXT if there is no current
-    GLXContext.
+    GLXContext or if the current context is not a direct rendering context.
 
 GLX Protocol
 
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index 19538f2e5c0..c429545f99a 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -1951,10 +1951,6 @@ __glXSwapIntervalMESA(unsigned int interval)
 {
    GLXContext gc = __glXGetCurrentContext();
 
-   if (interval < 0) {
-      return GLX_BAD_VALUE;
-   }
-
 #ifdef __DRI_SWAP_CONTROL
    if (gc != NULL && gc->driContext) {
       __GLXscreenConfigs *const psc = GetGLXScreenConfigs(gc->currentDpy,