Skip to content

Commit

Permalink
winevulkan: Implement VK_KHR_get_surface_capabilities2 and fake suppo…
Browse files Browse the repository at this point in the history 
…rt for VK_EXT_full_screen_exclusive
  • Loading branch information
@Joshua-Ashton @aeikum
Joshua-Ashton authored and aeikum committed Mar 18, 2020
1 parent 5e8fedb commit 76b8510
Show file tree
Hide file tree
Showing 10 changed files with 482 additions and 79 deletions.
2 changes: 2 additions & 0 deletions dlls/vulkan-1/vulkan-1.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,9 @@
@ stdcall vkGetPhysicalDeviceQueueFamilyProperties2(ptr ptr ptr) winevulkan.wine_vkGetPhysicalDeviceQueueFamilyProperties2
@ stdcall vkGetPhysicalDeviceSparseImageFormatProperties(ptr long long long long long ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSparseImageFormatProperties
@ stdcall vkGetPhysicalDeviceSparseImageFormatProperties2(ptr ptr ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSparseImageFormatProperties2
@ stdcall vkGetPhysicalDeviceSurfaceCapabilities2KHR(ptr ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR
@ stdcall vkGetPhysicalDeviceSurfaceCapabilitiesKHR(ptr int64 ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR
@ stdcall vkGetPhysicalDeviceSurfaceFormats2KHR(ptr ptr ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceFormats2KHR
@ stdcall vkGetPhysicalDeviceSurfaceFormatsKHR(ptr int64 ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceFormatsKHR
@ stdcall vkGetPhysicalDeviceSurfacePresentModesKHR(ptr int64 ptr long) winevulkan.wine_vkGetPhysicalDeviceSurfacePresentModesKHR
@ stdcall vkGetPhysicalDeviceSurfaceSupportKHR(ptr long int64 ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceSupportKHR
Expand Down
50 changes: 45 additions & 5 deletions dlls/winevulkan/make_vulkan
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,12 @@ BLACKLISTED_EXTENSIONS = [
"VK_EXT_validation_features",
"VK_EXT_validation_flags",
"VK_KHR_display", # Needs WSI work.
"VK_KHR_get_surface_capabilities2",
"VK_KHR_surface_protected_capabilities",

# Device extensions
"VK_AMD_display_native_hdr",
"VK_EXT_calibrated_timestamps",
"VK_EXT_display_control", # Requires VK_EXT_display_surface_counter
"VK_EXT_full_screen_exclusive",
"VK_EXT_hdr_metadata", # Needs WSI work.
"VK_EXT_pipeline_creation_feedback",
"VK_GOOGLE_display_timing",
Expand Down Expand Up @@ -133,12 +131,17 @@ CORE_EXTENSIONS = [
"VK_KHR_surface",
"VK_KHR_swapchain",
"VK_KHR_win32_surface",
"VK_KHR_get_surface_capabilities2",
]

FAKED_EXTENSIONS = [
{"name": "VK_EXT_full_screen_exclusive", "version": 4}
]

# Functions part of our winevulkan graphics driver interface.
# DRIVER_VERSION should be bumped on any change to driver interface
# in FUNCTION_OVERRIDES
DRIVER_VERSION = 7
DRIVER_VERSION = 8

# Table of functions for which we have a special implementation.
# These are regular device / instance functions for which we need
Expand Down Expand Up @@ -183,7 +186,7 @@ FUNCTION_OVERRIDES = {
"vkGetPhysicalDeviceSurfaceSupportKHR" : {"dispatch" : True, "driver" : True, "thunk" : True},
"vkGetPhysicalDeviceSurfaceCapabilitiesKHR" : {"dispatch" : True, "driver" : True, "thunk" : False, "private_thunk" : True},
"vkGetPhysicalDeviceSurfaceFormatsKHR" : {"dispatch" : True, "driver" : True, "thunk" : True},
"vkGetPhysicalDeviceSurfacePresentModesKHR" : {"dispatch" : True, "driver" : True, "thunk" : True},
"vkGetPhysicalDeviceSurfacePresentModesKHR" : {"dispatch" : True, "driver" : True, "thunk" : True, "private_thunk" : True},

# VK_KHR_win32_surface
"vkCreateWin32SurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : True},
Expand All @@ -210,8 +213,18 @@ FUNCTION_OVERRIDES = {
"vkEnumeratePhysicalDeviceGroupsKHR" : {"dispatch" : True, "driver" : False, "thunk" : False},

# VK_KHR_device_group
"vkGetDeviceGroupSurfacePresentModesKHR" : {"dispatch" : True, "driver" : True, "thunk" : True},
"vkGetDeviceGroupSurfacePresentModesKHR" : {"dispatch" : True, "driver" : True, "thunk" : True, "private_thunk": True},
"vkGetPhysicalDevicePresentRectanglesKHR" : {"dispatch" : True, "driver" : True, "thunk" : True},

# VK_KHR_get_surface_capabilities2
"vkGetPhysicalDeviceSurfaceCapabilities2KHR" : {"dispatch" : True, "driver" : True, "thunk" : False, "private_thunk" : True},
"vkGetPhysicalDeviceSurfaceFormats2KHR" : {"dispatch" : True, "driver" : True, "thunk" : False, "private_thunk" : True},

# VK_EXT_full_screen_exclusive
"vkGetPhysicalDeviceSurfacePresentModes2EXT" : {"dispatch" : True, "driver" : False, "thunk" : False},
"vkGetDeviceGroupSurfacePresentModes2EXT" : {"dispatch" : True, "driver" : False, "thunk" : False},
"vkAcquireFullScreenExclusiveModeEXT" : {"dispatch" : True, "driver" : False, "thunk" : False},
"vkReleaseFullScreenExclusiveModeEXT" : {"dispatch" : True, "driver" : False, "thunk" : False},
}

STRUCT_CHAIN_CONVERSIONS = [
Expand Down Expand Up @@ -2241,6 +2254,12 @@ class VkGenerator(object):
f.write(" \"{0}\",\n".format(ext["name"]))
f.write("};\n\n")

# Create array of faked device extensions.
f.write("static const VkExtensionProperties vk_device_extension_discards[] =\n{\n")
for ext in FAKED_EXTENSIONS:
f.write(" {{\"{0}\", {1}}},\n".format(ext["name"], ext["version"]))
f.write("};\n\n")

# Create array of instance extensions.
f.write("static const char * const vk_instance_extensions[] =\n{\n")
for ext in self.registry.extensions:
Expand All @@ -2261,6 +2280,27 @@ class VkGenerator(object):
f.write(" return FALSE;\n")
f.write("}\n\n")

f.write("BOOL wine_vk_device_extension_faked(const char *name)\n")
f.write("{\n")
f.write(" unsigned int i;\n")
f.write(" for (i = 0; i < ARRAY_SIZE(vk_device_extension_discards); i++)\n")
f.write(" {\n")
f.write(" if (strcmp(vk_device_extension_discards[i].extensionName, name) == 0)\n")
f.write(" return TRUE;\n")
f.write(" }\n")
f.write(" return FALSE;\n")
f.write("}\n\n")

f.write("unsigned int wine_vk_device_extension_faked_count(void)\n")
f.write("{\n")
f.write(" return ARRAY_SIZE(vk_device_extension_discards);\n")
f.write("}\n\n")

f.write("const VkExtensionProperties* wine_vk_device_extension_faked_idx(unsigned int idx)\n")
f.write("{\n")
f.write(" return &vk_device_extension_discards[idx];\n")
f.write("}\n\n")

f.write("BOOL wine_vk_instance_extension_supported(const char *name)\n")
f.write("{\n")
f.write(" unsigned int i;\n")
Expand Down
125 changes: 125 additions & 0 deletions dlls/winevulkan/vulkan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ static struct VkPhysicalDevice_T *wine_vk_physical_device_alloc(struct VkInstanc
}
}

num_properties += wine_vk_device_extension_faked_count();

TRACE("Host supported extensions %u, Wine supported extensions %u\n", num_host_properties, num_properties);

if (!(object->extensions = heap_calloc(num_properties, sizeof(*object->extensions))))
Expand All @@ -137,6 +139,13 @@ static struct VkPhysicalDevice_T *wine_vk_physical_device_alloc(struct VkInstanc
j++;
}
}

for (i = 0; i < wine_vk_device_extension_faked_count(); i++)
{
object->extensions[j] = *wine_vk_device_extension_faked_idx(i);
j++;
}

object->extension_count = num_properties;

heap_free(host_properties);
Expand Down Expand Up @@ -217,6 +226,8 @@ static void wine_vk_device_free_create_info(VkDeviceCreateInfo *create_info)
heap_free((void *)group_info->pPhysicalDevices);
}

heap_free((void *)create_info->ppEnabledExtensionNames);

free_VkDeviceCreateInfo_struct_chain(create_info);
}

Expand All @@ -226,6 +237,7 @@ static VkResult wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src
VkDeviceGroupDeviceCreateInfo *group_info;
unsigned int i;
VkResult res;
const char** extensions;

*dst = *src;

Expand All @@ -252,6 +264,18 @@ static VkResult wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src
group_info->pPhysicalDevices = physical_devices;
}

extensions = heap_alloc(sizeof(const char*) * src->enabledExtensionCount);
dst->ppEnabledExtensionNames = extensions;
dst->enabledExtensionCount = 0;
for (i = 0; i < src->enabledExtensionCount; i++) {
const char *extension_name = src->ppEnabledExtensionNames[i];

if (!wine_vk_device_extension_faked(extension_name)) {
extensions[dst->enabledExtensionCount] = extension_name;
dst->enabledExtensionCount++;
}
}

/* Should be filtered out by loader as ICDs don't support layers. */
dst->enabledLayerCount = 0;
dst->ppEnabledLayerNames = NULL;
Expand Down Expand Up @@ -2693,6 +2717,107 @@ VkResult WINAPI wine_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR *pP

}

/* VK_KHR_get_surface_capabilities2 */

VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(
VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo,
VkSurfaceCapabilities2KHR* pSurfaceCapabilities)
{
VkResult res;
VkSurfaceCapabilitiesFullScreenExclusiveEXT* full_screen_exclusive_caps;

/* Toss out VkSurfaceFullScreenExclusiveInfoEXT
* and VkSurfaceFullScreenExclusiveWin32InfoEXT */
VkPhysicalDeviceSurfaceInfo2KHR surface_info;
surface_info.sType = pSurfaceInfo->sType;
surface_info.pNext = NULL;
surface_info.surface = pSurfaceInfo->surface;

TRACE("%p, %p, %p\n", physicalDevice, pSurfaceInfo, pSurfaceCapabilities);

res = thunk_vkGetPhysicalDeviceSurfaceCapabilities2KHR(physicalDevice, &surface_info, pSurfaceCapabilities);

/* lie and say we support this.... */
if ((full_screen_exclusive_caps = wine_vk_find_struct(pSurfaceInfo, SURFACE_CAPABILITIES_FULL_SCREEN_EXCLUSIVE_EXT)))
{
full_screen_exclusive_caps->fullScreenExclusiveSupported = VK_TRUE;
}

return res;
}

VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceFormats2KHR(
VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo,
uint32_t* pSurfaceFormatCount,
VkSurfaceFormat2KHR* pSurfaceFormats)
{
/* Toss out VkSurfaceFullScreenExclusiveInfoEXT
* and VkSurfaceFullScreenExclusiveWin32InfoEXT */
VkPhysicalDeviceSurfaceInfo2KHR surface_info;
surface_info.sType = pSurfaceInfo->sType;
surface_info.pNext = NULL;
surface_info.surface = pSurfaceInfo->surface;

TRACE("%p, %p, %p, %p\n", physicalDevice, pSurfaceInfo, pSurfaceFormatCount, pSurfaceFormats);

return thunk_vkGetPhysicalDeviceSurfaceFormats2KHR(physicalDevice, &surface_info, pSurfaceFormatCount, pSurfaceFormats);
}

/* VK_EXT_full_screen_exclusive */

VkResult WINAPI wine_vkGetPhysicalDeviceSurfacePresentModes2EXT(
VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo,
uint32_t* pPresentModeCount,
VkPresentModeKHR* pPresentModes)
{
TRACE("%p, %p, %p, %p", physicalDevice, pSurfaceInfo, pPresentModeCount, pPresentModes);
return thunk_vkGetPhysicalDeviceSurfacePresentModesKHR(physicalDevice, pSurfaceInfo->surface, pPresentModeCount, pPresentModes);
}

VkResult WINAPI wine_vkGetDeviceGroupSurfacePresentModes2EXT(
VkDevice device,
const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo,
VkDeviceGroupPresentModeFlagsKHR* pModes)
{
TRACE("%p, %p, %p", device, pSurfaceInfo, pModes);
return thunk_vkGetDeviceGroupSurfacePresentModesKHR(device, pSurfaceInfo->surface, pModes);
}

VkResult WINAPI wine_vkAcquireFullScreenExclusiveModeEXT(
VkDevice device,
VkSwapchainKHR swapchain)
{
/* don't care */
TRACE("%p, %s", device, wine_dbgstr_longlong(swapchain));

return VK_SUCCESS;
}

VkResult WINAPI wine_vkReleaseFullScreenExclusiveModeEXT(
VkDevice device,
VkSwapchainKHR swapchain)
{
/* don't care */
TRACE("%p, %s", device, wine_dbgstr_longlong(swapchain));

return VK_SUCCESS;
}

/* extra crap we moved to private thunks */

VkResult WINAPI wine_vkGetDeviceGroupSurfacePresentModesKHR(VkDevice device, VkSurfaceKHR surface, VkDeviceGroupPresentModeFlagsKHR *pModes)
{
return thunk_vkGetDeviceGroupSurfacePresentModesKHR(device, surface, pModes);
}

VkResult WINAPI wine_vkGetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t *pPresentModeCount, VkPresentModeKHR *pPresentModes)
{
return thunk_vkGetPhysicalDeviceSurfacePresentModesKHR(physicalDevice, surface, pPresentModeCount, pPresentModes);
}

VkDevice WINAPI __wine_get_native_VkDevice(VkDevice device)
{
return device->device;
Expand Down
4 changes: 4 additions & 0 deletions dlls/winevulkan/vulkan_private.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,10 @@ struct VkSwapchainKHR_T
void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN;
void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN;

BOOL wine_vk_device_extension_faked(const char *name) DECLSPEC_HIDDEN;
unsigned int wine_vk_device_extension_faked_count(void) DECLSPEC_HIDDEN;
const VkExtensionProperties* wine_vk_device_extension_faked_idx(unsigned int idx) DECLSPEC_HIDDEN;

BOOL wine_vk_device_extension_supported(const char *name) DECLSPEC_HIDDEN;
BOOL wine_vk_instance_extension_supported(const char *name) DECLSPEC_HIDDEN;

Expand Down

0 comments on commit 76b8510

Please sign in to comment.