commit b67821da87ffa711c07af75ee618b13dbccd6b7d
author Robert Phillips <robertphillips@google.com> Wed Dec 13 15:00:45 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Dec 13 21:34:20 2017 +0000
tree 25179bbe05f6104f0314458f4cdd52475dfed73e
parent 81d9f0d42eea5bb428808e0a48e4ef85aec45e10

Add GrBackendTexture & GrBackendRenderTarget access methods to GrTexture and GrRenderTarget

Change-Id: I627fcc2cab1d04169f49e33a6c17e161e9a9772a
Reviewed-on: https://skia-review.googlesource.com/84621
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

tests/GrMipMappedTest.cpp

diff --git a/tests/GrMipMappedTest.cpp b/tests/GrMipMappedTest.cpp
index 7caa4bb..58faec4 100644
--- a/tests/GrMipMappedTest.cpp
+++ b/tests/GrMipMappedTest.cpp
@@ -159,21 +159,19 @@
                 return;
             }
 
-            GrBackendObject genBackendObject = genTexture->getTextureHandle();
+            GrBackendTexture genBackendTex = genTexture->getBackendTexture();
 
-            if (kOpenGL_GrBackend == context->contextPriv().getBackend()) {
+            if (const GrGLTextureInfo* genTexInfo = genBackendTex.getGLTextureInfo()) {
                 const GrGLTextureInfo* origTexInfo = backendTex.getGLTextureInfo();
-                GrGLTextureInfo* genTexInfo = (GrGLTextureInfo*)genBackendObject;
                 if (willUseMips && GrMipMapped::kNo == mipMapped) {
                     // We did a copy so the texture IDs should be different
                     REPORTER_ASSERT(reporter, origTexInfo->fID != genTexInfo->fID);
                 } else {
                     REPORTER_ASSERT(reporter, origTexInfo->fID == genTexInfo->fID);
                 }
-            } else if (kVulkan_GrBackend == context->contextPriv().getBackend()) {
 #ifdef SK_VULKAN
+            } else if (const GrVkImageInfo* genImageInfo = genBackendTex.getVkImageInfo()) {
                 const GrVkImageInfo* origImageInfo = backendTex.getVkImageInfo();
-                GrVkImageInfo* genImageInfo = (GrVkImageInfo*)genBackendObject;
                 if (willUseMips && GrMipMapped::kNo == mipMapped) {
                     // We did a copy so the texture IDs should be different
                     REPORTER_ASSERT(reporter, origImageInfo->fImage != genImageInfo->fImage);
@@ -181,8 +179,6 @@
                     REPORTER_ASSERT(reporter, origImageInfo->fImage == genImageInfo->fImage);
                 }
 #endif
-            } else if (kMetal_GrBackend == context->contextPriv().getBackend()) {
-                REPORTER_ASSERT(reporter, false);
             } else {
                 REPORTER_ASSERT(reporter, false);
             }