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 --- tests/ImageFilterCacheTest.cpp | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'tests/ImageFilterCacheTest.cpp') diff --git a/tests/ImageFilterCacheTest.cpp b/tests/ImageFilterCacheTest.cpp index 0dda42e3a8..95ade044bd 100644 --- a/tests/ImageFilterCacheTest.cpp +++ b/tests/ImageFilterCacheTest.cpp @@ -179,9 +179,7 @@ DEF_TEST(ImageFilterCache_ImageBackedRaster, reporter) { #if SK_SUPPORT_GPU #include "GrContext.h" -#include "GrContextPriv.h" #include "GrResourceProvider.h" -#include "GrTest.h" static sk_sp create_proxy(GrResourceProvider* resourceProvider) { SkBitmap srcBM = create_bm(); @@ -211,16 +209,17 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageFilterCache_ImageBackedGPU, reporter, ct return; } - GrBackendTexture backendTex = GrTest::CreateBackendTexture(context->contextPriv().getBackend(), - kFullSize, - kFullSize, - kRGBA_8888_GrPixelConfig, - tex->getTextureHandle()); - GrSurfaceOrigin texOrigin = kTopLeft_GrSurfaceOrigin; + GrBackendTextureDesc backendDesc; + backendDesc.fFlags = kNone_GrBackendTextureFlag; + backendDesc.fOrigin = kTopLeft_GrSurfaceOrigin; + backendDesc.fConfig = kRGBA_8888_GrPixelConfig; + backendDesc.fWidth = kFullSize; + backendDesc.fHeight = kFullSize; + backendDesc.fSampleCnt = 0; + backendDesc.fTextureHandle = tex->getTextureHandle(); sk_sp srcImage(SkImage::MakeFromTexture(context, - backendTex, - texOrigin, - kPremul_SkAlphaType, nullptr)); + backendDesc, + kPremul_SkAlphaType)); if (!srcImage) { return; } @@ -229,18 +228,18 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageFilterCache_ImageBackedGPU, reporter, ct GrBackendObject readBackHandle = srcImage->getTextureHandle(false, &readBackOrigin); // TODO: Make it so we can check this (see skbug.com/5019) #if 0 - if (readBackHandle != tex->getTextureHandle()) { + if (readBackHandle != backendDesc.fTextureHandle) { ERRORF(reporter, "backend mismatch %d %d\n", - (int)readBackHandle, (int)tex->getTextureHandle()); + (int)readBackHandle, (int)backendDesc.fTextureHandle); } - REPORTER_ASSERT(reporter, readBackHandle == tex->getTextureHandle()); + REPORTER_ASSERT(reporter, readBackHandle == backendDesc.fTextureHandle); #else REPORTER_ASSERT(reporter, SkToBool(readBackHandle)); #endif - if (readBackOrigin != texOrigin) { - ERRORF(reporter, "origin mismatch %d %d\n", readBackOrigin, texOrigin); + if (readBackOrigin != backendDesc.fOrigin) { + ERRORF(reporter, "origin mismatch %d %d\n", readBackOrigin, backendDesc.fOrigin); } - REPORTER_ASSERT(reporter, readBackOrigin == texOrigin); + REPORTER_ASSERT(reporter, readBackOrigin == backendDesc.fOrigin); test_image_backed(reporter, srcImage); } -- cgit v1.2.3