[webkit-changes] [WebKit/WebKit] 9860d7: [TextureMapper] Merge TextureMapper and TextureMap...

Carlos Garcia Campos noreply at github.com
Wed Nov 1 03:27:20 PDT 2023 

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 9860d777b101834d2237b1592e9fd771dffb712f
      https://github.com/WebKit/WebKit/commit/9860d777b101834d2237b1592e9fd771dffb712f
  Author: Carlos Garcia Campos <cgarcia at igalia.com>
  Date:   2023-11-01 (Wed, 01 Nov 2023)

  Changed paths:
    M Source/WebCore/platform/TextureMapper.cmake
    M Source/WebCore/platform/graphics/gstreamer/GStreamerVideoFrameHolder.cpp
    M Source/WebCore/platform/graphics/gstreamer/GStreamerVideoFrameHolder.h
    M Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
    M Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
    M Source/WebCore/platform/graphics/holepunch/MediaPlayerPrivateHolePunch.cpp
    M Source/WebCore/platform/graphics/holepunch/MediaPlayerPrivateHolePunch.h
    M Source/WebCore/platform/graphics/nicosia/NicosiaGCGLANGLELayer.cpp
    M Source/WebCore/platform/graphics/nicosia/NicosiaImageBufferPipe.cpp
    M Source/WebCore/platform/graphics/texmap/BitmapTexture.cpp
    M Source/WebCore/platform/graphics/texmap/BitmapTexture.h
    R Source/WebCore/platform/graphics/texmap/BitmapTextureGL.cpp
    R Source/WebCore/platform/graphics/texmap/BitmapTextureGL.h
    M Source/WebCore/platform/graphics/texmap/BitmapTexturePool.cpp
    M Source/WebCore/platform/graphics/texmap/BitmapTexturePool.h
    M Source/WebCore/platform/graphics/texmap/TextureMapper.cpp
    M Source/WebCore/platform/graphics/texmap/TextureMapper.h
    M Source/WebCore/platform/graphics/texmap/TextureMapperContextAttributes.cpp
    M Source/WebCore/platform/graphics/texmap/TextureMapperContextAttributes.h
    M Source/WebCore/platform/graphics/texmap/TextureMapperGCGLPlatformLayer.cpp
    R Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp
    R Source/WebCore/platform/graphics/texmap/TextureMapperGL.h
    M Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp
    M Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp
    M Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h
    M Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.h
    M Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxyDMABuf.cpp
    M Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxyDMABuf.h
    M Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxyGL.cpp
    M Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp
    M Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h
    M Source/WebCore/platform/graphics/texmap/TextureMapperTile.cpp
    M Source/WebCore/platform/graphics/texmap/TextureMapperTile.h
    M Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.cpp
    M Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedBackingStore.cpp
    M Source/WebKit/GPUProcess/graphics/wc/WCScene.cpp
    M Source/WebKit/GPUProcess/graphics/wc/WCSceneContext.cpp
    M Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp
    M Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h
    M Source/WebKit/WebProcess/GPU/graphics/gbm/RemoteGraphicsContextGLProxyGBM.cpp
    M Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHostTextureMapper.cpp
    M Source/cmake/OptionsGTK.cmake
    M Source/cmake/OptionsPlayStation.cmake
    M Source/cmake/OptionsWPE.cmake
    M Source/cmake/OptionsWin.cmake

  Log Message:
  -----------
  [TextureMapper] Merge TextureMapper and TextureMapperGL
https://bugs.webkit.org/show_bug.cgi?id=263961

Reviewed by Alejandro G. Castro.

GL is the only implementation of TextureMapper now, so we don't need to have both.

