Modified: trunk/LayoutTests/ChangeLog (261608 => 261609)
--- trunk/LayoutTests/ChangeLog 2020-05-13 09:38:52 UTC (rev 261608)
+++ trunk/LayoutTests/ChangeLog 2020-05-13 10:47:34 UTC (rev 261609)
@@ -1,3 +1,13 @@
+2020-05-13 Zan Dobersek <[email protected]>
+
+ REGRESSION(r261023): [GTK][WPE] Several WebGL tests are failing
+ https://bugs.webkit.org/show_bug.cgi?id=211338
+
+ Reviewed by Dean Jackson.
+
+ * platform/gtk/TestExpectations: Remove failure expectations for the fixed tests.
+ * platform/wpe/TestExpectations: Ditto.
+
2020-05-13 Antti Koivisto <[email protected]>
[Wheel event region] Include listeners on Window
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (261608 => 261609)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2020-05-13 09:38:52 UTC (rev 261608)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2020-05-13 10:47:34 UTC (rev 261609)
@@ -1377,72 +1377,6 @@
# Failing in test bots. Started failing since r260615.
webkit.org/b/210968 fast/css/resize-corner-tracking.html [ Failure ImageOnlyFailure Pass ]
-# WebGL failures after r261023.
-webkit.org/b/211338 webgl/1.0.3/conformance/more/functions/copyTexImage2DBadArgs.html [ Crash ]
-webkit.org/b/211338 fast/canvas/webgl/invalid-passed-params.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-array-buffer-view.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgb565.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba4444.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba5551.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgb565.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba4444.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba5551.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgb565.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba4444.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba5551.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-image.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-potentially-subsampled-image.html [ Failure Timeout Pass ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-svg-image.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgb565.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba4444.html [ Failure ]
-webkit.org/b/211338 webkit.org/b/199014 fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba5551.html [ Pass Crash Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-with-format-and-type.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-input-validation.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-sub-image-2d-bad-args.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-sub-image-2d.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-sub-image-cube-maps.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/uninitialized-test.html [ Failure ]
-webkit.org/b/211338 http/tests/webgl/1.0.2/texSubImage2DHTML.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/extensions/oes-texture-float-with-canvas.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/extensions/oes-texture-float-with-image-data.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/extensions/oes-texture-float-with-image.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/extensions/oes-texture-half-float-with-canvas.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/extensions/oes-texture-half-float-with-image-data.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/extensions/oes-texture-half-float-with-image.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/misc/invalid-passed-params.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/misc/uninitialized-test.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/more/functions/texSubImage2D.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/more/functions/texSubImage2DBadArgs.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/more/functions/texSubImage2DHTMLBadArgs.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-array-buffer-view.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-canvas-rgb565.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-canvas-rgba4444.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-canvas-rgba5551.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-canvas.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image-data-rgb565.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image-data-rgba4444.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image-data-rgba5551.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image-data.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image-rgb565.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image-rgba4444.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image-rgba5551.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-svg-image.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgb565.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgba4444.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgba5551.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-with-format-and-type.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-input-validation.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-sub-image-2d-bad-args.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-sub-image-2d.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/texture-sub-image-cube-maps.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/texture-upload-cube-maps.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/glsl/bugs/sampler-array-using-loop-index.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/texture-size-limit.html [ Failure ]
-
webkit.org/b/210239 fast/canvas/webgl/index-validation-with-subsequent-draws.html [ Failure ]
webkit.org/b/211501 compositing/iframes/border-radius-composited-frame.html [ ImageOnlyFailure ]
Modified: trunk/LayoutTests/platform/wpe/TestExpectations (261608 => 261609)
--- trunk/LayoutTests/platform/wpe/TestExpectations 2020-05-13 09:38:52 UTC (rev 261608)
+++ trunk/LayoutTests/platform/wpe/TestExpectations 2020-05-13 10:47:34 UTC (rev 261609)
@@ -731,71 +731,6 @@
# Failing in test bots. Started failing since r260615.
webkit.org/b/210968 fast/css/resize-corner-tracking.html [ Failure ImageOnlyFailure Pass ]
-# WebGL failures after r261023.
-webkit.org/b/211338 webgl/1.0.3/conformance/more/functions/copyTexImage2DBadArgs.html [ Crash ]
-webkit.org/b/211338 fast/canvas/webgl/invalid-passed-params.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-array-buffer-view.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgb565.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba4444.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba5551.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgb565.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba4444.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba5551.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgb565.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba4444.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba5551.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-image.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-potentially-subsampled-image.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-svg-image.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgb565.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba4444.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba5551.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-image-with-format-and-type.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-input-validation.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-sub-image-2d-bad-args.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-sub-image-2d.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/tex-sub-image-cube-maps.html [ Failure ]
-webkit.org/b/211338 fast/canvas/webgl/uninitialized-test.html [ Failure ]
-webkit.org/b/211338 http/tests/webgl/1.0.2/texSubImage2DHTML.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/extensions/oes-texture-float-with-canvas.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/extensions/oes-texture-float-with-image-data.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/extensions/oes-texture-float-with-image.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/extensions/oes-texture-half-float-with-canvas.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/extensions/oes-texture-half-float-with-image-data.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/extensions/oes-texture-half-float-with-image.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/misc/invalid-passed-params.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/misc/uninitialized-test.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/more/functions/texSubImage2D.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/more/functions/texSubImage2DBadArgs.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/more/functions/texSubImage2DHTMLBadArgs.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-array-buffer-view.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-canvas-rgb565.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-canvas-rgba4444.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-canvas-rgba5551.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-canvas.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image-data-rgb565.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image-data-rgba4444.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image-data-rgba5551.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image-data.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image-rgb565.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image-rgba4444.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image-rgba5551.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-svg-image.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgb565.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgba4444.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgba5551.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-image-with-format-and-type.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-input-validation.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-sub-image-2d-bad-args.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/tex-sub-image-2d.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/texture-size.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/texture-sub-image-cube-maps.html [ Failure ]
-webkit.org/b/211338 webgl/1.0.3/conformance/textures/texture-upload-cube-maps.html [ Failure ]
-
webkit.org/b/211563 fast/text-indicator/text-indicator-estimated-color-with-implicit-newline.html [ Failure ]
#////////////////////////////////////////////////////////////////////////////////////////
Modified: trunk/Source/WebCore/ChangeLog (261608 => 261609)
--- trunk/Source/WebCore/ChangeLog 2020-05-13 09:38:52 UTC (rev 261608)
+++ trunk/Source/WebCore/ChangeLog 2020-05-13 10:47:34 UTC (rev 261609)
@@ -1,3 +1,19 @@
+2020-05-13 Zan Dobersek <[email protected]>
+
+ REGRESSION(r261023): [GTK][WPE] Several WebGL tests are failing
+ https://bugs.webkit.org/show_bug.cgi?id=211338
+
+ Reviewed by Dean Jackson.
+
+ For non-ANGLE-backed WebGL, we are still required to query the internal
+ format of the target texture for the texture sub-image commands. Falling
+ back to that behavior on !USE(ANGLE) removes regressions in a bunch of
+ WebGL tests.
+
+ * html/canvas/WebGLRenderingContextBase.cpp:
+ (WebCore::WebGLRenderingContextBase::texImageSourceHelper):
+ (WebCore::WebGLRenderingContextBase::texImageArrayBufferViewHelper):
+
2020-05-13 Carlos Garcia Campos <[email protected]>
Unreviewed. Fix GTK debug build after r261554
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (261608 => 261609)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2020-05-13 09:38:52 UTC (rev 261608)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2020-05-13 10:47:34 UTC (rev 261609)
@@ -4301,6 +4301,15 @@
functionType = TexImageFunctionType::TexImage;
else
functionType = TexImageFunctionType::TexSubImage;
+
+#if !USE(ANGLE)
+ if (functionType == TexImageFunctionType::TexSubImage) {
+ auto texture = validateTexImageBinding(functionName, functionID, target);
+ if (texture)
+ internalformat = texture->getInternalFormat(target, level);
+ }
+#endif
+
auto visitor = WTF::makeVisitor([&](const RefPtr<ImageBitmap>& bitmap) -> ExceptionOr<void> {
auto validationResult = validateImageBitmap(functionName, bitmap.get());
if (validationResult.hasException())
@@ -4541,7 +4550,8 @@
if (isContextLostOrPending())
return;
const char* functionName = getTexImageFunctionName(functionID);
- if (!validateTexImageBinding(functionName, functionID, target))
+ auto texture = validateTexImageBinding(functionName, functionID, target);
+ if (!texture)
return;
TexImageFunctionType functionType;
if (functionID == TexImageFunctionID::TexImage2D || functionID == TexImageFunctionID::TexImage3D)
@@ -4548,6 +4558,11 @@
functionType = TexImageFunctionType::TexImage;
else
functionType = TexImageFunctionType::TexSubImage;
+#if !USE(ANGLE)
+ if (functionType == TexImageFunctionType::TexSubImage)
+ internalformat = texture->getInternalFormat(target, level);
+#endif
+
if (!validateTexFunc(functionName, functionType, SourceArrayBufferView, target, level, internalformat, width, height, depth, border, format, type, xoffset, yoffset, zoffset))
return;
TexImageDimension sourceType;
