| Index: src/gpu/GrTextureAccess.cpp
|
| diff --git a/src/gpu/GrTextureAccess.cpp b/src/gpu/GrTextureAccess.cpp
|
| index 7e1eda6211f5783c0bf8ab7e0b59e781b8e74df0..f1fec1acd4fe5de4c65c86b55e22f53d3f9595fd 100644
|
| --- a/src/gpu/GrTextureAccess.cpp
|
| +++ b/src/gpu/GrTextureAccess.cpp
|
| @@ -16,56 +16,62 @@ GrTextureAccess::GrTextureAccess() {
|
| #endif
|
| }
|
|
|
| -GrTextureAccess::GrTextureAccess(GrTexture* texture, const GrTextureParams& params) {
|
| - this->reset(texture, params);
|
| +GrTextureAccess::GrTextureAccess(GrTexture* texture, const GrTextureParams& params, GrRenderTarget* dst) {
|
| + this->reset(texture, params, dst);
|
| }
|
|
|
| GrTextureAccess::GrTextureAccess(GrTexture* texture,
|
| GrTextureParams::FilterMode filterMode,
|
| - SkShader::TileMode tileXAndY) {
|
| - this->reset(texture, filterMode, tileXAndY);
|
| + SkShader::TileMode tileXAndY,
|
| + GrRenderTarget* dst) {
|
| + this->reset(texture, filterMode, tileXAndY, dst);
|
| }
|
|
|
| GrTextureAccess::GrTextureAccess(GrTexture* texture,
|
| const char* swizzle,
|
| - const GrTextureParams& params) {
|
| - this->reset(texture, swizzle, params);
|
| + const GrTextureParams& params,
|
| + GrRenderTarget* dst) {
|
| + this->reset(texture, swizzle, params, dst);
|
| }
|
|
|
| GrTextureAccess::GrTextureAccess(GrTexture* texture,
|
| const char* swizzle,
|
| GrTextureParams::FilterMode filterMode,
|
| - SkShader::TileMode tileXAndY) {
|
| - this->reset(texture, swizzle, filterMode, tileXAndY);
|
| + SkShader::TileMode tileXAndY,
|
| + GrRenderTarget* dst) {
|
| + this->reset(texture, swizzle, filterMode, tileXAndY, dst);
|
| }
|
|
|
| void GrTextureAccess::reset(GrTexture* texture,
|
| const char* swizzle,
|
| - const GrTextureParams& params) {
|
| + const GrTextureParams& params,
|
| + GrRenderTarget* dst) {
|
| SkASSERT(texture);
|
| SkASSERT(strlen(swizzle) >= 1 && strlen(swizzle) <= 4);
|
|
|
| fParams = params;
|
| - fTexture.set(SkRef(texture), kRead_GrIOType);
|
| + fTexture.set(SkRef(texture), kRead_GrIOType, dst);
|
| this->setSwizzle(swizzle);
|
| }
|
|
|
| void GrTextureAccess::reset(GrTexture* texture,
|
| const char* swizzle,
|
| GrTextureParams::FilterMode filterMode,
|
| - SkShader::TileMode tileXAndY) {
|
| + SkShader::TileMode tileXAndY,
|
| + GrRenderTarget* dst) {
|
| SkASSERT(texture);
|
| SkASSERT(strlen(swizzle) >= 1 && strlen(swizzle) <= 4);
|
|
|
| fParams.reset(tileXAndY, filterMode);
|
| - fTexture.set(SkRef(texture), kRead_GrIOType);
|
| + fTexture.set(SkRef(texture), kRead_GrIOType, dst);
|
| this->setSwizzle(swizzle);
|
| }
|
|
|
| void GrTextureAccess::reset(GrTexture* texture,
|
| - const GrTextureParams& params) {
|
| + const GrTextureParams& params,
|
| + GrRenderTarget* dst) {
|
| SkASSERT(texture);
|
| - fTexture.set(SkRef(texture), kRead_GrIOType);
|
| + fTexture.set(SkRef(texture), kRead_GrIOType, dst);
|
| fParams = params;
|
| memcpy(fSwizzle, "rgba", 5);
|
| fSwizzleMask = kRGBA_GrColorComponentFlags;
|
| @@ -73,9 +79,10 @@ void GrTextureAccess::reset(GrTexture* texture,
|
|
|
| void GrTextureAccess::reset(GrTexture* texture,
|
| GrTextureParams::FilterMode filterMode,
|
| - SkShader::TileMode tileXAndY) {
|
| + SkShader::TileMode tileXAndY,
|
| + GrRenderTarget* dst) {
|
| SkASSERT(texture);
|
| - fTexture.set(SkRef(texture), kRead_GrIOType);
|
| + fTexture.set(SkRef(texture), kRead_GrIOType, dst);
|
| fParams.reset(tileXAndY, filterMode);
|
| memcpy(fSwizzle, "rgba", 5);
|
| fSwizzleMask = kRGBA_GrColorComponentFlags;
|
|
|