diff options
author | Robert Phillips <robertphillips@google.com> | 2018-04-04 15:54:55 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-04 20:34:28 +0000 |
commit | c5509955b98daa0643da7fcd7ad356a9aa5a42da (patch) | |
tree | b8f9628b518b8efb5c4de5fd566ca4cc10be7b07 /tests/ImageTest.cpp | |
parent | 1fda0247a77e5c7af57163750a3f7a04fddffdd5 (diff) |
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 <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tests/ImageTest.cpp')
-rw-r--r-- | tests/ImageTest.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp index 98c2f03c2e..fd9baecd4b 100644 --- a/tests/ImageTest.cpp +++ b/tests/ImageTest.cpp @@ -817,17 +817,11 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(SkImage_NewFromTextureRelease, reporter, c TextureReleaseChecker::Release, &releaseChecker)); GrSurfaceOrigin readBackOrigin; - GrBackendObject readBackHandle = refImg->getTextureHandle(false, &readBackOrigin); - // TODO: Make it so we can check this (see skbug.com/5019) -#if 0 - if (*readBackHandle != *(backendTexHandle)) { - ERRORF(reporter, "backend mismatch %d %d\n", - (int)readBackHandle, (int)backendTexHandle); + GrBackendTexture readBackBackendTex = refImg->getBackendTexture(false, &readBackOrigin); + if (!GrBackendTexture::TestingOnly_Equals(readBackBackendTex, backendTex)) { + ERRORF(reporter, "backend mismatch\n"); } - REPORTER_ASSERT(reporter, readBackHandle == backendTexHandle); -#else - REPORTER_ASSERT(reporter, SkToBool(readBackHandle)); -#endif + REPORTER_ASSERT(reporter, GrBackendTexture::TestingOnly_Equals(readBackBackendTex, backendTex)); if (readBackOrigin != texOrigin) { ERRORF(reporter, "origin mismatch %d %d\n", readBackOrigin, texOrigin); } |