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_texture_storage_multisample.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_texture_storage_multisample.xml')
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/ARB_texture_storage_multisample.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mapi/glapi/gen/ARB_texture_storage_multisample.xml b/mesalib/src/mapi/glapi/gen/ARB_texture_storage_multisample.xml index 0f9d323d4..6ed8f1a01 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_texture_storage_multisample.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_texture_storage_multisample.xml @@ -7,7 +7,7 @@ <category name="GL_ARB_texture_storage_multisample" number="141"> - <function name="TexStorage2DMultisample" offset="assign"> + <function name="TexStorage2DMultisample" es2="3.1"> <param name="target" type="GLenum"/> <param name="samples" type="GLsizei"/> <param name="internalformat" type="GLenum"/> @@ -16,7 +16,7 @@ <param name="fixedsamplelocations" type="GLboolean"/> </function> - <function name="TexStorage3DMultisample" offset="assign"> + <function name="TexStorage3DMultisample"> <param name="target" type="GLenum"/> <param name="samples" type="GLsizei"/> <param name="internalformat" type="GLenum"/> |