[Skia] Stop using ScopedGLContextCurrent to make the Skia GL context current #25101
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
EWS run on previous version of this PR (hash 8528678)
|
There was a problem hiding this comment.
Since I have no experience with ANGLE, something for @magomez - just a few questions
| @@ -86,9 +86,10 @@ bool GraphicsContextGLImageExtractor::extractImage(bool premultiplyAlpha, bool i | |||
|
|
|||
| if (image->isTextureBacked()) { | |||
| auto data = SkData::MakeUninitialized(imageInfo.computeMinByteSize()); | |||
| if (!PlatformDisplay::sharedDisplayForCompositing().skiaGLContext()->makeContextCurrent()) | |||
There was a problem hiding this comment.
This would only return false, if the actual GL context switch fails, right?
There was a problem hiding this comment.
Right, if the context is still current and nothing is done, true is returned.
Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayerSkia.cpp
Show resolved
Hide resolved
carlosgcampos
force-pushed
the
skia-no-scoped-gl-context
branch
from
8528678
to
bc1de93
Compare
|
EWS run on previous version of this PR (hash bc1de93) |
magomez
approved these changes
Feb 27, 2024
carlosgcampos
added
unsafe-merge-queue
carlosgcampos
force-pushed
the
skia-no-scoped-gl-context
branch
from
bc1de93
to
ada0d9e
Compare
|
EWS run on current version of this PR (hash ada0d9e)
|
carlosgcampos
added
the
unsafe-merge-queue
…current https://bugs.webkit.org/show_bug.cgi?id=270082 Reviewed by Miguel Gomez. In most of the cases we are setting anf unsetting the same context all the time. If there's WebGL content, ANGLE graphics context will make the ANGLE context current on every operation that requires it. * Source/WebCore/platform/graphics/skia/GraphicsContextGLSkia.cpp: (WebCore::GraphicsContextGLImageExtractor::extractImage): * Source/WebCore/platform/graphics/skia/ImageBufferSkiaAcceleratedBackend.cpp: (WebCore::ImageBufferSkiaAcceleratedBackend::create): (WebCore::ImageBufferSkiaAcceleratedBackend::getPixelBuffer): (WebCore::ImageBufferSkiaAcceleratedBackend::putPixelBuffer): * Source/WebCore/platform/graphics/skia/ImageBufferUtilitiesSkia.cpp: (WebCore::encodeAcceleratedImage): * Source/WebCore/platform/graphics/skia/NativeImageSkia.cpp: (WebCore::NativeImage::singlePixelSolidColor const): * Source/WebCore/platform/graphics/skia/PlatformDisplaySkia.cpp: (WebCore::PlatformDisplay::skiaGLContext): * Source/WebCore/platform/graphics/skia/SkiaAcceleratedBufferPool.cpp: (WebCore::SkiaAcceleratedBufferPool::~SkiaAcceleratedBufferPool): (WebCore::SkiaAcceleratedBufferPool::releaseUnusedBuffersTimerFired): * Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayerSkia.cpp: (WebCore::CoordinatedGraphicsLayer::paintTile): Canonical link: https://commits.webkit.org/275379@main
webkit-commit-queue
force-pushed
the
skia-no-scoped-gl-context
branch
from
ada0d9e
to
1a34924
Compare
|
Committed 275379@main (1a34924): https://commits.webkit.org/275379@main Reviewed commits have been landed. Closing PR #25101 and removing active labels. |
webkit-commit-queue
removed
the
unsafe-merge-queue
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
1a34924
ada0d9e
🧪 wpe-wk2🧪 ios-wk2🧪 api-mac🧪 api-wpe🧪 ios-wk2-wpt🧪 mac-wk1🧪 api-ios🧪 mac-wk2🧪 gtk-wk2🧪 api-gtk🛠 watch