xserver: Branch 'master' - 4 commits

[Keith Packard]

 glx/glxserver.h                         |    1 -
 glx/indirect_program.c                  |   22 ----------------------
 glx/indirect_texture_compression.c      |    8 ++++++--
 hw/xfree86/os-support/linux/lnx_video.c |    2 +-
 4 files changed, 7 insertions(+), 26 deletions(-)

New commits:
commit 76eedb039fc8d515a76c1df944fd5a85ac674019
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Jan 27 11:36:08 2014 -0800

    xfree86: Fix a compiler warning on 64-bit.
    
    asm/mtrr.h makes this an unsigned long on 32, but a u64 on 64.  Cast
    it to a long to win.
    
    Signed-off-by: Eric Anholt <eric at anholt.net>
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
index 824003d..47f5abc 100644
--- a/hw/xfree86/os-support/linux/lnx_video.c
+++ b/hw/xfree86/os-support/linux/lnx_video.c
@@ -204,7 +204,7 @@ mtrr_cull_wc_region(int screenNum, unsigned long base, unsigned long size,
             xf86DrvMsgVerb(screenNum, X_WARNING, 0,
                            "Failed to remove MMIO "
                            "write-combining range (0x%lx,0x%lx)\n",
-                           gent.base, (unsigned long) gent.size);
+                           (unsigned long)gent.base, (unsigned long) gent.size);
         }
     }
     return wcreturn;
commit 9f8f6657cdd3a5b166771695addb6fe76d93c378
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Jan 27 11:36:07 2014 -0800

    glx: Delete dead NV program string functions.
    
    These have been throwing a compiler warning about missing prototypes,
    since the generated code to define the prototypes stopped being
    generated (possibly because the code was dead).
    
    Signed-off-by: Eric Anholt <eric at anholt.net>
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/glx/indirect_program.c b/glx/indirect_program.c
index fa4a240..d503262 100644
--- a/glx/indirect_program.c
+++ b/glx/indirect_program.c
@@ -122,25 +122,3 @@ __glXDispSwap_GetProgramStringARB(struct __GLXclientStateRec *cl, GLbyte * pc)
 
     return DoGetProgramString(cl, pc, get_program, get_program_string, True);
 }
-
-int
-__glXDisp_GetProgramStringNV(struct __GLXclientStateRec *cl, GLbyte * pc)
-{
-    PFNGLGETPROGRAMIVARBPROC get_program =
-        __glGetProcAddress("glGetProgramivARB");
-    PFNGLGETPROGRAMSTRINGARBPROC get_program_string =
-        __glGetProcAddress("glGetProgramStringARB");
-
-    return DoGetProgramString(cl, pc, get_program, get_program_string, False);
-}
-
-int
-__glXDispSwap_GetProgramStringNV(struct __GLXclientStateRec *cl, GLbyte * pc)
-{
-    PFNGLGETPROGRAMIVARBPROC get_program =
-        __glGetProcAddress("glGetProgramivARB");
-    PFNGLGETPROGRAMSTRINGARBPROC get_program_string =
-        __glGetProcAddress("glGetProgramStringARB");
-
-    return DoGetProgramString(cl, pc, get_program, get_program_string, True);
-}
commit 0c774d53c5c1e8845e7da9b01814d7b98f621f51
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Jan 27 11:36:06 2014 -0800

    glx: Reduce compiler warnings by not requesting GL extension prototypes.
    
    They're not officially in the ABI, so you shouldn't use them anyway.
    
    Signed-off-by: Eric Anholt <eric at anholt.net>
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/glx/glxserver.h b/glx/glxserver.h
index 7f36e5f..3f2ae35 100644
--- a/glx/glxserver.h
+++ b/glx/glxserver.h
@@ -46,7 +46,6 @@
 #include <resource.h>
 #include <scrnintstr.h>
 
-#define GL_GLEXT_PROTOTYPES     /* we want prototypes */
 #include <GL/gl.h>
 #include <GL/glext.h>
 #include <GL/glxproto.h>
commit 87c4551c9cc9e382e6cfb59df1759d27c776abc8
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Jan 27 11:36:05 2014 -0800

    glx: Stop relying on libGL ABI bugs for glGetCompressedTexImage().
    
    In theory, the linux libGL ABI exposes just GL 1.2 plus GLX 1.3.  But,
    thanks to libglapi, we're letting glGetCompressedTexImageARB() be
    exposed too.  The GLX code was inappropriately relying on it by using
    GL_GLEXT_PROTOTYPES.
    
    Signed-off-by: Eric Anholt <eric at anholt.net>
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/glx/indirect_texture_compression.c b/glx/indirect_texture_compression.c
index 94de47d..2018de6 100644
--- a/glx/indirect_texture_compression.c
+++ b/glx/indirect_texture_compression.c
@@ -54,9 +54,11 @@ __glXDisp_GetCompressedTexImage(struct __GLXclientStateRec *cl, GLbyte * pc)
                                  &compsize);
 
         if (compsize != 0) {
+            PFNGLGETCOMPRESSEDTEXIMAGEARBPROC GetCompressedTexImageARB =
+                __glGetProcAddress("glGetCompressedTexImageARB");
             __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
             __glXClearErrorOccured();
-            glGetCompressedTexImageARB(target, level, answer);
+            GetCompressedTexImageARB(target, level, answer);
         }
 
         if (__glXErrorOccured()) {
@@ -96,9 +98,11 @@ __glXDispSwap_GetCompressedTexImage(struct __GLXclientStateRec *cl, GLbyte * pc)
                                  &compsize);
 
         if (compsize != 0) {
+            PFNGLGETCOMPRESSEDTEXIMAGEARBPROC GetCompressedTexImageARB =
+                __glGetProcAddress("glGetCompressedTexImageARB");
             __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
             __glXClearErrorOccured();
-            glGetCompressedTexImageARB(target, level, answer);
+            GetCompressedTexImageARB(target, level, answer);
         }
 
         if (__glXErrorOccured()) {