diff --git a/src/MagnumExternal/OpenGL/GL/extensions.txt b/src/MagnumExternal/OpenGL/GL/extensions.txt index 135a48876..9b9733d36 100644 --- a/src/MagnumExternal/OpenGL/GL/extensions.txt +++ b/src/MagnumExternal/OpenGL/GL/extensions.txt @@ -9,6 +9,7 @@ EXT_texture_filter_anisotropic EXT_texture_mirror_clamp EXT_direct_state_access + EXT_texture_sRGB_decode EXT_debug_label EXT_debug_marker GREMEDY_string_marker diff --git a/src/MagnumExternal/OpenGL/GL/gl_magnum.c b/src/MagnumExternal/OpenGL/GL/gl_magnum.c index f72669798..136800cfe 100644 --- a/src/MagnumExternal/OpenGL/GL/gl_magnum.c +++ b/src/MagnumExternal/OpenGL/GL/gl_magnum.c @@ -90,6 +90,7 @@ int ogl_ext_ATI_texture_mirror_once = ogl_LOAD_FAILED; int ogl_ext_EXT_texture_filter_anisotropic = ogl_LOAD_FAILED; int ogl_ext_EXT_texture_mirror_clamp = ogl_LOAD_FAILED; int ogl_ext_EXT_direct_state_access = ogl_LOAD_FAILED; +int ogl_ext_EXT_texture_sRGB_decode = ogl_LOAD_FAILED; int ogl_ext_EXT_debug_label = ogl_LOAD_FAILED; int ogl_ext_EXT_debug_marker = ogl_LOAD_FAILED; int ogl_ext_GREMEDY_string_marker = ogl_LOAD_FAILED; @@ -2632,7 +2633,7 @@ typedef struct ogl_StrToExtMap_s PFN_LOADFUNCPOINTERS LoadExtension; } ogl_StrToExtMap; -static ogl_StrToExtMap ExtensionMap[10] = { +static ogl_StrToExtMap ExtensionMap[11] = { {"GL_AMD_vertex_shader_layer", &ogl_ext_AMD_vertex_shader_layer, NULL}, {"GL_AMD_shader_trinary_minmax", &ogl_ext_AMD_shader_trinary_minmax, NULL}, {"GL_ARB_robustness", &ogl_ext_ARB_robustness, Load_ARB_robustness}, @@ -2640,12 +2641,13 @@ static ogl_StrToExtMap ExtensionMap[10] = { {"GL_EXT_texture_filter_anisotropic", &ogl_ext_EXT_texture_filter_anisotropic, NULL}, {"GL_EXT_texture_mirror_clamp", &ogl_ext_EXT_texture_mirror_clamp, NULL}, {"GL_EXT_direct_state_access", &ogl_ext_EXT_direct_state_access, Load_EXT_direct_state_access}, + {"GL_EXT_texture_sRGB_decode", &ogl_ext_EXT_texture_sRGB_decode, NULL}, {"GL_EXT_debug_label", &ogl_ext_EXT_debug_label, Load_EXT_debug_label}, {"GL_EXT_debug_marker", &ogl_ext_EXT_debug_marker, Load_EXT_debug_marker}, {"GL_GREMEDY_string_marker", &ogl_ext_GREMEDY_string_marker, Load_GREMEDY_string_marker}, }; -static int g_extensionMapSize = 10; +static int g_extensionMapSize = 11; static void ClearExtensionVars() { @@ -2656,6 +2658,7 @@ static void ClearExtensionVars() ogl_ext_EXT_texture_filter_anisotropic = ogl_LOAD_FAILED; ogl_ext_EXT_texture_mirror_clamp = ogl_LOAD_FAILED; ogl_ext_EXT_direct_state_access = ogl_LOAD_FAILED; + ogl_ext_EXT_texture_sRGB_decode = ogl_LOAD_FAILED; ogl_ext_EXT_debug_label = ogl_LOAD_FAILED; ogl_ext_EXT_debug_marker = ogl_LOAD_FAILED; ogl_ext_GREMEDY_string_marker = ogl_LOAD_FAILED; diff --git a/src/MagnumExternal/OpenGL/GL/gl_magnum.h b/src/MagnumExternal/OpenGL/GL/gl_magnum.h index cd53bf8a7..08bceb8e2 100644 --- a/src/MagnumExternal/OpenGL/GL/gl_magnum.h +++ b/src/MagnumExternal/OpenGL/GL/gl_magnum.h @@ -170,6 +170,7 @@ extern int ogl_ext_ATI_texture_mirror_once; extern int ogl_ext_EXT_texture_filter_anisotropic; extern int ogl_ext_EXT_texture_mirror_clamp; extern int ogl_ext_EXT_direct_state_access; +extern int ogl_ext_EXT_texture_sRGB_decode; extern int ogl_ext_EXT_debug_label; extern int ogl_ext_EXT_debug_marker; extern int ogl_ext_GREMEDY_string_marker; @@ -197,6 +198,10 @@ extern int ogl_ext_GREMEDY_string_marker; #define GL_PROGRAM_MATRIX_STACK_DEPTH_EXT 0x8E2F #define GL_TRANSPOSE_PROGRAM_MATRIX_EXT 0x8E2E +#define GL_DECODE_EXT 0x8A49 +#define GL_SKIP_DECODE_EXT 0x8A4A +#define GL_TEXTURE_SRGB_DECODE_EXT 0x8A48 + #define GL_BUFFER_OBJECT_EXT 0x9151 #define GL_PROGRAM_OBJECT_EXT 0x8B40 #define GL_PROGRAM_PIPELINE_OBJECT_EXT 0x8A4F @@ -2081,6 +2086,7 @@ extern GLLOADGEN_EXPORT void (CODEGEN_FUNCPTR *_ptrc_glVertexArrayVertexOffsetEX #define glVertexArrayVertexOffsetEXT _ptrc_glVertexArrayVertexOffsetEXT #endif /*GL_EXT_direct_state_access*/ + #ifndef GL_EXT_debug_label #define GL_EXT_debug_label 1 extern GLLOADGEN_EXPORT void (CODEGEN_FUNCPTR *_ptrc_glGetObjectLabelEXT)(GLenum, GLuint, GLsizei, GLsizei *, GLchar *);