diff options
| author |  Mike Klein <mtklein@google.com> | 2017-04-17 18:04:41 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-17 18:04:46 +0000 |
| commit | e186cfd15f2df43415ae024185bdcf5baa955ec9 (patch) | |
| tree | a595d33b0925711ac5189ecaceb9eb7e015d5e54 /include | |
| parent | 215989330c1895a8bd4c00ba767dae6cc79b17ba (diff) | |
Revert "Split cleanup changes out of bigger CL"
This reverts commit cd11c809f206af0da3ce1779dee3c91193baa7b0.
Reason for revert: assert(rtp->getLastOpList())
Original change's description:
> 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>
>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ia3ef7322fe830a6a4dc29226ce931d35d181c6e0
Reviewed-on: https://skia-review.googlesource.com/13641
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@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, 8 insertions, 2 deletions
diff --git a/include/gpu/GrProcessor.h b/include/gpu/GrProcessor.h index 1816db2ea5..d10136846a 100644 --- a/include/gpu/GrProcessor.h +++ b/include/gpu/GrProcessor.h @@ -216,7 +216,13 @@ public: */ TextureSampler(); - // MDB TODO: this is the last GrTexture-based reset call! + 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); 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 4f0ab964d5..e438e66cad 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. * |