diff options
author | 2017-04-19 00:23:39 +0000 | |
---|---|---|
committer | 2017-04-19 00:23:50 +0000 | |
commit | 7fa5c31c2c9af834bee66d5fcf476e250076c8d6 (patch) | |
tree | 846c27759d4cf4c6487a636872e2e9c88d9137ff /tools | |
parent | edec99b640a7a9dbc7d4fd9f48d35ed3a54c61e3 (diff) |
Revert "Plumb GrBackendTexture throughout skia."
This reverts commit 7da62b9059f3c1d31624a0e4da96ee5f908f9c12.
Reason for revert: fix android roll
Original change's description:
> Plumb GrBackendTexture throughout skia.
>
> Bug: skia:
> Change-Id: I1bae6768ee7229818a83ba608035a1f7867e6875
> Reviewed-on: https://skia-review.googlesource.com/13645
> Commit-Queue: Greg Daniel <egdaniel@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com,brianosman@google.com,reviews@skia.org,stani@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I5cb8763cc837c83ebc6d10366fe2dd3efe35fb89
Reviewed-on: https://skia-review.googlesource.com/13773
Reviewed-by: Stan Iliev <stani@google.com>
Commit-Queue: Stan Iliev <stani@google.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/gpu/GrTest.cpp | 23 | ||||
-rw-r--r-- | tools/gpu/GrTest.h | 4 |
2 files changed, 2 insertions, 25 deletions
diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp index 2e34d2ff5b..30f73163f0 100644 --- a/tools/gpu/GrTest.cpp +++ b/tools/gpu/GrTest.cpp @@ -7,7 +7,6 @@ #include "GrTest.h" -#include "GrBackendSurface.h" #include "GrContextOptions.h" #include "GrDrawOpAtlas.h" #include "GrDrawingManager.h" @@ -55,18 +54,6 @@ void SetupAlwaysEvictAtlas(GrContext* context) { context->setTextContextAtlasSizes_ForTesting(configs); } - -GrBackendTexture CreateBackendTexture(GrBackend backend, int width, int height, - GrPixelConfig config, GrBackendObject handle) { - if (kOpenGL_GrBackend == backend) { - GrGLTextureInfo* glInfo = (GrGLTextureInfo*)(handle); - return GrBackendTexture(width, height, config, glInfo); - } else { - SkASSERT(kVulkan_GrBackend == backend); - GrVkImageInfo* vkInfo = (GrVkImageInfo*)(handle); - return GrBackendTexture(width, height, vkInfo); - } -} }; bool GrSurfaceProxy::isWrapped_ForTesting() const { @@ -351,11 +338,7 @@ private: return nullptr; } - sk_sp<GrTexture> onWrapBackendTexture(const GrBackendTexture&, - GrSurfaceOrigin, - GrBackendTextureFlags, - int sampleCnt, - GrWrapOwnership) override { + sk_sp<GrTexture> onWrapBackendTexture(const GrBackendTextureDesc&, GrWrapOwnership) override { return nullptr; } @@ -363,9 +346,7 @@ private: return nullptr; } - sk_sp<GrRenderTarget> onWrapBackendTextureAsRenderTarget(const GrBackendTexture&, - GrSurfaceOrigin, - int sampleCnt) override { + sk_sp<GrRenderTarget> onWrapBackendTextureAsRenderTarget(const GrBackendTextureDesc&) override { return nullptr; } diff --git a/tools/gpu/GrTest.h b/tools/gpu/GrTest.h index d4a4c6dfac..db4c4515b3 100644 --- a/tools/gpu/GrTest.h +++ b/tools/gpu/GrTest.h @@ -8,7 +8,6 @@ #ifndef GrTest_DEFINED #define GrTest_DEFINED -#include "GrBackendSurface.h" #include "GrContext.h" namespace GrTest { @@ -17,9 +16,6 @@ namespace GrTest { * constantly be evicting entries */ void SetupAlwaysEvictAtlas(GrContext*); - - GrBackendTexture CreateBackendTexture(GrBackend, int width, int height, - GrPixelConfig, GrBackendObject); }; #endif |