fontconfig libxcb xcb-proto mesa xserver git update 27 Mar 2012

1 files changed, 32 insertions, 18 deletions

diff --git a/mesalib/src/mapi/glapi/glapi_gentable.c b/mesalib/src/mapi/glapi/glapi_gentable.c
index abb0d0109..e4f75fe7b 100644
--- a/mesalib/src/mapi/glapi/glapi_gentable.c
+++ b/mesalib/src/mapi/glapi/glapi_gentable.c
@@ -5813,6 +5813,20 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
     }
 
 
+    if(!disp->BindFragDataLocationIndexed) {
+        void ** procp = (void **) &disp->BindFragDataLocationIndexed;
+        snprintf(symboln, sizeof(symboln), "%sBindFragDataLocationIndexed", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->GetFragDataIndex) {
+        void ** procp = (void **) &disp->GetFragDataIndex;
+        snprintf(symboln, sizeof(symboln), "%sGetFragDataIndex", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
     if(!disp->BindSampler) {
         void ** procp = (void **) &disp->BindSampler;
         snprintf(symboln, sizeof(symboln), "%sBindSampler", symbol_prefix);
@@ -8300,14 +8314,14 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
 
     if(!disp->PrimitiveRestartIndexNV) {
         void ** procp = (void **) &disp->PrimitiveRestartIndexNV;
-        snprintf(symboln, sizeof(symboln), "%sPrimitiveRestartIndexNV", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sPrimitiveRestartIndex", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->PrimitiveRestartIndexNV) {
         void ** procp = (void **) &disp->PrimitiveRestartIndexNV;
-        snprintf(symboln, sizeof(symboln), "%sPrimitiveRestartIndex", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sPrimitiveRestartIndexNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
@@ -9266,56 +9280,56 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
 
     if(!disp->BeginConditionalRenderNV) {
         void ** procp = (void **) &disp->BeginConditionalRenderNV;
-        snprintf(symboln, sizeof(symboln), "%sBeginConditionalRenderNV", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sBeginConditionalRender", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->BeginConditionalRenderNV) {
         void ** procp = (void **) &disp->BeginConditionalRenderNV;
-        snprintf(symboln, sizeof(symboln), "%sBeginConditionalRender", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sBeginConditionalRenderNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->EndConditionalRenderNV) {
         void ** procp = (void **) &disp->EndConditionalRenderNV;
-        snprintf(symboln, sizeof(symboln), "%sEndConditionalRenderNV", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sEndConditionalRender", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->EndConditionalRenderNV) {
         void ** procp = (void **) &disp->EndConditionalRenderNV;
-        snprintf(symboln, sizeof(symboln), "%sEndConditionalRender", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sEndConditionalRenderNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->BeginTransformFeedbackEXT) {
         void ** procp = (void **) &disp->BeginTransformFeedbackEXT;
-        snprintf(symboln, sizeof(symboln), "%sBeginTransformFeedbackEXT", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sBeginTransformFeedback", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->BeginTransformFeedbackEXT) {
         void ** procp = (void **) &disp->BeginTransformFeedbackEXT;
-        snprintf(symboln, sizeof(symboln), "%sBeginTransformFeedback", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sBeginTransformFeedbackEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->BindBufferBaseEXT) {
         void ** procp = (void **) &disp->BindBufferBaseEXT;
-        snprintf(symboln, sizeof(symboln), "%sBindBufferBaseEXT", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sBindBufferBase", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->BindBufferBaseEXT) {
         void ** procp = (void **) &disp->BindBufferBaseEXT;
-        snprintf(symboln, sizeof(symboln), "%sBindBufferBase", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sBindBufferBaseEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
@@ -9329,56 +9343,56 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
 
     if(!disp->BindBufferRangeEXT) {
         void ** procp = (void **) &disp->BindBufferRangeEXT;
-        snprintf(symboln, sizeof(symboln), "%sBindBufferRangeEXT", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sBindBufferRange", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->BindBufferRangeEXT) {
         void ** procp = (void **) &disp->BindBufferRangeEXT;
-        snprintf(symboln, sizeof(symboln), "%sBindBufferRange", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sBindBufferRangeEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->EndTransformFeedbackEXT) {
         void ** procp = (void **) &disp->EndTransformFeedbackEXT;
-        snprintf(symboln, sizeof(symboln), "%sEndTransformFeedbackEXT", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sEndTransformFeedback", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->EndTransformFeedbackEXT) {
         void ** procp = (void **) &disp->EndTransformFeedbackEXT;
-        snprintf(symboln, sizeof(symboln), "%sEndTransformFeedback", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sEndTransformFeedbackEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->GetTransformFeedbackVaryingEXT) {
         void ** procp = (void **) &disp->GetTransformFeedbackVaryingEXT;
-        snprintf(symboln, sizeof(symboln), "%sGetTransformFeedbackVaryingEXT", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sGetTransformFeedbackVarying", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->GetTransformFeedbackVaryingEXT) {
         void ** procp = (void **) &disp->GetTransformFeedbackVaryingEXT;
-        snprintf(symboln, sizeof(symboln), "%sGetTransformFeedbackVarying", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sGetTransformFeedbackVaryingEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->TransformFeedbackVaryingsEXT) {
         void ** procp = (void **) &disp->TransformFeedbackVaryingsEXT;
-        snprintf(symboln, sizeof(symboln), "%sTransformFeedbackVaryingsEXT", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sTransformFeedbackVaryings", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->TransformFeedbackVaryingsEXT) {
         void ** procp = (void **) &disp->TransformFeedbackVaryingsEXT;
-        snprintf(symboln, sizeof(symboln), "%sTransformFeedbackVaryings", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sTransformFeedbackVaryingsEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }