diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-25 14:46:10 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-25 14:46:10 +0200 |
| commit | f6c8097ba5b5bb714185762dbd0ff9958d23e804 (patch) | |
| tree | 222a1d19624e55a205786f54edd7892aae79a7bd /mesalib/src/mapi | |
| parent | b929a2bab9e244cbc823f7bb2fe9e21537e3ceb7 (diff) | |
| parent | 281f26a1dfda732687680a36857960f74608df5b (diff) | |
| download | vcxsrv-f6c8097ba5b5bb714185762dbd0ff9958d23e804.tar.gz vcxsrv-f6c8097ba5b5bb714185762dbd0ff9958d23e804.tar.bz2 vcxsrv-f6c8097ba5b5bb714185762dbd0ff9958d23e804.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman git update
Diffstat (limited to 'mesalib/src/mapi')
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/GL3x.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesalib/src/mapi/glapi/gen/GL3x.xml b/mesalib/src/mapi/glapi/gen/GL3x.xml index 9485d58a2..808d3cdc7 100644 --- a/mesalib/src/mapi/glapi/gen/GL3x.xml +++ b/mesalib/src/mapi/glapi/gen/GL3x.xml @@ -154,7 +154,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> @@ -628,7 +628,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> |