| Index: src/gpu/GrGpu.cpp
|
| diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp
|
| index 4fcd4d57af0a23b7f7c316c813fd7c25b942db38..8548e54a17121588eaddef0d57a0abe1796ed1e7 100644
|
| --- a/src/gpu/GrGpu.cpp
|
| +++ b/src/gpu/GrGpu.cpp
|
| @@ -88,7 +88,7 @@ static GrSurfaceOrigin resolve_origin(GrSurfaceOrigin origin, bool renderTarget)
|
| }
|
| }
|
|
|
| -GrTexture* GrGpu::createTexture(const GrSurfaceDesc& origDesc, bool budgeted,
|
| +GrTexture* GrGpu::createTexture(const GrSurfaceDesc& origDesc, SkBudgeted budgeted,
|
| const void* srcData, size_t rowBytes) {
|
| GrSurfaceDesc desc = origDesc;
|
|
|
| @@ -120,8 +120,9 @@ GrTexture* GrGpu::createTexture(const GrSurfaceDesc& origDesc, bool budgeted,
|
| }
|
| }
|
|
|
| - GrGpuResource::LifeCycle lifeCycle = budgeted ? GrGpuResource::kCached_LifeCycle :
|
| - GrGpuResource::kUncached_LifeCycle;
|
| + GrGpuResource::LifeCycle lifeCycle = SkBudgeted::kYes == budgeted ?
|
| + GrGpuResource::kCached_LifeCycle :
|
| + GrGpuResource::kUncached_LifeCycle;
|
|
|
| desc.fSampleCnt = SkTMin(desc.fSampleCnt, this->caps()->maxSampleCount());
|
| // Attempt to catch un- or wrongly initialized sample counts;
|
|
|