Modified: trunk/Source/WebCore/ChangeLog (267594 => 267595)
--- trunk/Source/WebCore/ChangeLog 2020-09-25 21:32:22 UTC (rev 267594)
+++ trunk/Source/WebCore/ChangeLog 2020-09-25 21:43:41 UTC (rev 267595)
@@ -1,3 +1,16 @@
+2020-09-25 James Darpinian <[email protected]>
+
+ Fix WEBGL_compressed_texture_s3tc_srgb in WebGL 2
+ https://bugs.webkit.org/show_bug.cgi?id=216951
+
+ Reviewed by Kenneth Russell.
+
+ Tested by webgl/2.0.0/conformance/extensions/webgl-compressed-texture-s3tc-srgb.html
+
+ * html/canvas/WebGL2RenderingContext.cpp:
+ (WebCore::WebGL2RenderingContext::getExtension):
+ (WebCore::WebGL2RenderingContext::getSupportedExtensions):
+
2020-09-25 Yusuke Suzuki <[email protected]>
[JSC] Introduce JSC_DECLARE_HOST_FUNCTION / JSC_DEFINE_HOST_FUNCTION to make host function definition easy-to-scanned for JIT-caging
Modified: trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp (267594 => 267595)
--- trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp 2020-09-25 21:32:22 UTC (rev 267594)
+++ trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp 2020-09-25 21:43:41 UTC (rev 267595)
@@ -54,6 +54,7 @@
#include "WebGLCompressedTextureETC1.h"
#include "WebGLCompressedTexturePVRTC.h"
#include "WebGLCompressedTextureS3TC.h"
+#include "WebGLCompressedTextureS3TCsRGB.h"
#include "WebGLDebugRendererInfo.h"
#include "WebGLDebugShaders.h"
#include "WebGLDepthTexture.h"
@@ -2685,6 +2686,7 @@
ENABLE_IF_REQUESTED(WebGLCompressedTextureETC1, m_webglCompressedTextureETC1, "WEBGL_compressed_texture_etc1", WebGLCompressedTextureETC1::supported(*this));
ENABLE_IF_REQUESTED(WebGLCompressedTexturePVRTC, m_webglCompressedTexturePVRTC, "WEBKIT_WEBGL_compressed_texture_pvrtc", WebGLCompressedTexturePVRTC::supported(*this));
ENABLE_IF_REQUESTED(WebGLCompressedTextureS3TC, m_webglCompressedTextureS3TC, "WEBGL_compressed_texture_s3tc", WebGLCompressedTextureS3TC::supported(*this));
+ ENABLE_IF_REQUESTED(WebGLCompressedTextureS3TCsRGB, m_webglCompressedTextureS3TCsRGB, "WEBGL_compressed_texture_s3tc_srgb", WebGLCompressedTextureS3TCsRGB::supported(*this));
ENABLE_IF_REQUESTED(WebGLDepthTexture, m_webglDepthTexture, "WEBGL_depth_texture", WebGLDepthTexture::supported(*graphicsContextGL()));
ENABLE_IF_REQUESTED(WebGLDebugRendererInfo, m_webglDebugRendererInfo, "WEBGL_debug_renderer_info", true);
ENABLE_IF_REQUESTED(WebGLDebugShaders, m_webglDebugShaders, "WEBGL_debug_shaders", m_context->getExtensions().supports("GL_ANGLE_translated_shader_source"_s));
@@ -2726,6 +2728,8 @@
result.append("WEBKIT_WEBGL_compressed_texture_pvrtc"_s);
if (WebGLCompressedTextureS3TC::supported(*this))
result.append("WEBGL_compressed_texture_s3tc"_s);
+ if (WebGLCompressedTextureS3TCsRGB::supported(*this))
+ result.append("WEBGL_compressed_texture_s3tc_srgb"_s);
if (WebGLDepthTexture::supported(*graphicsContextGL()))
result.append("WEBGL_depth_texture"_s);
result.append("WEBGL_lose_context"_s);
