Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
d493fab3
Commit
d493fab3
authored
Aug 04, 2022
by
Georg Lehmann
Committed by
Alexandre Julliard
Aug 04, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winevulkan: Update to VK spec version 1.3.224.
Signed-off-by:
Georg Lehmann
<
dadschoorse@gmail.com
>
parent
d3638d42
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
126 additions
and
2 deletions
+126
-2
loader_thunks.c
dlls/winevulkan/loader_thunks.c
+21
-0
loader_thunks.h
dlls/winevulkan/loader_thunks.h
+17
-0
make_vulkan
dlls/winevulkan/make_vulkan
+2
-1
vulkan_thunks.c
dlls/winevulkan/vulkan_thunks.c
+81
-0
vulkan_thunks.h
dlls/winevulkan/vulkan_thunks.h
+4
-0
winevulkan.json
dlls/winevulkan/winevulkan.json
+1
-1
vulkan.h
include/wine/vulkan.h
+0
-0
No files found.
dlls/winevulkan/loader_thunks.c
View file @
d493fab3
...
...
@@ -3154,6 +3154,15 @@ VkResult WINAPI vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(VkDevice device,
return
vk_unix_call
(
unix_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI
,
&
params
);
}
VkResult
WINAPI
vkGetDynamicRenderingTilePropertiesQCOM
(
VkDevice
device
,
const
VkRenderingInfo
*
pRenderingInfo
,
VkTilePropertiesQCOM
*
pProperties
)
{
struct
vkGetDynamicRenderingTilePropertiesQCOM_params
params
;
params
.
device
=
device
;
params
.
pRenderingInfo
=
pRenderingInfo
;
params
.
pProperties
=
pProperties
;
return
vk_unix_call
(
unix_vkGetDynamicRenderingTilePropertiesQCOM
,
&
params
);
}
VkResult
WINAPI
vkGetEventStatus
(
VkDevice
device
,
VkEvent
event
)
{
struct
vkGetEventStatus_params
params
;
...
...
@@ -3170,6 +3179,16 @@ VkResult WINAPI vkGetFenceStatus(VkDevice device, VkFence fence)
return
vk_unix_call
(
unix_vkGetFenceStatus
,
&
params
);
}
VkResult
WINAPI
vkGetFramebufferTilePropertiesQCOM
(
VkDevice
device
,
VkFramebuffer
framebuffer
,
uint32_t
*
pPropertiesCount
,
VkTilePropertiesQCOM
*
pProperties
)
{
struct
vkGetFramebufferTilePropertiesQCOM_params
params
;
params
.
device
=
device
;
params
.
framebuffer
=
framebuffer
;
params
.
pPropertiesCount
=
pPropertiesCount
;
params
.
pProperties
=
pProperties
;
return
vk_unix_call
(
unix_vkGetFramebufferTilePropertiesQCOM
,
&
params
);
}
void
WINAPI
vkGetGeneratedCommandsMemoryRequirementsNV
(
VkDevice
device
,
const
VkGeneratedCommandsMemoryRequirementsInfoNV
*
pInfo
,
VkMemoryRequirements2
*
pMemoryRequirements
)
{
struct
vkGetGeneratedCommandsMemoryRequirementsNV_params
params
;
...
...
@@ -4620,8 +4639,10 @@ static const struct vulkan_func vk_device_dispatch_table[] =
{
"vkGetDeviceQueue"
,
vkGetDeviceQueue
},
{
"vkGetDeviceQueue2"
,
vkGetDeviceQueue2
},
{
"vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI"
,
vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI
},
{
"vkGetDynamicRenderingTilePropertiesQCOM"
,
vkGetDynamicRenderingTilePropertiesQCOM
},
{
"vkGetEventStatus"
,
vkGetEventStatus
},
{
"vkGetFenceStatus"
,
vkGetFenceStatus
},
{
"vkGetFramebufferTilePropertiesQCOM"
,
vkGetFramebufferTilePropertiesQCOM
},
{
"vkGetGeneratedCommandsMemoryRequirementsNV"
,
vkGetGeneratedCommandsMemoryRequirementsNV
},
{
"vkGetImageMemoryRequirements"
,
vkGetImageMemoryRequirements
},
{
"vkGetImageMemoryRequirements2"
,
vkGetImageMemoryRequirements2
},
...
...
dlls/winevulkan/loader_thunks.h
View file @
d493fab3
...
...
@@ -345,8 +345,10 @@ enum unix_call
unix_vkGetDeviceQueue
,
unix_vkGetDeviceQueue2
,
unix_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI
,
unix_vkGetDynamicRenderingTilePropertiesQCOM
,
unix_vkGetEventStatus
,
unix_vkGetFenceStatus
,
unix_vkGetFramebufferTilePropertiesQCOM
,
unix_vkGetGeneratedCommandsMemoryRequirementsNV
,
unix_vkGetImageMemoryRequirements
,
unix_vkGetImageMemoryRequirements2
,
...
...
@@ -2981,6 +2983,13 @@ struct vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI_params
VkExtent2D
*
pMaxWorkgroupSize
;
};
struct
vkGetDynamicRenderingTilePropertiesQCOM_params
{
VkDevice
device
;
const
VkRenderingInfo
*
pRenderingInfo
;
VkTilePropertiesQCOM
*
pProperties
;
};
struct
vkGetEventStatus_params
{
VkDevice
device
;
...
...
@@ -2993,6 +3002,14 @@ struct vkGetFenceStatus_params
VkFence
fence
;
};
struct
vkGetFramebufferTilePropertiesQCOM_params
{
VkDevice
device
;
VkFramebuffer
framebuffer
;
uint32_t
*
pPropertiesCount
;
VkTilePropertiesQCOM
*
pProperties
;
};
struct
vkGetGeneratedCommandsMemoryRequirementsNV_params
{
VkDevice
device
;
...
...
dlls/winevulkan/make_vulkan
View file @
d493fab3
...
...
@@ -64,7 +64,7 @@ from enum import Enum
LOGGER
=
logging
.
Logger
(
"vulkan"
)
LOGGER
.
addHandler
(
logging
.
StreamHandler
())
VK_XML_VERSION
=
"1.3.22
1
"
VK_XML_VERSION
=
"1.3.22
4
"
WINE_VK_VERSION
=
(
1
,
3
)
# Filenames to create.
...
...
@@ -113,6 +113,7 @@ UNSUPPORTED_EXTENSIONS = [
"VK_KHR_external_fence_fd"
,
"VK_KHR_external_memory_fd"
,
"VK_KHR_external_semaphore_fd"
,
"VK_SEC_amigo_profiling"
,
# Angle specific.
# Extensions which require callback handling
"VK_EXT_device_memory_report"
,
...
...
dlls/winevulkan/vulkan_thunks.c
View file @
d493fab3
...
...
@@ -5018,6 +5018,56 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea
break
;
}
case
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_PROCESSING_FEATURES_QCOM
:
{
const
VkPhysicalDeviceImageProcessingFeaturesQCOM
*
in
=
(
const
VkPhysicalDeviceImageProcessingFeaturesQCOM
*
)
in_header
;
VkPhysicalDeviceImageProcessingFeaturesQCOM
*
out
;
if
(
!
(
out
=
malloc
(
sizeof
(
*
out
))))
goto
out_of_memory
;
out
->
sType
=
in
->
sType
;
out
->
pNext
=
NULL
;
out
->
textureSampleWeighted
=
in
->
textureSampleWeighted
;
out
->
textureBoxFilter
=
in
->
textureBoxFilter
;
out
->
textureBlockMatch
=
in
->
textureBlockMatch
;
out_header
->
pNext
=
(
VkBaseOutStructure
*
)
out
;
out_header
=
out_header
->
pNext
;
break
;
}
case
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_PROPERTIES_FEATURES_QCOM
:
{
const
VkPhysicalDeviceTilePropertiesFeaturesQCOM
*
in
=
(
const
VkPhysicalDeviceTilePropertiesFeaturesQCOM
*
)
in_header
;
VkPhysicalDeviceTilePropertiesFeaturesQCOM
*
out
;
if
(
!
(
out
=
malloc
(
sizeof
(
*
out
))))
goto
out_of_memory
;
out
->
sType
=
in
->
sType
;
out
->
pNext
=
NULL
;
out
->
tileProperties
=
in
->
tileProperties
;
out_header
->
pNext
=
(
VkBaseOutStructure
*
)
out
;
out_header
=
out_header
->
pNext
;
break
;
}
case
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ATTACHMENT_FEEDBACK_LOOP_LAYOUT_FEATURES_EXT
:
{
const
VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT
*
in
=
(
const
VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT
*
)
in_header
;
VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT
*
out
;
if
(
!
(
out
=
malloc
(
sizeof
(
*
out
))))
goto
out_of_memory
;
out
->
sType
=
in
->
sType
;
out
->
pNext
=
NULL
;
out
->
attachmentFeedbackLoopLayout
=
in
->
attachmentFeedbackLoopLayout
;
out_header
->
pNext
=
(
VkBaseOutStructure
*
)
out
;
out_header
=
out_header
->
pNext
;
break
;
}
default
:
FIXME
(
"Application requested a linked structure of type %u.
\n
"
,
in_header
->
sType
);
}
...
...
@@ -8600,6 +8650,25 @@ static NTSTATUS wine_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(void *args)
return
params
->
device
->
funcs
.
p_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI
(
params
->
device
->
device
,
params
->
renderpass
,
params
->
pMaxWorkgroupSize
);
}
static
NTSTATUS
wine_vkGetDynamicRenderingTilePropertiesQCOM
(
void
*
args
)
{
struct
vkGetDynamicRenderingTilePropertiesQCOM_params
*
params
=
args
;
#if defined(USE_STRUCT_CONVERSION)
VkResult
result
;
VkRenderingInfo_host
pRenderingInfo_host
;
TRACE
(
"%p, %p, %p
\n
"
,
params
->
device
,
params
->
pRenderingInfo
,
params
->
pProperties
);
convert_VkRenderingInfo_win_to_host
(
params
->
pRenderingInfo
,
&
pRenderingInfo_host
);
result
=
params
->
device
->
funcs
.
p_vkGetDynamicRenderingTilePropertiesQCOM
(
params
->
device
->
device
,
&
pRenderingInfo_host
,
params
->
pProperties
);
free_VkRenderingInfo
(
&
pRenderingInfo_host
);
return
result
;
#else
TRACE
(
"%p, %p, %p
\n
"
,
params
->
device
,
params
->
pRenderingInfo
,
params
->
pProperties
);
return
params
->
device
->
funcs
.
p_vkGetDynamicRenderingTilePropertiesQCOM
(
params
->
device
->
device
,
params
->
pRenderingInfo
,
params
->
pProperties
);
#endif
}
static
NTSTATUS
wine_vkGetEventStatus
(
void
*
args
)
{
struct
vkGetEventStatus_params
*
params
=
args
;
...
...
@@ -8614,6 +8683,13 @@ static NTSTATUS wine_vkGetFenceStatus(void *args)
return
params
->
device
->
funcs
.
p_vkGetFenceStatus
(
params
->
device
->
device
,
params
->
fence
);
}
static
NTSTATUS
wine_vkGetFramebufferTilePropertiesQCOM
(
void
*
args
)
{
struct
vkGetFramebufferTilePropertiesQCOM_params
*
params
=
args
;
TRACE
(
"%p, 0x%s, %p, %p
\n
"
,
params
->
device
,
wine_dbgstr_longlong
(
params
->
framebuffer
),
params
->
pPropertiesCount
,
params
->
pProperties
);
return
params
->
device
->
funcs
.
p_vkGetFramebufferTilePropertiesQCOM
(
params
->
device
->
device
,
params
->
framebuffer
,
params
->
pPropertiesCount
,
params
->
pProperties
);
}
static
NTSTATUS
wine_vkGetGeneratedCommandsMemoryRequirementsNV
(
void
*
args
)
{
struct
vkGetGeneratedCommandsMemoryRequirementsNV_params
*
params
=
args
;
...
...
@@ -9933,6 +10009,7 @@ static const char * const vk_device_extensions[] =
"VK_ARM_rasterization_order_attachment_access"
,
"VK_EXT_4444_formats"
,
"VK_EXT_astc_decode_mode"
,
"VK_EXT_attachment_feedback_loop_layout"
,
"VK_EXT_blend_operation_advanced"
,
"VK_EXT_border_color_swizzle"
,
"VK_EXT_buffer_device_address"
,
...
...
@@ -10118,10 +10195,12 @@ static const char * const vk_device_extensions[] =
"VK_NV_viewport_array2"
,
"VK_NV_viewport_swizzle"
,
"VK_QCOM_fragment_density_map_offset"
,
"VK_QCOM_image_processing"
,
"VK_QCOM_render_pass_shader_resolve"
,
"VK_QCOM_render_pass_store_ops"
,
"VK_QCOM_render_pass_transform"
,
"VK_QCOM_rotated_copy_commands"
,
"VK_QCOM_tile_properties"
,
"VK_VALVE_descriptor_set_host_mapping"
,
"VK_VALVE_mutable_descriptor_type"
,
};
...
...
@@ -10540,8 +10619,10 @@ const unixlib_entry_t __wine_unix_call_funcs[] =
wine_vkGetDeviceQueue
,
wine_vkGetDeviceQueue2
,
wine_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI
,
wine_vkGetDynamicRenderingTilePropertiesQCOM
,
wine_vkGetEventStatus
,
wine_vkGetFenceStatus
,
wine_vkGetFramebufferTilePropertiesQCOM
,
wine_vkGetGeneratedCommandsMemoryRequirementsNV
,
wine_vkGetImageMemoryRequirements
,
wine_vkGetImageMemoryRequirements2
,
...
...
dlls/winevulkan/vulkan_thunks.h
View file @
d493fab3
...
...
@@ -2141,8 +2141,10 @@ struct vulkan_device_funcs
void
(
*
p_vkGetDeviceQueue
)(
VkDevice
,
uint32_t
,
uint32_t
,
VkQueue
*
);
void
(
*
p_vkGetDeviceQueue2
)(
VkDevice
,
const
VkDeviceQueueInfo2
*
,
VkQueue
*
);
VkResult
(
*
p_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI
)(
VkDevice
,
VkRenderPass
,
VkExtent2D
*
);
VkResult
(
*
p_vkGetDynamicRenderingTilePropertiesQCOM
)(
VkDevice
,
const
VkRenderingInfo_host
*
,
VkTilePropertiesQCOM
*
);
VkResult
(
*
p_vkGetEventStatus
)(
VkDevice
,
VkEvent
);
VkResult
(
*
p_vkGetFenceStatus
)(
VkDevice
,
VkFence
);
VkResult
(
*
p_vkGetFramebufferTilePropertiesQCOM
)(
VkDevice
,
VkFramebuffer
,
uint32_t
*
,
VkTilePropertiesQCOM
*
);
void
(
*
p_vkGetGeneratedCommandsMemoryRequirementsNV
)(
VkDevice
,
const
VkGeneratedCommandsMemoryRequirementsInfoNV_host
*
,
VkMemoryRequirements2_host
*
);
void
(
*
p_vkGetImageMemoryRequirements
)(
VkDevice
,
VkImage
,
VkMemoryRequirements_host
*
);
void
(
*
p_vkGetImageMemoryRequirements2
)(
VkDevice
,
const
VkImageMemoryRequirementsInfo2_host
*
,
VkMemoryRequirements2_host
*
);
...
...
@@ -2596,8 +2598,10 @@ struct vulkan_instance_funcs
USE_VK_FUNC(vkGetDeviceQueue) \
USE_VK_FUNC(vkGetDeviceQueue2) \
USE_VK_FUNC(vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI) \
USE_VK_FUNC(vkGetDynamicRenderingTilePropertiesQCOM) \
USE_VK_FUNC(vkGetEventStatus) \
USE_VK_FUNC(vkGetFenceStatus) \
USE_VK_FUNC(vkGetFramebufferTilePropertiesQCOM) \
USE_VK_FUNC(vkGetGeneratedCommandsMemoryRequirementsNV) \
USE_VK_FUNC(vkGetImageMemoryRequirements) \
USE_VK_FUNC(vkGetImageMemoryRequirements2) \
...
...
dlls/winevulkan/winevulkan.json
View file @
d493fab3
...
...
@@ -2,6 +2,6 @@
"file_format_version"
:
"1.0.0"
,
"ICD"
:
{
"library_path"
:
".
\\
winevulkan.dll"
,
"api_version"
:
"1.3.22
1
"
"api_version"
:
"1.3.22
4
"
}
}
include/wine/vulkan.h
View file @
d493fab3
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment