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_internalformat_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_internalformat_query.xml')
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/ARB_internalformat_query.xml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesalib/src/mapi/glapi/gen/ARB_internalformat_query.xml b/mesalib/src/mapi/glapi/gen/ARB_internalformat_query.xml index 70a2a3109..16d14b1b7 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_internalformat_query.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_internalformat_query.xml @@ -8,8 +8,7 @@ <enum name="NUM_SAMPLE_COUNTS" value="0x9380"/> - <function name="GetInternalformativ" offset="assign" static_dispatch="false" - es2="3.0"> + <function name="GetInternalformativ" es2="3.0"> <param name="target" type="GLenum"/> <param name="internalformat" type="GLenum"/> <param name="pname" type="GLenum"/> |