* Source/WebCore/platform/TextureMapper.cmake:
* Source/WebCore/platform/graphics/gstreamer/GStreamerVideoFrameHolder.cpp:
(WebCore::GstVideoFrameHolder::GstVideoFrameHolder):
(WebCore::GstVideoFrameHolder::updateTexture):
* Source/WebCore/platform/graphics/gstreamer/GStreamerVideoFrameHolder.h:
(WebCore::GstVideoFrameHolder::flags const):
* Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::MediaPlayerPrivateGStreamer):
(WebCore::MediaPlayerPrivateGStreamer::~MediaPlayerPrivateGStreamer):
(WebCore::MediaPlayerPrivateGStreamer::configureVideoDecoder):
(WebCore::MediaPlayerPrivateGStreamer::pushTextureToCompositor):
(WebCore::MediaPlayerPrivateGStreamer::triggerRepaint):
(WebCore::MediaPlayerPrivateGStreamer::setVideoSourceOrientation):
(WebCore::MediaPlayerPrivateGStreamer::updateTextureMapperFlags):
(WebCore::MediaPlayerPrivateGStreamer::pushNextHolePunchBuffer):
* Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
* Source/WebCore/platform/graphics/holepunch/MediaPlayerPrivateHolePunch.cpp:
(WebCore::MediaPlayerPrivateHolePunch::pushNextHolePunchBuffer):
* Source/WebCore/platform/graphics/holepunch/MediaPlayerPrivateHolePunch.h:
* Source/WebCore/platform/graphics/nicosia/NicosiaImageBufferPipe.cpp:
(Nicosia::NicosiaImageBufferPipeSource::handle):
* Source/WebCore/platform/graphics/nicosia/texmap/NicosiaGCGLANGLELayer.cpp:
(Nicosia::GCGLANGLELayer::swapBuffersIfNeeded):
* Source/WebCore/platform/graphics/texmap/BitmapTexture.cpp:
(WebCore::BitmapTexture::BitmapTexture):
(WebCore::BitmapTexture::didReset):
(WebCore::BitmapTexture::updateContents):
(WebCore::BitmapTexture::applyFilters):
(WebCore::BitmapTexture::initializeStencil):
(WebCore::BitmapTexture::initializeDepthBuffer):
(WebCore::BitmapTexture::clearIfNeeded):
(WebCore::BitmapTexture::createFboIfNeeded):
(WebCore::BitmapTexture::bindAsSurface):
(WebCore::BitmapTexture::~BitmapTexture):
(WebCore::BitmapTexture::isValid const):
(WebCore::BitmapTexture::size const):
(WebCore::BitmapTexture::copyFromExternalTexture):
* Source/WebCore/platform/graphics/texmap/BitmapTexture.h:
(WebCore::BitmapTexture::BitmapTexture): Deleted.
(WebCore::BitmapTexture::isBackedByOpenGL const): Deleted.
(WebCore::BitmapTexture::flags const): Deleted.
(WebCore::BitmapTexture::bpp const): Deleted.
(WebCore::BitmapTexture::reset): Deleted.
(WebCore::BitmapTexture::didReset): Deleted.
(WebCore::BitmapTexture::contentSize const): Deleted.
(WebCore::BitmapTexture::numberOfBytes const): Deleted.
(WebCore::BitmapTexture::isOpaque const): Deleted.
(WebCore::BitmapTexture::applyFilters): Deleted.
* Source/WebCore/platform/graphics/texmap/BitmapTextureGL.cpp: Removed.
* Source/WebCore/platform/graphics/texmap/BitmapTextureGL.h: Removed.
* Source/WebCore/platform/graphics/texmap/BitmapTexturePool.cpp:
(WebCore::BitmapTexturePool::BitmapTexturePool):
(WebCore::BitmapTexturePool::createTexture):
* Source/WebCore/platform/graphics/texmap/BitmapTexturePool.h:
* Source/WebCore/platform/graphics/texmap/TextureMapper.cpp:
(WebCore::TextureMapperGLData::SharedGLData::currentSharedGLData):
(WebCore::TextureMapperGLData::SharedGLData::~SharedGLData):
(WebCore::TextureMapperGLData::SharedGLData::contextDataMap):
(WebCore::TextureMapperGLData::TextureMapperGLData):
(WebCore::TextureMapperGLData::~TextureMapperGLData):
(WebCore::TextureMapperGLData::initializeStencil):
(WebCore::TextureMapperGLData::getStaticVBO):
(WebCore::TextureMapperGLData::getVAO):
(WebCore::TextureMapperGLData::getShaderProgram):
(WebCore::TextureMapper::create):
(WebCore::TextureMapper::TextureMapper):
(WebCore::TextureMapper::clipStack):
(WebCore::TextureMapper::beginPainting):
(WebCore::TextureMapper::endPainting):
(WebCore::TextureMapper::drawBorder):
(WebCore::TextureMapper::drawNumber):
(WebCore::optionsForFilterType):
(WebCore::blurRadiusToKernelHalfSize):
(WebCore::kernelHalfSizeToBlurRadius):
(WebCore::kernelHalfSizeToSimplifiedKernelHalfSize):
(WebCore::gauss):
(WebCore::computeGaussianKernel):
(WebCore::prepareFilterProgram):
(WebCore::colorSpaceMatrixForFlags):
(WebCore::prepareRoundedRectClip):
(WebCore::TextureMapper::drawTexture):
(WebCore::prepareTransformationMatrixWithFlags):
(WebCore::TextureMapper::drawTexturePlanarYUV):
(WebCore::TextureMapper::drawTextureSemiPlanarYUV):
(WebCore::TextureMapper::drawTexturePackedYUV):
(WebCore::TextureMapper::drawSolidColor):
(WebCore::TextureMapper::clearColor):
(WebCore::TextureMapper::drawEdgeTriangles):
(WebCore::TextureMapper::drawUnitRect):
(WebCore::TextureMapper::draw):
(WebCore::TextureMapper::drawTexturedQuadWithProgram):
(WebCore::TextureMapper::drawTextureCopy):
(WebCore::TextureMapper::drawBlurred):
(WebCore::TextureMapper::applyBlurFilter):
(WebCore::TextureMapper::applyDropShadowFilter):
(WebCore::TextureMapper::applySinglePassFilter):
(WebCore::TextureMapper::applyFilter):
(WebCore::createProjectionMatrix):
(WebCore::TextureMapper::~TextureMapper):
(WebCore::TextureMapper::bindDefaultSurface):
(WebCore::TextureMapper::bindSurface):
(WebCore::TextureMapper::currentSurface):
(WebCore::TextureMapper::beginScissorClip):
(WebCore::TextureMapper::beginRoundedRectClip):
(WebCore::TextureMapper::beginClip):
(WebCore::TextureMapper::endClip):
(WebCore::TextureMapper::clipBounds):
(WebCore::TextureMapper::createTexture):
(WebCore::TextureMapper::setDepthRange):
(WebCore::TextureMapper::updateProjectionMatrix):
(WebCore::TextureMapper::drawTextureExternalOES):
* Source/WebCore/platform/graphics/texmap/TextureMapper.h:
(WebCore::TextureMapper::maxTextureSize const):
(WebCore::TextureMapper::setWrapMode):
(WebCore::TextureMapper::setPatternTransform):
(WebCore::TextureMapper::data):
(WebCore::TextureMapper::beginPainting): Deleted.
(WebCore::TextureMapper::endPainting): Deleted.
(WebCore::TextureMapper::platformCreateAccelerated): Deleted.
* Source/WebCore/platform/graphics/texmap/TextureMapperContextAttributes.cpp:
* Source/WebCore/platform/graphics/texmap/TextureMapperContextAttributes.h:
* Source/WebCore/platform/graphics/texmap/TextureMapperGCGLPlatformLayer.cpp:
(WebCore::TextureMapperGCGLPlatformLayer::paintToTextureMapper):
* Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp: Removed.
* Source/WebCore/platform/graphics/texmap/TextureMapperGL.h: Removed.
* Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:
* Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp:
(WebCore::TextureMapperPlatformLayerBuffer::TextureMapperPlatformLayerBuffer):
(WebCore::TextureMapperPlatformLayerBuffer::canReuseWithoutReset):
(WebCore::TextureMapperPlatformLayerBuffer::clone):
(WebCore::TextureMapperPlatformLayerBuffer::paintToTextureMapper):
* Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h:
(WebCore::TextureMapperPlatformLayerBuffer::texture):
(WebCore::TextureMapperPlatformLayerBuffer::setExtraFlags):
(WebCore::TextureMapperPlatformLayerBuffer::textureGL): Deleted.
* Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.h:
* Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxyDMABuf.cpp:
(WebCore::TextureMapperPlatformLayerProxyDMABuf::DMABufLayer::DMABufLayer):
(WebCore::TextureMapperPlatformLayerProxyDMABuf::DMABufLayer::paintToTextureMapper):
* Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxyDMABuf.h:
* Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxyGL.cpp:
* Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp:
* Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h:
* Source/WebCore/platform/graphics/texmap/TextureMapperTile.cpp:
(WebCore::TextureMapperTile::TextureMapperTile):
(WebCore::TextureMapperTile::texture const):
(WebCore::TextureMapperTile::setTexture):
* Source/WebCore/platform/graphics/texmap/TextureMapperTile.h:
(WebCore::TextureMapperTile::texture const): Deleted.
(WebCore::TextureMapperTile::setTexture): Deleted.
(WebCore::TextureMapperTile::TextureMapperTile): Deleted.
* Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedBackingStore.cpp:
* Source/WebKit/GPUProcess/graphics/wc/WCSceneContext.cpp:
(WebKit::WCSceneContext::createTextureMapper):
* Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:
* Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h:
* Source/WebKit/WebProcess/GPU/graphics/gbm/RemoteGraphicsContextGLProxyGBM.cpp:
(WebKit::NicosiaDisplayDelegate::swapBuffersIfNeeded):
* Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHostTextureMapper.cpp:
(WebKit::LayerTreeHost::LayerTreeHost):
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsPlayStation.cmake:
* Source/cmake/OptionsWPE.cmake:
* Source/cmake/OptionsWin.cmake:

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

More information about the webkit-changes mailing list