Reland^2: Use "gfxstream" namespace
This reverts commit d37d7c8c0cdf6b84d453cb41e358094880a8f3b5.
Reland adds in aosp/2516595 which was only built on the "full"
target and removes namespace around window methods to satisfy
MacOS build.
Bug: b/271464937
Test: android build
Test: cmake build
Test: ATP MacOS build
Change-Id: Ida36ac16f9c3b98aedd744d21c9b27e9063a8eea
diff --git a/stream-servers/virtio-gpu-gfxstream-renderer.cpp b/stream-servers/virtio-gpu-gfxstream-renderer.cpp
index fe649b9..66951d5 100644
--- a/stream-servers/virtio-gpu-gfxstream-renderer.cpp
+++ b/stream-servers/virtio-gpu-gfxstream-renderer.cpp
@@ -693,15 +693,15 @@
}
#define DECODE(variable, type, input) \
- struct type variable = {}; \
+ type variable = {}; \
memcpy(&variable, input, sizeof(type));
void addressSpaceProcessCmd(VirtioGpuCtxId ctxId, uint32_t* dwords, int dwordCount) {
- DECODE(header, gfxstreamHeader, dwords)
+ DECODE(header, gfxstream::gfxstreamHeader, dwords)
switch (header.opCode) {
case GFXSTREAM_CONTEXT_CREATE: {
- DECODE(contextCreate, gfxstreamContextCreate, dwords)
+ DECODE(contextCreate, gfxstream::gfxstreamContextCreate, dwords)
auto resEntryIt = mResources.find(contextCreate.resourceId);
if (resEntryIt == mResources.end()) {
@@ -739,7 +739,7 @@
break;
}
case GFXSTREAM_CONTEXT_PING: {
- DECODE(contextPing, gfxstreamContextPing, dwords)
+ DECODE(contextPing, gfxstream::gfxstreamContextPing, dwords)
AutoLock lock(mLock);
@@ -772,7 +772,7 @@
return -1;
}
- DECODE(header, gfxstreamHeader, buffer);
+ DECODE(header, gfxstream::gfxstreamHeader, buffer);
switch (header.opCode) {
case GFXSTREAM_CONTEXT_CREATE:
case GFXSTREAM_CONTEXT_PING:
@@ -780,7 +780,7 @@
addressSpaceProcessCmd(ctxId, (uint32_t*)buffer, dwordCount);
break;
case GFXSTREAM_CREATE_EXPORT_SYNC: {
- DECODE(exportSync, gfxstreamCreateExportSync, buffer)
+ DECODE(exportSync, gfxstream::gfxstreamCreateExportSync, buffer)
uint64_t sync_handle =
convert32to64(exportSync.syncHandleLo, exportSync.syncHandleHi);
@@ -794,7 +794,7 @@
}
case GFXSTREAM_CREATE_EXPORT_SYNC_VK:
case GFXSTREAM_CREATE_IMPORT_SYNC_VK: {
- DECODE(exportSyncVK, gfxstreamCreateExportSyncVK, buffer)
+ DECODE(exportSyncVK, gfxstream::gfxstreamCreateExportSyncVK, buffer)
uint64_t device_handle =
convert32to64(exportSyncVK.deviceHandleLo, exportSyncVK.deviceHandleHi);
@@ -819,7 +819,7 @@
.mRingIdx = 0,
};
- DECODE(exportQSRI, gfxstreamCreateQSRIExportVK, buffer)
+ DECODE(exportQSRI, gfxstream::gfxstreamCreateQSRIExportVK, buffer)
uint64_t image_handle =
convert32to64(exportQSRI.imageHandleLo, exportQSRI.imageHandleHi);
@@ -1312,11 +1312,12 @@
void getCapset(uint32_t set, uint32_t *max_size) {
// Only one capset right not
- *max_size = sizeof(struct gfxstreamCapset);
+ *max_size = sizeof(struct gfxstream::gfxstreamCapset);
}
void fillCaps(uint32_t set, void* caps) {
- struct gfxstreamCapset *capset = reinterpret_cast<struct gfxstreamCapset*>(caps);
+ struct gfxstream::gfxstreamCapset *capset =
+ reinterpret_cast<struct gfxstream::gfxstreamCapset*>(caps);
if (capset) {
memset(capset, 0, sizeof(*capset));
@@ -2199,27 +2200,28 @@
}
// Set non product-specific callbacks
- vk_util::setVkCheckCallbacks(
- std::make_unique<vk_util::VkCheckCallbacks>(vk_util::VkCheckCallbacks{
- .onVkErrorOutOfMemory =
- [](VkResult result, const char* function, int line) {
- auto fb = FrameBuffer::getFB();
- if (!fb) {
- ERR("FrameBuffer not yet initialized. Dropping out of memory event");
- return;
- }
- fb->logVulkanOutOfMemory(result, function, line);
- },
- .onVkErrorOutOfMemoryOnAllocation =
- [](VkResult result, const char* function, int line,
- std::optional<uint64_t> allocationSize) {
- auto fb = FrameBuffer::getFB();
- if (!fb) {
- ERR("FrameBuffer not yet initialized. Dropping out of memory event");
- return;
- }
- fb->logVulkanOutOfMemory(result, function, line, allocationSize);
- }}));
+ gfxstream::vk::vk_util::setVkCheckCallbacks(
+ std::make_unique<gfxstream::vk::vk_util::VkCheckCallbacks>(
+ gfxstream::vk::vk_util::VkCheckCallbacks{
+ .onVkErrorOutOfMemory =
+ [](VkResult result, const char* function, int line) {
+ auto fb = gfxstream::FrameBuffer::getFB();
+ if (!fb) {
+ ERR("FrameBuffer not yet initialized. Dropping out of memory event");
+ return;
+ }
+ fb->logVulkanOutOfMemory(result, function, line);
+ },
+ .onVkErrorOutOfMemoryOnAllocation =
+ [](VkResult result, const char* function, int line,
+ std::optional<uint64_t> allocationSize) {
+ auto fb = gfxstream::FrameBuffer::getFB();
+ if (!fb) {
+ ERR("FrameBuffer not yet initialized. Dropping out of memory event");
+ return;
+ }
+ fb->logVulkanOutOfMemory(result, function, line, allocationSize);
+ }}));
gfxstream_backend_init_product_override();
// First we make some agents available.
@@ -2326,7 +2328,7 @@
<< "can't enable vulkan native swapchain, Vulkan is disabled";
}
- emugl::vkDispatch(false /* don't use test ICD */);
+ gfxstream::vk::vkDispatch(false /* don't use test ICD */);
auto androidHw = aemu_get_android_hw();
@@ -2352,7 +2354,7 @@
android_prepareOpenglesEmulation();
{
- static emugl::RenderLibPtr renderLibPtr = initLibrary();
+ static gfxstream::RenderLibPtr renderLibPtr = gfxstream::initLibrary();
void* egldispatch = renderLibPtr->getEGLDispatch();
void* glesv2Dispatch = renderLibPtr->getGLESv2Dispatch();
android_setOpenglesEmulation(renderLibPtr.get(), egldispatch, glesv2Dispatch);
@@ -2478,7 +2480,7 @@
VG_EXPORT void gfxstream_backend_getrender(char* buf, size_t bufSize, size_t* size) {
const char* render = "";
- FrameBuffer* pFB = FrameBuffer::getFB();
+ auto* pFB = gfxstream::FrameBuffer::getFB();
if (pFB) {
const char* vendor = nullptr;
const char* version = nullptr;
