mirror of
git://source.winehq.org/git/wine.git
synced 2024-08-30 14:35:31 +00:00
winevulkan: Remove now unnecessary vkGetPhysicalDeviceSurfaceCapabilities2KHR driver entry.
This commit is contained in:
parent
c83f86bef5
commit
923f1d1b10
|
@ -121,7 +121,6 @@ static void wine_vk_init(void)
|
|||
LOAD_FUNCPTR(vkEnumerateInstanceExtensionProperties)
|
||||
LOAD_FUNCPTR(vkGetDeviceProcAddr)
|
||||
LOAD_FUNCPTR(vkGetInstanceProcAddr)
|
||||
LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceCapabilities2KHR)
|
||||
LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceCapabilitiesKHR)
|
||||
LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceFormats2KHR)
|
||||
LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceFormatsKHR)
|
||||
|
@ -462,19 +461,6 @@ static void *macdrv_vkGetInstanceProcAddr(VkInstance instance, const char *name)
|
|||
return pvkGetInstanceProcAddr(instance, name);
|
||||
}
|
||||
|
||||
static VkResult macdrv_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice phys_dev,
|
||||
const VkPhysicalDeviceSurfaceInfo2KHR *surface_info, VkSurfaceCapabilities2KHR *capabilities)
|
||||
{
|
||||
VkPhysicalDeviceSurfaceInfo2KHR surface_info_host;
|
||||
|
||||
TRACE("%p, %p, %p\n", phys_dev, surface_info, capabilities);
|
||||
|
||||
surface_info_host = *surface_info;
|
||||
surface_info_host.surface = surface_from_handle(surface_info->surface)->host_surface;
|
||||
|
||||
return pvkGetPhysicalDeviceSurfaceCapabilities2KHR(phys_dev, &surface_info_host, capabilities);
|
||||
}
|
||||
|
||||
static VkResult macdrv_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice phys_dev,
|
||||
VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *capabilities)
|
||||
{
|
||||
|
@ -575,7 +561,6 @@ static const struct vulkan_funcs vulkan_funcs =
|
|||
macdrv_vkGetDeviceProcAddr,
|
||||
macdrv_vkGetInstanceProcAddr,
|
||||
NULL,
|
||||
macdrv_vkGetPhysicalDeviceSurfaceCapabilities2KHR,
|
||||
macdrv_vkGetPhysicalDeviceSurfaceCapabilitiesKHR,
|
||||
macdrv_vkGetPhysicalDeviceSurfaceFormats2KHR,
|
||||
macdrv_vkGetPhysicalDeviceSurfaceFormatsKHR,
|
||||
|
|
|
@ -160,7 +160,7 @@ PERF_CRITICAL_FUNCTIONS = [
|
|||
# Functions part of our winevulkan graphics driver interface.
|
||||
# DRIVER_VERSION should be bumped on any change to driver interface
|
||||
# in FUNCTION_OVERRIDES
|
||||
DRIVER_VERSION = 14
|
||||
DRIVER_VERSION = 15
|
||||
|
||||
# Table of functions for which we have a special implementation.
|
||||
# These are regular device / instance functions for which we need
|
||||
|
@ -204,7 +204,6 @@ USER_DRIVER_FUNCS = {
|
|||
"vkGetDeviceProcAddr",
|
||||
"vkGetInstanceProcAddr",
|
||||
"vkGetPhysicalDevicePresentRectanglesKHR",
|
||||
"vkGetPhysicalDeviceSurfaceCapabilities2KHR",
|
||||
"vkGetPhysicalDeviceSurfaceCapabilitiesKHR",
|
||||
"vkGetPhysicalDeviceSurfaceFormats2KHR",
|
||||
"vkGetPhysicalDeviceSurfaceFormatsKHR",
|
||||
|
|
|
@ -1889,7 +1889,7 @@ VkResult wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice device
|
|||
&capabilities->surfaceCapabilities);
|
||||
}
|
||||
|
||||
surface_info_host.surface = surface->driver_surface;
|
||||
surface_info_host.surface = surface->host_surface;
|
||||
|
||||
if (!NtUserIsWindow(surface->hwnd)) return VK_ERROR_SURFACE_LOST_KHR;
|
||||
res = instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilities2KHR(physical_device->host_physical_device,
|
||||
|
|
|
@ -61,7 +61,6 @@ static VkResult (*pvkEnumerateInstanceExtensionProperties)(const char *, uint32_
|
|||
static void * (*pvkGetDeviceProcAddr)(VkDevice, const char *);
|
||||
static void * (*pvkGetInstanceProcAddr)(VkInstance, const char *);
|
||||
static VkResult (*pvkGetPhysicalDevicePresentRectanglesKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkRect2D *);
|
||||
static VkResult (*pvkGetPhysicalDeviceSurfaceCapabilities2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *, VkSurfaceCapabilities2KHR *);
|
||||
static VkResult (*pvkGetPhysicalDeviceSurfaceCapabilitiesKHR)(VkPhysicalDevice, VkSurfaceKHR, VkSurfaceCapabilitiesKHR *);
|
||||
static VkResult (*pvkGetPhysicalDeviceSurfaceFormats2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *, uint32_t *, VkSurfaceFormat2KHR *);
|
||||
static VkResult (*pvkGetPhysicalDeviceSurfaceFormatsKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkSurfaceFormatKHR *);
|
||||
|
@ -549,34 +548,6 @@ static VkResult wayland_vkGetPhysicalDevicePresentRectanglesKHR(VkPhysicalDevice
|
|||
count, rects);
|
||||
}
|
||||
|
||||
static VkResult wayland_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice phys_dev,
|
||||
const VkPhysicalDeviceSurfaceInfo2KHR *surface_info,
|
||||
VkSurfaceCapabilities2KHR *capabilities)
|
||||
{
|
||||
struct wine_vk_surface *wine_vk_surface = wine_vk_surface_from_handle(surface_info->surface);
|
||||
VkPhysicalDeviceSurfaceInfo2KHR surface_info_host;
|
||||
|
||||
TRACE("%p, %p, %p\n", phys_dev, surface_info, capabilities);
|
||||
|
||||
surface_info_host = *surface_info;
|
||||
surface_info_host.surface = wine_vk_surface->host_surface;
|
||||
|
||||
if (pvkGetPhysicalDeviceSurfaceCapabilities2KHR)
|
||||
return pvkGetPhysicalDeviceSurfaceCapabilities2KHR(phys_dev, &surface_info_host,
|
||||
capabilities);
|
||||
|
||||
/* Until the loader version exporting this function is common, emulate it
|
||||
* using the older non-2 version. */
|
||||
if (surface_info->pNext || capabilities->pNext)
|
||||
{
|
||||
FIXME("Emulating vkGetPhysicalDeviceSurfaceCapabilities2KHR with "
|
||||
"vkGetPhysicalDeviceSurfaceCapabilitiesKHR, pNext is ignored.\n");
|
||||
}
|
||||
|
||||
return pvkGetPhysicalDeviceSurfaceCapabilitiesKHR(phys_dev, surface_info_host.surface,
|
||||
&capabilities->surfaceCapabilities);
|
||||
}
|
||||
|
||||
static VkResult wayland_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice phys_dev,
|
||||
VkSurfaceKHR surface,
|
||||
VkSurfaceCapabilitiesKHR *capabilities)
|
||||
|
@ -705,7 +676,6 @@ static void wine_vk_init(void)
|
|||
LOAD_FUNCPTR(vkGetDeviceProcAddr);
|
||||
LOAD_FUNCPTR(vkGetInstanceProcAddr);
|
||||
LOAD_OPTIONAL_FUNCPTR(vkGetPhysicalDevicePresentRectanglesKHR);
|
||||
LOAD_OPTIONAL_FUNCPTR(vkGetPhysicalDeviceSurfaceCapabilities2KHR);
|
||||
LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceCapabilitiesKHR);
|
||||
LOAD_OPTIONAL_FUNCPTR(vkGetPhysicalDeviceSurfaceFormats2KHR);
|
||||
LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceFormatsKHR);
|
||||
|
@ -734,7 +704,6 @@ static const struct vulkan_funcs vulkan_funcs =
|
|||
.p_vkGetDeviceProcAddr = wayland_vkGetDeviceProcAddr,
|
||||
.p_vkGetInstanceProcAddr = wayland_vkGetInstanceProcAddr,
|
||||
.p_vkGetPhysicalDevicePresentRectanglesKHR = wayland_vkGetPhysicalDevicePresentRectanglesKHR,
|
||||
.p_vkGetPhysicalDeviceSurfaceCapabilities2KHR = wayland_vkGetPhysicalDeviceSurfaceCapabilities2KHR,
|
||||
.p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR = wayland_vkGetPhysicalDeviceSurfaceCapabilitiesKHR,
|
||||
.p_vkGetPhysicalDeviceSurfaceFormats2KHR = wayland_vkGetPhysicalDeviceSurfaceFormats2KHR,
|
||||
.p_vkGetPhysicalDeviceSurfaceFormatsKHR = wayland_vkGetPhysicalDeviceSurfaceFormatsKHR,
|
||||
|
|
|
@ -84,7 +84,6 @@ static VkResult (*pvkEnumerateInstanceExtensionProperties)(const char *, uint32_
|
|||
static void * (*pvkGetDeviceProcAddr)(VkDevice, const char *);
|
||||
static void * (*pvkGetInstanceProcAddr)(VkInstance, const char *);
|
||||
static VkResult (*pvkGetPhysicalDevicePresentRectanglesKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkRect2D *);
|
||||
static VkResult (*pvkGetPhysicalDeviceSurfaceCapabilities2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *, VkSurfaceCapabilities2KHR *);
|
||||
static VkResult (*pvkGetPhysicalDeviceSurfaceCapabilitiesKHR)(VkPhysicalDevice, VkSurfaceKHR, VkSurfaceCapabilitiesKHR *);
|
||||
static VkResult (*pvkGetPhysicalDeviceSurfaceFormats2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *, uint32_t *, VkSurfaceFormat2KHR *);
|
||||
static VkResult (*pvkGetPhysicalDeviceSurfaceFormatsKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkSurfaceFormatKHR *);
|
||||
|
@ -123,7 +122,6 @@ static void wine_vk_init(void)
|
|||
LOAD_FUNCPTR(vkEnumerateInstanceExtensionProperties);
|
||||
LOAD_FUNCPTR(vkGetDeviceProcAddr);
|
||||
LOAD_FUNCPTR(vkGetInstanceProcAddr);
|
||||
LOAD_OPTIONAL_FUNCPTR(vkGetPhysicalDeviceSurfaceCapabilities2KHR);
|
||||
LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceCapabilitiesKHR);
|
||||
LOAD_OPTIONAL_FUNCPTR(vkGetPhysicalDeviceSurfaceFormats2KHR);
|
||||
LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceFormatsKHR);
|
||||
|
@ -509,25 +507,6 @@ static VkResult X11DRV_vkGetPhysicalDevicePresentRectanglesKHR(VkPhysicalDevice
|
|||
return pvkGetPhysicalDevicePresentRectanglesKHR( phys_dev, x11_surface->host_surface, count, rects );
|
||||
}
|
||||
|
||||
static VkResult X11DRV_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice phys_dev,
|
||||
const VkPhysicalDeviceSurfaceInfo2KHR *surface_info, VkSurfaceCapabilities2KHR *capabilities)
|
||||
{
|
||||
VkPhysicalDeviceSurfaceInfo2KHR surface_info_host;
|
||||
TRACE("%p, %p, %p\n", phys_dev, surface_info, capabilities);
|
||||
|
||||
surface_info_host = *surface_info;
|
||||
surface_info_host.surface = surface_from_handle( surface_info->surface )->host_surface;
|
||||
|
||||
if (pvkGetPhysicalDeviceSurfaceCapabilities2KHR)
|
||||
return pvkGetPhysicalDeviceSurfaceCapabilities2KHR(phys_dev, &surface_info_host, capabilities);
|
||||
|
||||
/* Until the loader version exporting this function is common, emulate it using the older non-2 version. */
|
||||
if (surface_info->pNext || capabilities->pNext)
|
||||
FIXME("Emulating vkGetPhysicalDeviceSurfaceCapabilities2KHR with vkGetPhysicalDeviceSurfaceCapabilitiesKHR, pNext is ignored.\n");
|
||||
|
||||
return pvkGetPhysicalDeviceSurfaceCapabilitiesKHR(phys_dev, surface_info_host.surface, &capabilities->surfaceCapabilities);
|
||||
}
|
||||
|
||||
static VkResult X11DRV_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice phys_dev,
|
||||
VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *capabilities)
|
||||
{
|
||||
|
@ -655,7 +634,6 @@ static const struct vulkan_funcs vulkan_funcs =
|
|||
X11DRV_vkGetDeviceProcAddr,
|
||||
X11DRV_vkGetInstanceProcAddr,
|
||||
X11DRV_vkGetPhysicalDevicePresentRectanglesKHR,
|
||||
X11DRV_vkGetPhysicalDeviceSurfaceCapabilities2KHR,
|
||||
X11DRV_vkGetPhysicalDeviceSurfaceCapabilitiesKHR,
|
||||
X11DRV_vkGetPhysicalDeviceSurfaceFormats2KHR,
|
||||
X11DRV_vkGetPhysicalDeviceSurfaceFormatsKHR,
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#define __WINE_VULKAN_DRIVER_H
|
||||
|
||||
/* Wine internal vulkan driver version, needs to be bumped upon vulkan_funcs changes. */
|
||||
#define WINE_VULKAN_DRIVER_VERSION 14
|
||||
#define WINE_VULKAN_DRIVER_VERSION 15
|
||||
|
||||
struct vulkan_funcs
|
||||
{
|
||||
|
@ -31,7 +31,6 @@ struct vulkan_funcs
|
|||
void * (*p_vkGetDeviceProcAddr)(VkDevice, const char *);
|
||||
void * (*p_vkGetInstanceProcAddr)(VkInstance, const char *);
|
||||
VkResult (*p_vkGetPhysicalDevicePresentRectanglesKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkRect2D *);
|
||||
VkResult (*p_vkGetPhysicalDeviceSurfaceCapabilities2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *, VkSurfaceCapabilities2KHR *);
|
||||
VkResult (*p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR)(VkPhysicalDevice, VkSurfaceKHR, VkSurfaceCapabilitiesKHR *);
|
||||
VkResult (*p_vkGetPhysicalDeviceSurfaceFormats2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *, uint32_t *, VkSurfaceFormat2KHR *);
|
||||
VkResult (*p_vkGetPhysicalDeviceSurfaceFormatsKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkSurfaceFormatKHR *);
|
||||
|
@ -88,8 +87,6 @@ static inline void *get_vulkan_driver_instance_proc_addr(
|
|||
return vulkan_funcs->p_vkGetInstanceProcAddr;
|
||||
if (!strcmp(name, "GetPhysicalDevicePresentRectanglesKHR"))
|
||||
return vulkan_funcs->p_vkGetPhysicalDevicePresentRectanglesKHR;
|
||||
if (!strcmp(name, "GetPhysicalDeviceSurfaceCapabilities2KHR"))
|
||||
return vulkan_funcs->p_vkGetPhysicalDeviceSurfaceCapabilities2KHR;
|
||||
if (!strcmp(name, "GetPhysicalDeviceSurfaceCapabilitiesKHR"))
|
||||
return vulkan_funcs->p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR;
|
||||
if (!strcmp(name, "GetPhysicalDeviceSurfaceFormats2KHR"))
|
||||
|
|
Loading…
Reference in a new issue