[webkit-changes] [WebKit/WebKit] e322dc: [EGL] Merge GLContext and GLContextEGL

[Carlos Garcia Campos]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: e322dc6f4a1493e12924c3d4e8f51351ed00a733
      https://github.com/WebKit/WebKit/commit/e322dc6f4a1493e12924c3d4e8f51351ed00a733
  Author: Carlos Garcia Campos <cgarcia at igalia.com>
  Date:   2023-03-24 (Fri, 24 Mar 2023)

  Changed paths:
    M Source/WebCore/Headers.cmake
    M Source/WebCore/PlatformPlayStation.cmake
    M Source/WebCore/PlatformWin.cmake
    M Source/WebCore/SourcesGTK.txt
    M Source/WebCore/SourcesWPE.txt
    R Source/WebCore/platform/graphics/GLContext.cpp
    R Source/WebCore/platform/graphics/GLContext.h
    M Source/WebCore/platform/graphics/PlatformDisplay.cpp
    A Source/WebCore/platform/graphics/egl/GLContext.cpp
    A Source/WebCore/platform/graphics/egl/GLContext.h
    R Source/WebCore/platform/graphics/egl/GLContextEGL.cpp
    R Source/WebCore/platform/graphics/egl/GLContextEGL.h
    R Source/WebCore/platform/graphics/egl/GLContextEGLLibWPE.cpp
    R Source/WebCore/platform/graphics/egl/GLContextEGLWayland.cpp
    R Source/WebCore/platform/graphics/egl/GLContextEGLX11.cpp
    A Source/WebCore/platform/graphics/egl/GLContextLibWPE.cpp
    A Source/WebCore/platform/graphics/egl/GLContextWayland.cpp
    A Source/WebCore/platform/graphics/egl/GLContextX11.cpp
    M Source/WebCore/platform/graphics/gstreamer/PlatformDisplayGStreamer.cpp
    M Source/WebCore/platform/graphics/libwpe/PlatformDisplayLibWPE.cpp
    M Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerDmabuf.cpp
    M Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp
    M Source/WebCore/platform/xr/openxr/PlatformXROpenXR.cpp
    M Source/WebCore/platform/xr/openxr/PlatformXROpenXR.h
    M Source/WebKit/GPUProcess/graphics/wc/WCSceneContext.cpp
    M Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp
    M Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
    M Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp
    M Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHostTextureMapper.cpp

  Log Message:
  -----------
  [EGL] Merge GLContext and GLContextEGL
https://bugs.webkit.org/show_bug.cgi?id=254270

Reviewed by Adrian Perez de Castro.

GLContextEGL is now the only implementation of GLContext, so there's no
reason to have a base abstract class.

* Source/WebCore/Headers.cmake:
* Source/WebCore/PlatformPlayStation.cmake:
* Source/WebCore/PlatformWin.cmake:
* Source/WebCore/SourcesGTK.txt:
* Source/WebCore/SourcesWPE.txt:
* Source/WebCore/platform/graphics/GLContext.cpp: Removed.
* Source/WebCore/platform/graphics/GLContext.h: Removed.
* Source/WebCore/platform/graphics/PlatformDisplay.cpp:
(WebCore::PlatformDisplay::sharingGLContext):
(WebCore::PlatformDisplay::initializeEGLDisplay):
* Source/WebCore/platform/graphics/egl/GLContext.cpp: Renamed from Source/WebCore/platform/graphics/egl/GLContextEGL.cpp.
(WebCore::initializeOpenGLShimsIfNeeded):
(WebCore::GLContext::errorString):
(WebCore::GLContext::lastErrorString):
(WebCore::GLContext::getEGLConfig):
(WebCore::GLContext::createWindowContext):
(WebCore::GLContext::createPbufferContext):
(WebCore::GLContext::createSurfacelessContext):
(WebCore::GLContext::createContext):
(WebCore::GLContext::createOffscreen):
(WebCore::GLContext::createSharing):
(WebCore::GLContext::GLContext):
(WebCore::GLContext::~GLContext):
(WebCore::GLContext::createContextForEGLVersion):
(WebCore::GLContext::makeContextCurrent):
(WebCore::GLContext::current):
(WebCore::GLContext::swapBuffers):
(WebCore::GLContext::platformContext):
(WebCore::GLContext::isExtensionSupported):
(WebCore::GLContext::version):
* Source/WebCore/platform/graphics/egl/GLContext.h: Added.
(WebCore::GLContext::display const):
(WebCore::GLContext::config const):
* Source/WebCore/platform/graphics/egl/GLContextEGL.h: Removed.
* Source/WebCore/platform/graphics/egl/GLContextEGLLibWPE.cpp:
(WebCore::GLContext::GLContext):
(WebCore::GLContext::createWindowSurfaceWPE):
(WebCore::GLContext::createWPEContext):
(WebCore::GLContext::destroyWPETarget):
(WebCore::GLContextEGL::GLContextEGL): Deleted.
(WebCore::GLContextEGL::createWindowSurfaceWPE): Deleted.
(WebCore::GLContextEGL::createWPEContext): Deleted.
(WebCore::GLContextEGL::destroyWPETarget): Deleted.
* Source/WebCore/platform/graphics/egl/GLContextEGLWayland.cpp:
(WebCore::GLContext::GLContext):
(WebCore::GLContext::createWindowSurfaceWayland):
(WebCore::GLContext::createWaylandContext):
(WebCore::GLContext::destroyWaylandWindow):
(WebCore::GLContextEGL::GLContextEGL): Deleted.
(WebCore::GLContextEGL::createWindowSurfaceWayland): Deleted.
(WebCore::GLContextEGL::createWaylandContext): Deleted.
(WebCore::GLContextEGL::destroyWaylandWindow): Deleted.
* Source/WebCore/platform/graphics/egl/GLContextEGLX11.cpp:
(WebCore::GLContext::GLContext):
(WebCore::GLContext::createWindowSurfaceX11):
(WebCore::GLContext::createPixmapContext):
(WebCore::GLContextEGL::GLContextEGL): Deleted.
(WebCore::GLContextEGL::createWindowSurfaceX11): Deleted.
(WebCore::GLContextEGL::createPixmapContext): Deleted.
* Source/WebCore/platform/graphics/gstreamer/PlatformDisplayGStreamer.cpp:
* Source/WebCore/platform/graphics/libwpe/PlatformDisplayLibWPE.cpp:
(WebCore::PlatformDisplayLibWPE::initialize):
* Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerDmabuf.cpp:
(WebCore::TextureMapperPlatformLayerDmabuf::validateTexture):
* Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp:
* Source/WebCore/platform/xr/openxr/PlatformXROpenXR.cpp:
(PlatformXR::OpenXRDevice::initializeTrackingAndRendering):
* Source/WebCore/platform/xr/openxr/PlatformXROpenXR.h:
* Source/WebKit/GPUProcess/graphics/wc/WCSceneContext.cpp:
(WebKit::WCSceneContext::WCSceneContext):
* Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
(WebKit::ThreadedCompositor::createGLContext):
* Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp:
(WebKit::WebKitProtocolHandler::handleGPU):
* Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
(WebKit::tryInitializeEGL):
* Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHostTextureMapper.cpp:
(WebKit::LayerTreeHost::LayerTreeHost):

Canonical link: https://commits.webkit.org/262074@main