diff options
| author |  Greg Daniel <egdaniel@google.com> | 2018-03-14 17:32:12 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-14 17:32:41 +0000 |
| commit | 8a3f55c659ca4b902c6d111201c0789073c5e9be (patch) | |
| tree | 9d0d3d3afa462378dabf8666c97adce3b486c16c /include/gpu/GrBackendSurface.h | |
| parent | 9aef424b71a3b200b4c8cf12a7541991622ccabf (diff) | |
Revert "Improve handling of GrPixelConfig in GrBackendTex/RT ctors"
This reverts commit 7d2b16ad13fd3262c776ae75ae35da4ad69df690.
Reason for revert: Maybe breaking chrome?
Original change's description:
> Improve handling of GrPixelConfig in GrBackendTex/RT ctors
>
> Make sure that no client facing code was relying on what we set as the
> default value for fConfig by making in kUnkown.
>
> Bug: skia:
> Change-Id: Ie52ff08ba8deeacc16fe06eb0dd0c7292b2edf91
> Reviewed-on: https://skia-review.googlesource.com/114261
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com
Change-Id: I91e190d72407f9c4bee93a031a557f740bb49b66
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/114423
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'include/gpu/GrBackendSurface.h')
| -rw-r--r-- | include/gpu/GrBackendSurface.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/include/gpu/GrBackendSurface.h b/include/gpu/GrBackendSurface.h index 7bab31d0dd..0145dc44c0 100644 --- a/include/gpu/GrBackendSurface.h +++ b/include/gpu/GrBackendSurface.h @@ -138,10 +138,7 @@ public: // Returns true if the backend texture has been initialized. bool isValid() const { return fConfig != kUnknown_GrPixelConfig; } -#if GR_TEST_UTILS - GrPixelConfig getPixelConfig() const { return fConfig; } - void setPixelConfig(GrPixelConfig config) { fConfig = config; } -#endif + GrPixelConfig testingOnly_getPixelConfig() const; private: // Friending for access to the GrPixelConfig @@ -152,7 +149,6 @@ private: friend class GrGpu; friend class GrGLGpu; friend class GrVkGpu; - friend class PromiseImageHelper; GrPixelConfig config() const { return fConfig; } int fWidth; //<! width in pixels @@ -228,10 +224,7 @@ public: // Returns true if the backend texture has been initialized. bool isValid() const { return fConfig != kUnknown_GrPixelConfig; } -#if GR_TEST_UTILS - GrPixelConfig getPixelConfig() const { return fConfig; } - void setPixelConfig(GrPixelConfig config) { fConfig = config; } -#endif + GrPixelConfig testingOnly_getPixelConfig() const; private: // Friending for access to the GrPixelConfig |