- Revision
- 270395
- Author
- hironori.fu...@sony.com
- Date
- 2020-12-03 09:24:50 -0800 (Thu, 03 Dec 2020)
Log Message
Remove GraphicsContextGLOpenGL::setRenderbufferStorageFromDrawable declaration
https://bugs.webkit.org/show_bug.cgi?id=219463
Reviewed by Alex Christensen.
Source/WebCore:
r268198 removed the definition.
* platform/graphics/opengl/GraphicsContextGLOpenGL.h:
* platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp:
(WebCore::GraphicsContextGLOpenGL::reshapeFBOs):
Removed a dead code of USE(OPENGL_ES) in PLATFORM(COCOA).
Source/WTF:
* wtf/Platform.h: Removed checking whether USE_ANGLE, USE_OPENGL,
and USE_OPENGL_ES are exclusive because Cocoa ports no longer use
USE_OPENGL and USE_OPENGL_ES, and they are not exclusive on
non-Cocoa ports.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (270394 => 270395)
--- trunk/Source/WTF/ChangeLog 2020-12-03 17:15:41 UTC (rev 270394)
+++ trunk/Source/WTF/ChangeLog 2020-12-03 17:24:50 UTC (rev 270395)
@@ -1,3 +1,15 @@
+2020-12-03 Fujii Hironori <hironori.fu...@sony.com>
+
+ Remove GraphicsContextGLOpenGL::setRenderbufferStorageFromDrawable declaration
+ https://bugs.webkit.org/show_bug.cgi?id=219463
+
+ Reviewed by Alex Christensen.
+
+ * wtf/Platform.h: Removed checking whether USE_ANGLE, USE_OPENGL,
+ and USE_OPENGL_ES are exclusive because Cocoa ports no longer use
+ USE_OPENGL and USE_OPENGL_ES, and they are not exclusive on
+ non-Cocoa ports.
+
2020-12-03 Lauro Moura <lmo...@igalia.com>
[WTF] Avoid JSONValue::create with raw string falling to bool overload
Modified: trunk/Source/WTF/wtf/Platform.h (270394 => 270395)
--- trunk/Source/WTF/wtf/Platform.h 2020-12-03 17:15:41 UTC (rev 270394)
+++ trunk/Source/WTF/wtf/Platform.h 2020-12-03 17:24:50 UTC (rev 270395)
@@ -153,51 +153,13 @@
#define USE_LIBWEBRTC 1
#endif
-
-#if PLATFORM(COCOA)
-#if ENABLE(WEBGL)
-
-/* USE_ANGLE=1 uses ANGLE for the WebGL backend.
- It replaces USE_OPENGL, USE_OPENGL_ES and USE_EGL. */
-#if PLATFORM(MAC) || (PLATFORM(MACCATALYST) && __has_include(<OpenGL/OpenGL.h>))
-#define USE_OPENGL 0
-#define USE_OPENGL_ES 0
+#if PLATFORM(COCOA) && ENABLE(WEBGL)
#define USE_ANGLE 1
-#else
-#define USE_OPENGL 0
-#define USE_OPENGL_ES 0
-#define USE_ANGLE 1
-#endif
#ifndef GL_SILENCE_DEPRECATION
#define GL_SILENCE_DEPRECATION 1
#endif
-
-#if USE(OPENGL) && !defined(HAVE_OPENGL_4)
-#define HAVE_OPENGL_4 1
#endif
-#if USE(OPENGL_ES) && !defined(HAVE_OPENGL_ES_3)
-#define HAVE_OPENGL_ES_3 1
-#endif
-
-#if USE_ANGLE && (USE_OPENGL || USE_OPENGL_ES)
-#error USE_ANGLE is incompatible with USE_OPENGL and USE_OPENGL_ES
-#endif
-
-#endif /* ENABLE(WEBGL) */
-#endif /* PLATFORM(COCOA) */
-
-#if ENABLE(WEBGL)
-#if !defined(USE_ANGLE)
-#define USE_ANGLE 0
-#endif
-
-#if (USE_ANGLE && (USE_OPENGL || USE_OPENGL_ES || (defined(USE_EGL) && USE_EGL))) && !USE(TEXTURE_MAPPER)
-#error USE_ANGLE is incompatible with USE_OPENGL, USE_OPENGL_ES and USE_EGL
-#endif
-
-#endif
-
#if USE(TEXTURE_MAPPER) && ENABLE(GRAPHICS_CONTEXT_GL) && !defined(USE_TEXTURE_MAPPER_GL)
#define USE_TEXTURE_MAPPER_GL 1
#endif
@@ -206,4 +168,3 @@
#if PLATFORM(COCOA) && ENABLE(ACCESSIBILITY)
#define USE_ACCESSIBILITY_CONTEXT_MENUS 1
#endif
-
Modified: trunk/Source/WebCore/ChangeLog (270394 => 270395)
--- trunk/Source/WebCore/ChangeLog 2020-12-03 17:15:41 UTC (rev 270394)
+++ trunk/Source/WebCore/ChangeLog 2020-12-03 17:24:50 UTC (rev 270395)
@@ -1,3 +1,17 @@
+2020-12-03 Fujii Hironori <hironori.fu...@sony.com>
+
+ Remove GraphicsContextGLOpenGL::setRenderbufferStorageFromDrawable declaration
+ https://bugs.webkit.org/show_bug.cgi?id=219463
+
+ Reviewed by Alex Christensen.
+
+ r268198 removed the definition.
+
+ * platform/graphics/opengl/GraphicsContextGLOpenGL.h:
+ * platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp:
+ (WebCore::GraphicsContextGLOpenGL::reshapeFBOs):
+ Removed a dead code of USE(OPENGL_ES) in PLATFORM(COCOA).
+
2020-12-03 Jer Noble <jer.no...@apple.com>
MediaSessionHelper::setSharedHelper() hangs when "media in the GPU process" is enabled
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h (270394 => 270395)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h 2020-12-03 17:15:41 UTC (rev 270394)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h 2020-12-03 17:24:50 UTC (rev 270395)
@@ -532,10 +532,6 @@
void readRenderingResults(unsigned char* pixels, int pixelsSize);
void readPixelsAndConvertToBGRAIfNecessary(int x, int y, int width, int height, unsigned char* pixels);
-#if USE(OPENGL_ES)
- void setRenderbufferStorageFromDrawable(GCGLsizei width, GCGLsizei height);
-#endif
-
bool reshapeFBOs(const IntSize&);
void prepareTextureImpl();
void resolveMultisamplingIfNecessary(const IntRect& = IntRect());
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp (270394 => 270395)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp 2020-12-03 17:15:41 UTC (rev 270394)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp 2020-12-03 17:24:50 UTC (rev 270395)
@@ -154,11 +154,6 @@
::glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_fbo);
ASSERT(m_texture);
#if PLATFORM(COCOA)
-#if USE(OPENGL_ES)
- ::glBindRenderbuffer(GL_RENDERBUFFER, m_texture);
- ::glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, m_texture);
- setRenderbufferStorageFromDrawable(m_currentWidth, m_currentHeight);
-#else
if (!allocateIOSurfaceBackingStore(size)) {
RELEASE_LOG(WebGL, "Fatal: Unable to allocate backing store of size %d x %d", width, height);
forceContextLost();
@@ -165,7 +160,6 @@
return true;
}
::glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_RECTANGLE_ARB, m_texture, 0);
-#endif // !USE(OPENGL_ES))
#else
::glBindTexture(GL_TEXTURE_2D, m_texture);
::glTexImage2D(GL_TEXTURE_2D, 0, m_internalColorFormat, width, height, 0, colorFormat, GL_UNSIGNED_BYTE, 0);
