| Index: src/gpu/effects/GrYUVtoRGBEffect.cpp
|
| diff --git a/src/gpu/effects/GrYUVtoRGBEffect.cpp b/src/gpu/effects/GrYUVtoRGBEffect.cpp
|
| index fb69472ccacab00664583089fa2090e8c372a062..8daf34829c20e1663b52f2fbeeb2a834ff607218 100644
|
| --- a/src/gpu/effects/GrYUVtoRGBEffect.cpp
|
| +++ b/src/gpu/effects/GrYUVtoRGBEffect.cpp
|
| @@ -33,15 +33,7 @@
|
| yuvMatrix[1].preScale(w[1] / w[0], h[1] / h[0]);
|
| yuvMatrix[2] = yuvMatrix[0];
|
| yuvMatrix[2].preScale(w[2] / w[0], h[2] / h[0]);
|
| - GrTextureParams::FilterMode uvFilterMode =
|
| - ((sizes[1].fWidth != sizes[0].fWidth) ||
|
| - (sizes[1].fHeight != sizes[0].fHeight) ||
|
| - (sizes[2].fWidth != sizes[0].fWidth) ||
|
| - (sizes[2].fHeight != sizes[0].fHeight)) ?
|
| - GrTextureParams::kBilerp_FilterMode :
|
| - GrTextureParams::kNone_FilterMode;
|
| - return SkNEW_ARGS(YUVtoRGBEffect, (yTexture, uTexture, vTexture, yuvMatrix,
|
| - uvFilterMode, colorSpace));
|
| + return SkNEW_ARGS(YUVtoRGBEffect, (yTexture, uTexture, vTexture, yuvMatrix, colorSpace));
|
| }
|
|
|
| const char* name() const SK_OVERRIDE { return "YUV to RGB"; }
|
| @@ -111,14 +103,13 @@
|
|
|
| private:
|
| YUVtoRGBEffect(GrTexture* yTexture, GrTexture* uTexture, GrTexture* vTexture,
|
| - SkMatrix yuvMatrix[3], GrTextureParams::FilterMode uvFilterMode,
|
| - SkYUVColorSpace colorSpace)
|
| + SkMatrix yuvMatrix[3], SkYUVColorSpace colorSpace)
|
| : fYTransform(kLocal_GrCoordSet, yuvMatrix[0], yTexture, GrTextureParams::kNone_FilterMode)
|
| , fYAccess(yTexture)
|
| - , fUTransform(kLocal_GrCoordSet, yuvMatrix[1], uTexture, uvFilterMode)
|
| - , fUAccess(uTexture, uvFilterMode)
|
| - , fVTransform(kLocal_GrCoordSet, yuvMatrix[2], vTexture, uvFilterMode)
|
| - , fVAccess(vTexture, uvFilterMode)
|
| + , fUTransform(kLocal_GrCoordSet, yuvMatrix[1], uTexture, GrTextureParams::kNone_FilterMode)
|
| + , fUAccess(uTexture)
|
| + , fVTransform(kLocal_GrCoordSet, yuvMatrix[2], vTexture, GrTextureParams::kNone_FilterMode)
|
| + , fVAccess(vTexture)
|
| , fColorSpace(colorSpace) {
|
| this->initClassID<YUVtoRGBEffect>();
|
| this->addCoordTransform(&fYTransform);
|
|
|