aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/image/SkImageShader.cpp
diff options
context:
space:
mode:
authorGravatar tomhudson <tomhudson@google.com>2015-09-18 09:36:12 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-09-18 09:36:12 -0700
commitf2608513626264459a00388537175600b515cae2 (patch)
tree7ad1de293c0760b458904a6c89f34228be460cb3 /src/image/SkImageShader.cpp
parentbcfd511eb1aada39622116fd1df8178b58650fba (diff)
Revert of add ImageShader, sharing code with its Bitmap cousin (patchset #10 id:180001 of https://codereview.chromium.org/1342113002/ )
Reason for revert: Failing ImageNewShaderTest on both Android (Tegra3 GPU) and iOS bots. e.g. /Users/chrome-bot/buildbot/skiabot-ipad4-000/build/slave/workdir/build/skia/tests/ ImageNewShaderTest.cpp:24 0 == memcmp(bm1.getPixels(), bm2.getPixels(), bm1.getSize()) ImageNewShaderTest.cpp:95 0xFFFF0000 == bmt.getColor(0, y) ImageNewShaderTest.cpp:98 0xFFDEDEDE == bmt.getColor(x, y) ImageNewShaderTest.cpp:98 0xFFDEDEDE == bmt.getColor(x, y) ImageNewShaderTest.cpp:98 0xFFDEDEDE == bmt.getColor(x, y) ImageNewShaderTest.cpp:98 0xFFDEDEDE == bmt.getColor(x, y) ImageNewShaderTest.cpp:95 0xFFFF0000 == bmt.getColor(0, y) ... Original issue's description: > add ImageShader, sharing code with its Bitmap cousin > > This is done by having abstracted the BitmapShaderContext to take a BitmapProvider, instead of just a bitmap. This allows us to share all of that code between SkBitmap and SkImage, since both are valid providers. > > It also means that we can simplify SkImage_Base to not need a virtual for onNewShader, since ALL images can uniformly be turned into a shader now. > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/0b93e3149d2cb30860c51f9f3204ae811d9a97ca TBR=fmalita@chromium.org,bsalomon@google.com,robertphillips@google.com,reed@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1355863002
Diffstat (limited to 'src/image/SkImageShader.cpp')
-rw-r--r--src/image/SkImageShader.cpp145
1 files changed, 0 insertions, 145 deletions
diff --git a/src/image/SkImageShader.cpp b/src/image/SkImageShader.cpp
deleted file mode 100644
index 58eddf3f7d..0000000000
--- a/src/image/SkImageShader.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkBitmapProcShader.h"
-#include "SkBitmapProvider.h"
-#include "SkImage_Base.h"
-#include "SkImageShader.h"
-#include "SkReadBuffer.h"
-#include "SkWriteBuffer.h"
-
-SkImageShader::SkImageShader(const SkImage* img, TileMode tmx, TileMode tmy, const SkMatrix* matrix)
- : INHERITED(matrix)
- , fImage(SkRef(img))
- , fTileModeX(tmx)
- , fTileModeY(tmy)
-{}
-
-SkFlattenable* SkImageShader::CreateProc(SkReadBuffer& buffer) {
- const TileMode tx = (TileMode)buffer.readUInt();
- const TileMode ty = (TileMode)buffer.readUInt();
- SkMatrix matrix;
- buffer.readMatrix(&matrix);
- SkAutoTUnref<SkImage> img(buffer.readImage());
- if (!img) {
- return nullptr;
- }
- return new SkImageShader(img, tx, ty, &matrix);
-}
-
-void SkImageShader::flatten(SkWriteBuffer& buffer) const {
- buffer.writeUInt(fTileModeX);
- buffer.writeUInt(fTileModeY);
- buffer.writeMatrix(this->getLocalMatrix());
- buffer.writeImage(fImage);
-}
-
-bool SkImageShader::isOpaque() const {
- return fImage->isOpaque();
-}
-
-size_t SkImageShader::contextSize() const {
- return SkBitmapProcShader::ContextSize();
-}
-
-SkShader::Context* SkImageShader::onCreateContext(const ContextRec& rec, void* storage) const {
- return SkBitmapProcShader::MakeContext(*this, fTileModeX, fTileModeY,
- SkBitmapProvider(fImage), rec, storage);
-}
-
-SkShader* SkImageShader::Create(const SkImage* image, TileMode tx, TileMode ty,
- const SkMatrix* localMatrix) {
- if (!image) {
- return nullptr;
- }
- return new SkImageShader(image, tx, ty, localMatrix);
-}
-
-#ifndef SK_IGNORE_TO_STRING
-void SkImageShader::toString(SkString* str) const {
- const char* gTileModeName[SkShader::kTileModeCount] = {
- "clamp", "repeat", "mirror"
- };
-
- str->appendf("ImageShader: ((%s %s) ", gTileModeName[fTileModeX], gTileModeName[fTileModeY]);
- fImage->toString(str);
- this->INHERITED::toString(str);
- str->append(")");
-}
-#endif
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#if SK_SUPPORT_GPU
-
-#include "GrTextureAccess.h"
-#include "SkGr.h"
-#include "effects/GrSimpleTextureEffect.h"
-#include "effects/GrBicubicEffect.h"
-#include "effects/GrExtractAlphaFragmentProcessor.h"
-#include "effects/GrSimpleTextureEffect.h"
-
-const GrFragmentProcessor* SkImageShader::asFragmentProcessor(GrContext* context,
- const SkMatrix& viewM,
- const SkMatrix* localMatrix,
- SkFilterQuality filterQuality,
- GrProcessorDataManager* mgr) const {
- SkMatrix matrix;
- matrix.setIDiv(fImage->width(), fImage->height());
-
- SkMatrix lmInverse;
- if (!this->getLocalMatrix().invert(&lmInverse)) {
- return nullptr;
- }
- if (localMatrix) {
- SkMatrix inv;
- if (!localMatrix->invert(&inv)) {
- return nullptr;
- }
- lmInverse.postConcat(inv);
- }
- matrix.preConcat(lmInverse);
-
- SkShader::TileMode tm[] = { fTileModeX, fTileModeY };
-
- // Must set wrap and filter on the sampler before requesting a texture. In two places below
- // we check the matrix scale factors to determine how to interpret the filter quality setting.
- // This completely ignores the complexity of the drawVertices case where explicit local coords
- // are provided by the caller.
- bool doBicubic;
- GrTextureParams::FilterMode textureFilterMode =
- GrSkFilterQualityToGrFilterMode(filterQuality, viewM, this->getLocalMatrix(), &doBicubic);
- GrTextureParams params(tm, textureFilterMode);
-
- SkImageUsageType usageType;
- if (kClamp_TileMode == fTileModeX && kClamp_TileMode == fTileModeY) {
- usageType = kUntiled_SkImageUsageType;
- } else if (GrTextureParams::kNone_FilterMode == textureFilterMode) {
- usageType = kTiled_Unfiltered_SkImageUsageType;
- } else {
- usageType = kTiled_Filtered_SkImageUsageType;
- }
-
- SkAutoTUnref<GrTexture> texture(as_IB(fImage)->asTextureRef(context, usageType));
- if (!texture) {
- return nullptr;
- }
-
- SkAutoTUnref<GrFragmentProcessor> inner;
- if (doBicubic) {
- inner.reset(GrBicubicEffect::Create(mgr, texture, matrix, tm));
- } else {
- inner.reset(GrSimpleTextureEffect::Create(mgr, texture, matrix, params));
- }
-
- if (GrPixelConfigIsAlphaOnly(texture->config())) {
- return SkRef(inner.get());
- }
- return GrExtractAlphaFragmentProcessor::Create(inner);
-}
-
-#endif