From 281f26a1dfda732687680a36857960f74608df5b Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 25 Oct 2012 09:59:33 +0200
Subject: fontconfig mesa pixman git update

fonconfig: 73ab254336100c5971e3a1e14b73222efd0e9822
mesa: 86cd77d0a9ac940c2c06eebc5e9ef840d176712a
pixman: 9df645dfb04b5a790faabe1e9a84fc37287d91b0
---
 mesalib/src/mapi/glapi/gen/GL3x.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'mesalib/src/mapi/glapi')

diff --git a/mesalib/src/mapi/glapi/gen/GL3x.xml b/mesalib/src/mapi/glapi/gen/GL3x.xml
index 7642a27c4..82b977f58 100644
--- a/mesalib/src/mapi/glapi/gen/GL3x.xml
+++ b/mesalib/src/mapi/glapi/gen/GL3x.xml
@@ -150,7 +150,7 @@
       <return type="const GLubyte *"/>
   </function>
 
-  <function name="ClampColor" offset="assign">
+  <function name="ClampColor" alias="ClampColorARB">
     <param name="target" type="GLenum"/>
     <param name="clamp" type="GLenum"/>
   </function>
@@ -624,7 +624,8 @@
   <enum name="TEXTURE_SWIZZLE_A"                value="0x8E45"/>
   <enum name="TEXTURE_SWIZZLE_RGBA"             value="0x8E46"/>
 
-  <function name="VertexAttribDivisor" offset="assign" es2="3.0">
+  <function name="VertexAttribDivisor" offset="assign" es2="3.0"
+            alias="VertexAttribDivisorARB">
     <param name="index" type="GLuint"/>
     <param name="divisor" type="GLuint"/>
   </function>
-- 
cgit v1.2.3