| Index: src/gpu/GrTextureAccess.cpp
|
| diff --git a/src/gpu/GrTextureAccess.cpp b/src/gpu/GrTextureAccess.cpp
|
| index 662ccd65f83845d57397aad83330e14a576acefb..7e1eda6211f5783c0bf8ab7e0b59e781b8e74df0 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.set(SkRef(texture), GrIORef::kRead_IOType);
|
| + fTexture.set(SkRef(texture), kRead_GrIOType);
|
| this->setSwizzle(swizzle);
|
| }
|
|
|
| @@ -58,14 +58,14 @@ void GrTextureAccess::reset(GrTexture* texture,
|
| SkASSERT(strlen(swizzle) >= 1 && strlen(swizzle) <= 4);
|
|
|
| fParams.reset(tileXAndY, filterMode);
|
| - fTexture.set(SkRef(texture), GrIORef::kRead_IOType);
|
| + fTexture.set(SkRef(texture), kRead_GrIOType);
|
| this->setSwizzle(swizzle);
|
| }
|
|
|
| void GrTextureAccess::reset(GrTexture* texture,
|
| const GrTextureParams& params) {
|
| SkASSERT(texture);
|
| - fTexture.set(SkRef(texture), GrIORef::kRead_IOType);
|
| + fTexture.set(SkRef(texture), kRead_GrIOType);
|
| 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(texture);
|
| - fTexture.set(SkRef(texture), GrIORef::kRead_IOType);
|
| + fTexture.set(SkRef(texture), kRead_GrIOType);
|
| fParams.reset(tileXAndY, filterMode);
|
| memcpy(fSwizzle, "rgba", 5);
|
| fSwizzleMask = kRGBA_GrColorComponentFlags;
|
|
|