Use a struct for client GL texture handles

Review URL: https://codereview.chromium.org/1429863009

4 files changed, 22 insertions, 14 deletions

diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp
index a61ab5484b..d984f92142 100644
--- a/tests/GrPorterDuffTest.cpp
+++ b/tests/GrPorterDuffTest.cpp
@@ -1164,10 +1164,12 @@ static void test_no_dual_source_blending(skiatest::Reporter* reporter) {
         return;
     }
 
+    GrBackendObject backendTex =
+        ctx->getGpu()->createTestingOnlyBackendTexture(nullptr, 100, 100, kRGBA_8888_GrPixelConfig);
     GrBackendTextureDesc fakeDesc;
     fakeDesc.fConfig = kRGBA_8888_GrPixelConfig;
     fakeDesc.fWidth = fakeDesc.fHeight = 100;
-    fakeDesc.fTextureHandle = 1;
+    fakeDesc.fTextureHandle = backendTex;
     SkAutoTUnref<GrTexture> fakeTexture(ctx->textureProvider()->wrapBackendTexture(fakeDesc,
         kBorrow_GrWrapOwnership));
     GrXferProcessor::DstTexture fakeDstTexture;
@@ -1213,6 +1215,7 @@ static void test_no_dual_source_blending(skiatest::Reporter* reporter) {
             }
         }
     }
+    ctx->getGpu()->deleteTestingOnlyBackendTexture(backendTex);
 }
 
 #endif
diff --git a/tests/GrSurfaceTest.cpp b/tests/GrSurfaceTest.cpp
index 24ffc7c5d3..bc24d1c02a 100644
--- a/tests/GrSurfaceTest.cpp
+++ b/tests/GrSurfaceTest.cpp
@@ -11,6 +11,7 @@
 
 #include "GrContext.h"
 #include "GrContextFactory.h"
+#include "GrGpu.h"
 #include "GrRenderTarget.h"
 #include "GrTexture.h"
 #include "GrSurfacePriv.h"
@@ -44,13 +45,16 @@ DEF_GPUTEST(GrSurface, reporter, factory) {
         REPORTER_ASSERT(reporter, tex1 == tex1->asTexture());
         REPORTER_ASSERT(reporter, static_cast<GrSurface*>(tex1) == tex1->asTexture());
 
+        GrBackendObject backendTex = context->getGpu()->createTestingOnlyBackendTexture(
+            nullptr, 256, 256, kSkia8888_GrPixelConfig);
+
         GrBackendTextureDesc backendDesc;
         backendDesc.fConfig = kSkia8888_GrPixelConfig;
         backendDesc.fFlags = kRenderTarget_GrBackendTextureFlag;
         backendDesc.fWidth = 256;
         backendDesc.fHeight = 256;
         backendDesc.fSampleCnt = 0;
-        backendDesc.fTextureHandle = 5;
+        backendDesc.fTextureHandle = backendTex;
         GrSurface* texRT2 = context->textureProvider()->wrapBackendTexture(
             backendDesc, kBorrow_GrWrapOwnership);
         REPORTER_ASSERT(reporter, texRT2 == texRT2->asRenderTarget());
@@ -60,11 +64,12 @@ DEF_GPUTEST(GrSurface, reporter, factory) {
         REPORTER_ASSERT(reporter, texRT2->asRenderTarget() ==
                                   static_cast<GrSurface*>(texRT2->asTexture()));
         REPORTER_ASSERT(reporter, static_cast<GrSurface*>(texRT2->asRenderTarget()) ==
-                                   static_cast<GrSurface*>(texRT2->asTexture()));
+                                  static_cast<GrSurface*>(texRT2->asTexture()));
 
         texRT1->unref();
         texRT2->unref();
         tex1->unref();
+        context->getGpu()->deleteTestingOnlyBackendTexture(backendTex);
     }
 }
 
diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp
index 83e4535361..c33af9f302 100644
--- a/tests/ResourceCacheTest.cpp
+++ b/tests/ResourceCacheTest.cpp
@@ -183,12 +183,12 @@ static void test_wrapped_resources(skiatest::Reporter* reporter, GrContext* cont
         return;
     }
 
