tree 8e45d1f75bbb2b0b02190d8f952b6e0c2289958f
parent 454e4a29df6e6bb3d99feba8d9f6ff95628ba0b6
author commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> 1637846562 +0000
committer commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> 1637846562 +0000

GraphicsContextGL implementations should have separate class definitions
https://bugs.webkit.org/show_bug.cgi?id=233491

Patch by Kimmo Kinnunen <kkinnunen@apple.com> on 2021-11-25
Reviewed by Antti Koivisto.

Source/WebCore:

Add new concrete classes GraphicsContextGLCocoa and
GraphicsContextGLTextureMapper.
In the future, the platform-specific functionality can be moved
to these classes, reducing the GraphicsContextGLOpenGL #ifdefs.

No new tests, a refactor.

* Modules/webxr/WebXROpaqueFramebuffer.cpp:
(WebCore::WebXROpaqueFramebuffer::startFrame):
(WebCore::WebXROpaqueFramebuffer::endFrame):
* PlatformMac.cmake:
* SourcesCocoa.txt:
* WebCore.xcodeproj/project.pbxproj:
* platform/TextureMapper.cmake:
* platform/graphics/cocoa/GraphicsContextGLCocoa.h: Added.
* platform/graphics/cocoa/GraphicsContextGLCocoa.mm: Renamed from Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm.
(WebCore::GraphicsContextGLCocoa::create):
(WebCore::GraphicsContextGLCocoa::displayBuffer):
(WebCore::GraphicsContextGLCocoa::markDisplayBufferInUse):
(WebCore::GraphicsContextGLCocoa::GraphicsContextGLCocoa):
(WebCore::GraphicsContextGLCocoa::isValid const):
(WebCore::GraphicsContextGLCocoa::createPbufferAndAttachIOSurface):
(WebCore::GraphicsContextGLCocoa::destroyPbufferAndDetachIOSurface):
(WebCore::GraphicsContextGLCocoa::attachIOSurfaceToSharedTexture):
(WebCore::GraphicsContextGLCocoa::detachIOSurfaceFromSharedTexture):
* platform/graphics/cocoa/WebProcessGraphicsContextGLCocoa.mm: Renamed from Source/WebCore/platform/graphics/cocoa/WebProcessGraphicsContextGLOpenGLCocoa.mm.
(WebCore::GraphicsContextGLOpenGL::create):
* platform/graphics/opengl/GraphicsContextGLOpenGL.cpp:
(WebCore::GraphicsContextGLOpenGL::isValid const): Deleted.
* platform/graphics/opengl/GraphicsContextGLOpenGL.h:
* platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp:
(WebCore::GraphicsContextGLOpenGL::reshapeFBOs):
* platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp:
(WebCore::GraphicsContextGLTextureMapper::create):
(WebCore::GraphicsContextGLTextureMapper::GraphicsContextGLTextureMapper):
(WebCore::GraphicsContextGLOpenGL::create):
* platform/graphics/texmap/GraphicsContextGLTextureMapper.h: Added.

Source/WebKit:

Use the new concrete classes GraphicsContextGLCocoa and
GraphicsContextGLTextureMapper in GPUP WebGL implemetation.

Remove GPUProcessGraphicsContextGL as the added functionality is
now in the GraphicsContextGLCocoa.

* GPUProcess/graphics/GPUProcessGraphicsContextGL.h: Removed.
* GPUProcess/graphics/RemoteGraphicsContextGL.h:
* GPUProcess/graphics/RemoteGraphicsContextGLCocoa.cpp:
(WebKit::RemoteGraphicsContextGLCocoa::platformWorkQueueInitialize):
* GPUProcess/graphics/RemoteGraphicsContextGLWin.cpp:
(WebKit::RemoteGraphicsContextGLWin::platformWorkQueueInitialize):
* WebKit.xcodeproj/project.pbxproj:

Tools:

Adjust TestGraphicsContextGLOpenGLCocoa to
TestGraphicsContextGLCocoa after GraphicsContextGLOpenGL
Cocoa variant rename to GraphicsContextGLCocoa.

* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* TestWebKitAPI/Tests/WebCore/cocoa/TestGraphicsContextGLCocoa.mm: Renamed from Tools/TestWebKitAPI/Tests/WebCore/cocoa/TestGraphicsContextGLOpenGLCocoa.mm.
(TestWebKitAPI::createDefaultTestContext):
(TestWebKitAPI::changeContextContents):
(TestWebKitAPI::TEST_F):

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