[WebGL] Add logging statements to attempt to catch texture-upload-size.html timeout
authorjustin_fan@apple.com <justin_fan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 31 Jan 2020 00:23:55 +0000 (00:23 +0000)
committerjustin_fan@apple.com <justin_fan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 31 Jan 2020 00:23:55 +0000 (00:23 +0000)
https://bugs.webkit.org/show_bug.cgi?id=207006

Source/WebCore:

Unreviewed temporary logging additions for flaky timeout investigation.

* html/canvas/WebGLRenderingContextBase.cpp:
(WebCore::WebGLRenderingContextBase::bindTexture):
(WebCore::WebGLRenderingContextBase::createTexture):
(WebCore::WebGLRenderingContextBase::getError):
(WebCore::WebGLRenderingContextBase::texSubImage2D):
(WebCore::WebGLRenderingContextBase::texImage2D):
* platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp:
(WebCore::GraphicsContextGLOpenGL::texImage2D):
* platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp:
(WebCore::GraphicsContextGLOpenGL::bindTexture):
(WebCore::GraphicsContextGLOpenGL::getError):
(WebCore::GraphicsContextGLOpenGL::texSubImage2D):
(WebCore::GraphicsContextGLOpenGL::createTexture):

LayoutTests:

Unreviewed temporary logging additions caused unrelated tests to time out.

* TestExpectations:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@255468 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/TestExpectations
Source/WebCore/ChangeLog
Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp
Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp
Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp

index 05be767..a9894a2 100644 (file)
@@ -1,3 +1,12 @@
+2020-01-30  Justin Fan  <justin_fan@apple.com>
+
+        [WebGL] Add logging statements to attempt to catch texture-upload-size.html timeout
+        https://bugs.webkit.org/show_bug.cgi?id=207006
+
+        Unreviewed temporary logging additions caused unrelated tests to time out.
+
+        * TestExpectations:
+
 2020-01-30  Ryan Haddad  <ryanhaddad@apple.com>
 
         Regression: fast/hidpi/image-srcset-relative-svg-canvas-2x.html is consistently failing on iOS EWS
index b4be78c..5a25082 100644 (file)
@@ -3493,3 +3493,8 @@ webkit.org/b/206753 imported/w3c/web-platform-tests/css/css-backgrounds/first-le
 webkit.org/b/206578 [ Debug ] imported/w3c/web-platform-tests/css/css-backgrounds/animations/border-image-width-interpolation.html [ Crash ]
 webkit.org/b/206579 [ Debug ] imported/w3c/web-platform-tests/css/css-backgrounds/background-size/vector/zero-height-ratio-auto-5px.html [ Crash ]
 webkit.org/b/206579 [ Debug ] imported/w3c/web-platform-tests/css/css-backgrounds/background-size/vector/zero-width-ratio-auto-5px.html [ Crash ]
+
+# Slow now due to added logging for unrelated investigation. Will be reverted.
+webkit.org/b/207006 fast/canvas/webgl/uniform-samplers-test.html [ Timeout ]
+webkit.org/b/207006 webgl/1.0.3/conformance/state/gl-object-get-calls.html [ Timeout ]
+webkit.org/b/207006 webgl/1.0.3/conformance/uniforms/uniform-samplers-test.html [ Timeout ]
\ No newline at end of file
index ad9b006..891decc 100644 (file)
@@ -1,3 +1,24 @@
+2020-01-30  Justin Fan  <justin_fan@apple.com>
+
+        [WebGL] Add logging statements to attempt to catch texture-upload-size.html timeout
+        https://bugs.webkit.org/show_bug.cgi?id=207006
+
+        Unreviewed temporary logging additions for flaky timeout investigation.
+
+        * html/canvas/WebGLRenderingContextBase.cpp:
+        (WebCore::WebGLRenderingContextBase::bindTexture):
+        (WebCore::WebGLRenderingContextBase::createTexture):
+        (WebCore::WebGLRenderingContextBase::getError):
+        (WebCore::WebGLRenderingContextBase::texSubImage2D):
+        (WebCore::WebGLRenderingContextBase::texImage2D):
+        * platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp:
+        (WebCore::GraphicsContextGLOpenGL::texImage2D):
+        * platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp:
+        (WebCore::GraphicsContextGLOpenGL::bindTexture):
+        (WebCore::GraphicsContextGLOpenGL::getError):
+        (WebCore::GraphicsContextGLOpenGL::texSubImage2D):
+        (WebCore::GraphicsContextGLOpenGL::createTexture):
+
 2020-01-30  Per Arne Vollan  <pvollan@apple.com>
 
         [iOS] Issue mach sandbox extension to the frontboard and icon service when the attachment element is enabled
index 0efa4b4..06d4ff5 100644 (file)
@@ -1314,6 +1314,8 @@ void WebGLRenderingContextBase::bindRenderbuffer(GCGLenum target, WebGLRenderbuf
 
 void WebGLRenderingContextBase::bindTexture(GCGLenum target, WebGLTexture* texture)
 {
+    WTFLogAlways("[ WEBGL ] bindTexture()");
+
     bool deleted;
     if (!checkObjectToBeBound("bindTexture", texture, deleted))
         return;
@@ -1743,6 +1745,8 @@ RefPtr<WebGLFramebuffer> WebGLRenderingContextBase::createFramebuffer()
 
 RefPtr<WebGLTexture> WebGLRenderingContextBase::createTexture()
 {
+    WTFLogAlways("[ WEBGL ] createTexture()");
+
     if (isContextLostOrPending())
         return nullptr;
     auto texture = WebGLTexture::create(*this);
@@ -2651,6 +2655,8 @@ Optional<WebGLContextAttributes> WebGLRenderingContextBase::getContextAttributes
 
 GCGLenum WebGLRenderingContextBase::getError()
 {
+    WTFLogAlways("[ WEBGL ] getError()");
+
     if (m_isPendingPolicyResolution)
         return GraphicsContextGL::NO_ERROR;
     return m_context->getError();
@@ -3956,6 +3962,8 @@ void WebGLRenderingContextBase::texSubImage2D(GCGLenum target, GCGLint level, GC
 
 ExceptionOr<void> WebGLRenderingContextBase::texSubImage2D(GCGLenum target, GCGLint level, GCGLint xoffset, GCGLint yoffset, GCGLenum format, GCGLenum type, Optional<TexImageSource>&& source)
 {
+    WTFLogAlways("[ WEBGL ] texSubImage2D()");
+
     if (!source) {
         synthesizeGLError(GraphicsContextGL::INVALID_VALUE, "texSubImage2D", "source is null");
         return { };
@@ -4519,6 +4527,8 @@ static bool isRGBFormat(GCGLenum internalFormat)
 
 ExceptionOr<void> WebGLRenderingContextBase::texImage2D(GCGLenum target, GCGLint level, GCGLenum internalformat, GCGLenum format, GCGLenum type, Optional<TexImageSource> source)
 {
+    WTFLogAlways("[ WEBGL ] texImage2D()");
+
     if (!source) {
         synthesizeGLError(GraphicsContextGL::INVALID_VALUE, "texImage2D", "source is null");
         return { };
index 3cc3dc9..83500ba 100644 (file)
@@ -391,6 +391,8 @@ void GraphicsContextGLOpenGL::getShaderPrecisionFormat(GCGLenum shaderType, GCGL
 
 bool GraphicsContextGLOpenGL::texImage2D(GCGLenum target, GCGLint level, GCGLenum internalformat, GCGLsizei width, GCGLsizei height, GCGLint border, GCGLenum format, GCGLenum type, const void* pixels)
 {
+    WTFLogAlways("[ GraphicsContextGL ] texImage2D()");
+
     if (width && height && !pixels) {
         synthesizeGLError(INVALID_VALUE);
         return false;
index 1e035a7..c90231c 100644 (file)
@@ -504,6 +504,8 @@ void GraphicsContextGLOpenGL::bindRenderbuffer(GCGLenum target, PlatformGLObject
 
 void GraphicsContextGLOpenGL::bindTexture(GCGLenum target, PlatformGLObject texture)
 {
+    WTFLogAlways("[ GraphicsContextGL ] bindTexture()");
+
     makeContextCurrent();
     m_state.setBoundTexture(m_state.activeTextureUnit, texture, target);
     ::glBindTexture(target, texture);
@@ -1111,6 +1113,8 @@ bool GraphicsContextGLOpenGL::moveErrorsToSyntheticErrorList()
 
 GCGLenum GraphicsContextGLOpenGL::getError()
 {
+    WTFLogAlways("[ GraphicsContextGL ] getError()");
+
     if (!m_syntheticErrors.isEmpty()) {
         // Need to move the current errors to the synthetic error list in case
         // that error is already there, since the expected behavior of both
@@ -1822,6 +1826,8 @@ GCGLsizeiptr GraphicsContextGLOpenGL::getVertexAttribOffset(GCGLuint index, GCGL
 
 void GraphicsContextGLOpenGL::texSubImage2D(GCGLenum target, GCGLint level, GCGLint xoff, GCGLint yoff, GCGLsizei width, GCGLsizei height, GCGLenum format, GCGLenum type, const void* pixels)
 {
+    WTFLogAlways("[ GraphicsContextGL ] texSubImage2D()");
+
     makeContextCurrent();
 
 #if !USE(OPENGL_ES)
@@ -1903,6 +1909,8 @@ PlatformGLObject GraphicsContextGLOpenGL::createShader(GCGLenum type)
 
 PlatformGLObject GraphicsContextGLOpenGL::createTexture()
 {
+    WTFLogAlways("[ GraphicsContextGL ] createTexture()");
+
     makeContextCurrent();
     GLuint o = 0;
     glGenTextures(1, &o);