New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weβll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[EGL] Merge GLContext and GLContextEGL #11806
Conversation
EWS run on previous version of this PR (hash dfe4973) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you should rename GLContextEGLLibWPE.cpp, GLContextEGLWayland.cpp, and GLContextEGLX11.cpp as well.
dfe4973
to
74aa531
Compare
EWS run on current version of this PR (hash 74aa531) |
LGTM, but I'm sure you'll want a graphics developer to review this. |
After squinting a bit at this in the end it's cleanup/refactors without any real change in functionality, so r=me (and yay! for simpler code). |
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
74aa531
to
e322dc6
Compare
Committed 262074@main (e322dc6): https://commits.webkit.org/262074@main Reviewed commits have been landed. Closing PR #11806 and removing active labels. |
e322dc6
74aa531
π§ͺ mac-AS-debug-wk2