diff --git a/src/external/glad/include/glad/egl.h b/src/external/glad/include/glad/egl.h index 98cabb65d..e59969dc7 100644 --- a/src/external/glad/include/glad/egl.h +++ b/src/external/glad/include/glad/egl.h @@ -1,27 +1,27 @@ /** - * Loader generated by glad 2.0.0-beta on Mon Jul 20 17:00:25 2020 + * Loader generated by glad 2.0.0-beta on Tue Aug 18 17:49:30 2020 * * Generator: C/C++ * Specification: egl - * Extensions: 6 + * Extensions: 11 * * APIs: * - egl=1.4 * * Options: + * - ALIAS = False + * - DEBUG = False + * - HEADER_ONLY = False + * - LOADER = False + * - MX = False * - MX_GLOBAL = False * - ON_DEMAND = False - * - LOADER = False - * - ALIAS = False - * - HEADER_ONLY = False - * - DEBUG = False - * - MX = False * * Commandline: - * --api='egl=1.4' --extensions='EGL_ANDROID_get_native_client_buffer,EGL_ANDROID_image_native_buffer,EGL_EXT_image_dma_buf_import,EGL_EXT_image_dma_buf_import_modifiers,EGL_KHR_image,EGL_KHR_platform_android' c + * --merge --api='egl=1.4' --extensions='EGL_ANDROID_get_native_client_buffer,EGL_ANDROID_image_native_buffer,EGL_EXT_image_dma_buf_import,EGL_EXT_image_dma_buf_import_modifiers,EGL_EXT_image_gl_colorspace,EGL_IMG_context_priority,EGL_KHR_create_context,EGL_KHR_gl_colorspace,EGL_KHR_image,EGL_KHR_image_base,EGL_KHR_platform_android' c * * Online: - * http://glad.sh/#api=egl%3D1.4&extensions=EGL_ANDROID_get_native_client_buffer%2CEGL_ANDROID_image_native_buffer%2CEGL_EXT_image_dma_buf_import%2CEGL_EXT_image_dma_buf_import_modifiers%2CEGL_KHR_image%2CEGL_KHR_platform_android&generator=c&options= + * http://glad.sh/#api=egl%3D1.4&extensions=EGL_ANDROID_get_native_client_buffer%2CEGL_ANDROID_image_native_buffer%2CEGL_EXT_image_dma_buf_import%2CEGL_EXT_image_dma_buf_import_modifiers%2CEGL_EXT_image_gl_colorspace%2CEGL_IMG_context_priority%2CEGL_KHR_create_context%2CEGL_KHR_gl_colorspace%2CEGL_KHR_image%2CEGL_KHR_image_base%2CEGL_KHR_platform_android&generator=c&options=MERGE * */ @@ -183,7 +183,26 @@ typedef void (*GLADpostcallback)(void *ret, const char *name, GLADapiproc apipro #define EGL_CONFORMANT 0x3042 #define EGL_CONTEXT_CLIENT_TYPE 0x3097 #define EGL_CONTEXT_CLIENT_VERSION 0x3098 +#define EGL_CONTEXT_FLAGS_KHR 0x30FC #define EGL_CONTEXT_LOST 0x300E +#define EGL_CONTEXT_MAJOR_VERSION_KHR 0x3098 +#define EGL_CONTEXT_MINOR_VERSION 0x30FB +#define EGL_CONTEXT_MINOR_VERSION_KHR 0x30FB +#define EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT 0x00000002 +#define EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT_KHR 0x00000002 +#define EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT 0x00000001 +#define EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT_KHR 0x00000001 +#define EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR 0x00000001 +#define EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE_BIT_KHR 0x00000002 +#define EGL_CONTEXT_OPENGL_PROFILE_MASK 0x30FD +#define EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR 0x30FD +#define EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY 0x31BD +#define EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR 0x31BD +#define EGL_CONTEXT_OPENGL_ROBUST_ACCESS_BIT_KHR 0x00000004 +#define EGL_CONTEXT_PRIORITY_HIGH_IMG 0x3101 +#define EGL_CONTEXT_PRIORITY_LEVEL_IMG 0x3100 +#define EGL_CONTEXT_PRIORITY_LOW_IMG 0x3103 +#define EGL_CONTEXT_PRIORITY_MEDIUM_IMG 0x3102 #define EGL_CORE_NATIVE_ENGINE 0x305B #define EGL_DEFAULT_DISPLAY EGL_CAST(EGLNativeDisplayType,0) #define EGL_DEPTH_SIZE 0x3025 @@ -212,9 +231,15 @@ typedef void (*GLADpostcallback)(void *ret, const char *name, GLADapiproc apipro #define EGL_DRAW 0x3059 #define EGL_EXTENSIONS 0x3055 #define EGL_FALSE 0 +#define EGL_GL_COLORSPACE 0x309D +#define EGL_GL_COLORSPACE_DEFAULT_EXT 0x314D +#define EGL_GL_COLORSPACE_KHR 0x309D +#define EGL_GL_COLORSPACE_LINEAR_KHR 0x308A +#define EGL_GL_COLORSPACE_SRGB_KHR 0x3089 #define EGL_GREEN_SIZE 0x3023 #define EGL_HEIGHT 0x3056 #define EGL_HORIZONTAL_RESOLUTION 0x3090 +#define EGL_IMAGE_PRESERVED_KHR 0x30D2 #define EGL_ITU_REC2020_EXT 0x3281 #define EGL_ITU_REC601_EXT 0x327F #define EGL_ITU_REC709_EXT 0x3280 @@ -222,6 +247,8 @@ typedef void (*GLADpostcallback)(void *ret, const char *name, GLADapiproc apipro #define EGL_LEVEL 0x3029 #define EGL_LINUX_DMA_BUF_EXT 0x3270 #define EGL_LINUX_DRM_FOURCC_EXT 0x3271 +#define EGL_LOSE_CONTEXT_ON_RESET 0x31BF +#define EGL_LOSE_CONTEXT_ON_RESET_KHR 0x31BF #define EGL_LUMINANCE_BUFFER 0x308F #define EGL_LUMINANCE_SIZE 0x303D #define EGL_MATCH_NATIVE_PIXMAP 0x3041 @@ -247,11 +274,15 @@ typedef void (*GLADpostcallback)(void *ret, const char *name, GLADapiproc apipro #define EGL_NO_CONTEXT EGL_CAST(EGLContext,0) #define EGL_NO_DISPLAY EGL_CAST(EGLDisplay,0) #define EGL_NO_IMAGE_KHR EGL_CAST(EGLImageKHR,0) +#define EGL_NO_RESET_NOTIFICATION 0x31BE +#define EGL_NO_RESET_NOTIFICATION_KHR 0x31BE #define EGL_NO_SURFACE EGL_CAST(EGLSurface,0) #define EGL_NO_TEXTURE 0x305C #define EGL_OPENGL_API 0x30A2 #define EGL_OPENGL_BIT 0x0008 #define EGL_OPENGL_ES2_BIT 0x0004 +#define EGL_OPENGL_ES3_BIT 0x00000040 +#define EGL_OPENGL_ES3_BIT_KHR 0x00000040 #define EGL_OPENGL_ES_API 0x30A0 #define EGL_OPENGL_ES_BIT 0x0001 #define EGL_OPENVG_API 0x30A1 @@ -433,8 +464,18 @@ GLAD_API_CALL int GLAD_EGL_ANDROID_image_native_buffer; GLAD_API_CALL int GLAD_EGL_EXT_image_dma_buf_import; #define EGL_EXT_image_dma_buf_import_modifiers 1 GLAD_API_CALL int GLAD_EGL_EXT_image_dma_buf_import_modifiers; +#define EGL_EXT_image_gl_colorspace 1 +GLAD_API_CALL int GLAD_EGL_EXT_image_gl_colorspace; +#define EGL_IMG_context_priority 1 +GLAD_API_CALL int GLAD_EGL_IMG_context_priority; +#define EGL_KHR_create_context 1 +GLAD_API_CALL int GLAD_EGL_KHR_create_context; +#define EGL_KHR_gl_colorspace 1 +GLAD_API_CALL int GLAD_EGL_KHR_gl_colorspace; #define EGL_KHR_image 1 GLAD_API_CALL int GLAD_EGL_KHR_image; +#define EGL_KHR_image_base 1 +GLAD_API_CALL int GLAD_EGL_KHR_image_base; #define EGL_KHR_platform_android 1 GLAD_API_CALL int GLAD_EGL_KHR_platform_android; diff --git a/src/external/glad/include/glad/gl.h b/src/external/glad/include/glad/gl.h index 0f84cc5da..b70dfd0f3 100644 --- a/src/external/glad/include/glad/gl.h +++ b/src/external/glad/include/glad/gl.h @@ -1,28 +1,28 @@ /** - * Loader generated by glad 2.0.0-beta on Mon Jul 20 17:00:24 2020 + * Loader generated by glad 2.0.0-beta on Tue Aug 18 17:49:30 2020 * * Generator: C/C++ * Specification: gl - * Extensions: 6 + * Extensions: 13 * * APIs: * - gl:core=4.5 * - gles2=3.2 * * Options: + * - ALIAS = False + * - DEBUG = False + * - HEADER_ONLY = False + * - LOADER = False + * - MX = False * - MX_GLOBAL = False * - ON_DEMAND = False - * - LOADER = False - * - ALIAS = False - * - HEADER_ONLY = False - * - DEBUG = False - * - MX = False * * Commandline: - * --merge --api='gl:core=4.5,gles2=3.2' --extensions='GL_EXT_memory_object,GL_EXT_memory_object_fd,GL_EXT_memory_object_win32,GL_OES_EGL_image,GL_OES_EGL_image_external,GL_OES_EGL_image_external_essl3' c + * --merge --api='gl:core=4.5,gles2=3.2' --extensions='GL_EXT_EGL_image_storage,GL_EXT_external_buffer,GL_EXT_memory_object,GL_EXT_memory_object_fd,GL_EXT_memory_object_win32,GL_EXT_YUV_target,GL_EXT_sRGB,GL_OES_EGL_image,GL_OES_EGL_image_external,GL_OES_EGL_image_external_essl3,GL_OES_depth_texture,GL_OES_packed_depth_stencil,GL_OES_rgb8_rgba8' c * * Online: - * http://glad.sh/#api=gl%3Acore%3D4.5%2Cgles2%3D3.2&extensions=GL_EXT_memory_object%2CGL_EXT_memory_object_fd%2CGL_EXT_memory_object_win32%2CGL_OES_EGL_image%2CGL_OES_EGL_image_external%2CGL_OES_EGL_image_external_essl3&generator=c&options=MERGE + * http://glad.sh/#api=gl%3Acore%3D4.5%2Cgles2%3D3.2&extensions=GL_EXT_EGL_image_storage%2CGL_EXT_external_buffer%2CGL_EXT_memory_object%2CGL_EXT_memory_object_fd%2CGL_EXT_memory_object_win32%2CGL_EXT_YUV_target%2CGL_EXT_sRGB%2CGL_OES_EGL_image%2CGL_OES_EGL_image_external%2CGL_OES_EGL_image_external_essl3%2CGL_OES_depth_texture%2CGL_OES_packed_depth_stencil%2CGL_OES_rgb8_rgba8&generator=c&options=MERGE * */ @@ -1578,9 +1578,12 @@ typedef void (*GLADpostcallback)(void *ret, const char *name, GLADapiproc apipro #define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6 0x93D6 #define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8 0x93D7 #define GL_DARKEN 0x9297 +#define GL_DEPTH24_STENCIL8_OES 0x88F0 #define GL_DEPTH_BITS 0x0D56 +#define GL_DEPTH_STENCIL_OES 0x84F9 #define GL_DIFFERENCE 0x929E #define GL_EXCLUSION 0x92A0 +#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT 0x8210 #define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS 0x8CD9 #define GL_GENERATE_MIPMAP_HINT 0x8192 #define GL_GREEN_BITS 0x0D53 @@ -1599,12 +1602,19 @@ typedef void (*GLADpostcallback)(void *ret, const char *name, GLADapiproc apipro #define GL_PRIMITIVE_BOUNDING_BOX 0x92BE #define GL_RED_BITS 0x0D52 #define GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES 0x8D68 +#define GL_RGB8_OES 0x8051 +#define GL_RGBA8_OES 0x8058 +#define GL_SAMPLER_EXTERNAL_2D_Y2Y_EXT 0x8BE7 #define GL_SAMPLER_EXTERNAL_OES 0x8D66 #define GL_SCREEN 0x9295 #define GL_SOFTLIGHT 0x929C +#define GL_SRGB8_ALPHA8_EXT 0x8C43 +#define GL_SRGB_ALPHA_EXT 0x8C42 +#define GL_SRGB_EXT 0x8C40 #define GL_STENCIL_BITS 0x0D57 #define GL_TEXTURE_BINDING_EXTERNAL_OES 0x8D67 #define GL_TEXTURE_EXTERNAL_OES 0x8D65 +#define GL_UNSIGNED_INT_24_8_OES 0x84FA #include @@ -1759,18 +1769,32 @@ GLAD_API_CALL int GLAD_GL_ES_VERSION_3_0; GLAD_API_CALL int GLAD_GL_ES_VERSION_3_1; #define GL_ES_VERSION_3_2 1 GLAD_API_CALL int GLAD_GL_ES_VERSION_3_2; +#define GL_EXT_EGL_image_storage 1 +GLAD_API_CALL int GLAD_GL_EXT_EGL_image_storage; +#define GL_EXT_external_buffer 1 +GLAD_API_CALL int GLAD_GL_EXT_external_buffer; #define GL_EXT_memory_object 1 GLAD_API_CALL int GLAD_GL_EXT_memory_object; #define GL_EXT_memory_object_fd 1 GLAD_API_CALL int GLAD_GL_EXT_memory_object_fd; #define GL_EXT_memory_object_win32 1 GLAD_API_CALL int GLAD_GL_EXT_memory_object_win32; +#define GL_EXT_YUV_target 1 +GLAD_API_CALL int GLAD_GL_EXT_YUV_target; +#define GL_EXT_sRGB 1 +GLAD_API_CALL int GLAD_GL_EXT_sRGB; #define GL_OES_EGL_image 1 GLAD_API_CALL int GLAD_GL_OES_EGL_image; #define GL_OES_EGL_image_external 1 GLAD_API_CALL int GLAD_GL_OES_EGL_image_external; #define GL_OES_EGL_image_external_essl3 1 GLAD_API_CALL int GLAD_GL_OES_EGL_image_external_essl3; +#define GL_OES_depth_texture 1 +GLAD_API_CALL int GLAD_GL_OES_depth_texture; +#define GL_OES_packed_depth_stencil 1 +GLAD_API_CALL int GLAD_GL_OES_packed_depth_stencil; +#define GL_OES_rgb8_rgba8 1 +GLAD_API_CALL int GLAD_GL_OES_rgb8_rgba8; typedef void (GLAD_API_PTR *PFNGLACTIVESHADERPROGRAMPROC)(GLuint pipeline, GLuint program); @@ -1815,6 +1839,7 @@ typedef void (GLAD_API_PTR *PFNGLBLITFRAMEBUFFERPROC)(GLint srcX0, GLint srcY0, typedef void (GLAD_API_PTR *PFNGLBLITNAMEDFRAMEBUFFERPROC)(GLuint readFramebuffer, GLuint drawFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); typedef void (GLAD_API_PTR *PFNGLBUFFERDATAPROC)(GLenum target, GLsizeiptr size, const void * data, GLenum usage); typedef void (GLAD_API_PTR *PFNGLBUFFERSTORAGEPROC)(GLenum target, GLsizeiptr size, const void * data, GLbitfield flags); +typedef void (GLAD_API_PTR *PFNGLBUFFERSTORAGEEXTERNALEXTPROC)(GLenum target, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags); typedef void (GLAD_API_PTR *PFNGLBUFFERSTORAGEMEMEXTPROC)(GLenum target, GLsizeiptr size, GLuint memory, GLuint64 offset); typedef void (GLAD_API_PTR *PFNGLBUFFERSUBDATAPROC)(GLenum target, GLintptr offset, GLsizeiptr size, const void * data); typedef GLenum (GLAD_API_PTR *PFNGLCHECKFRAMEBUFFERSTATUSPROC)(GLenum target); @@ -1926,6 +1951,8 @@ typedef void (GLAD_API_PTR *PFNGLDRAWTRANSFORMFEEDBACKPROC)(GLenum mode, GLuint typedef void (GLAD_API_PTR *PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC)(GLenum mode, GLuint id, GLsizei instancecount); typedef void (GLAD_API_PTR *PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC)(GLenum mode, GLuint id, GLuint stream); typedef void (GLAD_API_PTR *PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC)(GLenum mode, GLuint id, GLuint stream, GLsizei instancecount); +typedef void (GLAD_API_PTR *PFNGLEGLIMAGETARGETTEXSTORAGEEXTPROC)(GLenum target, GLeglImageOES image, const GLint * attrib_list); +typedef void (GLAD_API_PTR *PFNGLEGLIMAGETARGETTEXTURESTORAGEEXTPROC)(GLuint texture, GLeglImageOES image, const GLint * attrib_list); typedef void (GLAD_API_PTR *PFNGLENABLEPROC)(GLenum cap); typedef void (GLAD_API_PTR *PFNGLENABLEVERTEXARRAYATTRIBPROC)(GLuint vaobj, GLuint index); typedef void (GLAD_API_PTR *PFNGLENABLEVERTEXATTRIBARRAYPROC)(GLuint index); @@ -2134,6 +2161,7 @@ typedef void (GLAD_API_PTR *PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC)(GLenum mode, c typedef void (GLAD_API_PTR *PFNGLMULTIDRAWELEMENTSINDIRECTPROC)(GLenum mode, GLenum type, const void * indirect, GLsizei drawcount, GLsizei stride); typedef void (GLAD_API_PTR *PFNGLNAMEDBUFFERDATAPROC)(GLuint buffer, GLsizeiptr size, const void * data, GLenum usage); typedef void (GLAD_API_PTR *PFNGLNAMEDBUFFERSTORAGEPROC)(GLuint buffer, GLsizeiptr size, const void * data, GLbitfield flags); +typedef void (GLAD_API_PTR *PFNGLNAMEDBUFFERSTORAGEEXTERNALEXTPROC)(GLuint buffer, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags); typedef void (GLAD_API_PTR *PFNGLNAMEDBUFFERSTORAGEMEMEXTPROC)(GLuint buffer, GLsizeiptr size, GLuint memory, GLuint64 offset); typedef void (GLAD_API_PTR *PFNGLNAMEDBUFFERSUBDATAPROC)(GLuint buffer, GLintptr offset, GLsizeiptr size, const void * data); typedef void (GLAD_API_PTR *PFNGLNAMEDFRAMEBUFFERDRAWBUFFERPROC)(GLuint framebuffer, GLenum buf); @@ -2537,6 +2565,8 @@ GLAD_API_CALL PFNGLBUFFERDATAPROC glad_glBufferData; #define glBufferData glad_glBufferData GLAD_API_CALL PFNGLBUFFERSTORAGEPROC glad_glBufferStorage; #define glBufferStorage glad_glBufferStorage +GLAD_API_CALL PFNGLBUFFERSTORAGEEXTERNALEXTPROC glad_glBufferStorageExternalEXT; +#define glBufferStorageExternalEXT glad_glBufferStorageExternalEXT GLAD_API_CALL PFNGLBUFFERSTORAGEMEMEXTPROC glad_glBufferStorageMemEXT; #define glBufferStorageMemEXT glad_glBufferStorageMemEXT GLAD_API_CALL PFNGLBUFFERSUBDATAPROC glad_glBufferSubData; @@ -2759,6 +2789,10 @@ GLAD_API_CALL PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC glad_glDrawTransformFeedbackS #define glDrawTransformFeedbackStream glad_glDrawTransformFeedbackStream GLAD_API_CALL PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC glad_glDrawTransformFeedbackStreamInstanced; #define glDrawTransformFeedbackStreamInstanced glad_glDrawTransformFeedbackStreamInstanced +GLAD_API_CALL PFNGLEGLIMAGETARGETTEXSTORAGEEXTPROC glad_glEGLImageTargetTexStorageEXT; +#define glEGLImageTargetTexStorageEXT glad_glEGLImageTargetTexStorageEXT +GLAD_API_CALL PFNGLEGLIMAGETARGETTEXTURESTORAGEEXTPROC glad_glEGLImageTargetTextureStorageEXT; +#define glEGLImageTargetTextureStorageEXT glad_glEGLImageTargetTextureStorageEXT GLAD_API_CALL PFNGLENABLEPROC glad_glEnable; #define glEnable glad_glEnable GLAD_API_CALL PFNGLENABLEVERTEXARRAYATTRIBPROC glad_glEnableVertexArrayAttrib; @@ -3175,6 +3209,8 @@ GLAD_API_CALL PFNGLNAMEDBUFFERDATAPROC glad_glNamedBufferData; #define glNamedBufferData glad_glNamedBufferData GLAD_API_CALL PFNGLNAMEDBUFFERSTORAGEPROC glad_glNamedBufferStorage; #define glNamedBufferStorage glad_glNamedBufferStorage +GLAD_API_CALL PFNGLNAMEDBUFFERSTORAGEEXTERNALEXTPROC glad_glNamedBufferStorageExternalEXT; +#define glNamedBufferStorageExternalEXT glad_glNamedBufferStorageExternalEXT GLAD_API_CALL PFNGLNAMEDBUFFERSTORAGEMEMEXTPROC glad_glNamedBufferStorageMemEXT; #define glNamedBufferStorageMemEXT glad_glNamedBufferStorageMemEXT GLAD_API_CALL PFNGLNAMEDBUFFERSUBDATAPROC glad_glNamedBufferSubData; diff --git a/src/external/glad/src/egl.c b/src/external/glad/src/egl.c index 5d573ba86..0d9f5804a 100644 --- a/src/external/glad/src/egl.c +++ b/src/external/glad/src/egl.c @@ -29,7 +29,12 @@ int GLAD_EGL_ANDROID_get_native_client_buffer = 0; int GLAD_EGL_ANDROID_image_native_buffer = 0; int GLAD_EGL_EXT_image_dma_buf_import = 0; int GLAD_EGL_EXT_image_dma_buf_import_modifiers = 0; +int GLAD_EGL_EXT_image_gl_colorspace = 0; +int GLAD_EGL_IMG_context_priority = 0; +int GLAD_EGL_KHR_create_context = 0; +int GLAD_EGL_KHR_gl_colorspace = 0; int GLAD_EGL_KHR_image = 0; +int GLAD_EGL_KHR_image_base = 0; int GLAD_EGL_KHR_platform_android = 0; @@ -135,6 +140,11 @@ static void glad_egl_load_EGL_KHR_image( GLADuserptrloadfunc load, void* userptr glad_eglCreateImageKHR = (PFNEGLCREATEIMAGEKHRPROC) load(userptr, "eglCreateImageKHR"); glad_eglDestroyImageKHR = (PFNEGLDESTROYIMAGEKHRPROC) load(userptr, "eglDestroyImageKHR"); } +static void glad_egl_load_EGL_KHR_image_base( GLADuserptrloadfunc load, void* userptr) { + if(!GLAD_EGL_KHR_image_base) return; + glad_eglCreateImageKHR = (PFNEGLCREATEIMAGEKHRPROC) load(userptr, "eglCreateImageKHR"); + glad_eglDestroyImageKHR = (PFNEGLDESTROYIMAGEKHRPROC) load(userptr, "eglDestroyImageKHR"); +} @@ -176,7 +186,12 @@ static int glad_egl_find_extensions_egl(EGLDisplay display) { GLAD_EGL_ANDROID_image_native_buffer = glad_egl_has_extension(extensions, "EGL_ANDROID_image_native_buffer"); GLAD_EGL_EXT_image_dma_buf_import = glad_egl_has_extension(extensions, "EGL_EXT_image_dma_buf_import"); GLAD_EGL_EXT_image_dma_buf_import_modifiers = glad_egl_has_extension(extensions, "EGL_EXT_image_dma_buf_import_modifiers"); + GLAD_EGL_EXT_image_gl_colorspace = glad_egl_has_extension(extensions, "EGL_EXT_image_gl_colorspace"); + GLAD_EGL_IMG_context_priority = glad_egl_has_extension(extensions, "EGL_IMG_context_priority"); + GLAD_EGL_KHR_create_context = glad_egl_has_extension(extensions, "EGL_KHR_create_context"); + GLAD_EGL_KHR_gl_colorspace = glad_egl_has_extension(extensions, "EGL_KHR_gl_colorspace"); GLAD_EGL_KHR_image = glad_egl_has_extension(extensions, "EGL_KHR_image"); + GLAD_EGL_KHR_image_base = glad_egl_has_extension(extensions, "EGL_KHR_image_base"); GLAD_EGL_KHR_platform_android = glad_egl_has_extension(extensions, "EGL_KHR_platform_android"); return 1; @@ -241,6 +256,7 @@ int gladLoadEGLUserPtr(EGLDisplay display, GLADuserptrloadfunc load, void* userp glad_egl_load_EGL_ANDROID_get_native_client_buffer(load, userptr); glad_egl_load_EGL_EXT_image_dma_buf_import_modifiers(load, userptr); glad_egl_load_EGL_KHR_image(load, userptr); + glad_egl_load_EGL_KHR_image_base(load, userptr); return version; } @@ -249,7 +265,7 @@ int gladLoadEGL(EGLDisplay display, GLADloadfunc load) { return gladLoadEGLUserPtr(display, glad_egl_get_proc_from_userptr, GLAD_GNUC_EXTENSION (void*) load); } - + #ifdef __cplusplus diff --git a/src/external/glad/src/gl.c b/src/external/glad/src/gl.c index 56eba0a1e..fe203bd65 100644 --- a/src/external/glad/src/gl.c +++ b/src/external/glad/src/gl.c @@ -42,12 +42,19 @@ int GLAD_GL_ES_VERSION_2_0 = 0; int GLAD_GL_ES_VERSION_3_0 = 0; int GLAD_GL_ES_VERSION_3_1 = 0; int GLAD_GL_ES_VERSION_3_2 = 0; +int GLAD_GL_EXT_EGL_image_storage = 0; +int GLAD_GL_EXT_external_buffer = 0; int GLAD_GL_EXT_memory_object = 0; int GLAD_GL_EXT_memory_object_fd = 0; int GLAD_GL_EXT_memory_object_win32 = 0; +int GLAD_GL_EXT_YUV_target = 0; +int GLAD_GL_EXT_sRGB = 0; int GLAD_GL_OES_EGL_image = 0; int GLAD_GL_OES_EGL_image_external = 0; int GLAD_GL_OES_EGL_image_external_essl3 = 0; +int GLAD_GL_OES_depth_texture = 0; +int GLAD_GL_OES_packed_depth_stencil = 0; +int GLAD_GL_OES_rgb8_rgba8 = 0; @@ -93,6 +100,7 @@ PFNGLBLITFRAMEBUFFERPROC glad_glBlitFramebuffer = NULL; PFNGLBLITNAMEDFRAMEBUFFERPROC glad_glBlitNamedFramebuffer = NULL; PFNGLBUFFERDATAPROC glad_glBufferData = NULL; PFNGLBUFFERSTORAGEPROC glad_glBufferStorage = NULL; +PFNGLBUFFERSTORAGEEXTERNALEXTPROC glad_glBufferStorageExternalEXT = NULL; PFNGLBUFFERSTORAGEMEMEXTPROC glad_glBufferStorageMemEXT = NULL; PFNGLBUFFERSUBDATAPROC glad_glBufferSubData = NULL; PFNGLCHECKFRAMEBUFFERSTATUSPROC glad_glCheckFramebufferStatus = NULL; @@ -204,6 +212,8 @@ PFNGLDRAWTRANSFORMFEEDBACKPROC glad_glDrawTransformFeedback = NULL; PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC glad_glDrawTransformFeedbackInstanced = NULL; PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC glad_glDrawTransformFeedbackStream = NULL; PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC glad_glDrawTransformFeedbackStreamInstanced = NULL; +PFNGLEGLIMAGETARGETTEXSTORAGEEXTPROC glad_glEGLImageTargetTexStorageEXT = NULL; +PFNGLEGLIMAGETARGETTEXTURESTORAGEEXTPROC glad_glEGLImageTargetTextureStorageEXT = NULL; PFNGLENABLEPROC glad_glEnable = NULL; PFNGLENABLEVERTEXARRAYATTRIBPROC glad_glEnableVertexArrayAttrib = NULL; PFNGLENABLEVERTEXATTRIBARRAYPROC glad_glEnableVertexAttribArray = NULL; @@ -412,6 +422,7 @@ PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC glad_glMultiDrawElementsBaseVertex = NULL; PFNGLMULTIDRAWELEMENTSINDIRECTPROC glad_glMultiDrawElementsIndirect = NULL; PFNGLNAMEDBUFFERDATAPROC glad_glNamedBufferData = NULL; PFNGLNAMEDBUFFERSTORAGEPROC glad_glNamedBufferStorage = NULL; +PFNGLNAMEDBUFFERSTORAGEEXTERNALEXTPROC glad_glNamedBufferStorageExternalEXT = NULL; PFNGLNAMEDBUFFERSTORAGEMEMEXTPROC glad_glNamedBufferStorageMemEXT = NULL; PFNGLNAMEDBUFFERSUBDATAPROC glad_glNamedBufferSubData = NULL; PFNGLNAMEDFRAMEBUFFERDRAWBUFFERPROC glad_glNamedFramebufferDrawBuffer = NULL; @@ -1813,6 +1824,16 @@ static void glad_gl_load_GL_ES_VERSION_3_2( GLADuserptrloadfunc load, void* user glad_glTexParameterIuiv = (PFNGLTEXPARAMETERIUIVPROC) load(userptr, "glTexParameterIuiv"); glad_glTexStorage3DMultisample = (PFNGLTEXSTORAGE3DMULTISAMPLEPROC) load(userptr, "glTexStorage3DMultisample"); } +static void glad_gl_load_GL_EXT_EGL_image_storage( GLADuserptrloadfunc load, void* userptr) { + if(!GLAD_GL_EXT_EGL_image_storage) return; + glad_glEGLImageTargetTexStorageEXT = (PFNGLEGLIMAGETARGETTEXSTORAGEEXTPROC) load(userptr, "glEGLImageTargetTexStorageEXT"); + glad_glEGLImageTargetTextureStorageEXT = (PFNGLEGLIMAGETARGETTEXTURESTORAGEEXTPROC) load(userptr, "glEGLImageTargetTextureStorageEXT"); +} +static void glad_gl_load_GL_EXT_external_buffer( GLADuserptrloadfunc load, void* userptr) { + if(!GLAD_GL_EXT_external_buffer) return; + glad_glBufferStorageExternalEXT = (PFNGLBUFFERSTORAGEEXTERNALEXTPROC) load(userptr, "glBufferStorageExternalEXT"); + glad_glNamedBufferStorageExternalEXT = (PFNGLNAMEDBUFFERSTORAGEEXTERNALEXTPROC) load(userptr, "glNamedBufferStorageExternalEXT"); +} static void glad_gl_load_GL_EXT_memory_object( GLADuserptrloadfunc load, void* userptr) { if(!GLAD_GL_EXT_memory_object) return; glad_glBufferStorageMemEXT = (PFNGLBUFFERSTORAGEMEMEXTPROC) load(userptr, "glBufferStorageMemEXT"); @@ -1956,6 +1977,8 @@ static int glad_gl_find_extensions_gl( int version) { char **exts_i = NULL; if (!glad_gl_get_extensions(version, &exts, &num_exts_i, &exts_i)) return 0; + GLAD_GL_EXT_EGL_image_storage = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_EXT_EGL_image_storage"); + GLAD_GL_EXT_external_buffer = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_EXT_external_buffer"); GLAD_GL_EXT_memory_object = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_EXT_memory_object"); GLAD_GL_EXT_memory_object_fd = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_EXT_memory_object_fd"); GLAD_GL_EXT_memory_object_win32 = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_EXT_memory_object_win32"); @@ -2036,6 +2059,8 @@ int gladLoadGLUserPtr( GLADuserptrloadfunc load, void *userptr) { glad_gl_load_GL_VERSION_4_5(load, userptr); if (!glad_gl_find_extensions_gl(version)) return 0; + glad_gl_load_GL_EXT_EGL_image_storage(load, userptr); + glad_gl_load_GL_EXT_external_buffer(load, userptr); glad_gl_load_GL_EXT_memory_object(load, userptr); glad_gl_load_GL_EXT_memory_object_fd(load, userptr); glad_gl_load_GL_EXT_memory_object_win32(load, userptr); @@ -2056,12 +2081,19 @@ static int glad_gl_find_extensions_gles2( int version) { char **exts_i = NULL; if (!glad_gl_get_extensions(version, &exts, &num_exts_i, &exts_i)) return 0; + GLAD_GL_EXT_EGL_image_storage = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_EXT_EGL_image_storage"); + GLAD_GL_EXT_external_buffer = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_EXT_external_buffer"); GLAD_GL_EXT_memory_object = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_EXT_memory_object"); GLAD_GL_EXT_memory_object_fd = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_EXT_memory_object_fd"); GLAD_GL_EXT_memory_object_win32 = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_EXT_memory_object_win32"); + GLAD_GL_EXT_YUV_target = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_EXT_YUV_target"); + GLAD_GL_EXT_sRGB = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_EXT_sRGB"); GLAD_GL_OES_EGL_image = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_OES_EGL_image"); GLAD_GL_OES_EGL_image_external = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_OES_EGL_image_external"); GLAD_GL_OES_EGL_image_external_essl3 = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_OES_EGL_image_external_essl3"); + GLAD_GL_OES_depth_texture = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_OES_depth_texture"); + GLAD_GL_OES_packed_depth_stencil = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_OES_packed_depth_stencil"); + GLAD_GL_OES_rgb8_rgba8 = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_OES_rgb8_rgba8"); glad_gl_free_extensions(exts_i, num_exts_i); @@ -2111,6 +2143,8 @@ int gladLoadGLES2UserPtr( GLADuserptrloadfunc load, void *userptr) { glad_gl_load_GL_ES_VERSION_3_2(load, userptr); if (!glad_gl_find_extensions_gles2(version)) return 0; + glad_gl_load_GL_EXT_EGL_image_storage(load, userptr); + glad_gl_load_GL_EXT_external_buffer(load, userptr); glad_gl_load_GL_EXT_memory_object(load, userptr); glad_gl_load_GL_EXT_memory_object_fd(load, userptr); glad_gl_load_GL_EXT_memory_object_win32(load, userptr); @@ -2128,7 +2162,7 @@ int gladLoadGLES2( GLADloadfunc load) { - + #ifdef __cplusplus diff --git a/src/external/glad/url.txt b/src/external/glad/url.txt index 35a7c3245..becfab5bb 100644 --- a/src/external/glad/url.txt +++ b/src/external/glad/url.txt @@ -1 +1,6 @@ http://gen.glad.sh/#profile=gl%3Dcore%2Cgles1%3Dcommon&api=egl%3D1.4%2Cgl%3D4.5%2Cgles2%3D3.2&extensions=EGL_ANDROID_get_native_client_buffer%2CEGL_ANDROID_image_native_buffer%2CEGL_EXT_image_dma_buf_import%2CEGL_EXT_image_dma_buf_import_modifiers%2CEGL_KHR_image%2CEGL_KHR_platform_android%2CGL_EXT_memory_object%2CGL_EXT_memory_object_fd%2CGL_EXT_memory_object_win32%2CGL_OES_EGL_image%2CGL_OES_EGL_image_external%2CGL_OES_EGL_image_external_essl3&options=MERGE%2CMERGE&generator=c + + +Alternately, command line (for the glad2 branch!) + +glad --merge --api='gl:core=4.5,gles2=3.2,egl=1.4' --extensions='GL_EXT_memory_object,GL_EXT_memory_object_fd,GL_EXT_memory_object_win32,GL_OES_EGL_image,GL_OES_EGL_image_external,GL_OES_EGL_image_external_essl3,EGL_ANDROID_get_native_client_buffer,EGL_ANDROID_image_native_buffer,EGL_EXT_image_dma_buf_import,EGL_EXT_image_dma_buf_import_modifiers,EGL_KHR_image,EGL_KHR_image_base,EGL_KHR_platform_android,EGL_IMG_context_priority,GL_EXT_external_buffer,EGL_KHR_create_context,EGL_EXT_image_gl_colorspace,EGL_KHR_gl_colorspace,GL_EXT_EGL_image_storage,GL_OES_depth_texture,GL_EXT_YUV_target,GL_EXT_sRGB,GL_OES_rgb8_rgba8,GL_OES_packed_depth_stencil' --out-path . c