diff options
author | Brian Salomon <bsalomon@google.com> | 2017-05-17 13:49:59 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-17 18:17:50 +0000 |
commit | bb5711a5e4b9c83f0fc49f2d4ee19ca1e4592e14 (patch) | |
tree | e743c265e75a1dad32c1425bf3b9ed88abad2c52 /src/gpu/effects/GrSimpleTextureEffect.h | |
parent | 9f1c403362d8de6038328c7238b6ac56be552324 (diff) |
Remove GrSurfaceDesc member from GrSurfaceProxy.
Stores the config, origin, and dimensions in GrSurfaceProxy, sample count in GrRenderTargetProxy, and "was constructed with mip maps" in GrTextureProxy.
Change-Id: Iee058674dce49107a991cca9d083cd33e3572809
Reviewed-on: https://skia-review.googlesource.com/17209
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/effects/GrSimpleTextureEffect.h')
-rw-r--r-- | src/gpu/effects/GrSimpleTextureEffect.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/effects/GrSimpleTextureEffect.h b/src/gpu/effects/GrSimpleTextureEffect.h index 7d5232c3e0..8e0e4b0fb1 100644 --- a/src/gpu/effects/GrSimpleTextureEffect.h +++ b/src/gpu/effects/GrSimpleTextureEffect.h @@ -28,7 +28,7 @@ public: // MDB TODO: remove this instantiation once instantiation is pushed past the // TextureSamplers. Instantiation failure in the TextureSampler is difficult to // recover from. - GrTexture* temp = proxy->instantiate(resourceProvider); + GrTexture* temp = proxy->instantiateTexture(resourceProvider); if (!temp) { return nullptr; } @@ -48,7 +48,7 @@ public: // MDB TODO: remove this instantiation once instantiation is pushed past the // TextureSamplers. Instantiation failure in the TextureSampler is difficult to // recover from. - GrTexture* temp = proxy->instantiate(resourceProvider); + GrTexture* temp = proxy->instantiateTexture(resourceProvider); if (!temp) { return nullptr; } @@ -67,7 +67,7 @@ public: // MDB TODO: remove this instantiation once instantiation is pushed past the // TextureSamplers. Instantiation failure in the TextureSampler is difficult to // recover from. - GrTexture* temp = proxy->instantiate(resourceProvider); + GrTexture* temp = proxy->instantiateTexture(resourceProvider); if (!temp) { return nullptr; } |