From c5509955b98daa0643da7fcd7ad356a9aa5a42da Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Wed, 4 Apr 2018 15:54:55 -0400 Subject: Add GrBackendTexture accessor to SkImage (take 2) This makes accessing the GPU resource behind an SkImage a lot more typesafe. Additionally, the GrBackendObject is being deprecated so this is the path forward. I split the controversial stuff off into https://skia-review.googlesource.com/c/skia/+/118575 (Add SkImage::setLayout call). Change-Id: I297e72770e8fb360fac7c7cd74f050ae759ae133 Reviewed-on: https://skia-review.googlesource.com/118571 Commit-Queue: Robert Phillips Reviewed-by: Brian Salomon --- tests/SurfaceTest.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tests/SurfaceTest.cpp') diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp index e74dcc915c..744dd63a42 100644 --- a/tests/SurfaceTest.cpp +++ b/tests/SurfaceTest.cpp @@ -551,11 +551,12 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SurfacepeekTexture_Gpu, reporter, ctxInfo) { sk_sp image(surface->makeImageSnapshot()); REPORTER_ASSERT(reporter, as_IB(image)->isTextureBacked()); - GrBackendObject textureHandle = image->getTextureHandle(false); - REPORTER_ASSERT(reporter, 0 != textureHandle); + GrBackendTexture backendTex = image->getBackendTexture(false); + REPORTER_ASSERT(reporter, backendTex.isValid()); surface->notifyContentWillChange(SkSurface::kDiscard_ContentChangeMode); REPORTER_ASSERT(reporter, as_IB(image)->isTextureBacked()); - REPORTER_ASSERT(reporter, textureHandle == image->getTextureHandle(false)); + GrBackendTexture backendTex2 = image->getBackendTexture(false); + REPORTER_ASSERT(reporter, GrBackendTexture::TestingOnly_Equals(backendTex, backendTex2)); } } #endif -- cgit v1.2.3