AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

In GrDrawVerticesOp, don't allow CPU xform with perspective matrices

Browse Source 
This causes the other attributes (colors and local coords) to be
interpolated incorrectly.

Bug: skia:10069
Change-Id: I90e926bed564f9c39375ba1ce0c27073f97a0875
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/278320
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This commit is contained in:
Brian Osman 2020-03-20 16:50:48 -04:00 committed by Skia Commit-Bot
parent cf3594b603
commit 7e9d6f43c1
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/gpu/ops/GrDrawVerticesOp.cpp
View File

@ -462,6 +462,7 @@ void DrawVerticesOp::onPrepareDraws(Target* target) {
}
if (fMultipleViewMatrices) {
SkASSERT(!mesh.fViewMatrix.hasPerspective());
SkMatrixPriv::MapPointsWithStride(mesh.fViewMatrix, posBase, vertexStride, vertexCount);
}
@ -519,6 +520,21 @@ GrOp::CombineResult DrawVerticesOp::onCombineIfPossible(GrOp* t, GrRecordingCont
return CombineResult::kCannotCombine;
}
// If we're acquiring a mesh with a different view matrix, or an op that needed multiple view
// matrices, we need multiple view matrices.
bool needMultipleViewMatrices =
fMultipleViewMatrices || that->fMultipleViewMatrices ||
!SkMatrixPriv::CheapEqual(this->fMeshes[0].fViewMatrix, that->fMeshes[0].fViewMatrix);
// ... but we can't enable multiple view matrices if any of them have perspective, or our other
// varyings won't be interpolated correctly.
if (needMultipleViewMatrices && (this->fMeshes[0].fViewMatrix.hasPerspective() ||
that->fMeshes[0].fViewMatrix.hasPerspective())) {
return CombineResult::kCannotCombine;
} else {
fMultipleViewMatrices = needMultipleViewMatrices;
}
// If the other op already required per-vertex colors, the combined mesh does.
if (that->fColorArrayType == ColorArrayType::kPremulGrColor) {
fColorArrayType = ColorArrayType::kPremulGrColor;
@ -536,12 +552,6 @@ GrOp::CombineResult DrawVerticesOp::onCombineIfPossible(GrOp* t, GrRecordingCont
// gamut is determined by the render target context. A mis-match should be impossible.
SkASSERT(GrColorSpaceXform::Equals(fColorSpaceXform.get(), that->fColorSpaceXform.get()));
// If we're acquiring a mesh with a different view matrix, or an op that needed multiple view
// matrices, we need multiple view matrices.
fMultipleViewMatrices =
fMultipleViewMatrices || that->fMultipleViewMatrices ||
!SkMatrixPriv::CheapEqual(this->fMeshes[0].fViewMatrix, that->fMeshes[0].fViewMatrix);
// If the other op already required explicit local coords the combined mesh does.
if (that->fLocalCoordsType == LocalCoordsType::kExplicit) {
fLocalCoordsType = LocalCoordsType::kExplicit;