AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gfxstream: Resolve/clean-up inconsistencies with advertising emulated

Browse Source 
extensions

Reviewed-By: Gurchetan Singh <gurchetansingh@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33944>
This commit is contained in:
Aaron Ruby
2025-03-06 14:19:41 -05:00
committed by Marge Bot
parent 2e15763686
commit 95161bb13d
2 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/gfxstream/guest/vulkan/gfxstream_vk_device.cpp
View File

@@ -57,8 +57,8 @@ namespace {
static bool instance_extension_table_initialized = false;
static struct vk_instance_extension_table gfxstream_vk_instance_extensions_supported = {};
// Provided by Mesa components only; never encoded/decoded through gfxstream
static const char* const kGuestOnlyInstanceExtension[] = {
// Always provided by guest driver only; never encoded/decoded to/from host
static const char* const kGuestEmulatedInstanceExtensions[] = {
VK_KHR_SURFACE_EXTENSION_NAME,
#if defined(GFXSTREAM_VK_WAYLAND)
VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME,
@@ -69,11 +69,12 @@ static const char* const kGuestOnlyInstanceExtension[] = {
VK_EXT_DEBUG_UTILS_EXTENSION_NAME,
};
static const char* const kGuestOnlyDeviceExtensions[] = {
VK_KHR_SWAPCHAIN_EXTENSION_NAME,
VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME,
VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME,
};
static bool isGuestEmulatedInstanceExtension(const char* name) {
for (auto mesaExt : kGuestEmulatedInstanceExtensions) {
if (!strncmp(mesaExt, name, VK_MAX_EXTENSION_NAME_SIZE)) return true;
}
return false;
}
static VkResult SetupInstanceForProcess(void) {
auto mgr = getConnectionManager();
@@ -110,33 +111,33 @@ static VkResult SetupInstanceForProcess(void) {
return VK_SUCCESS;
}
static bool isGuestOnlyInstanceExtension(const char* name) {
for (auto mesaExt : kGuestOnlyInstanceExtension) {
if (!strncmp(mesaExt, name, VK_MAX_EXTENSION_NAME_SIZE)) return true;
}
return false;
}
static bool isGuestOnlyDeviceExtension(const char* name) {
for (auto mesaExt : kGuestOnlyDeviceExtensions) {
if (!strncmp(mesaExt, name, VK_MAX_EXTENSION_NAME_SIZE)) return true;
}
return false;
}
// Filtered extension names for encoding
static std::vector<const char*> filteredInstanceExtensionNames(uint32_t count,
const char* const* extNames) {
std::vector<const char*> retList;
for (uint32_t i = 0; i < count; ++i) {
auto extName = extNames[i];
if (!isGuestOnlyInstanceExtension(extName)) {
if (!isGuestEmulatedInstanceExtension(extName)) {
retList.push_back(extName);
}
}
return retList;
}
// Always provided by guest driver only; never encoded/decoded to/from host
static const char* const kGuestEmulatedDeviceExtensions[] = {
VK_KHR_SWAPCHAIN_EXTENSION_NAME,
VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME,
VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME,
};
static bool isGuestEmulatedDeviceExtension(const char* name) {
for (auto mesaExt : kGuestEmulatedDeviceExtensions) {
if (!strncmp(mesaExt, name, VK_MAX_EXTENSION_NAME_SIZE)) return true;
}
return false;
}
static std::vector<const char*> filteredDeviceExtensionNames(
gfxstream_vk_physical_device* physical_device, uint32_t count, const char* const* extNames) {
std::vector<const char*> retList;
@@ -150,7 +151,7 @@ static std::vector<const char*> filteredDeviceExtensionNames(
} else {
retList.push_back(extName);
}
} else if (!isGuestOnlyDeviceExtension(extName)) {
} else if (!isGuestEmulatedDeviceExtension(extName)) {
retList.push_back(extName);
}
}
@@ -170,7 +171,7 @@ static void get_device_extensions(VkPhysicalDevice physDevInternal,
result = resources->on_vkEnumerateDeviceExtensionProperties(
vkEnc, VK_SUCCESS, physDevInternal, NULL, &numDeviceExts, extProps.data());
if (VK_SUCCESS == result) {
// device extensions from the host's physical device
// Enable device extensions from the host's physical device
for (uint32_t i = 0; i < numDeviceExts; i++) {
for (uint32_t j = 0; j < VK_DEVICE_EXTENSION_COUNT; j++) {
if (0 == strncmp(extProps[i].extensionName,
@@ -181,11 +182,10 @@ static void get_device_extensions(VkPhysicalDevice physDevInternal,
}
}
}
// device extensions from Mesa
// Make sure all guest-emulated device extensions are enabled
for (uint32_t j = 0; j < VK_DEVICE_EXTENSION_COUNT; j++) {
if (isGuestOnlyDeviceExtension(vk_device_extensions[j].extensionName)) {
if (isGuestEmulatedDeviceExtension(vk_device_extensions[j].extensionName)) {
deviceExts->extensions[j] = true;
break;
}
}
}
@@ -301,7 +301,7 @@ static struct vk_instance_extension_table* get_instance_extensions() {
result = resources->on_vkEnumerateInstanceExtensionProperties(
vkEnc, VK_SUCCESS, NULL, &numInstanceExts, extProps.data());
if (VK_SUCCESS == result) {
// instance extensions from gfxstream
// Enable instance extensions from gfxstream
for (uint32_t i = 0; i < numInstanceExts; i++) {
for (uint32_t j = 0; j < VK_INSTANCE_EXTENSION_COUNT; j++) {
if (0 == strncmp(extProps[i].extensionName,
@@ -312,9 +312,10 @@ static struct vk_instance_extension_table* get_instance_extensions() {
}
}
}
// instance extensions from Mesa
// Make sure all guest-emulated instance extensions are enabled
for (uint32_t j = 0; j < VK_INSTANCE_EXTENSION_COUNT; j++) {
if (isGuestOnlyInstanceExtension(vk_instance_extensions[j].extensionName)) {
if (isGuestEmulatedInstanceExtension(
vk_instance_extensions[j].extensionName)) {
gfxstream_vk_instance_extensions_supported.extensions[j] = true;
}
}

13
src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp
View File

@@ -1784,7 +1784,7 @@ VkResult ResourceTracker::on_vkEnumerateDeviceExtensionProperties(
#ifdef LINUX_GUEST_BUILD
// Required by Zink
"VK_KHR_imageless_framebuffer",
// Will be emulated on guest if not available on host
// Passthrough if available on host. Will otherwise be emulated by guest
"VK_EXT_image_drm_format_modifier",
#endif
// Vulkan 1.3
@@ -1887,9 +1887,16 @@ VkResult ResourceTracker::on_vkEnumerateDeviceExtensionProperties(
filteredExts.push_back(VkExtensionProperties{"VK_FUCHSIA_external_memory", 1});
filteredExts.push_back(VkExtensionProperties{"VK_FUCHSIA_buffer_collection", 1});
#endif
} else {
#ifdef LINUX_GUEST_BUILD
filteredExts.push_back(VkExtensionProperties{"VK_KHR_external_memory_fd", 1});
filteredExts.push_back(VkExtensionProperties{"VK_EXT_external_memory_dma_buf", 1});
// Note: Linux gfxstream-vulkan driver automatically assumes some form of external memory
// support on the host, and advertises VK_KHR_external_memory_fd and
// VK_EXT_external_memory_dma_buf unconditionally.
mesa_logw(
"%s: Did not recognize any form of external memory support on the host device/driver. "
"This may result in some unexpected functionality, "
"specifically when using external memory Vulkan extensions.",
__func__);
#endif
}