diff options
author | marha <marha@users.sourceforge.net> | 2012-11-19 11:21:45 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-11-19 11:21:45 +0100 |
commit | 57b3e446b9b4017ccfdd3227be481df590740426 (patch) | |
tree | 0e4899f530f75d343c090202fc7123c78f9b4866 /mesalib/src/mapi/glapi/gen/OES_single_precision.xml | |
parent | 24635abae6008bef13e30d798b3f33abab412770 (diff) | |
parent | b3e1e62c45f525cdd332073aaa34d8452cb23374 (diff) | |
download | vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.tar.gz vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.tar.bz2 vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
git update 19 nov 2012
Added bash script to update released branch
Conflicts:
mesalib/src/mapi/glapi/gen/gl_API.xml
mesalib/src/mesa/program/.gitignore
pixman/pixman/pixman-mmx.c
xorg-server/Xi/xiquerypointer.c
xorg-server/xkb/xkb.c
Diffstat (limited to 'mesalib/src/mapi/glapi/gen/OES_single_precision.xml')
-rw-r--r-- | mesalib/src/mapi/glapi/gen/OES_single_precision.xml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mesalib/src/mapi/glapi/gen/OES_single_precision.xml b/mesalib/src/mapi/glapi/gen/OES_single_precision.xml index 8a6c27194..8346b64ee 100644 --- a/mesalib/src/mapi/glapi/gen/OES_single_precision.xml +++ b/mesalib/src/mapi/glapi/gen/OES_single_precision.xml @@ -11,10 +11,10 @@ <param name="depth" type="GLclampf"/> </function> - <function name="ClipPlanefOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="ClipPlanefOES" static_dispatch="false" + es1="1.0" alias="ClipPlanef"> <param name="plane" type="GLenum"/> - <param name="equation" type="const GLfloat *" count="4"/> + <param name="equation" type="const GLfloat *"/> </function> <function name="DepthRangefOES" alias="DepthRangef" static_dispatch="false" @@ -23,14 +23,14 @@ <param name="zFar" type="GLclampf"/> </function> - <function name="GetClipPlanefOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" desktop="false" mesa_name="-OES"> + <function name="GetClipPlanefOES" static_dispatch="false" + es1="1.0" desktop="false" alias="GetClipPlanef"> <param name="plane" type="GLenum"/> - <param name="equation" type="GLfloat *" output="true" count="4"/> + <param name="equation" type="GLfloat *"/> </function> - <function name="FrustumfOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="FrustumfOES" static_dispatch="false" + es1="1.0" alias="Frustumf"> <param name="left" type="GLfloat"/> <param name="right" type="GLfloat"/> <param name="bottom" type="GLfloat"/> @@ -39,8 +39,8 @@ <param name="zFar" type="GLfloat"/> </function> - <function name="OrthofOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="OrthofOES" static_dispatch="false" + es1="1.0" alias="Orthof"> <param name="left" type="GLfloat"/> <param name="right" type="GLfloat"/> <param name="bottom" type="GLfloat"/> |