commit 72e86e79a1f9d87eda8c176464823f7a2f27cbf5
author Jason Macnak <natsu@google.com> Thu Apr 04 15:01:30 2024 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Apr 09 15:38:15 2024 -0700
tree f184745c0ffa3d050f9e378b9f76d40ad5dd0e59
parent 39229e795a1e2e083f31e44bfc16470c127e2611

Use scoped AHB helper

Bug: n/a
Test: GfxstreamEnd2EndTests
Change-Id: I75e20014fb0b6254b427cdd104016f3742398fc9
GitOrigin-RevId: 9cea79aa2bd1fa988572783768d52a5201e35f12

common/end2end/GfxstreamEnd2EndVkTests.cpp

diff --git a/common/end2end/GfxstreamEnd2EndVkTests.cpp b/common/end2end/GfxstreamEnd2EndVkTests.cpp
index 1acea55..2400994 100644
--- a/common/end2end/GfxstreamEnd2EndVkTests.cpp
+++ b/common/end2end/GfxstreamEnd2EndVkTests.cpp
@@ -50,8 +50,8 @@
 
     const uint32_t width = 32;
     const uint32_t height = 32;
-    AHardwareBuffer* ahb = nullptr;
-    ASSERT_THAT(mGralloc->allocate(width, height, GFXSTREAM_AHB_FORMAT_R8G8B8A8_UNORM, -1, &ahb), Eq(0));
+    auto ahb = GL_ASSERT(ScopedAHardwareBuffer::Allocate(*mGralloc, width, height,
+                                                         GFXSTREAM_AHB_FORMAT_R8G8B8A8_UNORM));
 
     const VkNativeBufferANDROID imageNativeBufferInfo = {
         .sType = VK_STRUCTURE_TYPE_NATIVE_BUFFER_ANDROID,
@@ -168,8 +168,6 @@
     ASSERT_THAT(fence, Not(Eq(-1)));
 
     ASSERT_THAT(mSync->wait(fence, 3000), Eq(0));
-
-    mGralloc->release(ahb);
 }
 
 TEST_P(GfxstreamEnd2EndVkTest, DeferredImportAHB) {
@@ -178,8 +176,8 @@
 
     const uint32_t width = 32;
     const uint32_t height = 32;
-    AHardwareBuffer* ahb = nullptr;
-    ASSERT_THAT(mGralloc->allocate(width, height, GFXSTREAM_AHB_FORMAT_R8G8B8A8_UNORM, -1, &ahb), Eq(0));
+    auto ahb = GL_ASSERT(ScopedAHardwareBuffer::Allocate(*mGralloc, width, height,
+                                                         GFXSTREAM_AHB_FORMAT_R8G8B8A8_UNORM));
 
     auto vkQueueSignalReleaseImageANDROID = PFN_vkQueueSignalReleaseImageANDROID(
         device->getProcAddr("vkQueueSignalReleaseImageANDROID"));
@@ -226,8 +224,6 @@
     ASSERT_THAT(fence, Not(Eq(-1)));
 
     ASSERT_THAT(mSync->wait(fence, 3000), Eq(0));
-
-    mGralloc->release(ahb);
 }
 
 TEST_P(GfxstreamEnd2EndVkTest, BlobAHBIsNotMapable) {