Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 65fb101

Browse files
Reland "Always tweak matrix for consistent opt"
This reverts commit 0a07e9b. Reason for revert: didnt' seem to help g3 Original change's description: > Revert "Always tweak matrix for consistent opt" > > This reverts commit 26e1073. > > Reason for revert: breaking google3? > > Original change's description: > > Always tweak matrix for consistent opt > > > > Change-Id: Id16d4c4831724571dc0b1bd5d99e8a93b2a88ea9 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/337724 > > Reviewed-by: Mike Klein <mtklein@google.com> > > Commit-Queue: Mike Reed <reed@google.com> > > TBR=mtklein@google.com,reed@google.com > > Change-Id: I6200dc3478863e50d4995da952e5c35686efc42a > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/337939 > Reviewed-by: Mike Reed <reed@google.com> TBR=mtklein@google.com,reed@google.com # Not skipping CQ checks because this is a reland. Change-Id: I52e97d0f5b6f5fa2c264541e9014de692fe436db Reviewed-on: https://skia-review.googlesource.com/c/skia/+/337941 Reviewed-by: Mike Reed <reed@google.com>
1 parent 0a07e9b commit 65fb101

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

src/shaders/SkImageShader.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -920,13 +920,7 @@ skvm::Color SkImageShader::onProgram(skvm::Builder* p,
920920
if (lowerWeight > 0) {
921921
lower = &access->lowerLevel();
922922
}
923-
924-
// should we do this all the time (not use in UseSampling?)
925-
if (!fUseSamplingOptions) {
926-
if (!sampling.fUseCubic) {
927-
tweak_filter_and_inv_matrix(&sampling.fFilter, &upperInv);
928-
}
929-
}
923+
tweak_filter_and_inv_matrix(&sampling.fFilter, &upperInv);
930924
}
931925

932926
skvm::Coord upperLocal = SkShaderBase::ApplyMatrix(p, upperInv, origLocal, uniforms);

0 commit comments

Comments
 (0)