From 435f7a9f1438498d1b8a728d3433ff68f3f38bcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 26 Aug 2019 15:58:35 +0200 Subject: [PATCH] GL: remove redundant defines to slim the GL headers a bit. What the hell, why does the ASTC HDR extension add *the exact same* defines as the LDR one. --- src/Magnum/GL/AbstractTexture.cpp | 8 +- src/Magnum/GL/PixelFormat.h | 112 ++++++++++++++++++ src/Magnum/GL/Sampler.cpp | 8 +- src/Magnum/GL/TextureFormat.h | 112 ++++++++++++++++++ src/MagnumExternal/OpenGL/GL/extensions.txt | 9 +- src/MagnumExternal/OpenGL/GL/flextGL.h | 36 ------ .../OpenGL/GLES2/Emscripten/extensions.txt | 5 +- .../OpenGL/GLES2/extensions.txt | 9 +- src/MagnumExternal/OpenGL/GLES2/flextGL.h | 51 -------- .../OpenGL/GLES2/flextGLWindowsDesktop.h | 51 -------- .../OpenGL/GLES3/Emscripten/extensions.txt | 5 +- .../OpenGL/GLES3/extensions.txt | 10 +- src/MagnumExternal/OpenGL/GLES3/flextGL.h | 62 ---------- .../OpenGL/GLES3/flextGLWindowsDesktop.h | 62 ---------- src/MagnumExternal/Vulkan/extensions.txt | 2 + 15 files changed, 267 insertions(+), 275 deletions(-) diff --git a/src/Magnum/GL/AbstractTexture.cpp b/src/Magnum/GL/AbstractTexture.cpp index 209c1b767..f80579c9d 100644 --- a/src/Magnum/GL/AbstractTexture.cpp +++ b/src/Magnum/GL/AbstractTexture.cpp @@ -1250,7 +1250,13 @@ void AbstractTexture::setMaxAnisotropyImplementationArb(GLfloat anisotropy) { #endif void AbstractTexture::setMaxAnisotropyImplementationExt(GLfloat anisotropy) { - (this->*Context::current().state().texture->parameterfImplementation)(GL_TEXTURE_MAX_ANISOTROPY_EXT, anisotropy); + (this->*Context::current().state().texture->parameterfImplementation)( + #ifndef MAGNUM_TARGET_GLES + GL_TEXTURE_MAX_ANISOTROPY + #else + GL_TEXTURE_MAX_ANISOTROPY_EXT + #endif + , anisotropy); } #if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL) diff --git a/src/Magnum/GL/PixelFormat.h b/src/Magnum/GL/PixelFormat.h index 449a9b4a7..9bfcb89dc 100644 --- a/src/Magnum/GL/PixelFormat.h +++ b/src/Magnum/GL/PixelFormat.h @@ -1032,7 +1032,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) RGBAAstc4x4 = GL_COMPRESSED_RGBA_ASTC_4x4_KHR, + #else + RGBAAstc4x4 = GL_COMPRESSED_RGBA_ASTC_4x4, + #endif /** * ASTC compressed sRGB with alpha with 4x4 blocks. **Available only on 2D, @@ -1046,7 +1050,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) SRGB8Alpha8Astc4x4 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR, + #else + SRGB8Alpha8Astc4x4 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4, + #endif /** * ASTC compressed RGBA with 5x4 blocks. **Available only on 2D, 3D, 2D @@ -1060,7 +1068,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) RGBAAstc5x4 = GL_COMPRESSED_RGBA_ASTC_5x4_KHR, + #else + RGBAAstc5x4 = GL_COMPRESSED_RGBA_ASTC_5x4, + #endif /** * ASTC compressed sRGB with alpha with 5x4 blocks. **Available only on 2D, @@ -1074,7 +1086,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) SRGB8Alpha8Astc5x4 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR, + #else + SRGB8Alpha8Astc5x4 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4, + #endif /** * ASTC compressed RGBA with 5x5 blocks. **Available only on 2D, 3D, 2D @@ -1088,7 +1104,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) RGBAAstc5x5 = GL_COMPRESSED_RGBA_ASTC_5x5_KHR, + #else + RGBAAstc5x5 = GL_COMPRESSED_RGBA_ASTC_5x5, + #endif /** * ASTC compressed sRGB with alpha with 5x5 blocks. **Available only on 2D, @@ -1102,7 +1122,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) SRGB8Alpha8Astc5x5 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR, + #else + SRGB8Alpha8Astc5x5 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5, + #endif /** * ASTC compressed RGBA with 6x5 blocks. **Available only on 2D, 3D, 2D @@ -1116,7 +1140,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) RGBAAstc6x5 = GL_COMPRESSED_RGBA_ASTC_6x5_KHR, + #else + RGBAAstc6x5 = GL_COMPRESSED_RGBA_ASTC_6x5, + #endif /** * ASTC compressed sRGB with alpha with 6x5 blocks. **Available only on 2D, @@ -1130,7 +1158,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) SRGB8Alpha8Astc6x5 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR, + #else + SRGB8Alpha8Astc6x5 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5, + #endif /** * ASTC compressed RGBA with 6x6 blocks. **Available only on 2D, 3D, 2D @@ -1144,7 +1176,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) RGBAAstc6x6 = GL_COMPRESSED_RGBA_ASTC_6x6_KHR, + #else + RGBAAstc6x6 = GL_COMPRESSED_RGBA_ASTC_6x6, + #endif /** * ASTC compressed sRGB with alpha with 6x6 blocks. **Available only on 2D, @@ -1158,7 +1194,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) SRGB8Alpha8Astc6x6 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR, + #else + SRGB8Alpha8Astc6x6 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6, + #endif /** * ASTC compressed RGBA with 8x5 blocks. **Available only on 2D, 3D, 2D @@ -1172,7 +1212,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) RGBAAstc8x5 = GL_COMPRESSED_RGBA_ASTC_8x5_KHR, + #else + RGBAAstc8x5 = GL_COMPRESSED_RGBA_ASTC_8x5, + #endif /** * ASTC compressed sRGB with alpha with 8x5 blocks. **Available only on 2D, @@ -1186,7 +1230,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) SRGB8Alpha8Astc8x5 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR, + #else + SRGB8Alpha8Astc8x5 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5, + #endif /** * ASTC compressed RGBA with 8x6 blocks. **Available only on 2D, 3D, 2D @@ -1200,7 +1248,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) RGBAAstc8x6 = GL_COMPRESSED_RGBA_ASTC_8x6_KHR, + #else + RGBAAstc8x6 = GL_COMPRESSED_RGBA_ASTC_8x6, + #endif /** * ASTC compressed sRGB with alpha with 8x6 blocks. **Available only on 2D, @@ -1214,7 +1266,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) SRGB8Alpha8Astc8x6 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR, + #else + SRGB8Alpha8Astc8x6 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6, + #endif /** * ASTC compressed RGBA with 8x8 blocks. **Available only on 2D, 3D, 2D @@ -1228,7 +1284,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) RGBAAstc8x8 = GL_COMPRESSED_RGBA_ASTC_8x8_KHR, + #else + RGBAAstc8x8 = GL_COMPRESSED_RGBA_ASTC_8x8, + #endif /** * ASTC compressed sRGB with alpha with 8x8 blocks. **Available only on 2D, @@ -1242,7 +1302,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) SRGB8Alpha8Astc8x8 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR, + #else + SRGB8Alpha8Astc8x8 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8, + #endif /** * ASTC compressed RGBA with 10x5 blocks. **Available only on 2D, 3D, 2D @@ -1256,7 +1320,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) RGBAAstc10x5 = GL_COMPRESSED_RGBA_ASTC_10x5_KHR, + #else + RGBAAstc10x5 = GL_COMPRESSED_RGBA_ASTC_10x5, + #endif /** * ASTC compressed sRGB with alpha with 10x5 blocks. **Available only on @@ -1270,7 +1338,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) SRGB8Alpha8Astc10x5 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR, + #else + SRGB8Alpha8Astc10x5 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5, + #endif /** * ASTC compressed RGBA with 10x6 blocks. **Available only on 2D, 3D, 2D @@ -1284,7 +1356,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) RGBAAstc10x6 = GL_COMPRESSED_RGBA_ASTC_10x6_KHR, + #else + RGBAAstc10x6 = GL_COMPRESSED_RGBA_ASTC_10x6, + #endif /** * ASTC compressed sRGB with alpha with 10x6 blocks. **Available only on @@ -1298,7 +1374,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) SRGB8Alpha8Astc10x6 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR, + #else + SRGB8Alpha8Astc10x6 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6, + #endif /** * ASTC compressed RGBA with 10x8 blocks. **Available only on 2D, 3D, 2D @@ -1312,7 +1392,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) RGBAAstc10x8 = GL_COMPRESSED_RGBA_ASTC_10x8_KHR, + #else + RGBAAstc10x8 = GL_COMPRESSED_RGBA_ASTC_10x8, + #endif /** * ASTC compressed sRGB with alpha with 10x8 blocks. **Available only on @@ -1326,7 +1410,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) SRGB8Alpha8Astc10x8 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR, + #else + SRGB8Alpha8Astc10x8 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8, + #endif /** * ASTC compressed RGBA with 10x10 blocks. **Available only on 2D, 3D, 2D @@ -1340,7 +1428,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) RGBAAstc10x10 = GL_COMPRESSED_RGBA_ASTC_10x10_KHR, + #else + RGBAAstc10x10 = GL_COMPRESSED_RGBA_ASTC_10x10, + #endif /** * ASTC compressed sRGB with alpha with 10x10 blocks. **Available only on @@ -1354,7 +1446,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) SRGB8Alpha8Astc10x10 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR, + #else + SRGB8Alpha8Astc10x10 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10, + #endif /** * ASTC compressed RGBA with 12x10 blocks. **Available only on 2D, 3D, 2D @@ -1368,7 +1464,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) RGBAAstc12x10 = GL_COMPRESSED_RGBA_ASTC_12x10_KHR, + #else + RGBAAstc12x10 = GL_COMPRESSED_RGBA_ASTC_12x10, + #endif /** * ASTC compressed sRGB with alpha with 12x10 blocks. **Available only on @@ -1382,7 +1482,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) SRGB8Alpha8Astc12x10 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR, + #else + SRGB8Alpha8Astc12x10 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10, + #endif /** * ASTC compressed RGBA with 12x12 blocks. **Available only on 2D, 3D, 2D @@ -1396,7 +1500,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) RGBAAstc12x12 = GL_COMPRESSED_RGBA_ASTC_12x12_KHR, + #else + RGBAAstc12x12 = GL_COMPRESSED_RGBA_ASTC_12x12, + #endif /** * ASTC compressed sRGB with alpha with 12x12 blocks. **Available only on @@ -1410,7 +1518,11 @@ enum class CompressedPixelFormat: GLenum { * for 3D textures and HDR profile ** @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) SRGB8Alpha8Astc12x12 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR, + #else + SRGB8Alpha8Astc12x12 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12, + #endif #if defined(DOXYGEN_GENERATING_OUTPUT) || defined(MAGNUM_TARGET_GLES) /** diff --git a/src/Magnum/GL/Sampler.cpp b/src/Magnum/GL/Sampler.cpp index 456a02812..c0b071146 100644 --- a/src/Magnum/GL/Sampler.cpp +++ b/src/Magnum/GL/Sampler.cpp @@ -117,7 +117,13 @@ Float Sampler::maxMaxAnisotropy() { else #endif if(Context::current().isExtensionSupported()) - glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &value); + glGetFloatv( + #ifndef MAGNUM_TARGET_GLES + GL_MAX_TEXTURE_MAX_ANISOTROPY + #else + GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT + #endif + , &value); } return value; diff --git a/src/Magnum/GL/TextureFormat.h b/src/Magnum/GL/TextureFormat.h index 9e6726695..a50f6aaad 100644 --- a/src/Magnum/GL/TextureFormat.h +++ b/src/Magnum/GL/TextureFormat.h @@ -1334,7 +1334,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedRGBAAstc4x4 = GL_COMPRESSED_RGBA_ASTC_4x4_KHR, + #else + CompressedRGBAAstc4x4 = GL_COMPRESSED_RGBA_ASTC_4x4, + #endif /** * ASTC compressed sRGB with alpha with 4x4 blocks. **Available only on 2D, @@ -1348,7 +1352,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedSRGB8Alpha8Astc4x4 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR, + #else + CompressedSRGB8Alpha8Astc4x4 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4, + #endif /** * ASTC compressed RGBA with 5x4 blocks. **Available only on 2D, 3D, 2D @@ -1362,7 +1370,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedRGBAAstc5x4 = GL_COMPRESSED_RGBA_ASTC_5x4_KHR, + #else + CompressedRGBAAstc5x4 = GL_COMPRESSED_RGBA_ASTC_5x4, + #endif /** * ASTC compressed sRGB with alpha with 5x4 blocks. **Available only on 2D, @@ -1376,7 +1388,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedSRGB8Alpha8Astc5x4 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR, + #else + CompressedSRGB8Alpha8Astc5x4 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4, + #endif /** * ASTC compressed RGBA with 5x5 blocks. **Available only on 2D, 3D, 2D @@ -1390,7 +1406,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedRGBAAstc5x5 = GL_COMPRESSED_RGBA_ASTC_5x5_KHR, + #else + CompressedRGBAAstc5x5 = GL_COMPRESSED_RGBA_ASTC_5x5, + #endif /** * ASTC compressed sRGB with alpha with 5x5 blocks. **Available only on 2D, @@ -1404,7 +1424,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedSRGB8Alpha8Astc5x5 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR, + #else + CompressedSRGB8Alpha8Astc5x5 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5, + #endif /** * ASTC compressed RGBA with 6x5 blocks. **Available only on 2D, 3D, 2D @@ -1418,7 +1442,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedRGBAAstc6x5 = GL_COMPRESSED_RGBA_ASTC_6x5_KHR, + #else + CompressedRGBAAstc6x5 = GL_COMPRESSED_RGBA_ASTC_6x5, + #endif /** * ASTC compressed sRGB with alpha with 6x5 blocks. **Available only on 2D, @@ -1432,7 +1460,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedSRGB8Alpha8Astc6x5 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR, + #else + CompressedSRGB8Alpha8Astc6x5 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5, + #endif /** * ASTC compressed RGBA with 6x6 blocks. **Available only on 2D, 3D, 2D @@ -1446,7 +1478,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedRGBAAstc6x6 = GL_COMPRESSED_RGBA_ASTC_6x6_KHR, + #else + CompressedRGBAAstc6x6 = GL_COMPRESSED_RGBA_ASTC_6x6, + #endif /** * ASTC compressed sRGB with alpha with 6x6 blocks. **Available only on 2D, @@ -1460,7 +1496,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedSRGB8Alpha8Astc6x6 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR, + #else + CompressedSRGB8Alpha8Astc6x6 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6, + #endif /** * ASTC compressed RGBA with 8x5 blocks. **Available only on 2D, 3D, 2D @@ -1474,7 +1514,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedRGBAAstc8x5 = GL_COMPRESSED_RGBA_ASTC_8x5_KHR, + #else + CompressedRGBAAstc8x5 = GL_COMPRESSED_RGBA_ASTC_8x5, + #endif /** * ASTC compressed sRGB with alpha with 8x5 blocks. **Available only on 2D, @@ -1488,7 +1532,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedSRGB8Alpha8Astc8x5 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR, + #else + CompressedSRGB8Alpha8Astc8x5 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5, + #endif /** * ASTC compressed RGBA with 8x6 blocks. **Available only on 2D, 3D, 2D @@ -1502,7 +1550,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedRGBAAstc8x6 = GL_COMPRESSED_RGBA_ASTC_8x6_KHR, + #else + CompressedRGBAAstc8x6 = GL_COMPRESSED_RGBA_ASTC_8x6, + #endif /** * ASTC compressed sRGB with alpha with 8x6 blocks. **Available only on 2D, @@ -1516,7 +1568,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedSRGB8Alpha8Astc8x6 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR, + #else + CompressedSRGB8Alpha8Astc8x6 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6, + #endif /** * ASTC compressed RGBA with 8x8 blocks. **Available only on 2D, 3D, 2D @@ -1530,7 +1586,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedRGBAAstc8x8 = GL_COMPRESSED_RGBA_ASTC_8x8_KHR, + #else + CompressedRGBAAstc8x8 = GL_COMPRESSED_RGBA_ASTC_8x8, + #endif /** * ASTC compressed sRGB with alpha with 8x8 blocks. **Available only on 2D, @@ -1544,7 +1604,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedSRGB8Alpha8Astc8x8 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR, + #else + CompressedSRGB8Alpha8Astc8x8 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8, + #endif /** * ASTC compressed RGBA with 10x5 blocks. **Available only on 2D, 3D, 2D @@ -1558,7 +1622,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedRGBAAstc10x5 = GL_COMPRESSED_RGBA_ASTC_10x5_KHR, + #else + CompressedRGBAAstc10x5 = GL_COMPRESSED_RGBA_ASTC_10x5, + #endif /** * ASTC compressed sRGB with alpha with 10x5 blocks. **Available only on @@ -1572,7 +1640,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedSRGB8Alpha8Astc10x5 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR, + #else + CompressedSRGB8Alpha8Astc10x5 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5, + #endif /** * ASTC compressed RGBA with 10x6 blocks. **Available only on 2D, 3D, 2D @@ -1586,7 +1658,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedRGBAAstc10x6 = GL_COMPRESSED_RGBA_ASTC_10x6_KHR, + #else + CompressedRGBAAstc10x6 = GL_COMPRESSED_RGBA_ASTC_10x6, + #endif /** * ASTC compressed sRGB with alpha with 10x6 blocks. **Available only on @@ -1600,7 +1676,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedSRGB8Alpha8Astc10x6 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR, + #else + CompressedSRGB8Alpha8Astc10x6 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6, + #endif /** * ASTC compressed RGBA with 10x8 blocks. **Available only on 2D, 3D, 2D @@ -1614,7 +1694,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedRGBAAstc10x8 = GL_COMPRESSED_RGBA_ASTC_10x8_KHR, + #else + CompressedRGBAAstc10x8 = GL_COMPRESSED_RGBA_ASTC_10x8, + #endif /** * ASTC compressed sRGB with alpha with 10x8 blocks. **Available only on @@ -1628,7 +1712,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedSRGB8Alpha8Astc10x8 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR, + #else + CompressedSRGB8Alpha8Astc10x8 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8, + #endif /** * ASTC compressed RGBA with 10x10 blocks. **Available only on 2D, 3D, 2D @@ -1642,7 +1730,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedRGBAAstc10x10 = GL_COMPRESSED_RGBA_ASTC_10x10_KHR, + #else + CompressedRGBAAstc10x10 = GL_COMPRESSED_RGBA_ASTC_10x10, + #endif /** * ASTC compressed sRGB with alpha with 10x10 blocks. **Available only on @@ -1656,7 +1748,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedSRGB8Alpha8Astc10x10 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR, + #else + CompressedSRGB8Alpha8Astc10x10 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10, + #endif /** * ASTC compressed RGBA with 12x10 blocks. **Available only on 2D, 3D, 2D @@ -1670,7 +1766,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedRGBAAstc12x10 = GL_COMPRESSED_RGBA_ASTC_12x10_KHR, + #else + CompressedRGBAAstc12x10 = GL_COMPRESSED_RGBA_ASTC_12x10, + #endif /** * ASTC compressed sRGB with alpha with 12x10 blocks. **Available only on @@ -1684,7 +1784,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedSRGB8Alpha8Astc12x10 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR, + #else + CompressedSRGB8Alpha8Astc12x10 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10, + #endif /** * ASTC compressed RGBA with 12x12 blocks. **Available only on 2D, 3D, 2D @@ -1698,7 +1802,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedRGBAAstc12x12 = GL_COMPRESSED_RGBA_ASTC_12x12_KHR, + #else + CompressedRGBAAstc12x12 = GL_COMPRESSED_RGBA_ASTC_12x12, + #endif /** * ASTC compressed sRGB with alpha with 12x12 blocks. **Available only on @@ -1712,7 +1820,11 @@ enum class TextureFormat: GLenum { * for 3D textures and HDR profile * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_astc} */ + #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL) CompressedSRGB8Alpha8Astc12x12 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR, + #else + CompressedSRGB8Alpha8Astc12x12 = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12, + #endif #if defined(DOXYGEN_GENERATING_OUTPUT) || defined(MAGNUM_TARGET_GLES) /** diff --git a/src/MagnumExternal/OpenGL/GL/extensions.txt b/src/MagnumExternal/OpenGL/GL/extensions.txt index 66f86799a..2e80edec7 100644 --- a/src/MagnumExternal/OpenGL/GL/extensions.txt +++ b/src/MagnumExternal/OpenGL/GL/extensions.txt @@ -1,6 +1,7 @@ # The following output is taken from `magnum-gl-info` with removed `GL_` # prefixes. Only vendor extensions are needed, everything else is pulled in -# with GL 4.6. +# with GL 4.6. Some extensions are comented out as they don't add any symbols +# that aren't already added by headers and would only bloat the headers. version 4.6 core @@ -21,7 +22,7 @@ extension ARB_sparse_texture optional extension ARB_sparse_buffer optional extension ARB_ES3_2_compatibility optional extension ATI_texture_mirror_once optional -extension EXT_texture_filter_anisotropic optional +# extension EXT_texture_filter_anisotropic optional extension EXT_texture_compression_s3tc optional extension EXT_texture_mirror_clamp optional extension EXT_texture_sRGB_decode optional @@ -30,6 +31,8 @@ extension EXT_debug_label optional extension EXT_debug_marker optional extension GREMEDY_string_marker optional extension KHR_texture_compression_astc_ldr optional -extension KHR_texture_compression_astc_hdr optional +# extension KHR_texture_compression_astc_hdr optional extension KHR_blend_equation_advanced optional extension KHR_blend_equation_advanced_coherent optional + +# kate: hl python diff --git a/src/MagnumExternal/OpenGL/GL/flextGL.h b/src/MagnumExternal/OpenGL/GL/flextGL.h index 7f03d8752..ae3bc86dd 100644 --- a/src/MagnumExternal/OpenGL/GL/flextGL.h +++ b/src/MagnumExternal/OpenGL/GL/flextGL.h @@ -1671,11 +1671,6 @@ typedef void (APIENTRY *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum #define GL_MIRROR_CLAMP_ATI 0x8742 #define GL_MIRROR_CLAMP_TO_EDGE_ATI 0x8743 -/* GL_EXT_texture_filter_anisotropic */ - -#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE -#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF - /* GL_EXT_texture_compression_s3tc */ #define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0 @@ -1737,37 +1732,6 @@ typedef void (APIENTRY *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum #define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC #define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD -/* GL_KHR_texture_compression_astc_hdr */ - -#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0 -#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1 -#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2 -#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3 -#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4 -#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5 -#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6 -#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7 -#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8 -#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9 -#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA -#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB -#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC -#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD - /* GL_KHR_blend_equation_advanced */ #define GL_MULTIPLY_KHR 0x9294 diff --git a/src/MagnumExternal/OpenGL/GLES2/Emscripten/extensions.txt b/src/MagnumExternal/OpenGL/GLES2/Emscripten/extensions.txt index 116caf5e1..7b6942cb3 100644 --- a/src/MagnumExternal/OpenGL/GLES2/Emscripten/extensions.txt +++ b/src/MagnumExternal/OpenGL/GLES2/Emscripten/extensions.txt @@ -1,5 +1,6 @@ # The following output is taken from `magnum-gl-info` with removed `GL_` -# prefixes. +# prefixes. Some extensions are comented out as they don't add any symbols +# that aren't already added by headers and would only bloat the headers. version 2.0 es @@ -30,3 +31,5 @@ extension EXT_texture_compression_s3tc optional extension EXT_texture_compression_s3tc_srgb optional extension IMG_texture_compression_pvrtc optional extension KHR_texture_compression_astc_ldr optional + +# kate: hl python diff --git a/src/MagnumExternal/OpenGL/GLES2/extensions.txt b/src/MagnumExternal/OpenGL/GLES2/extensions.txt index 028b3aba1..8c0f060f0 100644 --- a/src/MagnumExternal/OpenGL/GLES2/extensions.txt +++ b/src/MagnumExternal/OpenGL/GLES2/extensions.txt @@ -1,5 +1,6 @@ # The following output is taken from `magnum-gl-info` with removed `GL_` -# prefixes. +# prefixes. Some extensions are comented out as they don't add any symbols +# that aren't already added by headers and would only bloat the headers. version 2.0 es @@ -25,7 +26,7 @@ extension EXT_draw_buffers optional extension EXT_instanced_arrays optional extension EXT_draw_instanced optional extension NV_draw_buffers optional -extension NV_fbo_color_attachments optional +# extension NV_fbo_color_attachments optional extension NV_read_buffer optional extension NV_pack_subimage optional extension NV_draw_instanced optional @@ -84,7 +85,7 @@ extension EXT_pvrtc_sRGB optional extension EXT_polygon_offset_clamp optional extension EXT_texture_compression_s3tc_srgb optional extension IMG_texture_compression_pvrtc optional -extension KHR_texture_compression_astc_hdr optional +# extension KHR_texture_compression_astc_hdr optional extension KHR_blend_equation_advanced_coherent optional extension KHR_context_flush_control optional extension KHR_no_error optional @@ -134,3 +135,5 @@ begin functions blacklist TextureStorage2DEXT TextureStorage3DEXT end functions blacklist + +# kate: hl python diff --git a/src/MagnumExternal/OpenGL/GLES2/flextGL.h b/src/MagnumExternal/OpenGL/GLES2/flextGL.h index 9c57c46e6..14176edf3 100644 --- a/src/MagnumExternal/OpenGL/GLES2/flextGL.h +++ b/src/MagnumExternal/OpenGL/GLES2/flextGL.h @@ -614,26 +614,6 @@ typedef void (APIENTRY *GLDEBUGPROCKHR)(GLenum source,GLenum type,GLuint id,GLen #define GL_COLOR_ATTACHMENT14_NV 0x8CEE #define GL_COLOR_ATTACHMENT15_NV 0x8CEF -/* GL_NV_fbo_color_attachments */ - -#define GL_MAX_COLOR_ATTACHMENTS_NV 0x8CDF -#define GL_COLOR_ATTACHMENT0_NV 0x8CE0 -#define GL_COLOR_ATTACHMENT1_NV 0x8CE1 -#define GL_COLOR_ATTACHMENT2_NV 0x8CE2 -#define GL_COLOR_ATTACHMENT3_NV 0x8CE3 -#define GL_COLOR_ATTACHMENT4_NV 0x8CE4 -#define GL_COLOR_ATTACHMENT5_NV 0x8CE5 -#define GL_COLOR_ATTACHMENT6_NV 0x8CE6 -#define GL_COLOR_ATTACHMENT7_NV 0x8CE7 -#define GL_COLOR_ATTACHMENT8_NV 0x8CE8 -#define GL_COLOR_ATTACHMENT9_NV 0x8CE9 -#define GL_COLOR_ATTACHMENT10_NV 0x8CEA -#define GL_COLOR_ATTACHMENT11_NV 0x8CEB -#define GL_COLOR_ATTACHMENT12_NV 0x8CEC -#define GL_COLOR_ATTACHMENT13_NV 0x8CED -#define GL_COLOR_ATTACHMENT14_NV 0x8CEE -#define GL_COLOR_ATTACHMENT15_NV 0x8CEF - /* GL_NV_read_buffer */ #define GL_READ_BUFFER_NV 0x0C02 @@ -1014,37 +994,6 @@ typedef void (APIENTRY *GLDEBUGPROCKHR)(GLenum source,GLenum type,GLuint id,GLen #define GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG 0x8C02 #define GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8C03 -/* GL_KHR_texture_compression_astc_hdr */ - -#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0 -#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1 -#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2 -#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3 -#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4 -#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5 -#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6 -#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7 -#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8 -#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9 -#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA -#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB -#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC -#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD - /* GL_KHR_blend_equation_advanced_coherent */ #define GL_BLEND_ADVANCED_COHERENT_KHR 0x9285 diff --git a/src/MagnumExternal/OpenGL/GLES2/flextGLWindowsDesktop.h b/src/MagnumExternal/OpenGL/GLES2/flextGLWindowsDesktop.h index 726a7890e..ec932705a 100644 --- a/src/MagnumExternal/OpenGL/GLES2/flextGLWindowsDesktop.h +++ b/src/MagnumExternal/OpenGL/GLES2/flextGLWindowsDesktop.h @@ -609,26 +609,6 @@ typedef void (APIENTRY *GLDEBUGPROCKHR)(GLenum source,GLenum type,GLuint id,GLen #define GL_COLOR_ATTACHMENT14_NV 0x8CEE #define GL_COLOR_ATTACHMENT15_NV 0x8CEF -/* GL_NV_fbo_color_attachments */ - -#define GL_MAX_COLOR_ATTACHMENTS_NV 0x8CDF -#define GL_COLOR_ATTACHMENT0_NV 0x8CE0 -#define GL_COLOR_ATTACHMENT1_NV 0x8CE1 -#define GL_COLOR_ATTACHMENT2_NV 0x8CE2 -#define GL_COLOR_ATTACHMENT3_NV 0x8CE3 -#define GL_COLOR_ATTACHMENT4_NV 0x8CE4 -#define GL_COLOR_ATTACHMENT5_NV 0x8CE5 -#define GL_COLOR_ATTACHMENT6_NV 0x8CE6 -#define GL_COLOR_ATTACHMENT7_NV 0x8CE7 -#define GL_COLOR_ATTACHMENT8_NV 0x8CE8 -#define GL_COLOR_ATTACHMENT9_NV 0x8CE9 -#define GL_COLOR_ATTACHMENT10_NV 0x8CEA -#define GL_COLOR_ATTACHMENT11_NV 0x8CEB -#define GL_COLOR_ATTACHMENT12_NV 0x8CEC -#define GL_COLOR_ATTACHMENT13_NV 0x8CED -#define GL_COLOR_ATTACHMENT14_NV 0x8CEE -#define GL_COLOR_ATTACHMENT15_NV 0x8CEF - /* GL_NV_read_buffer */ #define GL_READ_BUFFER_NV 0x0C02 @@ -1009,37 +989,6 @@ typedef void (APIENTRY *GLDEBUGPROCKHR)(GLenum source,GLenum type,GLuint id,GLen #define GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG 0x8C02 #define GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8C03 -/* GL_KHR_texture_compression_astc_hdr */ - -#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0 -#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1 -#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2 -#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3 -#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4 -#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5 -#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6 -#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7 -#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8 -#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9 -#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA -#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB -#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC -#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD - /* GL_KHR_blend_equation_advanced_coherent */ #define GL_BLEND_ADVANCED_COHERENT_KHR 0x9285 diff --git a/src/MagnumExternal/OpenGL/GLES3/Emscripten/extensions.txt b/src/MagnumExternal/OpenGL/GLES3/Emscripten/extensions.txt index 9e6126f00..a33c26d8a 100644 --- a/src/MagnumExternal/OpenGL/GLES3/Emscripten/extensions.txt +++ b/src/MagnumExternal/OpenGL/GLES3/Emscripten/extensions.txt @@ -1,5 +1,6 @@ # The following output is taken from `magnum-gl-info` with removed `GL_` -# prefixes. +# prefixes. Some extensions are comented out as they don't add any symbols +# that aren't already added by headers and would only bloat the headers. version 3.0 es @@ -13,3 +14,5 @@ extension EXT_texture_compression_s3tc optional extension EXT_texture_compression_s3tc_srgb optional extension IMG_texture_compression_pvrtc optional extension KHR_texture_compression_astc_ldr optional + +# kate: hl python diff --git a/src/MagnumExternal/OpenGL/GLES3/extensions.txt b/src/MagnumExternal/OpenGL/GLES3/extensions.txt index 1ed2b994a..f36a85d95 100644 --- a/src/MagnumExternal/OpenGL/GLES3/extensions.txt +++ b/src/MagnumExternal/OpenGL/GLES3/extensions.txt @@ -1,5 +1,7 @@ # The following output is taken from `magnum-gl-info --all-extensions` with -# removed `GL_` prefixes. +# removed `GL_` prefixes. Some extensions are comented out as they don't add +# any symbols that aren't already added by headers and would only bloat the +# headers. version 3.2 es @@ -15,7 +17,7 @@ extension EXT_texture_border_clamp optional extension EXT_texture_buffer optional extension EXT_texture_cube_map_array optional extension EXT_primitive_bounding_box optional -extension KHR_texture_compression_astc_ldr optional +# extension KHR_texture_compression_astc_ldr optional extension KHR_debug optional extension KHR_blend_equation_advanced optional extension KHR_robustness optional @@ -52,7 +54,7 @@ extension EXT_texture_compression_rgtc optional extension EXT_texture_compression_bptc optional extension EXT_texture_compression_s3tc_srgb optional extension IMG_texture_compression_pvrtc optional -extension KHR_texture_compression_astc_hdr optional +# extension KHR_texture_compression_astc_hdr optional extension KHR_blend_equation_advanced_coherent optional extension KHR_context_flush_control optional extension KHR_no_error optional @@ -67,3 +69,5 @@ extension OES_depth32 optional extension OES_mapbuffer optional extension OES_stencil1 optional extension OES_stencil4 optional + +# kate: hl python diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGL.h b/src/MagnumExternal/OpenGL/GLES3/flextGL.h index 816f90f1f..a431e3bfd 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGL.h +++ b/src/MagnumExternal/OpenGL/GLES3/flextGL.h @@ -1304,37 +1304,6 @@ typedef void (APIENTRY *GLDEBUGPROCKHR)(GLenum source,GLenum type,GLuint id,GLen #define GL_PRIMITIVE_BOUNDING_BOX_EXT 0x92BE -/* GL_KHR_texture_compression_astc_ldr */ - -#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0 -#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1 -#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2 -#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3 -#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4 -#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5 -#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6 -#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7 -#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8 -#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9 -#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA -#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB -#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC -#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD - /* GL_KHR_debug */ #define GL_DEBUG_OUTPUT_SYNCHRONOUS_KHR 0x8242 @@ -1567,37 +1536,6 @@ typedef void (APIENTRY *GLDEBUGPROCKHR)(GLenum source,GLenum type,GLuint id,GLen #define GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG 0x8C02 #define GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8C03 -/* GL_KHR_texture_compression_astc_hdr */ - -#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0 -#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1 -#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2 -#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3 -#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4 -#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5 -#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6 -#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7 -#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8 -#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9 -#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA -#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB -#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC -#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD - /* GL_KHR_blend_equation_advanced_coherent */ #define GL_BLEND_ADVANCED_COHERENT_KHR 0x9285 diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h b/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h index 51f218eb0..e6f7665f9 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h +++ b/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h @@ -1296,37 +1296,6 @@ typedef void (APIENTRY *GLDEBUGPROCKHR)(GLenum source,GLenum type,GLuint id,GLen #define GL_PRIMITIVE_BOUNDING_BOX_EXT 0x92BE -/* GL_KHR_texture_compression_astc_ldr */ - -#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0 -#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1 -#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2 -#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3 -#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4 -#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5 -#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6 -#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7 -#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8 -#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9 -#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA -#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB -#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC -#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD - /* GL_KHR_debug */ #define GL_DEBUG_OUTPUT_SYNCHRONOUS_KHR 0x8242 @@ -1559,37 +1528,6 @@ typedef void (APIENTRY *GLDEBUGPROCKHR)(GLenum source,GLenum type,GLuint id,GLen #define GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG 0x8C02 #define GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8C03 -/* GL_KHR_texture_compression_astc_hdr */ - -#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0 -#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1 -#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2 -#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3 -#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4 -#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5 -#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6 -#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7 -#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8 -#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9 -#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA -#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB -#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC -#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD - /* GL_KHR_blend_equation_advanced_coherent */ #define GL_BLEND_ADVANCED_COHERENT_KHR 0x9285 diff --git a/src/MagnumExternal/Vulkan/extensions.txt b/src/MagnumExternal/Vulkan/extensions.txt index 0e0af739b..9b1bc5dfd 100644 --- a/src/MagnumExternal/Vulkan/extensions.txt +++ b/src/MagnumExternal/Vulkan/extensions.txt @@ -25,3 +25,5 @@ extension KHR_storage_buffer_storage_class optional extension KHR_variable_pointers optional extension IMG_format_pvrtc optional + +# kate: hl python