From 7fa5c31c2c9af834bee66d5fcf476e250076c8d6 Mon Sep 17 00:00:00 2001 From: Stan Iliev Date: Wed, 19 Apr 2017 00:23:39 +0000 Subject: 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 > Reviewed-by: Robert Phillips > 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 Commit-Queue: Stan Iliev --- include/core/SkCrossContextImageData.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'include/core') diff --git a/include/core/SkCrossContextImageData.h b/include/core/SkCrossContextImageData.h index a408f71446..beaaaa6a28 100644 --- a/include/core/SkCrossContextImageData.h +++ b/include/core/SkCrossContextImageData.h @@ -12,7 +12,6 @@ #include "SkImage.h" #if SK_SUPPORT_GPU -#include "GrBackendSurface.h" #include "GrExternalTextureData.h" #endif @@ -69,15 +68,16 @@ public: ~SkCCIDBackendTexture() override {} private: - SkCCIDBackendTexture(const GrBackendTexture& backendTex, - GrSurfaceOrigin origin, + SkCCIDBackendTexture(const GrBackendTextureDesc& desc, std::unique_ptr textureData, SkAlphaType alphaType, sk_sp colorSpace) : fAlphaType(alphaType) , fColorSpace(std::move(colorSpace)) - , fBackendTex(backendTex) - , fOrigin(origin) - , fTextureData(std::move(textureData)) {} + , fDesc(desc) + , fTextureData(std::move(textureData)) { + // Point our texture desc at our copy of the backend information + fDesc.fTextureHandle = fTextureData->getBackendObject(); + } sk_sp makeImage(GrContext*) override; @@ -85,8 +85,7 @@ private: // and some backend-specific info (to reconstruct the texture). SkAlphaType fAlphaType; sk_sp fColorSpace; - GrBackendTexture fBackendTex; - GrSurfaceOrigin fOrigin; + GrBackendTextureDesc fDesc; std::unique_ptr fTextureData; friend class SkCrossContextImageData; -- cgit v1.2.3