Set up helpers after setting up guest GL/VK
... so that the HostConnection::get() does not influence the
capset used.
Bug: b/293897204
Test: GfxstreamEnd2EndTests
Change-Id: I30f013491c8417843cd66c5f0d92afa05f2ac3d1
diff --git a/common/GfxstreamEnd2EndTests.cpp b/common/GfxstreamEnd2EndTests.cpp
index 0d1da31..f9b04a4 100644
--- a/common/GfxstreamEnd2EndTests.cpp
+++ b/common/GfxstreamEnd2EndTests.cpp
@@ -471,12 +471,6 @@
ASSERT_THAT(setenv("GFXSTREAM_EMULATED_VIRTIO_GPU_WITH_VK_SNAPSHOTS",
params.with_vk_snapshot ? "Y" : "N", /*overwrite=*/1), Eq(0));
- mAnwHelper = std::make_unique<TestingVirtGpuANativeWindowHelper>();
- HostConnection::get()->setANativeWindowHelperForTesting(mAnwHelper.get());
-
- mGralloc = std::make_unique<TestingVirtGpuGralloc>();
- HostConnection::get()->setGrallocHelperForTesting(mGralloc.get());
-
if (params.with_gl) {
mGl = SetupGuestGl();
ASSERT_THAT(mGl, NotNull());
@@ -486,6 +480,12 @@
ASSERT_THAT(mVk, NotNull());
}
+ mAnwHelper = std::make_unique<TestingVirtGpuANativeWindowHelper>();
+ HostConnection::get()->setANativeWindowHelperForTesting(mAnwHelper.get());
+
+ mGralloc = std::make_unique<TestingVirtGpuGralloc>();
+ HostConnection::get()->setGrallocHelperForTesting(mGralloc.get());
+
mSync = HostConnection::get()->syncHelper();
}
