diff options
| author | marha <marha@users.sourceforge.net> | 2015-06-15 21:36:28 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-06-15 21:36:28 +0200 |
| commit | 008a8d8051786badb83e455bd9281103ba9a6470 (patch) | |
| tree | f99ea672d105271cb60a726fac8022ce47ea2866 /mesalib/src/mapi/glapi/gen/ARB_program_interface_query.xml | |
| parent | 912e881bec8b16f2331225960645c3bdf5a8ba2d (diff) | |
| parent | e8d5e7c4bb11f7fcb0a4ba5c13f43e7929849a2f (diff) | |
| download | vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.tar.gz vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.tar.bz2 vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
freetype/src/base/ftfntfmt.c
freetype/src/cache/ftcimage.c
freetype/src/cid/cidriver.c
freetype/src/truetype/ttdriver.c
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/drivers/dri/swrast/swrast.c
openssl/Makefile
Diffstat (limited to 'mesalib/src/mapi/glapi/gen/ARB_program_interface_query.xml')
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/ARB_program_interface_query.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mesalib/src/mapi/glapi/gen/ARB_program_interface_query.xml b/mesalib/src/mapi/glapi/gen/ARB_program_interface_query.xml index 59eb59c64..c3162f5ed 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_program_interface_query.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_program_interface_query.xml @@ -56,21 +56,21 @@ <enum name="NUM_COMPATIBLE_SUBROUTINES" value="0x8E4A"/> <enum name="COMPATIBLE_SUBROUTINES" value="0x8E4B"/> - <function name="GetProgramInterfaceiv" offset="assign"> + <function name="GetProgramInterfaceiv" es2="3.1"> <param name="program" type="GLuint"/> <param name="programInterface" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true"/> </function> - <function name="GetProgramResourceIndex" offset="assign"> + <function name="GetProgramResourceIndex" es2="3.1"> <param name="program" type="GLuint"/> <param name="programInterface" type="GLenum"/> <param name="name" type="const GLchar *"/> <return type="GLuint"/> </function> - <function name="GetProgramResourceName" offset="assign"> + <function name="GetProgramResourceName" es2="3.1"> <param name="program" type="GLuint"/> <param name="programInterface" type="GLenum"/> <param name="index" type="GLuint"/> @@ -79,7 +79,7 @@ <param name="name" type="GLchar *" output="true"/> </function> - <function name="GetProgramResourceiv" offset="assign"> + <function name="GetProgramResourceiv" es2="3.1"> <param name="program" type="GLuint"/> <param name="programInterface" type="GLenum"/> <param name="index" type="GLuint"/> @@ -90,14 +90,14 @@ <param name="params" type="GLint *" output="true"/> </function> - <function name="GetProgramResourceLocation" offset="assign"> + <function name="GetProgramResourceLocation" es2="3.1"> <param name="program" type="GLuint"/> <param name="programInterface" type="GLenum"/> <param name="name" type="const GLchar *"/> <return type="GLint"/> </function> - <function name="GetProgramResourceLocationIndex" offset="assign"> + <function name="GetProgramResourceLocationIndex"> <param name="program" type="GLuint"/> <param name="programInterface" type="GLenum"/> <param name="name" type="const GLchar *"/> |