| Index: src/gpu/GrTextureAccess.cpp
|
| diff --git a/src/gpu/GrTextureAccess.cpp b/src/gpu/GrTextureAccess.cpp
|
| index 91db08bea5438543313be4c81934bd0a6bcb5f7e..018728414d38489b1fe87999fbfba883f30aa4df 100644
|
| --- a/src/gpu/GrTextureAccess.cpp
|
| +++ b/src/gpu/GrTextureAccess.cpp
|
| @@ -46,7 +46,7 @@ void GrTextureAccess::reset(GrTexture* texture,
|
| SkASSERT(strlen(swizzle) >= 1 && strlen(swizzle) <= 4);
|
|
|
| fParams = params;
|
| - fTexture.reset(SkRef(texture));
|
| + fTexture.setResource(SkRef(texture), GrProgramResource::kRead_IOType);
|
| this->setSwizzle(swizzle);
|
| }
|
|
|
| @@ -58,14 +58,14 @@ void GrTextureAccess::reset(GrTexture* texture,
|
| SkASSERT(strlen(swizzle) >= 1 && strlen(swizzle) <= 4);
|
|
|
| fParams.reset(tileXAndY, filterMode);
|
| - fTexture.reset(SkRef(texture));
|
| + fTexture.setResource(SkRef(texture), GrProgramResource::kRead_IOType);
|
| this->setSwizzle(swizzle);
|
| }
|
|
|
| void GrTextureAccess::reset(GrTexture* texture,
|
| const GrTextureParams& params) {
|
| SkASSERT(NULL != texture);
|
| - fTexture.reset(SkRef(texture));
|
| + fTexture.setResource(SkRef(texture), GrProgramResource::kRead_IOType);
|
| fParams = params;
|
| memcpy(fSwizzle, "rgba", 5);
|
| fSwizzleMask = kRGBA_GrColorComponentFlags;
|
| @@ -75,7 +75,7 @@ void GrTextureAccess::reset(GrTexture* texture,
|
| GrTextureParams::FilterMode filterMode,
|
| SkShader::TileMode tileXAndY) {
|
| SkASSERT(NULL != texture);
|
| - fTexture.reset(SkRef(texture));
|
| + fTexture.setResource(SkRef(texture), GrProgramResource::kRead_IOType);
|
| fParams.reset(tileXAndY, filterMode);
|
| memcpy(fSwizzle, "rgba", 5);
|
| fSwizzleMask = kRGBA_GrColorComponentFlags;
|
|
|