Revert "Revert "Plumb GrBackendTexture throughout skia.""
This reverts commit 7fa5c31c2c9af834bee66d5fcf476e250076c8d6.
Reason for revert: Relanding this change now that other fixes have landed.
Original change's description:
> 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>
>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com,reviews@skia.org,brianosman@google.com,stani@google.com
# Not skipping CQ checks because original CL landed > 1 day ago.
Change-Id: I92bc074e4fe37fa5c83186afadc472c03802e8f2
Reviewed-on: https://skia-review.googlesource.com/13975
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
diff --git a/tests/ImageFilterCacheTest.cpp b/tests/ImageFilterCacheTest.cpp
index 95ade04..0dda42e 100644
--- a/tests/ImageFilterCacheTest.cpp
+++ b/tests/ImageFilterCacheTest.cpp
@@ -179,7 +179,9 @@
#if SK_SUPPORT_GPU
#include "GrContext.h"
+#include "GrContextPriv.h"
#include "GrResourceProvider.h"
+#include "GrTest.h"
static sk_sp<GrTextureProxy> create_proxy(GrResourceProvider* resourceProvider) {
SkBitmap srcBM = create_bm();
@@ -209,17 +211,16 @@
return;
}
- 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();
+ GrBackendTexture backendTex = GrTest::CreateBackendTexture(context->contextPriv().getBackend(),
+ kFullSize,
+ kFullSize,
+ kRGBA_8888_GrPixelConfig,
+ tex->getTextureHandle());
+ GrSurfaceOrigin texOrigin = kTopLeft_GrSurfaceOrigin;
sk_sp<SkImage> srcImage(SkImage::MakeFromTexture(context,
- backendDesc,
- kPremul_SkAlphaType));
+ backendTex,
+ texOrigin,
+ kPremul_SkAlphaType, nullptr));
if (!srcImage) {
return;
}
@@ -228,18 +229,18 @@
GrBackendObject readBackHandle = srcImage->getTextureHandle(false, &readBackOrigin);
// TODO: Make it so we can check this (see skbug.com/5019)
#if 0
- if (readBackHandle != backendDesc.fTextureHandle) {
+ if (readBackHandle != tex->getTextureHandle()) {
ERRORF(reporter, "backend mismatch %d %d\n",
- (int)readBackHandle, (int)backendDesc.fTextureHandle);
+ (int)readBackHandle, (int)tex->getTextureHandle());
}
- REPORTER_ASSERT(reporter, readBackHandle == backendDesc.fTextureHandle);
+ REPORTER_ASSERT(reporter, readBackHandle == tex->getTextureHandle());
#else
REPORTER_ASSERT(reporter, SkToBool(readBackHandle));
#endif
- if (readBackOrigin != backendDesc.fOrigin) {
- ERRORF(reporter, "origin mismatch %d %d\n", readBackOrigin, backendDesc.fOrigin);
+ if (readBackOrigin != texOrigin) {
+ ERRORF(reporter, "origin mismatch %d %d\n", readBackOrigin, texOrigin);
}
- REPORTER_ASSERT(reporter, readBackOrigin == backendDesc.fOrigin);
+ REPORTER_ASSERT(reporter, readBackOrigin == texOrigin);
test_image_backed(reporter, srcImage);
}