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/ARB_get_program_binary.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/ARB_get_program_binary.xml')
-rw-r--r-- | mesalib/src/mapi/glapi/gen/ARB_get_program_binary.xml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mesalib/src/mapi/glapi/gen/ARB_get_program_binary.xml b/mesalib/src/mapi/glapi/gen/ARB_get_program_binary.xml index 8da5c41e8..7db166564 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_get_program_binary.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_get_program_binary.xml @@ -11,7 +11,8 @@ <enum name="NUM_PROGRAM_BINARY_FORMATS" value="0x87FE"/> <enum name="PROGRAM_BINARY_FORMATS" value="0x87FF"/> - <function name="GetProgramBinary" offset="assign" static_dispatch="false" es2="3.0"> + <function name="GetProgramBinary" offset="assign" static_dispatch="false" + es2="3.0" exec="skip"> <param name="program" type="GLuint"/> <param name="bufSize" type="GLsizei"/> <param name="length" type="GLsizei *"/> @@ -19,14 +20,16 @@ <param name="binary" type="GLvoid *"/> </function> - <function name="ProgramBinary" offset="assign" static_dispatch="false" es2="3.0"> + <function name="ProgramBinary" offset="assign" static_dispatch="false" + es2="3.0" exec="skip"> <param name="program" type="GLuint"/> <param name="binaryFormat" type="GLenum"/> <param name="binary" type="const GLvoid *"/> <param name="length" type="GLsizei"/> </function> - <function name="ProgramParameteri" offset="assign" static_dispatch="false" es2="3.0"> + <function name="ProgramParameteri" offset="assign" static_dispatch="false" + es2="3.0" exec="skip"> <param name="program" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="value" type="GLint"/> |