From 8c05fd4fe56a42fb8e8d91b928e89a808da0557e Mon Sep 17 00:00:00 2001 From: Alexey Knyazev Date: Sat, 21 Aug 2021 23:03:16 +0400 Subject: [PATCH] Add ASTC & PVRTC to GLenumToString Bug: angleproject:4093 Change-Id: Iab19fddd2e0680a39741d2ef0b9003af5a808d49 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3110552 Reviewed-by: Alexey Knyazev Reviewed-by: Jamie Madill Commit-Queue: Alexey Knyazev --- .../GL_EGL_WGL_loader.json | 4 +- .../GL_EGL_entry_points.json | 22 ++--- .../GLenum_value_to_string_map.json | 6 +- .../OpenGL_dispatch_table.json | 2 +- .../code_generation_hashes/proc_table.json | 4 +- scripts/gl.xml | 32 ++++++++ scripts/registry_xml.py | 6 ++ src/libANGLE/Context_gles_ext_autogen.h | 6 ++ .../capture/capture_gles_ext_autogen.h | 12 +++ .../capture/gl_enum_utils_autogen.cpp | 80 +++++++++++++++++++ src/libANGLE/validationESEXT_autogen.h | 12 +++ .../entry_points_gles_ext_autogen.cpp | 12 +++ src/libGLESv2/entry_points_gles_ext_autogen.h | 12 +++ src/libGLESv2/libGLESv2_autogen.cpp | 12 +++ src/libGLESv2/libGLESv2_autogen.def | 12 +++ .../libGLESv2_no_capture_autogen.def | 12 +++ .../libGLESv2_with_capture_autogen.def | 12 +++ 17 files changed, 239 insertions(+), 19 deletions(-) diff --git a/scripts/code_generation_hashes/GL_EGL_WGL_loader.json b/scripts/code_generation_hashes/GL_EGL_WGL_loader.json index b91045aba..177b540a4 100644 --- a/scripts/code_generation_hashes/GL_EGL_WGL_loader.json +++ b/scripts/code_generation_hashes/GL_EGL_WGL_loader.json @@ -8,11 +8,11 @@ "scripts/generate_loader.py": "22eee9c55261d30f7718123c89549c55", "scripts/gl.xml": - "4fcbd11300c8edcb3ed50826780cd57e", + "e99461f683ac14cbb1eac57ad73db0e8", "scripts/gl_angle_ext.xml": "08f74b35d908b7c02b45fdf45572c434", "scripts/registry_xml.py": - "d81cbf2dfb6161645177343e87b0d848", + "79b3dff3906f5189cb35d720902212de", "scripts/wgl.xml": "c36001431919e1c435f1215a85f7e1db", "src/libEGL/egl_loader_autogen.cpp": diff --git a/scripts/code_generation_hashes/GL_EGL_entry_points.json b/scripts/code_generation_hashes/GL_EGL_entry_points.json index fe8f4b331..5366c9982 100644 --- a/scripts/code_generation_hashes/GL_EGL_entry_points.json +++ b/scripts/code_generation_hashes/GL_EGL_entry_points.json @@ -12,11 +12,11 @@ "scripts/generate_entry_points.py": "b215414751c7c1b976482edc1a7ffc77", "scripts/gl.xml": - "4fcbd11300c8edcb3ed50826780cd57e", + "e99461f683ac14cbb1eac57ad73db0e8", "scripts/gl_angle_ext.xml": "08f74b35d908b7c02b45fdf45572c434", "scripts/registry_xml.py": - "d81cbf2dfb6161645177343e87b0d848", + "79b3dff3906f5189cb35d720902212de", "scripts/wgl.xml": "c36001431919e1c435f1215a85f7e1db", "src/common/entry_points_enum_autogen.cpp": @@ -42,7 +42,7 @@ "src/libANGLE/Context_gles_3_2_autogen.h": "48567dca16fd881dfe6d61fee0e3106f", "src/libANGLE/Context_gles_ext_autogen.h": - "1e78e832b23a36d8b0eb290ebfd95812", + "5eeaccc7ee552748ba74a11431c2e8b8", "src/libANGLE/capture/capture_gles_1_0_autogen.cpp": "7ec7ef8f779b809a45d74b97502c419b", "src/libANGLE/capture/capture_gles_1_0_autogen.h": @@ -66,7 +66,7 @@ "src/libANGLE/capture/capture_gles_ext_autogen.cpp": "b027d574c21f369aee0fb0117f453935", "src/libANGLE/capture/capture_gles_ext_autogen.h": - "42d26ead58cf52c8bbf2701589bc68aa", + "96db32ede5510e6448588719c5794cfb", "src/libANGLE/capture/frame_capture_replay_autogen.cpp": "e0a3c284b986e2a712589b6f3523d79c", "src/libANGLE/capture/frame_capture_utils_autogen.cpp": @@ -88,7 +88,7 @@ "src/libANGLE/validationES3_autogen.h": "7435b9caddf8787b937c71a54dda96e1", "src/libANGLE/validationESEXT_autogen.h": - "b2d36e26a63cd92fbb26d289f1aecb9b", + "1a3abaf72365c2dceab330aa98dac2c3", "src/libANGLE/validationGL1_autogen.h": "439f8ea26dc37ee6608100f4c6f9205c", "src/libANGLE/validationGL2_autogen.h": @@ -162,17 +162,17 @@ "src/libGLESv2/entry_points_gles_3_2_autogen.h": "647f932a299cdb4726b60bbba059f0d2", "src/libGLESv2/entry_points_gles_ext_autogen.cpp": - "df737a111291710513eda6f38d391b26", + "207d7d65e546979e6f07899a3f7fabe4", "src/libGLESv2/entry_points_gles_ext_autogen.h": - "5be077957c8cf2dbf10be897d56ef4ed", + "f4d29010703e0d46237b949d5558bc69", "src/libGLESv2/libGLESv2_autogen.cpp": - "e6fd37cfcb725f9d3a25cc9c55a1ea40", + "552beefc010a78af36d5802f1cc55ee0", "src/libGLESv2/libGLESv2_autogen.def": - "7f8231e286656964204c1f303e91dfc9", + "ec8840139100b5cf7b5e7ddc572171e5", "src/libGLESv2/libGLESv2_no_capture_autogen.def": - "e243621778233766d10df30029d4e2c7", + "72fe58a35bf0ecccc0034d3f85a8a397", "src/libGLESv2/libGLESv2_with_capture_autogen.def": - "cce23e17f23ef38ee99869b6bc3d8729", + "f293074422f7bd4d23bd4c3c2a5117bb", "src/libOpenCL/libOpenCL_autogen.cpp": "10849978c910dc1af5dd4f0c815d1581" } \ No newline at end of file diff --git a/scripts/code_generation_hashes/GLenum_value_to_string_map.json b/scripts/code_generation_hashes/GLenum_value_to_string_map.json index 674eede0f..7f0413b1b 100644 --- a/scripts/code_generation_hashes/GLenum_value_to_string_map.json +++ b/scripts/code_generation_hashes/GLenum_value_to_string_map.json @@ -2,13 +2,13 @@ "scripts/gen_gl_enum_utils.py": "332cfb6f04242d18966445f70f0039b3", "scripts/gl.xml": - "4fcbd11300c8edcb3ed50826780cd57e", + "e99461f683ac14cbb1eac57ad73db0e8", "scripts/gl_angle_ext.xml": "08f74b35d908b7c02b45fdf45572c434", "scripts/registry_xml.py": - "d81cbf2dfb6161645177343e87b0d848", + "79b3dff3906f5189cb35d720902212de", "src/libANGLE/capture/gl_enum_utils_autogen.cpp": - "9f432722dc11c315b6920d311d8df70e", + "96cc2400631cc3e7ab7aba104b8f23e9", "src/libANGLE/capture/gl_enum_utils_autogen.h": "fb0bb7f506f6082ea3b2c3fa384d2739" } \ No newline at end of file diff --git a/scripts/code_generation_hashes/OpenGL_dispatch_table.json b/scripts/code_generation_hashes/OpenGL_dispatch_table.json index 378d20697..89701314b 100644 --- a/scripts/code_generation_hashes/OpenGL_dispatch_table.json +++ b/scripts/code_generation_hashes/OpenGL_dispatch_table.json @@ -1,6 +1,6 @@ { "scripts/gl.xml": - "4fcbd11300c8edcb3ed50826780cd57e", + "e99461f683ac14cbb1eac57ad73db0e8", "src/libANGLE/renderer/angle_format.py": "74d6c9842128293118ccf128aeae896a", "src/libANGLE/renderer/gl/DispatchTableGL_autogen.cpp": diff --git a/scripts/code_generation_hashes/proc_table.json b/scripts/code_generation_hashes/proc_table.json index 8f43d1479..9efd512c1 100644 --- a/scripts/code_generation_hashes/proc_table.json +++ b/scripts/code_generation_hashes/proc_table.json @@ -8,11 +8,11 @@ "scripts/gen_proc_table.py": "8336449da7e36f45dd6d70c44add2ebf", "scripts/gl.xml": - "4fcbd11300c8edcb3ed50826780cd57e", + "e99461f683ac14cbb1eac57ad73db0e8", "scripts/gl_angle_ext.xml": "08f74b35d908b7c02b45fdf45572c434", "scripts/registry_xml.py": - "d81cbf2dfb6161645177343e87b0d848", + "79b3dff3906f5189cb35d720902212de", "scripts/wgl.xml": "c36001431919e1c435f1215a85f7e1db", "src/libGL/proc_table_wgl_autogen.cpp": diff --git a/scripts/gl.xml b/scripts/gl.xml index aa9e4ed85..1e5359c40 100644 --- a/scripts/gl.xml +++ b/scripts/gl.xml @@ -1877,6 +1877,38 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/scripts/registry_xml.py b/scripts/registry_xml.py index faccda674..db5f7ebd9 100644 --- a/scripts/registry_xml.py +++ b/scripts/registry_xml.py @@ -91,6 +91,7 @@ gles_extensions = [ "GL_EXT_occlusion_query_boolean", "GL_EXT_primitive_bounding_box", "GL_EXT_protected_textures", + "GL_EXT_pvrtc_sRGB", "GL_EXT_read_format_bgra", "GL_EXT_robustness", "GL_EXT_semaphore", @@ -115,8 +116,13 @@ gles_extensions = [ "GL_EXT_texture_sRGB_R8", "GL_EXT_texture_sRGB_RG8", "GL_EXT_YUV_target", + "GL_IMG_texture_compression_pvrtc", + "GL_IMG_texture_compression_pvrtc2", "GL_KHR_debug", "GL_KHR_parallel_shader_compile", + "GL_KHR_texture_compression_astc_ldr", + "GL_KHR_texture_compression_astc_hdr", + "GL_KHR_texture_compression_astc_sliced_3d", "GL_NV_fence", "GL_NV_framebuffer_blit", "GL_OES_compressed_ETC1_RGB8_texture", diff --git a/src/libANGLE/Context_gles_ext_autogen.h b/src/libANGLE/Context_gles_ext_autogen.h index 0c491740a..8afd8ef4f 100644 --- a/src/libANGLE/Context_gles_ext_autogen.h +++ b/src/libANGLE/Context_gles_ext_autogen.h @@ -185,6 +185,7 @@ /* GL_EXT_occlusion_query_boolean */ \ /* GL_EXT_primitive_bounding_box */ \ /* GL_EXT_protected_textures */ \ + /* GL_EXT_pvrtc_sRGB */ \ /* GL_EXT_read_format_bgra */ \ /* GL_EXT_robustness */ \ /* GL_EXT_sRGB */ \ @@ -223,10 +224,15 @@ /* GL_EXT_texture_sRGB_RG8 */ \ /* GL_EXT_texture_storage */ \ void texStorage1D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); \ + /* GL_IMG_texture_compression_pvrtc */ \ + /* GL_IMG_texture_compression_pvrtc2 */ \ /* GL_KHR_blend_equation_advanced */ \ /* GL_KHR_debug */ \ /* GL_KHR_parallel_shader_compile */ \ void maxShaderCompilerThreads(GLuint count); \ + /* GL_KHR_texture_compression_astc_hdr */ \ + /* GL_KHR_texture_compression_astc_ldr */ \ + /* GL_KHR_texture_compression_astc_sliced_3d */ \ /* GL_NV_fence */ \ void deleteFencesNV(GLsizei n, const FenceNVID *fencesPacked); \ void finishFenceNV(FenceNVID fencePacked); \ diff --git a/src/libANGLE/capture/capture_gles_ext_autogen.h b/src/libANGLE/capture/capture_gles_ext_autogen.h index d3166504b..66b309df5 100644 --- a/src/libANGLE/capture/capture_gles_ext_autogen.h +++ b/src/libANGLE/capture/capture_gles_ext_autogen.h @@ -1275,6 +1275,8 @@ angle::CallCapture CapturePrimitiveBoundingBoxEXT(const State &glState, // GL_EXT_protected_textures +// GL_EXT_pvrtc_sRGB + // GL_EXT_read_format_bgra // GL_EXT_robustness @@ -1729,6 +1731,10 @@ angle::CallCapture CaptureTexStorage3DEXT(const State &glState, GLsizei height, GLsizei depth); +// GL_IMG_texture_compression_pvrtc + +// GL_IMG_texture_compression_pvrtc2 + // GL_KHR_blend_equation_advanced angle::CallCapture CaptureBlendBarrierKHR(const State &glState, bool isCallValid); @@ -1805,6 +1811,12 @@ angle::CallCapture CaptureMaxShaderCompilerThreadsKHR(const State &glState, bool isCallValid, GLuint count); +// GL_KHR_texture_compression_astc_hdr + +// GL_KHR_texture_compression_astc_ldr + +// GL_KHR_texture_compression_astc_sliced_3d + // GL_NV_fence angle::CallCapture CaptureDeleteFencesNV(const State &glState, bool isCallValid, diff --git a/src/libANGLE/capture/gl_enum_utils_autogen.cpp b/src/libANGLE/capture/gl_enum_utils_autogen.cpp index cb4564b81..633905e62 100644 --- a/src/libANGLE/capture/gl_enum_utils_autogen.cpp +++ b/src/libANGLE/capture/gl_enum_utils_autogen.cpp @@ -2590,6 +2590,22 @@ const char *GLenumToString(GLenumGroup enumGroup, unsigned int value) return "GL_RGB16F"; case 0x88F0: return "GL_DEPTH24_STENCIL8"; + case 0x8A54: + return "GL_COMPRESSED_SRGB_PVRTC_2BPPV1_EXT"; + case 0x8A55: + return "GL_COMPRESSED_SRGB_PVRTC_4BPPV1_EXT"; + case 0x8A56: + return "GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT"; + case 0x8A57: + return "GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT"; + case 0x8C00: + return "GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG"; + case 0x8C01: + return "GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG"; + case 0x8C02: + return "GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG"; + case 0x8C03: + return "GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG"; case 0x8C3A: return "GL_R11F_G11F_B10F"; case 0x8C3D: @@ -2666,6 +2682,10 @@ const char *GLenumToString(GLenumGroup enumGroup, unsigned int value) return "GL_RGBA8_SNORM"; case 0x906F: return "GL_RGB10_A2UI"; + case 0x9137: + return "GL_COMPRESSED_RGBA_PVRTC_2BPPV2_IMG"; + case 0x9138: + return "GL_COMPRESSED_RGBA_PVRTC_4BPPV2_IMG"; case 0x9270: return "GL_COMPRESSED_R11_EAC"; case 0x9271: @@ -2686,6 +2706,66 @@ const char *GLenumToString(GLenumGroup enumGroup, unsigned int value) return "GL_COMPRESSED_RGBA8_ETC2_EAC"; case 0x9279: return "GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC"; + case 0x93B0: + return "GL_COMPRESSED_RGBA_ASTC_4x4_KHR"; + case 0x93B1: + return "GL_COMPRESSED_RGBA_ASTC_5x4_KHR"; + case 0x93B2: + return "GL_COMPRESSED_RGBA_ASTC_5x5_KHR"; + case 0x93B3: + return "GL_COMPRESSED_RGBA_ASTC_6x5_KHR"; + case 0x93B4: + return "GL_COMPRESSED_RGBA_ASTC_6x6_KHR"; + case 0x93B5: + return "GL_COMPRESSED_RGBA_ASTC_8x5_KHR"; + case 0x93B6: + return "GL_COMPRESSED_RGBA_ASTC_8x6_KHR"; + case 0x93B7: + return "GL_COMPRESSED_RGBA_ASTC_8x8_KHR"; + case 0x93B8: + return "GL_COMPRESSED_RGBA_ASTC_10x5_KHR"; + case 0x93B9: + return "GL_COMPRESSED_RGBA_ASTC_10x6_KHR"; + case 0x93BA: + return "GL_COMPRESSED_RGBA_ASTC_10x8_KHR"; + case 0x93BB: + return "GL_COMPRESSED_RGBA_ASTC_10x10_KHR"; + case 0x93BC: + return "GL_COMPRESSED_RGBA_ASTC_12x10_KHR"; + case 0x93BD: + return "GL_COMPRESSED_RGBA_ASTC_12x12_KHR"; + case 0x93D0: + return "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR"; + case 0x93D1: + return "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR"; + case 0x93D2: + return "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR"; + case 0x93D3: + return "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR"; + case 0x93D4: + return "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR"; + case 0x93D5: + return "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR"; + case 0x93D6: + return "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR"; + case 0x93D7: + return "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR"; + case 0x93D8: + return "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR"; + case 0x93D9: + return "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR"; + case 0x93DA: + return "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR"; + case 0x93DB: + return "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR"; + case 0x93DC: + return "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR"; + case 0x93DD: + return "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR"; + case 0x93F0: + return "GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV2_IMG"; + case 0x93F1: + return "GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV2_IMG"; default: return UnknownGLenumToString(value); } diff --git a/src/libANGLE/validationESEXT_autogen.h b/src/libANGLE/validationESEXT_autogen.h index f0feb1a65..41d5f8d30 100644 --- a/src/libANGLE/validationESEXT_autogen.h +++ b/src/libANGLE/validationESEXT_autogen.h @@ -1054,6 +1054,8 @@ bool ValidatePrimitiveBoundingBoxEXT(const Context *context, // GL_EXT_protected_textures +// GL_EXT_pvrtc_sRGB + // GL_EXT_read_format_bgra // GL_EXT_robustness @@ -1428,6 +1430,10 @@ bool ValidateTexStorage3DEXT(const Context *context, GLsizei height, GLsizei depth); +// GL_IMG_texture_compression_pvrtc + +// GL_IMG_texture_compression_pvrtc2 + // GL_KHR_blend_equation_advanced bool ValidateBlendBarrierKHR(const Context *context); @@ -1489,6 +1495,12 @@ bool ValidatePushDebugGroupKHR(const Context *context, // GL_KHR_parallel_shader_compile bool ValidateMaxShaderCompilerThreadsKHR(const Context *context, GLuint count); +// GL_KHR_texture_compression_astc_hdr + +// GL_KHR_texture_compression_astc_ldr + +// GL_KHR_texture_compression_astc_sliced_3d + // GL_NV_fence bool ValidateDeleteFencesNV(const Context *context, GLsizei n, const FenceNVID *fencesPacked); bool ValidateFinishFenceNV(const Context *context, FenceNVID fencePacked); diff --git a/src/libGLESv2/entry_points_gles_ext_autogen.cpp b/src/libGLESv2/entry_points_gles_ext_autogen.cpp index b0d9937e8..27964682f 100644 --- a/src/libGLESv2/entry_points_gles_ext_autogen.cpp +++ b/src/libGLESv2/entry_points_gles_ext_autogen.cpp @@ -5485,6 +5485,8 @@ void GL_APIENTRY GL_PrimitiveBoundingBoxEXT(GLfloat minX, // GL_EXT_protected_textures +// GL_EXT_pvrtc_sRGB + // GL_EXT_read_format_bgra // GL_EXT_robustness @@ -7612,6 +7614,10 @@ void GL_APIENTRY GL_TexStorage3DEXT(GLenum target, } } +// GL_IMG_texture_compression_pvrtc + +// GL_IMG_texture_compression_pvrtc2 + // GL_KHR_blend_equation_advanced void GL_APIENTRY GL_BlendBarrierKHR() { @@ -7980,6 +7986,12 @@ void GL_APIENTRY GL_MaxShaderCompilerThreadsKHR(GLuint count) } } +// GL_KHR_texture_compression_astc_hdr + +// GL_KHR_texture_compression_astc_ldr + +// GL_KHR_texture_compression_astc_sliced_3d + // GL_NV_fence void GL_APIENTRY GL_DeleteFencesNV(GLsizei n, const GLuint *fences) { diff --git a/src/libGLESv2/entry_points_gles_ext_autogen.h b/src/libGLESv2/entry_points_gles_ext_autogen.h index 146b62bff..4a68a37d9 100644 --- a/src/libGLESv2/entry_points_gles_ext_autogen.h +++ b/src/libGLESv2/entry_points_gles_ext_autogen.h @@ -895,6 +895,8 @@ ANGLE_EXPORT void GL_APIENTRY GL_PrimitiveBoundingBoxEXT(GLfloat minX, // GL_EXT_protected_textures +// GL_EXT_pvrtc_sRGB + // GL_EXT_read_format_bgra // GL_EXT_robustness @@ -1171,6 +1173,10 @@ ANGLE_EXPORT void GL_APIENTRY GL_TexStorage3DEXT(GLenum target, GLsizei height, GLsizei depth); +// GL_IMG_texture_compression_pvrtc + +// GL_IMG_texture_compression_pvrtc2 + // GL_KHR_blend_equation_advanced ANGLE_EXPORT void GL_APIENTRY GL_BlendBarrierKHR(); @@ -1223,6 +1229,12 @@ ANGLE_EXPORT void GL_APIENTRY GL_PushDebugGroupKHR(GLenum source, // GL_KHR_parallel_shader_compile ANGLE_EXPORT void GL_APIENTRY GL_MaxShaderCompilerThreadsKHR(GLuint count); +// GL_KHR_texture_compression_astc_hdr + +// GL_KHR_texture_compression_astc_ldr + +// GL_KHR_texture_compression_astc_sliced_3d + // GL_NV_fence ANGLE_EXPORT void GL_APIENTRY GL_DeleteFencesNV(GLsizei n, const GLuint *fences); ANGLE_EXPORT void GL_APIENTRY GL_FinishFenceNV(GLuint fence); diff --git a/src/libGLESv2/libGLESv2_autogen.cpp b/src/libGLESv2/libGLESv2_autogen.cpp index dfbf71864..33d0990e7 100644 --- a/src/libGLESv2/libGLESv2_autogen.cpp +++ b/src/libGLESv2/libGLESv2_autogen.cpp @@ -4229,6 +4229,8 @@ void GL_APIENTRY glPrimitiveBoundingBoxEXT(GLfloat minX, // GL_EXT_protected_textures +// GL_EXT_pvrtc_sRGB + // GL_EXT_read_format_bgra // GL_EXT_robustness @@ -4745,6 +4747,10 @@ void GL_APIENTRY glTexStorage3DEXT(GLenum target, return GL_TexStorage3DEXT(target, levels, internalformat, width, height, depth); } +// GL_IMG_texture_compression_pvrtc + +// GL_IMG_texture_compression_pvrtc2 + // GL_KHR_blend_equation_advanced void GL_APIENTRY glBlendBarrierKHR() { @@ -4841,6 +4847,12 @@ void GL_APIENTRY glMaxShaderCompilerThreadsKHR(GLuint count) return GL_MaxShaderCompilerThreadsKHR(count); } +// GL_KHR_texture_compression_astc_hdr + +// GL_KHR_texture_compression_astc_ldr + +// GL_KHR_texture_compression_astc_sliced_3d + // GL_NV_fence void GL_APIENTRY glDeleteFencesNV(GLsizei n, const GLuint *fences) { diff --git a/src/libGLESv2/libGLESv2_autogen.def b/src/libGLESv2/libGLESv2_autogen.def index 91b0f3272..fc882c9e8 100644 --- a/src/libGLESv2/libGLESv2_autogen.def +++ b/src/libGLESv2/libGLESv2_autogen.def @@ -718,6 +718,8 @@ EXPORTS ; GL_EXT_protected_textures + ; GL_EXT_pvrtc_sRGB + ; GL_EXT_read_format_bgra ; GL_EXT_robustness @@ -835,6 +837,10 @@ EXPORTS glTexStorage2DEXT glTexStorage3DEXT + ; GL_IMG_texture_compression_pvrtc + + ; GL_IMG_texture_compression_pvrtc2 + ; GL_KHR_blend_equation_advanced glBlendBarrierKHR @@ -854,6 +860,12 @@ EXPORTS ; GL_KHR_parallel_shader_compile glMaxShaderCompilerThreadsKHR + ; GL_KHR_texture_compression_astc_hdr + + ; GL_KHR_texture_compression_astc_ldr + + ; GL_KHR_texture_compression_astc_sliced_3d + ; GL_NV_fence glDeleteFencesNV glFinishFenceNV diff --git a/src/libGLESv2/libGLESv2_no_capture_autogen.def b/src/libGLESv2/libGLESv2_no_capture_autogen.def index b5d4a5efa..66d7e4be9 100644 --- a/src/libGLESv2/libGLESv2_no_capture_autogen.def +++ b/src/libGLESv2/libGLESv2_no_capture_autogen.def @@ -718,6 +718,8 @@ EXPORTS ; GL_EXT_protected_textures + ; GL_EXT_pvrtc_sRGB + ; GL_EXT_read_format_bgra ; GL_EXT_robustness @@ -835,6 +837,10 @@ EXPORTS glTexStorage2DEXT glTexStorage3DEXT + ; GL_IMG_texture_compression_pvrtc + + ; GL_IMG_texture_compression_pvrtc2 + ; GL_KHR_blend_equation_advanced glBlendBarrierKHR @@ -854,6 +860,12 @@ EXPORTS ; GL_KHR_parallel_shader_compile glMaxShaderCompilerThreadsKHR + ; GL_KHR_texture_compression_astc_hdr + + ; GL_KHR_texture_compression_astc_ldr + + ; GL_KHR_texture_compression_astc_sliced_3d + ; GL_NV_fence glDeleteFencesNV glFinishFenceNV diff --git a/src/libGLESv2/libGLESv2_with_capture_autogen.def b/src/libGLESv2/libGLESv2_with_capture_autogen.def index 5d684a684..b33794dcd 100644 --- a/src/libGLESv2/libGLESv2_with_capture_autogen.def +++ b/src/libGLESv2/libGLESv2_with_capture_autogen.def @@ -718,6 +718,8 @@ EXPORTS ; GL_EXT_protected_textures + ; GL_EXT_pvrtc_sRGB + ; GL_EXT_read_format_bgra ; GL_EXT_robustness @@ -835,6 +837,10 @@ EXPORTS glTexStorage2DEXT glTexStorage3DEXT + ; GL_IMG_texture_compression_pvrtc + + ; GL_IMG_texture_compression_pvrtc2 + ; GL_KHR_blend_equation_advanced glBlendBarrierKHR @@ -854,6 +860,12 @@ EXPORTS ; GL_KHR_parallel_shader_compile glMaxShaderCompilerThreadsKHR + ; GL_KHR_texture_compression_astc_hdr + + ; GL_KHR_texture_compression_astc_ldr + + ; GL_KHR_texture_compression_astc_sliced_3d + ; GL_NV_fence glDeleteFencesNV glFinishFenceNV