nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1829468 - Avoid uploading directly to framebuffer texture. r=aosmond

Browse source 
It seems that using a texture as a backing surface for a framebuffer
while simultaneously trying to use TexSubImage to upload to it aggravates
OpenGL driver bugs regarding the underlying representation of that
texture.

Given that I couldn't find an expedient way to preserve that optimized
upload path, instead we have to fallback to just uploading the sampling
rect of the surface to a transient texture that is then drawn via shader
to framebuffer.

Differential Revision: https://phabricator.services.mozilla.com/D176240
This commit is contained in:
Lee Salzman 2023-04-25 13:58:47 +00:00
parent 958cab9919
commit 5b43b941c7
1 changed files with 9 additions and 10 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

19
dom/canvas/DrawTargetWebgl.cpp
View file

@ -1518,6 +1518,7 @@ void DrawTargetWebgl::CopySurface(SourceSurface* aSurface,
return;
}
IntRect samplingRect;
if (!mSharedContext->IsCompatibleSurface(aSurface)) {
// If this data surface completely overwrites the framebuffer, then just
// copy it to the Skia target.
@ -1528,20 +1529,18 @@ void DrawTargetWebgl::CopySurface(SourceSurface* aSurface,
return;
}
// If this is a data surface with a matching format, try to upload the data
// directly to the backing texture of the framebuffer.
if (aSurface->GetFormat() == mFormat && PrepareContext(false) &&
MarkChanged()) {
if (RefPtr<DataSourceSurface> data = aSurface->GetDataSurface()) {
mSharedContext->UploadSurface(data, mFormat, srcRect,
destRect.TopLeft(), false, false, mTex);
}
return;
// CopySurface usually only samples a surface once, so don't cache the
// entire surface as it is unlikely to be reused. Limit it to the used
// source rectangle instead.
IntRect surfaceRect = aSurface->GetRect();
if (!srcRect.IsEqualEdges(surfaceRect)) {
samplingRect = srcRect.SafeIntersect(surfaceRect);
}
}
Matrix matrix = Matrix::Translation(destRect.TopLeft() - srcRect.TopLeft());
SurfacePattern pattern(aSurface, ExtendMode::CLAMP, matrix);
SurfacePattern pattern(aSurface, ExtendMode::CLAMP, matrix,
SamplingFilter::POINT, samplingRect);
DrawRect(Rect(destRect), pattern, DrawOptions(1.0f, CompositionOp::OP_SOURCE),
Nothing(), nullptr, false, false);
}