diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-04-17 12:47:15 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-17 17:25:32 +0000 |
| commit | cd11c809f206af0da3ce1779dee3c91193baa7b0 (patch) | |
| tree | bb012cbe517e6e83b4d9d5ad685957e63d53f8cc /include | |
| parent | b3821730e1ddd86b356fbf3247d115950c269240 (diff) | |
Split cleanup changes out of bigger CL
This are split out of: https://skia-review.googlesource.com/c/11581/ (Split up opLists)
TBR=bsalomon@google.com
Change-Id: I1239e806a30a93d3c17ad933f118b98a5077dd3a
Reviewed-on: https://skia-review.googlesource.com/13585
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Greg Daniel <egdaniel@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. * |