vulkan-cereal: remove ColorBuffer unused code
In prep for memory changes.
BUG=262595016
TEST=compile
Change-Id: Ie62f17168cff6bf46374945d37c22717fc2ca32c
diff --git a/stream-servers/vulkan/VkDecoder.cpp b/stream-servers/vulkan/VkDecoder.cpp
index f84345f..93791a5 100644
--- a/stream-servers/vulkan/VkDecoder.cpp
+++ b/stream-servers/vulkan/VkDecoder.cpp
@@ -16,7 +16,7 @@
// Autogenerated module VkDecoder
//
// (impl) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml cereal
-// -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// -o ../vulkan-cereal/stream-servers/vulkan/cereal
//
// Please do not modify directly;
// re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
@@ -31497,106 +31497,6 @@
}
#endif
#ifdef VK_GOOGLE_gfxstream
- case OP_vkRegisterImageColorBufferGOOGLE: {
- android::base::beginTrace("vkRegisterImageColorBufferGOOGLE decode");
- VkDevice device;
- VkImage image;
- uint32_t colorBuffer;
- // Begin global wrapped dispatchable handle unboxing for device;
- uint64_t cgen_var_0;
- memcpy((uint64_t*)&cgen_var_0, *readStreamPtrPtr, 1 * 8);
- *readStreamPtrPtr += 1 * 8;
- *(VkDevice*)&device = (VkDevice)(VkDevice)((VkDevice)(*&cgen_var_0));
- uint64_t cgen_var_1;
- memcpy((uint64_t*)&cgen_var_1, *readStreamPtrPtr, 1 * 8);
- *readStreamPtrPtr += 1 * 8;
- *(VkImage*)&image = (VkImage)unbox_VkImage((VkImage)(*&cgen_var_1));
- memcpy((uint32_t*)&colorBuffer, *readStreamPtrPtr, sizeof(uint32_t));
- *readStreamPtrPtr += sizeof(uint32_t);
- if (m_logCalls) {
- fprintf(
- stderr,
- "stream %p: call vkRegisterImageColorBufferGOOGLE 0x%llx 0x%llx 0x%llx \n",
- ioStream, (unsigned long long)device, (unsigned long long)image,
- (unsigned long long)colorBuffer);
- }
- VkResult vkRegisterImageColorBufferGOOGLE_VkResult_return = (VkResult)0;
- vkRegisterImageColorBufferGOOGLE_VkResult_return =
- m_state->on_vkRegisterImageColorBufferGOOGLE(&m_pool, device, image,
- colorBuffer);
- if ((vkRegisterImageColorBufferGOOGLE_VkResult_return) == VK_ERROR_DEVICE_LOST)
- m_state->on_DeviceLost();
- m_state->on_CheckOutOfMemory(vkRegisterImageColorBufferGOOGLE_VkResult_return,
- opcode, context);
- vkStream->unsetHandleMapping();
- vkStream->write(&vkRegisterImageColorBufferGOOGLE_VkResult_return,
- sizeof(VkResult));
- vkStream->commitWrite();
- vkReadStream->setReadPos((uintptr_t)(*readStreamPtrPtr) -
- (uintptr_t)snapshotTraceBegin);
- size_t snapshotTraceBytes = vkReadStream->endTrace();
- if (m_state->snapshotsEnabled()) {
- m_state->snapshot()->vkRegisterImageColorBufferGOOGLE(
- snapshotTraceBegin, snapshotTraceBytes, &m_pool,
- vkRegisterImageColorBufferGOOGLE_VkResult_return, device, image,
- colorBuffer);
- }
- vkReadStream->clearPool();
- if (queueSubmitWithCommandsEnabled)
- seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
- android::base::endTrace();
- break;
- }
- case OP_vkRegisterBufferColorBufferGOOGLE: {
- android::base::beginTrace("vkRegisterBufferColorBufferGOOGLE decode");
- VkDevice device;
- VkBuffer buffer;
- uint32_t colorBuffer;
- // Begin global wrapped dispatchable handle unboxing for device;
- uint64_t cgen_var_0;
- memcpy((uint64_t*)&cgen_var_0, *readStreamPtrPtr, 1 * 8);
- *readStreamPtrPtr += 1 * 8;
- *(VkDevice*)&device = (VkDevice)(VkDevice)((VkDevice)(*&cgen_var_0));
- uint64_t cgen_var_1;
- memcpy((uint64_t*)&cgen_var_1, *readStreamPtrPtr, 1 * 8);
- *readStreamPtrPtr += 1 * 8;
- *(VkBuffer*)&buffer = (VkBuffer)unbox_VkBuffer((VkBuffer)(*&cgen_var_1));
- memcpy((uint32_t*)&colorBuffer, *readStreamPtrPtr, sizeof(uint32_t));
- *readStreamPtrPtr += sizeof(uint32_t);
- if (m_logCalls) {
- fprintf(
- stderr,
- "stream %p: call vkRegisterBufferColorBufferGOOGLE 0x%llx 0x%llx 0x%llx \n",
- ioStream, (unsigned long long)device, (unsigned long long)buffer,
- (unsigned long long)colorBuffer);
- }
- VkResult vkRegisterBufferColorBufferGOOGLE_VkResult_return = (VkResult)0;
- vkRegisterBufferColorBufferGOOGLE_VkResult_return =
- m_state->on_vkRegisterBufferColorBufferGOOGLE(&m_pool, device, buffer,
- colorBuffer);
- if ((vkRegisterBufferColorBufferGOOGLE_VkResult_return) == VK_ERROR_DEVICE_LOST)
- m_state->on_DeviceLost();
- m_state->on_CheckOutOfMemory(vkRegisterBufferColorBufferGOOGLE_VkResult_return,
- opcode, context);
- vkStream->unsetHandleMapping();
- vkStream->write(&vkRegisterBufferColorBufferGOOGLE_VkResult_return,
- sizeof(VkResult));
- vkStream->commitWrite();
- vkReadStream->setReadPos((uintptr_t)(*readStreamPtrPtr) -
- (uintptr_t)snapshotTraceBegin);
- size_t snapshotTraceBytes = vkReadStream->endTrace();
- if (m_state->snapshotsEnabled()) {
- m_state->snapshot()->vkRegisterBufferColorBufferGOOGLE(
- snapshotTraceBegin, snapshotTraceBytes, &m_pool,
- vkRegisterBufferColorBufferGOOGLE_VkResult_return, device, buffer,
- colorBuffer);
- }
- vkReadStream->clearPool();
- if (queueSubmitWithCommandsEnabled)
- seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
- android::base::endTrace();
- break;
- }
case OP_vkMapMemoryIntoAddressSpaceGOOGLE: {
android::base::beginTrace("vkMapMemoryIntoAddressSpaceGOOGLE decode");
VkDevice device;
diff --git a/stream-servers/vulkan/VkDecoder.h b/stream-servers/vulkan/VkDecoder.h
index 5dc4fb6..f661d65 100644
--- a/stream-servers/vulkan/VkDecoder.h
+++ b/stream-servers/vulkan/VkDecoder.h
@@ -16,7 +16,7 @@
// Autogenerated module VkDecoder
//
// (header) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml
-// cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// cereal -o ../vulkan-cereal/stream-servers/vulkan/cereal
//
// Please do not modify directly;
// re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
diff --git a/stream-servers/vulkan/VkDecoderGlobalState.cpp b/stream-servers/vulkan/VkDecoderGlobalState.cpp
index 09e9545..a6eefc1 100644
--- a/stream-servers/vulkan/VkDecoderGlobalState.cpp
+++ b/stream-servers/vulkan/VkDecoderGlobalState.cpp
@@ -3001,17 +3001,6 @@
// originally created with a dedicated allocation.
bool shouldUseDedicatedAllocInfo = dedicatedAllocInfoPtr != nullptr;
- const VkImportPhysicalAddressGOOGLE* importPhysAddrInfoPtr =
- vk_find_struct<VkImportPhysicalAddressGOOGLE>(pAllocateInfo);
-
- if (importPhysAddrInfoPtr) {
- // TODO: Implement what happens on importing a physical address:
- // 1 - perform action of vkMapMemoryIntoAddressSpaceGOOGLE if
- // host visible
- // 2 - create color buffer, setup Vk for it,
- // and associate it with the physical address
- }
-
const VkImportColorBufferGOOGLE* importCbInfoPtr =
vk_find_struct<VkImportColorBufferGOOGLE>(pAllocateInfo);
const VkImportBufferGOOGLE* importBufferInfoPtr =
@@ -3690,20 +3679,6 @@
return VK_SUCCESS;
}
- VkResult on_vkRegisterImageColorBufferGOOGLE(android::base::BumpPool*, VkDevice, VkImage,
- uint32_t) {
- GFXSTREAM_ABORT(FatalError(ABORT_REASON_OTHER))
- << "Unimplemented deprecated vkRegisterImageColorBufferGOOGLE() called.";
- return VK_ERROR_OUT_OF_DEVICE_MEMORY;
- }
-
- VkResult on_vkRegisterBufferColorBufferGOOGLE(android::base::BumpPool* pool, VkDevice, VkBuffer,
- uint32_t) {
- GFXSTREAM_ABORT(FatalError(ABORT_REASON_OTHER))
- << "Unimplemented deprecated on_vkRegisterBufferColorBufferGOOGLE() called.";
- return VK_ERROR_OUT_OF_DEVICE_MEMORY;
- }
-
VkResult on_vkAllocateCommandBuffers(android::base::BumpPool* pool, VkDevice boxed_device,
const VkCommandBufferAllocateInfo* pAllocateInfo,
VkCommandBuffer* pCommandBuffers) {
@@ -6812,20 +6787,6 @@
return mImpl->on_vkFreeMemorySyncGOOGLE(pool, device, memory, pAllocator);
}
-// VK_GOOGLE_color_buffer
-VkResult VkDecoderGlobalState::on_vkRegisterImageColorBufferGOOGLE(android::base::BumpPool* pool,
- VkDevice device, VkImage image,
- uint32_t colorBuffer) {
- return mImpl->on_vkRegisterImageColorBufferGOOGLE(pool, device, image, colorBuffer);
-}
-
-VkResult VkDecoderGlobalState::on_vkRegisterBufferColorBufferGOOGLE(android::base::BumpPool* pool,
- VkDevice device,
- VkBuffer buffer,
- uint32_t colorBuffer) {
- return mImpl->on_vkRegisterBufferColorBufferGOOGLE(pool, device, buffer, colorBuffer);
-}
-
VkResult VkDecoderGlobalState::on_vkAllocateCommandBuffers(
android::base::BumpPool* pool, VkDevice device,
const VkCommandBufferAllocateInfo* pAllocateInfo, VkCommandBuffer* pCommandBuffers) {
diff --git a/stream-servers/vulkan/VkDecoderGlobalState.h b/stream-servers/vulkan/VkDecoderGlobalState.h
index 45d55ce..2a3e304 100644
--- a/stream-servers/vulkan/VkDecoderGlobalState.h
+++ b/stream-servers/vulkan/VkDecoderGlobalState.h
@@ -419,12 +419,6 @@
VkDeviceMemory memory,
const VkAllocationCallbacks* pAllocator);
- // VK_GOOGLE_color_buffer
- VkResult on_vkRegisterImageColorBufferGOOGLE(android::base::BumpPool* pool, VkDevice device,
- VkImage image, uint32_t colorBuffer);
- VkResult on_vkRegisterBufferColorBufferGOOGLE(android::base::BumpPool* pool, VkDevice device,
- VkBuffer buffer, uint32_t colorBuffer);
-
VkResult on_vkAllocateCommandBuffers(android::base::BumpPool* pool, VkDevice device,
const VkCommandBufferAllocateInfo* pAllocateInfo,
VkCommandBuffer* pCommandBuffers);
diff --git a/stream-servers/vulkan/VkDecoderSnapshot.cpp b/stream-servers/vulkan/VkDecoderSnapshot.cpp
index ec833ca..c5f545d 100644
--- a/stream-servers/vulkan/VkDecoderSnapshot.cpp
+++ b/stream-servers/vulkan/VkDecoderSnapshot.cpp
@@ -16,7 +16,7 @@
// Autogenerated module VkDecoderSnapshot
//
// (impl) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml cereal
-// -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// -o ../vulkan-cereal/stream-servers/vulkan/cereal
//
// Please do not modify directly;
// re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
@@ -4164,18 +4164,6 @@
}
#endif
#ifdef VK_GOOGLE_gfxstream
- void vkRegisterImageColorBufferGOOGLE(const uint8_t* snapshotTraceBegin,
- size_t snapshotTraceBytes, android::base::BumpPool* pool,
- VkResult input_result, VkDevice device, VkImage image,
- uint32_t colorBuffer) {
- // TODO: Implement
- }
- void vkRegisterBufferColorBufferGOOGLE(const uint8_t* snapshotTraceBegin,
- size_t snapshotTraceBytes, android::base::BumpPool* pool,
- VkResult input_result, VkDevice device, VkBuffer buffer,
- uint32_t colorBuffer) {
- // TODO: Implement
- }
void vkMapMemoryIntoAddressSpaceGOOGLE(const uint8_t* snapshotTraceBegin,
size_t snapshotTraceBytes, android::base::BumpPool* pool,
VkResult input_result, VkDevice device,
@@ -9316,26 +9304,6 @@
}
#endif
#ifdef VK_GOOGLE_gfxstream
-void VkDecoderSnapshot::vkRegisterImageColorBufferGOOGLE(const uint8_t* snapshotTraceBegin,
- size_t snapshotTraceBytes,
- android::base::BumpPool* pool,
- VkResult input_result, VkDevice device,
- VkImage image, uint32_t colorBuffer) {
- mImpl->vkRegisterImageColorBufferGOOGLE(snapshotTraceBegin, snapshotTraceBytes, pool,
- input_result, device, image, colorBuffer);
-}
-#endif
-#ifdef VK_GOOGLE_gfxstream
-void VkDecoderSnapshot::vkRegisterBufferColorBufferGOOGLE(const uint8_t* snapshotTraceBegin,
- size_t snapshotTraceBytes,
- android::base::BumpPool* pool,
- VkResult input_result, VkDevice device,
- VkBuffer buffer, uint32_t colorBuffer) {
- mImpl->vkRegisterBufferColorBufferGOOGLE(snapshotTraceBegin, snapshotTraceBytes, pool,
- input_result, device, buffer, colorBuffer);
-}
-#endif
-#ifdef VK_GOOGLE_gfxstream
void VkDecoderSnapshot::vkMapMemoryIntoAddressSpaceGOOGLE(
const uint8_t* snapshotTraceBegin, size_t snapshotTraceBytes, android::base::BumpPool* pool,
VkResult input_result, VkDevice device, VkDeviceMemory memory, uint64_t* pAddress) {
diff --git a/stream-servers/vulkan/VkDecoderSnapshot.h b/stream-servers/vulkan/VkDecoderSnapshot.h
index e07ba13..5cc327b 100644
--- a/stream-servers/vulkan/VkDecoderSnapshot.h
+++ b/stream-servers/vulkan/VkDecoderSnapshot.h
@@ -16,7 +16,7 @@
// Autogenerated module VkDecoderSnapshot
//
// (header) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml
-// cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// cereal -o ../vulkan-cereal/stream-servers/vulkan/cereal
//
// Please do not modify directly;
// re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
@@ -2586,14 +2586,6 @@
uint32_t attachmentCount, const VkBool32* pColorWriteEnables);
#endif
#ifdef VK_GOOGLE_gfxstream
- void vkRegisterImageColorBufferGOOGLE(const uint8_t* snapshotTraceBegin,
- size_t snapshotTraceBytes, android::base::BumpPool* pool,
- VkResult input_result, VkDevice device, VkImage image,
- uint32_t colorBuffer);
- void vkRegisterBufferColorBufferGOOGLE(const uint8_t* snapshotTraceBegin,
- size_t snapshotTraceBytes, android::base::BumpPool* pool,
- VkResult input_result, VkDevice device, VkBuffer buffer,
- uint32_t colorBuffer);
void vkMapMemoryIntoAddressSpaceGOOGLE(const uint8_t* snapshotTraceBegin,
size_t snapshotTraceBytes, android::base::BumpPool* pool,
VkResult input_result, VkDevice device,
diff --git a/stream-servers/vulkan/VkSubDecoder.cpp b/stream-servers/vulkan/VkSubDecoder.cpp
index 733d044..524a5f1 100644
--- a/stream-servers/vulkan/VkSubDecoder.cpp
+++ b/stream-servers/vulkan/VkSubDecoder.cpp
@@ -16,7 +16,7 @@
// Autogenerated module VkSubDecoder
//
// (impl) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml cereal
-// -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// -o ../vulkan-cereal/stream-servers/vulkan/cereal
//
// Please do not modify directly;
// re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
diff --git a/stream-servers/vulkan/cereal/CMakeLists.txt b/stream-servers/vulkan/cereal/CMakeLists.txt
index f8c3173..ef5666c 100644
--- a/stream-servers/vulkan/cereal/CMakeLists.txt
+++ b/stream-servers/vulkan/cereal/CMakeLists.txt
@@ -1,6 +1,6 @@
# Autogenerated makefile
-# registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+# registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml cereal -o ../vulkan-cereal/stream-servers/vulkan/cereal
# Please do not modify directly;
# re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
# or directly from Python by defining:
diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_deepcopy.cpp b/stream-servers/vulkan/cereal/common/goldfish_vk_deepcopy.cpp
index d6239cc..47d7fe0 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_deepcopy.cpp
+++ b/stream-servers/vulkan/cereal/common/goldfish_vk_deepcopy.cpp
@@ -16,7 +16,7 @@
// Autogenerated module goldfish_vk_deepcopy
//
// (impl) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml cereal
-// -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// -o ../vulkan-cereal/stream-servers/vulkan/cereal
//
// Please do not modify directly;
// re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
@@ -17024,28 +17024,6 @@
}
}
-void deepcopy_VkImportPhysicalAddressGOOGLE(Allocator* alloc, VkStructureType rootType,
- const VkImportPhysicalAddressGOOGLE* from,
- VkImportPhysicalAddressGOOGLE* to) {
- (void)alloc;
- (void)rootType;
- *to = *from;
- if (rootType == VK_STRUCTURE_TYPE_MAX_ENUM) {
- rootType = from->sType;
- }
- const void* from_pNext = from;
- size_t pNext_size = 0u;
- while (!pNext_size && from_pNext) {
- from_pNext = static_cast<const vk_struct_common*>(from_pNext)->pNext;
- pNext_size = goldfish_vk_extension_struct_size(rootType, from_pNext);
- }
- to->pNext = nullptr;
- if (pNext_size) {
- to->pNext = (void*)alloc->alloc(pNext_size);
- deepcopy_extension_struct(alloc, rootType, from_pNext, (void*)(to->pNext));
- }
-}
-
#endif
#ifdef VK_EXT_global_priority_query
void deepcopy_VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT(
@@ -20054,13 +20032,6 @@
structExtension_out));
break;
}
- case VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO: {
- deepcopy_VkImportPhysicalAddressGOOGLE(
- alloc, rootType,
- reinterpret_cast<const VkImportPhysicalAddressGOOGLE*>(structExtension),
- reinterpret_cast<VkImportPhysicalAddressGOOGLE*>(structExtension_out));
- break;
- }
default: {
deepcopy_VkPhysicalDeviceFragmentDensityMapPropertiesEXT(
alloc, rootType,
@@ -20920,13 +20891,6 @@
reinterpret_cast<VkImportBufferGOOGLE*>(structExtension_out));
break;
}
- case VK_STRUCTURE_TYPE_IMPORT_PHYSICAL_ADDRESS_GOOGLE: {
- deepcopy_VkImportPhysicalAddressGOOGLE(
- alloc, rootType,
- reinterpret_cast<const VkImportPhysicalAddressGOOGLE*>(structExtension),
- reinterpret_cast<VkImportPhysicalAddressGOOGLE*>(structExtension_out));
- break;
- }
#endif
#ifdef VK_EXT_global_priority_query
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT: {
diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_deepcopy.h b/stream-servers/vulkan/cereal/common/goldfish_vk_deepcopy.h
index fad7465..db290f9 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_deepcopy.h
+++ b/stream-servers/vulkan/cereal/common/goldfish_vk_deepcopy.h
@@ -16,7 +16,7 @@
// Autogenerated module goldfish_vk_deepcopy
//
// (header) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml
-// cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// cereal -o ../vulkan-cereal/stream-servers/vulkan/cereal
//
// Please do not modify directly;
// re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
@@ -3768,10 +3768,6 @@
void deepcopy_VkImportBufferGOOGLE(Allocator* alloc, VkStructureType rootType,
const VkImportBufferGOOGLE* from, VkImportBufferGOOGLE* to);
-void deepcopy_VkImportPhysicalAddressGOOGLE(Allocator* alloc, VkStructureType rootType,
- const VkImportPhysicalAddressGOOGLE* from,
- VkImportPhysicalAddressGOOGLE* to);
-
#endif
#ifdef VK_EXT_global_priority_query
void deepcopy_VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT(
diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_dispatch.cpp b/stream-servers/vulkan/cereal/common/goldfish_vk_dispatch.cpp
index 06a6c29..7b00124 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_dispatch.cpp
+++ b/stream-servers/vulkan/cereal/common/goldfish_vk_dispatch.cpp
@@ -16,7 +16,7 @@
// Autogenerated module goldfish_vk_dispatch
//
// (impl) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml cereal
-// -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// -o ../vulkan-cereal/stream-servers/vulkan/cereal
//
// Please do not modify directly;
// re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
@@ -1718,10 +1718,6 @@
(PFN_vkCmdSetColorWriteEnableEXT)dlSymFunc(lib, "vkCmdSetColorWriteEnableEXT");
#endif
#ifdef VK_GOOGLE_gfxstream
- out->vkRegisterImageColorBufferGOOGLE =
- (PFN_vkRegisterImageColorBufferGOOGLE)dlSymFunc(lib, "vkRegisterImageColorBufferGOOGLE");
- out->vkRegisterBufferColorBufferGOOGLE =
- (PFN_vkRegisterBufferColorBufferGOOGLE)dlSymFunc(lib, "vkRegisterBufferColorBufferGOOGLE");
out->vkMapMemoryIntoAddressSpaceGOOGLE =
(PFN_vkMapMemoryIntoAddressSpaceGOOGLE)dlSymFunc(lib, "vkMapMemoryIntoAddressSpaceGOOGLE");
out->vkUpdateDescriptorSetWithTemplateSizedGOOGLE =
@@ -3235,12 +3231,6 @@
instance, "vkCmdSetColorWriteEnableEXT");
#endif
#ifdef VK_GOOGLE_gfxstream
- out->vkRegisterImageColorBufferGOOGLE =
- (PFN_vkRegisterImageColorBufferGOOGLE)vk->vkGetInstanceProcAddr(
- instance, "vkRegisterImageColorBufferGOOGLE");
- out->vkRegisterBufferColorBufferGOOGLE =
- (PFN_vkRegisterBufferColorBufferGOOGLE)vk->vkGetInstanceProcAddr(
- instance, "vkRegisterBufferColorBufferGOOGLE");
out->vkMapMemoryIntoAddressSpaceGOOGLE =
(PFN_vkMapMemoryIntoAddressSpaceGOOGLE)vk->vkGetInstanceProcAddr(
instance, "vkMapMemoryIntoAddressSpaceGOOGLE");
@@ -4740,12 +4730,6 @@
device, "vkCmdSetColorWriteEnableEXT");
#endif
#ifdef VK_GOOGLE_gfxstream
- out->vkRegisterImageColorBufferGOOGLE =
- (PFN_vkRegisterImageColorBufferGOOGLE)vk->vkGetDeviceProcAddr(
- device, "vkRegisterImageColorBufferGOOGLE");
- out->vkRegisterBufferColorBufferGOOGLE =
- (PFN_vkRegisterBufferColorBufferGOOGLE)vk->vkGetDeviceProcAddr(
- device, "vkRegisterBufferColorBufferGOOGLE");
out->vkMapMemoryIntoAddressSpaceGOOGLE =
(PFN_vkMapMemoryIntoAddressSpaceGOOGLE)vk->vkGetDeviceProcAddr(
device, "vkMapMemoryIntoAddressSpaceGOOGLE");
diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_dispatch.h b/stream-servers/vulkan/cereal/common/goldfish_vk_dispatch.h
index dca0de0..afbf14b 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_dispatch.h
+++ b/stream-servers/vulkan/cereal/common/goldfish_vk_dispatch.h
@@ -16,7 +16,7 @@
// Autogenerated module goldfish_vk_dispatch
//
// (header) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml
-// cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// cereal -o ../vulkan-cereal/stream-servers/vulkan/cereal
//
// Please do not modify directly;
// re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
@@ -1096,8 +1096,6 @@
PFN_vkCmdSetColorWriteEnableEXT vkCmdSetColorWriteEnableEXT;
#endif
#ifdef VK_GOOGLE_gfxstream
- PFN_vkRegisterImageColorBufferGOOGLE vkRegisterImageColorBufferGOOGLE;
- PFN_vkRegisterBufferColorBufferGOOGLE vkRegisterBufferColorBufferGOOGLE;
PFN_vkMapMemoryIntoAddressSpaceGOOGLE vkMapMemoryIntoAddressSpaceGOOGLE;
PFN_vkUpdateDescriptorSetWithTemplateSizedGOOGLE vkUpdateDescriptorSetWithTemplateSizedGOOGLE;
PFN_vkBeginCommandBufferAsyncGOOGLE vkBeginCommandBufferAsyncGOOGLE;
diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_extension_structs.cpp b/stream-servers/vulkan/cereal/common/goldfish_vk_extension_structs.cpp
index 0a8de20..4895f05 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_extension_structs.cpp
+++ b/stream-servers/vulkan/cereal/common/goldfish_vk_extension_structs.cpp
@@ -16,7 +16,7 @@
// Autogenerated module goldfish_vk_extension_structs
//
// (impl) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml cereal
-// -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// -o ../vulkan-cereal/stream-servers/vulkan/cereal
//
// Please do not modify directly;
// re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
@@ -1553,10 +1553,6 @@
return sizeof(VkPhysicalDeviceFragmentDensityMapPropertiesEXT);
break;
}
- case VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO: {
- return sizeof(VkImportPhysicalAddressGOOGLE);
- break;
- }
default: {
return sizeof(VkPhysicalDeviceFragmentDensityMapPropertiesEXT);
break;
@@ -1943,9 +1939,6 @@
case VK_STRUCTURE_TYPE_IMPORT_BUFFER_GOOGLE: {
return sizeof(VkImportBufferGOOGLE);
}
- case VK_STRUCTURE_TYPE_IMPORT_PHYSICAL_ADDRESS_GOOGLE: {
- return sizeof(VkImportPhysicalAddressGOOGLE);
- }
#endif
#ifdef VK_EXT_global_priority_query
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT: {
@@ -2985,10 +2978,6 @@
return sizeof(VkPhysicalDeviceFragmentDensityMapPropertiesEXT);
break;
}
- case VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO: {
- return sizeof(VkImportPhysicalAddressGOOGLE);
- break;
- }
default: {
return sizeof(VkPhysicalDeviceFragmentDensityMapPropertiesEXT);
break;
@@ -3375,9 +3364,6 @@
case VK_STRUCTURE_TYPE_IMPORT_BUFFER_GOOGLE: {
return sizeof(VkImportBufferGOOGLE);
}
- case VK_STRUCTURE_TYPE_IMPORT_PHYSICAL_ADDRESS_GOOGLE: {
- return sizeof(VkImportPhysicalAddressGOOGLE);
- }
#endif
#ifdef VK_EXT_global_priority_query
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT: {
diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_extension_structs.h b/stream-servers/vulkan/cereal/common/goldfish_vk_extension_structs.h
index a37dc62..261cefb 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_extension_structs.h
+++ b/stream-servers/vulkan/cereal/common/goldfish_vk_extension_structs.h
@@ -16,7 +16,7 @@
// Autogenerated module goldfish_vk_extension_structs
//
// (header) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml
-// cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// cereal -o ../vulkan-cereal/stream-servers/vulkan/cereal
//
// Please do not modify directly;
// re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_handlemap.cpp b/stream-servers/vulkan/cereal/common/goldfish_vk_handlemap.cpp
index 7aa4b31..b523f18 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_handlemap.cpp
+++ b/stream-servers/vulkan/cereal/common/goldfish_vk_handlemap.cpp
@@ -16,7 +16,7 @@
// Autogenerated module goldfish_vk_handlemap
//
// (impl) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml cereal
-// -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// -o ../vulkan-cereal/stream-servers/vulkan/cereal
//
// Please do not modify directly;
// re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
@@ -7794,15 +7794,6 @@
}
}
-void handlemap_VkImportPhysicalAddressGOOGLE(VulkanHandleMapping* handlemap,
- VkImportPhysicalAddressGOOGLE* toMap) {
- (void)handlemap;
- (void)toMap;
- if (toMap->pNext) {
- handlemap_extension_struct(handlemap, (void*)(toMap->pNext));
- }
-}
-
#endif
#ifdef VK_EXT_global_priority_query
void handlemap_VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT(
@@ -10484,11 +10475,6 @@
handlemap, reinterpret_cast<VkImportBufferGOOGLE*>(structExtension_out));
break;
}
- case VK_STRUCTURE_TYPE_IMPORT_PHYSICAL_ADDRESS_GOOGLE: {
- handlemap_VkImportPhysicalAddressGOOGLE(
- handlemap, reinterpret_cast<VkImportPhysicalAddressGOOGLE*>(structExtension_out));
- break;
- }
#endif
#ifdef VK_EXT_global_priority_query
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT: {
diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_handlemap.h b/stream-servers/vulkan/cereal/common/goldfish_vk_handlemap.h
index b3edcf2..bc2d79c 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_handlemap.h
+++ b/stream-servers/vulkan/cereal/common/goldfish_vk_handlemap.h
@@ -16,7 +16,7 @@
// Autogenerated module goldfish_vk_handlemap
//
// (header) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml
-// cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// cereal -o ../vulkan-cereal/stream-servers/vulkan/cereal
//
// Please do not modify directly;
// re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
@@ -2877,9 +2877,6 @@
void handlemap_VkImportBufferGOOGLE(VulkanHandleMapping* handlemap, VkImportBufferGOOGLE* toMap);
-void handlemap_VkImportPhysicalAddressGOOGLE(VulkanHandleMapping* handlemap,
- VkImportPhysicalAddressGOOGLE* toMap);
-
#endif
#ifdef VK_EXT_global_priority_query
void handlemap_VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT(
diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_marshaling.cpp b/stream-servers/vulkan/cereal/common/goldfish_vk_marshaling.cpp
index bbe4641..982106d 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_marshaling.cpp
+++ b/stream-servers/vulkan/cereal/common/goldfish_vk_marshaling.cpp
@@ -16,7 +16,7 @@
// Autogenerated module goldfish_vk_marshaling
//
// (impl) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml cereal
-// -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// -o ../vulkan-cereal/stream-servers/vulkan/cereal
//
// Please do not modify directly;
// re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
@@ -31857,49 +31857,6 @@
vkStream->read((uint32_t*)&forUnmarshaling->buffer, sizeof(uint32_t));
}
-void marshal_VkImportPhysicalAddressGOOGLE(VulkanStream* vkStream, VkStructureType rootType,
- const VkImportPhysicalAddressGOOGLE* forMarshaling) {
- (void)rootType;
- vkStream->write((VkStructureType*)&forMarshaling->sType, sizeof(VkStructureType));
- if (rootType == VK_STRUCTURE_TYPE_MAX_ENUM) {
- rootType = forMarshaling->sType;
- }
- marshal_extension_struct(vkStream, rootType, forMarshaling->pNext);
- vkStream->write((uint64_t*)&forMarshaling->physicalAddress, sizeof(uint64_t));
- vkStream->write((VkDeviceSize*)&forMarshaling->size, sizeof(VkDeviceSize));
- vkStream->write((VkFormat*)&forMarshaling->format, sizeof(VkFormat));
- vkStream->write((VkImageTiling*)&forMarshaling->tiling, sizeof(VkImageTiling));
- vkStream->write((uint32_t*)&forMarshaling->tilingParameter, sizeof(uint32_t));
-}
-
-void unmarshal_VkImportPhysicalAddressGOOGLE(VulkanStream* vkStream, VkStructureType rootType,
- VkImportPhysicalAddressGOOGLE* forUnmarshaling) {
- (void)rootType;
- vkStream->read((VkStructureType*)&forUnmarshaling->sType, sizeof(VkStructureType));
- forUnmarshaling->sType = VK_STRUCTURE_TYPE_IMPORT_PHYSICAL_ADDRESS_GOOGLE;
- if (rootType == VK_STRUCTURE_TYPE_MAX_ENUM) {
- rootType = forUnmarshaling->sType;
- }
- size_t pNext_size;
- pNext_size = vkStream->getBe32();
- forUnmarshaling->pNext = nullptr;
- if (pNext_size) {
- vkStream->alloc((void**)&forUnmarshaling->pNext, sizeof(VkStructureType));
- vkStream->read((void*)forUnmarshaling->pNext, sizeof(VkStructureType));
- VkStructureType extType = *(VkStructureType*)(forUnmarshaling->pNext);
- vkStream->alloc((void**)&forUnmarshaling->pNext,
- goldfish_vk_extension_struct_size_with_stream_features(
- vkStream->getFeatureBits(), rootType, forUnmarshaling->pNext));
- *(VkStructureType*)forUnmarshaling->pNext = extType;
- unmarshal_extension_struct(vkStream, rootType, (void*)(forUnmarshaling->pNext));
- }
- vkStream->read((uint64_t*)&forUnmarshaling->physicalAddress, sizeof(uint64_t));
- vkStream->read((VkDeviceSize*)&forUnmarshaling->size, sizeof(VkDeviceSize));
- vkStream->read((VkFormat*)&forUnmarshaling->format, sizeof(VkFormat));
- vkStream->read((VkImageTiling*)&forUnmarshaling->tiling, sizeof(VkImageTiling));
- vkStream->read((uint32_t*)&forUnmarshaling->tilingParameter, sizeof(uint32_t));
-}
-
#endif
#ifdef VK_EXT_global_priority_query
void marshal_VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT(
@@ -35337,12 +35294,6 @@
structExtension));
break;
}
- case VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO: {
- marshal_VkImportPhysicalAddressGOOGLE(
- vkStream, rootType,
- reinterpret_cast<const VkImportPhysicalAddressGOOGLE*>(structExtension));
- break;
- }
default: {
marshal_VkPhysicalDeviceFragmentDensityMapPropertiesEXT(
vkStream, rootType,
@@ -36062,12 +36013,6 @@
vkStream, rootType, reinterpret_cast<const VkImportBufferGOOGLE*>(structExtension));
break;
}
- case VK_STRUCTURE_TYPE_IMPORT_PHYSICAL_ADDRESS_GOOGLE: {
- marshal_VkImportPhysicalAddressGOOGLE(
- vkStream, rootType,
- reinterpret_cast<const VkImportPhysicalAddressGOOGLE*>(structExtension));
- break;
- }
#endif
#ifdef VK_EXT_global_priority_query
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT: {
@@ -38022,12 +37967,6 @@
structExtension_out));
break;
}
- case VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO: {
- unmarshal_VkImportPhysicalAddressGOOGLE(
- vkStream, rootType,
- reinterpret_cast<VkImportPhysicalAddressGOOGLE*>(structExtension_out));
- break;
- }
default: {
unmarshal_VkPhysicalDeviceFragmentDensityMapPropertiesEXT(
vkStream, rootType,
@@ -38738,12 +38677,6 @@
vkStream, rootType, reinterpret_cast<VkImportBufferGOOGLE*>(structExtension_out));
break;
}
- case VK_STRUCTURE_TYPE_IMPORT_PHYSICAL_ADDRESS_GOOGLE: {
- unmarshal_VkImportPhysicalAddressGOOGLE(
- vkStream, rootType,
- reinterpret_cast<VkImportPhysicalAddressGOOGLE*>(structExtension_out));
- break;
- }
#endif
#ifdef VK_EXT_global_priority_query
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT: {
@@ -39899,12 +39832,6 @@
case OP_vkMapMemoryIntoAddressSpaceGOOGLE: {
return "OP_vkMapMemoryIntoAddressSpaceGOOGLE";
}
- case OP_vkRegisterImageColorBufferGOOGLE: {
- return "OP_vkRegisterImageColorBufferGOOGLE";
- }
- case OP_vkRegisterBufferColorBufferGOOGLE: {
- return "OP_vkRegisterBufferColorBufferGOOGLE";
- }
case OP_vkUpdateDescriptorSetWithTemplateSizedGOOGLE: {
return "OP_vkUpdateDescriptorSetWithTemplateSizedGOOGLE";
}
diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_marshaling.h b/stream-servers/vulkan/cereal/common/goldfish_vk_marshaling.h
index 119ff0f..a6f4827 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_marshaling.h
+++ b/stream-servers/vulkan/cereal/common/goldfish_vk_marshaling.h
@@ -16,7 +16,7 @@
// Autogenerated module goldfish_vk_marshaling
//
// (header) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml
-// cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// cereal -o ../vulkan-cereal/stream-servers/vulkan/cereal
//
// Please do not modify directly;
// re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
@@ -6607,14 +6607,6 @@
void unmarshal_VkImportBufferGOOGLE(VulkanStream* vkStream, VkStructureType rootType,
VkImportBufferGOOGLE* forUnmarshaling);
-void marshal_VkImportPhysicalAddressGOOGLE(VulkanStream* vkStream, VkStructureType rootType,
- const VkImportPhysicalAddressGOOGLE* forMarshaling);
-
-void unmarshal_VkImportPhysicalAddressGOOGLE(VulkanStream* vkStream, VkStructureType rootType,
- VkImportPhysicalAddressGOOGLE* forUnmarshaling);
-
-#define OP_vkRegisterImageColorBufferGOOGLE 20318
-#define OP_vkRegisterBufferColorBufferGOOGLE 20319
#define OP_vkMapMemoryIntoAddressSpaceGOOGLE 20317
#define OP_vkUpdateDescriptorSetWithTemplateSizedGOOGLE 20320
#define OP_vkBeginCommandBufferAsyncGOOGLE 20321
diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_reserved_marshaling.cpp b/stream-servers/vulkan/cereal/common/goldfish_vk_reserved_marshaling.cpp
index 2e95115..ff4364e 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_reserved_marshaling.cpp
+++ b/stream-servers/vulkan/cereal/common/goldfish_vk_reserved_marshaling.cpp
@@ -16,7 +16,7 @@
// Autogenerated module goldfish_vk_reserved_marshaling
//
// (impl) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml cereal
-// -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// -o ../vulkan-cereal/stream-servers/vulkan/cereal
//
// Please do not modify directly;
// re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
@@ -24849,45 +24849,6 @@
*ptr += sizeof(uint32_t);
}
-void reservedunmarshal_VkImportPhysicalAddressGOOGLE(VulkanStream* vkStream,
- VkStructureType rootType,
- VkImportPhysicalAddressGOOGLE* forUnmarshaling,
- uint8_t** ptr) {
- memcpy((VkStructureType*)&forUnmarshaling->sType, *ptr, sizeof(VkStructureType));
- *ptr += sizeof(VkStructureType);
- forUnmarshaling->sType = VK_STRUCTURE_TYPE_IMPORT_PHYSICAL_ADDRESS_GOOGLE;
- if (rootType == VK_STRUCTURE_TYPE_MAX_ENUM) {
- rootType = forUnmarshaling->sType;
- }
- uint32_t pNext_size;
- memcpy((uint32_t*)&pNext_size, *ptr, sizeof(uint32_t));
- android::base::Stream::fromBe32((uint8_t*)&pNext_size);
- *ptr += sizeof(uint32_t);
- forUnmarshaling->pNext = nullptr;
- if (pNext_size) {
- vkStream->alloc((void**)&forUnmarshaling->pNext, sizeof(VkStructureType));
- memcpy((void*)forUnmarshaling->pNext, *ptr, sizeof(VkStructureType));
- *ptr += sizeof(VkStructureType);
- VkStructureType extType = *(VkStructureType*)(forUnmarshaling->pNext);
- vkStream->alloc((void**)&forUnmarshaling->pNext,
- goldfish_vk_extension_struct_size_with_stream_features(
- vkStream->getFeatureBits(), rootType, forUnmarshaling->pNext));
- *(VkStructureType*)forUnmarshaling->pNext = extType;
- reservedunmarshal_extension_struct(vkStream, rootType, (void*)(forUnmarshaling->pNext),
- ptr);
- }
- memcpy((uint64_t*)&forUnmarshaling->physicalAddress, *ptr, sizeof(uint64_t));
- *ptr += sizeof(uint64_t);
- memcpy((VkDeviceSize*)&forUnmarshaling->size, *ptr, sizeof(VkDeviceSize));
- *ptr += sizeof(VkDeviceSize);
- memcpy((VkFormat*)&forUnmarshaling->format, *ptr, sizeof(VkFormat));
- *ptr += sizeof(VkFormat);
- memcpy((VkImageTiling*)&forUnmarshaling->tiling, *ptr, sizeof(VkImageTiling));
- *ptr += sizeof(VkImageTiling);
- memcpy((uint32_t*)&forUnmarshaling->tilingParameter, *ptr, sizeof(uint32_t));
- *ptr += sizeof(uint32_t);
-}
-
#endif
#ifdef VK_EXT_global_priority_query
void reservedunmarshal_VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT(
@@ -28057,12 +28018,6 @@
ptr);
break;
}
- case VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO: {
- reservedunmarshal_VkImportPhysicalAddressGOOGLE(
- vkStream, rootType,
- reinterpret_cast<VkImportPhysicalAddressGOOGLE*>(structExtension_out), ptr);
- break;
- }
default: {
reservedunmarshal_VkPhysicalDeviceFragmentDensityMapPropertiesEXT(
vkStream, rootType,
@@ -28844,12 +28799,6 @@
ptr);
break;
}
- case VK_STRUCTURE_TYPE_IMPORT_PHYSICAL_ADDRESS_GOOGLE: {
- reservedunmarshal_VkImportPhysicalAddressGOOGLE(
- vkStream, rootType,
- reinterpret_cast<VkImportPhysicalAddressGOOGLE*>(structExtension_out), ptr);
- break;
- }
#endif
#ifdef VK_EXT_global_priority_query
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT: {
diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_reserved_marshaling.h b/stream-servers/vulkan/cereal/common/goldfish_vk_reserved_marshaling.h
index 6290abc..0f44245 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_reserved_marshaling.h
+++ b/stream-servers/vulkan/cereal/common/goldfish_vk_reserved_marshaling.h
@@ -16,7 +16,7 @@
// Autogenerated module goldfish_vk_reserved_marshaling
//
// (header) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml
-// cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// cereal -o ../vulkan-cereal/stream-servers/vulkan/cereal
//
// Please do not modify directly;
// re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
@@ -3641,11 +3641,6 @@
void reservedunmarshal_VkImportBufferGOOGLE(VulkanStream* vkStream, VkStructureType rootType,
VkImportBufferGOOGLE* forUnmarshaling, uint8_t** ptr);
-void reservedunmarshal_VkImportPhysicalAddressGOOGLE(VulkanStream* vkStream,
- VkStructureType rootType,
- VkImportPhysicalAddressGOOGLE* forUnmarshaling,
- uint8_t** ptr);
-
#endif
#ifdef VK_EXT_global_priority_query
void reservedunmarshal_VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT(
diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_testing.cpp b/stream-servers/vulkan/cereal/common/goldfish_vk_testing.cpp
index 811df82..64ac323 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_testing.cpp
+++ b/stream-servers/vulkan/cereal/common/goldfish_vk_testing.cpp
@@ -16,7 +16,7 @@
// Autogenerated module goldfish_vk_testing
//
// (impl) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml cereal
-// -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// -o ../vulkan-cereal/stream-servers/vulkan/cereal
//
// Please do not modify directly;
// re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
@@ -17145,32 +17145,6 @@
};
}
-void checkEqual_VkImportPhysicalAddressGOOGLE(const VkImportPhysicalAddressGOOGLE* a,
- const VkImportPhysicalAddressGOOGLE* b,
- OnFailCompareFunc onFail) {
- if (!((a->sType) == (b->sType))) {
- onFail("a->sType (Error: Value not equal)");
- };
- if (a->pNext) {
- checkEqual_extension_struct(a->pNext, b->pNext, onFail);
- }
- if (!((a->physicalAddress) == (b->physicalAddress))) {
- onFail("a->physicalAddress (Error: Value not equal)");
- };
- if (!((a->size) == (b->size))) {
- onFail("a->size (Error: Value not equal)");
- };
- if (!((a->format) == (b->format))) {
- onFail("a->format (Error: Value not equal)");
- };
- if (!((a->tiling) == (b->tiling))) {
- onFail("a->tiling (Error: Value not equal)");
- };
- if (!((a->tilingParameter) == (b->tilingParameter))) {
- onFail("a->tilingParameter (Error: Value not equal)");
- };
-}
-
#endif
#ifdef VK_EXT_global_priority_query
void checkEqual_VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT(
@@ -20911,12 +20885,6 @@
reinterpret_cast<const VkImportBufferGOOGLE*>(structExtension2), onFail);
break;
}
- case VK_STRUCTURE_TYPE_IMPORT_PHYSICAL_ADDRESS_GOOGLE: {
- checkEqual_VkImportPhysicalAddressGOOGLE(
- reinterpret_cast<const VkImportPhysicalAddressGOOGLE*>(structExtension),
- reinterpret_cast<const VkImportPhysicalAddressGOOGLE*>(structExtension2), onFail);
- break;
- }
#endif
#ifdef VK_EXT_global_priority_query
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT: {
diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_testing.h b/stream-servers/vulkan/cereal/common/goldfish_vk_testing.h
index 71b2fdc..cb352af 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_testing.h
+++ b/stream-servers/vulkan/cereal/common/goldfish_vk_testing.h
@@ -16,7 +16,7 @@
// Autogenerated module goldfish_vk_testing
//
// (header) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml
-// cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// cereal -o ../vulkan-cereal/stream-servers/vulkan/cereal
//
// Please do not modify directly;
// re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
@@ -3530,10 +3530,6 @@
void checkEqual_VkImportBufferGOOGLE(const VkImportBufferGOOGLE* a, const VkImportBufferGOOGLE* b,
OnFailCompareFunc onFail);
-void checkEqual_VkImportPhysicalAddressGOOGLE(const VkImportPhysicalAddressGOOGLE* a,
- const VkImportPhysicalAddressGOOGLE* b,
- OnFailCompareFunc onFail);
-
#endif
#ifdef VK_EXT_global_priority_query
void checkEqual_VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT(
diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_transform.cpp b/stream-servers/vulkan/cereal/common/goldfish_vk_transform.cpp
index 2285f6f..85c07c7 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_transform.cpp
+++ b/stream-servers/vulkan/cereal/common/goldfish_vk_transform.cpp
@@ -16,7 +16,7 @@
// Autogenerated module goldfish_vk_transform
//
// (impl) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml cereal
-// -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// -o ../vulkan-cereal/stream-servers/vulkan/cereal
//
// Please do not modify directly;
// re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
@@ -15453,24 +15453,6 @@
}
}
-void transform_tohost_VkImportPhysicalAddressGOOGLE(VkDecoderGlobalState* resourceTracker,
- VkImportPhysicalAddressGOOGLE* toTransform) {
- (void)resourceTracker;
- (void)toTransform;
- if (toTransform->pNext) {
- transform_tohost_extension_struct(resourceTracker, (void*)(toTransform->pNext));
- }
-}
-
-void transform_fromhost_VkImportPhysicalAddressGOOGLE(VkDecoderGlobalState* resourceTracker,
- VkImportPhysicalAddressGOOGLE* toTransform) {
- (void)resourceTracker;
- (void)toTransform;
- if (toTransform->pNext) {
- transform_fromhost_extension_struct(resourceTracker, (void*)(toTransform->pNext));
- }
-}
-
#endif
#ifdef VK_EXT_global_priority_query
void transform_tohost_VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT(
@@ -18631,12 +18613,6 @@
resourceTracker, reinterpret_cast<VkImportBufferGOOGLE*>(structExtension_out));
break;
}
- case VK_STRUCTURE_TYPE_IMPORT_PHYSICAL_ADDRESS_GOOGLE: {
- transform_tohost_VkImportPhysicalAddressGOOGLE(
- resourceTracker,
- reinterpret_cast<VkImportPhysicalAddressGOOGLE*>(structExtension_out));
- break;
- }
#endif
#ifdef VK_EXT_global_priority_query
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT: {
@@ -21127,12 +21103,6 @@
resourceTracker, reinterpret_cast<VkImportBufferGOOGLE*>(structExtension_out));
break;
}
- case VK_STRUCTURE_TYPE_IMPORT_PHYSICAL_ADDRESS_GOOGLE: {
- transform_fromhost_VkImportPhysicalAddressGOOGLE(
- resourceTracker,
- reinterpret_cast<VkImportPhysicalAddressGOOGLE*>(structExtension_out));
- break;
- }
#endif
#ifdef VK_EXT_global_priority_query
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT: {
diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_transform.h b/stream-servers/vulkan/cereal/common/goldfish_vk_transform.h
index fcde010..b8584cd 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_transform.h
+++ b/stream-servers/vulkan/cereal/common/goldfish_vk_transform.h
@@ -16,7 +16,7 @@
// Autogenerated module goldfish_vk_transform
//
// (header) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml
-// cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// cereal -o ../vulkan-cereal/stream-servers/vulkan/cereal
//
// Please do not modify directly;
// re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
@@ -5776,12 +5776,6 @@
void transform_fromhost_VkImportBufferGOOGLE(VkDecoderGlobalState* resourceTracker,
VkImportBufferGOOGLE* toTransform);
-void transform_tohost_VkImportPhysicalAddressGOOGLE(VkDecoderGlobalState* resourceTracker,
- VkImportPhysicalAddressGOOGLE* toTransform);
-
-void transform_fromhost_VkImportPhysicalAddressGOOGLE(VkDecoderGlobalState* resourceTracker,
- VkImportPhysicalAddressGOOGLE* toTransform);
-
#endif
#ifdef VK_EXT_global_priority_query
void transform_tohost_VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT(
diff --git a/stream-servers/vulkan/cereal/common/vk_struct_id.h b/stream-servers/vulkan/cereal/common/vk_struct_id.h
index f03d653..62002db 100644
--- a/stream-servers/vulkan/cereal/common/vk_struct_id.h
+++ b/stream-servers/vulkan/cereal/common/vk_struct_id.h
@@ -42,7 +42,6 @@
REGISTER_VK_STRUCT_ID(VkSamplerCreateInfo, VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO);
REGISTER_VK_STRUCT_ID(VkSamplerCustomBorderColorCreateInfoEXT, VK_STRUCTURE_TYPE_SAMPLER_CUSTOM_BORDER_COLOR_CREATE_INFO_EXT);
REGISTER_VK_STRUCT_ID(VkSamplerYcbcrConversionInfo, VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO);
-REGISTER_VK_STRUCT_ID(VkImportPhysicalAddressGOOGLE, VK_STRUCTURE_TYPE_IMPORT_PHYSICAL_ADDRESS_GOOGLE);
REGISTER_VK_STRUCT_ID(VkImportBufferGOOGLE, VK_STRUCTURE_TYPE_IMPORT_BUFFER_GOOGLE);
#ifdef _WIN32
diff --git a/stream-servers/vulkan/vk_android_native_buffer_structure_type.h b/stream-servers/vulkan/vk_android_native_buffer_structure_type.h
index 983f85b..7bacaf2 100644
--- a/stream-servers/vulkan/vk_android_native_buffer_structure_type.h
+++ b/stream-servers/vulkan/vk_android_native_buffer_structure_type.h
@@ -16,7 +16,7 @@
// Autogenerated module vk_android_native_buffer_structure_type
//
// (header) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml
-// cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// cereal -o ../vulkan-cereal/stream-servers/vulkan/cereal
//
// Please do not modify directly;
// re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
diff --git a/stream-servers/vulkan/vulkan_gfxstream.h b/stream-servers/vulkan/vulkan_gfxstream.h
index 1c55e09..a2c922e 100644
--- a/stream-servers/vulkan/vulkan_gfxstream.h
+++ b/stream-servers/vulkan/vulkan_gfxstream.h
@@ -43,20 +43,6 @@
uint32_t buffer;
} VkImportBufferGOOGLE;
-typedef struct VkImportPhysicalAddressGOOGLE {
- VkStructureType sType;
- void* pNext;
- uint64_t physicalAddress;
- VkDeviceSize size;
- VkFormat format;
- VkImageTiling tiling;
- uint32_t tilingParameter;
-} VkImportPhysicalAddressGOOGLE;
-
-typedef VkResult(VKAPI_PTR* PFN_vkRegisterImageColorBufferGOOGLE)(VkDevice device, VkImage image,
- uint32_t colorBuffer);
-typedef VkResult(VKAPI_PTR* PFN_vkRegisterBufferColorBufferGOOGLE)(VkDevice device, VkBuffer buffer,
- uint32_t colorBuffer);
typedef VkResult(VKAPI_PTR* PFN_vkMapMemoryIntoAddressSpaceGOOGLE)(VkDevice device,
VkDeviceMemory memory,
uint64_t* pAddress);
@@ -126,12 +112,6 @@
VkDeviceSize dataSize);
#ifndef VK_NO_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkRegisterImageColorBufferGOOGLE(VkDevice device, VkImage image,
- uint32_t colorBuffer);
-
-VKAPI_ATTR VkResult VKAPI_CALL vkRegisterBufferColorBufferGOOGLE(VkDevice device, VkBuffer buffer,
- uint32_t colorBuffer);
-
VKAPI_ATTR VkResult VKAPI_CALL vkMapMemoryIntoAddressSpaceGOOGLE(VkDevice device,
VkDeviceMemory memory,
uint64_t* pAddress);
diff --git a/stream-servers/vulkan/vulkan_gfxstream_structure_type.h b/stream-servers/vulkan/vulkan_gfxstream_structure_type.h
index b66918b..4df95ec 100644
--- a/stream-servers/vulkan/vulkan_gfxstream_structure_type.h
+++ b/stream-servers/vulkan/vulkan_gfxstream_structure_type.h
@@ -16,7 +16,7 @@
// Autogenerated module vulkan_gfxstream_structure_type
//
// (header) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml
-// cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// cereal -o ../vulkan-cereal/stream-servers/vulkan/cereal
//
// Please do not modify directly;
// re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
