Merge remote-tracking branch 'origin/released'

* origin/released:
  xserver mesa xkbcomp git update 5 nov 2012

Conflicts:
	mesalib/src/glsl/.gitignore
	mesalib/src/mesa/main/.gitignore
	xorg-server/Xi/chgdctl.c
	xorg-server/dix/getevents.c
	xorg-server/hw/xwin/winprefs.c
	xorg-server/os/utils.c

1 files changed, 47 insertions, 26 deletions

diff --git a/xorg-server/glx/glapi_gentable.c b/xorg-server/glx/glapi_gentable.c
index c4c0b79d2..cfbfb671f 100644
--- a/xorg-server/glx/glapi_gentable.c
+++ b/xorg-server/glx/glapi_gentable.c
@@ -48,7 +48,7 @@
 #include <stdlib.h>

 #include <stdio.h>

 

-#include <GL/gl.h>

+#include "glheader.h"

 

 #include "glapi.h"

 #include "glapitable.h"

@@ -3769,13 +3769,6 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
     }

 

 

-    if(!disp->ClampColor) {

-        void ** procp = (void **) &disp->ClampColor;

-        snprintf(symboln, sizeof(symboln), "%sClampColor", symbol_prefix);

-        *procp = dlsym(handle, symboln);

-    }

-

-

     if(!disp->ClearBufferfi) {

         void ** procp = (void **) &disp->ClearBufferfi;

         snprintf(symboln, sizeof(symboln), "%sClearBufferfi", symbol_prefix);

@@ -3813,6 +3806,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
 

     if(!disp->FramebufferTexture) {

         void ** procp = (void **) &disp->FramebufferTexture;

+        snprintf(symboln, sizeof(symboln), "%sFramebufferTextureARB", symbol_prefix);

+        *procp = dlsym(handle, symboln);

+    }

+

+

+    if(!disp->FramebufferTexture) {

+        void ** procp = (void **) &disp->FramebufferTexture;

         snprintf(symboln, sizeof(symboln), "%sFramebufferTexture", symbol_prefix);

         *procp = dlsym(handle, symboln);

     }

@@ -3832,13 +3832,6 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
     }

 

 

-    if(!disp->VertexAttribDivisor) {

-        void ** procp = (void **) &disp->VertexAttribDivisor;

-        snprintf(symboln, sizeof(symboln), "%sVertexAttribDivisor", symbol_prefix);

-        *procp = dlsym(handle, symboln);

-    }

-

-

     if(!disp->LoadTransposeMatrixdARB) {

         void ** procp = (void **) &disp->LoadTransposeMatrixdARB;

         snprintf(symboln, sizeof(symboln), "%sLoadTransposeMatrixd", symbol_prefix);

@@ -5540,6 +5533,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
     }

 

 

+    if(!disp->ClampColorARB) {

+        void ** procp = (void **) &disp->ClampColorARB;

+        snprintf(symboln, sizeof(symboln), "%sClampColor", symbol_prefix);

+        *procp = dlsym(handle, symboln);

+    }

+

+

     if(!disp->DrawArraysInstancedARB) {

         void ** procp = (void **) &disp->DrawArraysInstancedARB;

         snprintf(symboln, sizeof(symboln), "%sDrawArraysInstancedARB", symbol_prefix);

@@ -5596,13 +5596,6 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
     }

 

 

-    if(!disp->FramebufferTextureARB) {

-        void ** procp = (void **) &disp->FramebufferTextureARB;

-        snprintf(symboln, sizeof(symboln), "%sFramebufferTextureARB", symbol_prefix);

-        *procp = dlsym(handle, symboln);

-    }

-

-

     if(!disp->FramebufferTextureFaceARB) {

         void ** procp = (void **) &disp->FramebufferTextureFaceARB;

         snprintf(symboln, sizeof(symboln), "%sFramebufferTextureFaceARB", symbol_prefix);

@@ -5610,16 +5603,16 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
     }

 

 

-    if(!disp->ProgramParameteriARB) {

-        void ** procp = (void **) &disp->ProgramParameteriARB;

-        snprintf(symboln, sizeof(symboln), "%sProgramParameteriARB", symbol_prefix);

+    if(!disp->VertexAttribDivisorARB) {

+        void ** procp = (void **) &disp->VertexAttribDivisorARB;

+        snprintf(symboln, sizeof(symboln), "%sVertexAttribDivisorARB", symbol_prefix);

         *procp = dlsym(handle, symboln);

     }

 

 

     if(!disp->VertexAttribDivisorARB) {

         void ** procp = (void **) &disp->VertexAttribDivisorARB;

-        snprintf(symboln, sizeof(symboln), "%sVertexAttribDivisorARB", symbol_prefix);

+        snprintf(symboln, sizeof(symboln), "%sVertexAttribDivisor", symbol_prefix);

         *procp = dlsym(handle, symboln);

     }

 

@@ -6352,6 +6345,34 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
     }

 

 

+    if(!disp->GetProgramBinary) {

+        void ** procp = (void **) &disp->GetProgramBinary;

+        snprintf(symboln, sizeof(symboln), "%sGetProgramBinary", symbol_prefix);

+        *procp = dlsym(handle, symboln);

+    }

+

+

+    if(!disp->ProgramBinary) {

+        void ** procp = (void **) &disp->ProgramBinary;

+        snprintf(symboln, sizeof(symboln), "%sProgramBinary", symbol_prefix);

+        *procp = dlsym(handle, symboln);

+    }

+

+

+    if(!disp->ProgramParameteri) {

+        void ** procp = (void **) &disp->ProgramParameteri;

+        snprintf(symboln, sizeof(symboln), "%sProgramParameteriARB", symbol_prefix);

+        *procp = dlsym(handle, symboln);

+    }

+

+

+    if(!disp->ProgramParameteri) {

+        void ** procp = (void **) &disp->ProgramParameteri;

+        snprintf(symboln, sizeof(symboln), "%sProgramParameteri", symbol_prefix);

+        *procp = dlsym(handle, symboln);

+    }

+

+

     if(!disp->DebugMessageCallbackARB) {

         void ** procp = (void **) &disp->DebugMessageCallbackARB;

         snprintf(symboln, sizeof(symboln), "%sDebugMessageCallbackARB", symbol_prefix);