Mesa (master): glx: Fix interval test in glXSwapIntervalMESA

Ian Romanick idr at kemper.freedesktop.org
Wed Feb 17 19:44:23 UTC 2010


Module: Mesa
Branch: master
Commit: 68fef184390da2fd67acfd99fba0a2dbe4a3b875
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=68fef184390da2fd67acfd99fba0a2dbe4a3b875

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Thu Feb  4 16:15:45 2010 -0800

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.

---

 docs/MESA_swap_control.spec |    7 ++-----
 src/glx/glxcmds.c           |    4 ----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/docs/MESA_swap_control.spec b/docs/MESA_swap_control.spec
index ecc6746..856978b 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 19538f2..c429545 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,




More information about the mesa-commit mailing list