-    GrBackendObject texIDs[2];
+    GrBackendObject texHandles[2];
     static const int kW = 100;
     static const int kH = 100;
 
-    texIDs[0] = gpu->createTestingOnlyBackendTexture(nullptr, kW, kH, kRGBA_8888_GrPixelConfig);
-    texIDs[1] = gpu->createTestingOnlyBackendTexture(nullptr, kW, kH, kRGBA_8888_GrPixelConfig);
+    texHandles[0] = gpu->createTestingOnlyBackendTexture(nullptr, kW, kH, kRGBA_8888_GrPixelConfig);
+    texHandles[1] = gpu->createTestingOnlyBackendTexture(nullptr, kW, kH, kRGBA_8888_GrPixelConfig);
 
     context->resetContext();
 
@@ -197,11 +197,11 @@ static void test_wrapped_resources(skiatest::Reporter* reporter, GrContext* cont
     desc.fWidth = kW;
     desc.fHeight = kH;
 
-    desc.fTextureHandle = texIDs[0];
+    desc.fTextureHandle = texHandles[0];
     SkAutoTUnref<GrTexture> borrowed(context->textureProvider()->wrapBackendTexture(
                                      desc, kBorrow_GrWrapOwnership));
 
-    desc.fTextureHandle = texIDs[1];
+    desc.fTextureHandle = texHandles[1];
     SkAutoTUnref<GrTexture> adopted(context->textureProvider()->wrapBackendTexture(
                                     desc, kAdopt_GrWrapOwnership));
 
@@ -215,13 +215,13 @@ static void test_wrapped_resources(skiatest::Reporter* reporter, GrContext* cont
 
     context->flush();
 
-    bool borrowedIsAlive = gpu->isTestingOnlyBackendTexture(texIDs[0]);
-    bool adoptedIsAlive = gpu->isTestingOnlyBackendTexture(texIDs[1]);
+    bool borrowedIsAlive = gpu->isTestingOnlyBackendTexture(texHandles[0]);
+    bool adoptedIsAlive = gpu->isTestingOnlyBackendTexture(texHandles[1]);
 
     REPORTER_ASSERT(reporter, borrowedIsAlive);
     REPORTER_ASSERT(reporter, !adoptedIsAlive);
 
-    gpu->deleteTestingOnlyBackendTexture(texIDs[0]);
+    gpu->deleteTestingOnlyBackendTexture(texHandles[0]);
 
     context->resetContext();
 }
diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp
index 4efe985926..a3b79813f7 100644
--- a/tests/SurfaceTest.cpp
+++ b/tests/SurfaceTest.cpp
@@ -118,8 +118,8 @@ static void test_wrapped_texture_surface(skiatest::Reporter* reporter, GrContext
     static const uint32_t kOrigColor = 0xFFAABBCC;
     SkAutoTArray<uint32_t> pixels(kW * kH);
     sk_memset32(pixels.get(), kOrigColor, kW * kH);
-    GrBackendObject texID = gpu->createTestingOnlyBackendTexture(pixels.get(), kW, kH,
-                                                                 kRGBA_8888_GrPixelConfig);
+    GrBackendObject texHandle = gpu->createTestingOnlyBackendTexture(pixels.get(), kW, kH,
+                                                                     kRGBA_8888_GrPixelConfig);
 
     GrBackendTextureDesc wrappedDesc;
     wrappedDesc.fConfig = kRGBA_8888_GrPixelConfig;
@@ -128,7 +128,7 @@ static void test_wrapped_texture_surface(skiatest::Reporter* reporter, GrContext
     wrappedDesc.fOrigin = kBottomLeft_GrSurfaceOrigin;
     wrappedDesc.fSampleCnt = 0;
     wrappedDesc.fFlags = kRenderTarget_GrBackendTextureFlag;
-    wrappedDesc.fTextureHandle = texID;
+    wrappedDesc.fTextureHandle = texHandle;
 
     SkAutoTUnref<SkSurface> surface(SkSurface::NewWrappedRenderTarget(ctx, wrappedDesc, nullptr));
     REPORTER_ASSERT(reporter, surface);