diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-04-17 14:18:34 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-18 11:43:17 +0000 |
| commit | f5442bb4c152e7c8138c83d27140e55d846f7ea5 (patch) | |
| tree | 9ff66ac0e928c8cfa325e6bb741cb230ecf584a2 /include | |
| parent | c1b879f11b937142f5478bd3b416b26be93dea23 (diff) | |
Split cleanup changes out of bigger CL (take 2)
This are split out of: https://skia-review.googlesource.com/c/11581/ (Split up opLists)
This is a reland of: https://skia-review.googlesource.com/c/13585/ (Split cleanup changes out of bigger CL)
TBR=bsalomon@google.com
Change-Id: Id0d5c764953230412e78ae6aa654f8dfae998c60
Reviewed-on: https://skia-review.googlesource.com/13643
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/gpu/GrProcessor.h | 8 | ||||
| -rw-r--r-- | include/private/GrSurfaceProxy.h | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/include/gpu/GrProcessor.h b/include/gpu/GrProcessor.h index d10136846a..1816db2ea5 100644 --- a/include/gpu/GrProcessor.h +++ b/include/gpu/GrProcessor.h @@ -216,13 +216,7 @@ public: */ TextureSampler(); - TextureSampler(GrTexture*, const GrSamplerParams&); - explicit TextureSampler(GrTexture*, - GrSamplerParams::FilterMode = GrSamplerParams::kNone_FilterMode, - SkShader::TileMode tileXAndY = SkShader::kClamp_TileMode, - GrShaderFlags visibility = kFragment_GrShaderFlag); - void reset(GrTexture*, const GrSamplerParams&, - GrShaderFlags visibility = kFragment_GrShaderFlag); + // MDB TODO: this is the last GrTexture-based reset call! void reset(GrTexture*, GrSamplerParams::FilterMode = GrSamplerParams::kNone_FilterMode, SkShader::TileMode tileXAndY = SkShader::kClamp_TileMode, diff --git a/include/private/GrSurfaceProxy.h b/include/private/GrSurfaceProxy.h index e438e66cad..4f0ab964d5 100644 --- a/include/private/GrSurfaceProxy.h +++ b/include/private/GrSurfaceProxy.h @@ -284,7 +284,7 @@ public: GrTextureOpList* getLastTextureOpList(); /** - * Retrieves the amount of GPU memory that will be or currently is used by this resource + * Retrieves the amount of GPU memory that will be or currently is used by this resource * in bytes. It is approximate since we aren't aware of additional padding or copies made * by the driver. * |