Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Fotios Valasiadis
wine
Commits
77f4d220
Commit
77f4d220
authored
1 year ago
by
Rémi Bernon
Committed by
Alexandre Julliard
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
winex11: Remove unnecessary X11DRV_get_vk_* helpers.
parent
6f122f48
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/winex11.drv/vulkan.c
+3
-14
3 additions, 14 deletions
dlls/winex11.drv/vulkan.c
with
3 additions
and
14 deletions
dlls/winex11.drv/vulkan.c
+
3
−
14
View file @
77f4d220
...
...
@@ -87,8 +87,7 @@ static VkBool32 (*pvkGetPhysicalDeviceXlibPresentationSupportKHR)(VkPhysicalDevi
static
VkResult
(
*
pvkGetSwapchainImagesKHR
)(
VkDevice
,
VkSwapchainKHR
,
uint32_t
*
,
VkImage
*
);
static
VkResult
(
*
pvkQueuePresentKHR
)(
VkQueue
,
const
VkPresentInfoKHR
*
);
static
void
*
X11DRV_get_vk_device_proc_addr
(
const
char
*
name
);
static
void
*
X11DRV_get_vk_instance_proc_addr
(
VkInstance
instance
,
const
char
*
name
);
static
const
struct
vulkan_funcs
vulkan_funcs
;
static
inline
struct
wine_vk_surface
*
surface_from_handle
(
VkSurfaceKHR
handle
)
{
...
...
@@ -439,7 +438,7 @@ static void *X11DRV_vkGetDeviceProcAddr(VkDevice device, const char *name)
TRACE
(
"%p, %s
\n
"
,
device
,
debugstr_a
(
name
));
if
((
proc_addr
=
X11DRV_get_vk
_device_proc_addr
(
name
)))
if
((
proc_addr
=
get_vulkan_driver
_device_proc_addr
(
&
vulkan_funcs
,
name
)))
return
proc_addr
;
return
pvkGetDeviceProcAddr
(
device
,
name
);
...
...
@@ -451,7 +450,7 @@ static void *X11DRV_vkGetInstanceProcAddr(VkInstance instance, const char *name)
TRACE
(
"%p, %s
\n
"
,
instance
,
debugstr_a
(
name
));
if
((
proc_addr
=
X11DRV_get_vk
_instance_proc_addr
(
instance
,
name
)))
if
((
proc_addr
=
get_vulkan_driver
_instance_proc_addr
(
&
vulkan_funcs
,
instance
,
name
)))
return
proc_addr
;
return
pvkGetInstanceProcAddr
(
instance
,
name
);
...
...
@@ -532,16 +531,6 @@ static const struct vulkan_funcs vulkan_funcs =
X11DRV_wine_get_host_surface
,
};
static
void
*
X11DRV_get_vk_device_proc_addr
(
const
char
*
name
)
{
return
get_vulkan_driver_device_proc_addr
(
&
vulkan_funcs
,
name
);
}
static
void
*
X11DRV_get_vk_instance_proc_addr
(
VkInstance
instance
,
const
char
*
name
)
{
return
get_vulkan_driver_instance_proc_addr
(
&
vulkan_funcs
,
instance
,
name
);
}
const
struct
vulkan_funcs
*
get_vulkan_driver
(
UINT
version
)
{
static
pthread_once_t
init_once
=
PTHREAD_ONCE_INIT
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment