[WebGL] Revert logging added to investigate 205757
authorjustin_fan@apple.com <justin_fan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 1 Feb 2020 00:23:20 +0000 (00:23 +0000)
committerjustin_fan@apple.com <justin_fan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 1 Feb 2020 00:23:20 +0000 (00:23 +0000)
https://bugs.webkit.org/show_bug.cgi?id=207076

Unreviewed.

Revert https://trac.webkit.org/changeset/255468.

Source/WebCore:

* 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:

* TestExpectations:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@255531 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 4dc016d..4b13f7b 100644 (file)
@@ -1,3 +1,14 @@
+2020-01-31  Justin Fan  <justin_fan@apple.com>
+
+        [WebGL] Revert logging added to investigate 205757
+        https://bugs.webkit.org/show_bug.cgi?id=207076
+
+        Unreviewed.
+        
+        Revert https://trac.webkit.org/changeset/255468.
+
+        * TestExpectations:
+
 2020-01-31  Jacob Uphoff  <jacob_uphoff@apple.com>
 
         [ macOS wk2 ] webgpu/whlsl/textures-sample-level.html is flaky failing
index 5a25082..bc80a15 100644 (file)
@@ -3492,9 +3492,4 @@ 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
+webkit.org/b/206579 [ Debug ] imported/w3c/web-platform-tests/css/css-backgrounds/background-size/vector/zero-width-ratio-auto-5px.html [ Crash ]
\ No newline at end of file
index df071bd..0e77a11 100644 (file)
@@ -1,3 +1,26 @@
+2020-01-31  Justin Fan  <justin_fan@apple.com>
+
+        [WebGL] Revert logging added to investigate 205757
+        https://bugs.webkit.org/show_bug.cgi?id=207076
+
+        Unreviewed.
+        
+        Revert https://trac.webkit.org/changeset/255468.
+
+        * 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-31  Antoine Quint  <graouts@apple.com>
 
         [Web Animations] [WK1] REGRESSION: opacity doesn't animate
index 06d4ff5..0efa4b4 100644 (file)
@@ -1314,8 +1314,6 @@ void WebGLRenderingContextBase::bindRenderbuffer(GCGLenum target, WebGLRenderbuf
 
 void WebGLRenderingContextBase::bindTexture(GCGLenum target, WebGLTexture* texture)
 {
-    WTFLogAlways("[ WEBGL ] bindTexture()");
-
     bool deleted;
     if (!checkObjectToBeBound("bindTexture", texture, deleted))
         return;
@@ -1745,8 +1743,6 @@ RefPtr<WebGLFramebuffer> WebGLRenderingContextBase::createFramebuffer()
 
 RefPtr<WebGLTexture> WebGLRenderingContextBase::createTexture()
 {
-    WTFLogAlways("[ WEBGL ] createTexture()");
-
     if (isContextLostOrPending())
         return nullptr;
     auto texture = WebGLTexture::create(*this);
@@ -2655,8 +2651,6 @@ Optional<WebGLContextAttributes> WebGLRenderingContextBase::getContextAttributes
 
 GCGLenum WebGLRenderingContextBase::getError()
 {
-    WTFLogAlways("[ WEBGL ] getError()");
-
     if (m_isPendingPolicyResolution)
         return GraphicsContextGL::NO_ERROR;
     return m_context->getError();
@@ -3962,8 +3956,6 @@ 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 { };
@@ -4527,8 +4519,6 @@ 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 83500ba..3cc3dc9 100644 (file)
@@ -391,8 +391,6 @@ 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 c90231c..1e035a7 100644 (file)
@@ -504,8 +504,6 @@ 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);
@@ -1113,8 +1111,6 @@ 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
@@ -1826,8 +1822,6 @@ 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)
@@ -1909,8 +1903,6 @@ PlatformGLObject GraphicsContextGLOpenGL::createShader(GCGLenum type)
 
 PlatformGLObject GraphicsContextGLOpenGL::createTexture()
 {
-    WTFLogAlways("[ GraphicsContextGL ] createTexture()");
-
     makeContextCurrent();
     GLuint o = 0;
     glGenTextures(1, &o);