diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-07 10:08:29 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-07 10:08:29 +0100 |
| commit | 74380c2fc1384a529df4f4995bddcf587fbac389 (patch) | |
| tree | 0089fa6c54409e2a9515e0f530bf33e5f9561e29 /mesalib/src/mapi/glapi/gen/OES_single_precision.xml | |
| parent | 2c345c9da4dedfafe791557ca3fcf891ce26249d (diff) | |
| parent | 1738a6973deb03f33a71c9527594727cb8bb64b4 (diff) | |
| download | vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.tar.gz vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.tar.bz2 vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa xkbcomp git update 7 nov 2012
Conflicts:
mesalib/src/mapi/glapi/gen/glX_API.xml
mesalib/src/mesa/main/.gitignore
xkbcomp/listing.c
xorg-server/hw/xwin/winshaddd.c
xorg-server/hw/xwin/winshadddnl.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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesalib/src/mapi/glapi/gen/OES_single_precision.xml b/mesalib/src/mapi/glapi/gen/OES_single_precision.xml index 7d4744159..8a6c27194 100644 --- a/mesalib/src/mapi/glapi/gen/OES_single_precision.xml +++ b/mesalib/src/mapi/glapi/gen/OES_single_precision.xml @@ -12,7 +12,7 @@ </function> <function name="ClipPlanefOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="plane" type="GLenum"/> <param name="equation" type="const GLfloat *" count="4"/> </function> @@ -24,13 +24,13 @@ </function> <function name="GetClipPlanefOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" desktop="false" mesa_name="-OES"> <param name="plane" type="GLenum"/> <param name="equation" type="GLfloat *" output="true" count="4"/> </function> <function name="FrustumfOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="left" type="GLfloat"/> <param name="right" type="GLfloat"/> <param name="bottom" type="GLfloat"/> @@ -40,7 +40,7 @@ </function> <function name="OrthofOES" offset="assign" static_dispatch="false" - es1="1.0"> + es1="1.0" exec="es" mesa_name="-OES"> <param name="left" type="GLfloat"/> <param name="right" type="GLfloat"/> <param name="bottom" type="GLfloat"/> |