wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

vulkan-Vulkan_Implementation: Update to spec version 1.0.30 (no VK_EXT_debug_marker support yet).

Browse Source
This commit is contained in:
Sebastian Lackner 2016-10-10 00:00:35 +02:00
parent 3fe8a52e3c
commit 6dd07ec3e7
3 changed files with 640 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/patchinstall.sh
View File

@ -7097,12 +7097,16 @@ if test "$enable_vulkan_Vulkan_Implementation" -eq 1; then
patch_apply vulkan-Vulkan_Implementation/0003-vulkan-Use-binary-search-to-lookup-function-in-is_nu.patch
patch_apply vulkan-Vulkan_Implementation/0004-vulkan-Try-to-load-libvulkan.so.1.patch
patch_apply vulkan-Vulkan_Implementation/0005-vulkan-Enumerate-VK_KHR_win32_surface-only-one-time-.patch
patch_apply vulkan-Vulkan_Implementation/0006-vulkan-Update-to-spec-version-1.0.30-no-VK_EXT_debug.patch
patch_apply vulkan-Vulkan_Implementation/0007-vulkan-Improve-vkGetPhysicalDeviceWin32PresentationS.patch
(
echo '+ { "Sebastian Lackner", "vulkan: Initial implementation.", 2 },';
echo '+ { "Michael Müller", "vulkan: Implement vkGetPhysicalDeviceWin32PresentationSupportKHR.", 1 },';
echo '+ { "Sebastian Lackner", "vulkan: Use binary search to lookup function in is_null_func.", 1 },';
echo '+ { "Michael Müller", "vulkan: Try to load libvulkan.so.1.", 1 },';
echo '+ { "Michael Müller", "vulkan: Enumerate VK_KHR_win32_surface only one time in vkEnumerateInstanceExtensionProperties.", 1 },';
echo '+ { "Michael Müller", "vulkan: Update to spec version 1.0.30 (no VK_EXT_debug_marker support yet).", 1 },';
echo '+ { "Michael Müller", "vulkan: Improve vkGetPhysicalDeviceWin32PresentationSupportKHR and vkCreateWin32SurfaceKHR.", 1 },';
) >> "$patchlist"
fi

574
patches/vulkan-Vulkan_Implementation/0006-vulkan-Update-to-spec-version-1.0.30-no-VK_EXT_debug.patch Normal file
View File

@ -0,0 +1,574 @@
From 9f91a5be15c940eee321bec6cabe89aacf2c65ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 9 Oct 2016 23:29:51 +0200
Subject: vulkan: Update to spec version 1.0.30 (no VK_EXT_debug_marker support
yet).
---
dlls/vulkan-1/vulkan-1.spec | 3 +
dlls/vulkan/vulkan.spec | 3 +
dlls/vulkan/vulkan_private.h | 105 +++++++++++++++++--
dlls/vulkan/vulkan_thunks.c | 235 ++++++++++++++++++++++++++++++++++++++++---
4 files changed, 323 insertions(+), 23 deletions(-)
diff --git a/dlls/vulkan-1/vulkan-1.spec b/dlls/vulkan-1/vulkan-1.spec
index 51bcfff..7bd905f 100644
--- a/dlls/vulkan-1/vulkan-1.spec
+++ b/dlls/vulkan-1/vulkan-1.spec
@@ -25,7 +25,9 @@
@ stdcall vkCmdDraw(ptr long long long long) vulkan.vkCmdDraw
@ stdcall vkCmdDrawIndexed(ptr long long long long long) vulkan.vkCmdDrawIndexed
@ stdcall vkCmdDrawIndexedIndirect(ptr int64 int64 long long) vulkan.vkCmdDrawIndexedIndirect
+@ stdcall vkCmdDrawIndexedIndirectCountAMD(ptr int64 int64 int64 int64 long long) vulkan.vkCmdDrawIndexedIndirectCountAMD
@ stdcall vkCmdDrawIndirect(ptr int64 int64 long long) vulkan.vkCmdDrawIndirect
+@ stdcall vkCmdDrawIndirectCountAMD(ptr int64 int64 int64 int64 long long) vulkan.vkCmdDrawIndirectCountAMD
@ stdcall vkCmdEndQuery(ptr int64 long) vulkan.vkCmdEndQuery
@ stdcall vkCmdEndRenderPass(ptr) vulkan.vkCmdEndRenderPass
@ stdcall vkCmdExecuteCommands(ptr long ptr) vulkan.vkCmdExecuteCommands
@@ -126,6 +128,7 @@
@ stdcall vkGetInstanceProcAddr(ptr str) vulkan.vkGetInstanceProcAddr
@ stdcall vkGetPhysicalDeviceDisplayPlanePropertiesKHR(ptr ptr ptr) vulkan.vkGetPhysicalDeviceDisplayPlanePropertiesKHR
@ stdcall vkGetPhysicalDeviceDisplayPropertiesKHR(ptr ptr ptr) vulkan.vkGetPhysicalDeviceDisplayPropertiesKHR
+@ stdcall vkGetPhysicalDeviceExternalImageFormatPropertiesNV(ptr long long long long long long ptr) vulkan.vkGetPhysicalDeviceExternalImageFormatPropertiesNV
@ stdcall vkGetPhysicalDeviceFeatures(ptr ptr) vulkan.vkGetPhysicalDeviceFeatures
@ stdcall vkGetPhysicalDeviceFormatProperties(ptr long ptr) vulkan.vkGetPhysicalDeviceFormatProperties
@ stdcall vkGetPhysicalDeviceImageFormatProperties(ptr long long long long long ptr) vulkan.vkGetPhysicalDeviceImageFormatProperties
diff --git a/dlls/vulkan/vulkan.spec b/dlls/vulkan/vulkan.spec
index 9b689ad..2d16b19 100644
--- a/dlls/vulkan/vulkan.spec
+++ b/dlls/vulkan/vulkan.spec
@@ -25,7 +25,9 @@
@ stdcall vkCmdDraw(ptr long long long long)
@ stdcall vkCmdDrawIndexed(ptr long long long long long)
@ stdcall vkCmdDrawIndexedIndirect(ptr int64 int64 long long)
+@ stdcall vkCmdDrawIndexedIndirectCountAMD(ptr int64 int64 int64 int64 long long)
@ stdcall vkCmdDrawIndirect(ptr int64 int64 long long)
+@ stdcall vkCmdDrawIndirectCountAMD(ptr int64 int64 int64 int64 long long)
@ stdcall vkCmdEndQuery(ptr int64 long)
@ stdcall vkCmdEndRenderPass(ptr)
@ stdcall vkCmdExecuteCommands(ptr long ptr)
@@ -126,6 +128,7 @@
@ stdcall vkGetInstanceProcAddr(ptr str)
@ stdcall vkGetPhysicalDeviceDisplayPlanePropertiesKHR(ptr ptr ptr)
@ stdcall vkGetPhysicalDeviceDisplayPropertiesKHR(ptr ptr ptr)
+@ stdcall vkGetPhysicalDeviceExternalImageFormatPropertiesNV(ptr long long long long long long ptr)
@ stdcall vkGetPhysicalDeviceFeatures(ptr ptr)
@ stdcall vkGetPhysicalDeviceFormatProperties(ptr long ptr)
@ stdcall vkGetPhysicalDeviceImageFormatProperties(ptr long long long long long ptr)
diff --git a/dlls/vulkan/vulkan_private.h b/dlls/vulkan/vulkan_private.h
index 6fb3ed6..1d4f5b6 100644
--- a/dlls/vulkan/vulkan_private.h
+++ b/dlls/vulkan/vulkan_private.h
@@ -119,6 +119,8 @@ typedef uint32_t VkDisplaySurfaceCreateFlagsKHR;
typedef int VkDynamicState;
typedef uint64_t VkEvent;
typedef uint32_t VkEventCreateFlags;
+typedef uint32_t VkExternalMemoryFeatureFlagsNV;
+typedef uint32_t VkExternalMemoryHandleTypeFlagsNV;
typedef uint64_t VkFence;
typedef uint32_t VkFenceCreateFlags;
typedef int VkFilter;
@@ -1521,13 +1523,6 @@ typedef struct VkDisplayPropertiesKHR_host
VkBool32 persistentContent;
} VkDisplayPropertiesKHR_host;
-typedef struct VkFormatProperties
-{
- VkFormatFeatureFlags linearTilingFeatures;
- VkFormatFeatureFlags optimalTilingFeatures;
- VkFormatFeatureFlags bufferFeatures;
-} VkFormatProperties;
-
typedef struct VkImageFormatProperties
{
VkExtent3D maxExtent;
@@ -1546,6 +1541,29 @@ typedef struct VkImageFormatProperties_host
VkDeviceSize maxResourceSize;
} VkImageFormatProperties_host;
+typedef struct VkExternalImageFormatPropertiesNV
+{
+ VkImageFormatProperties DECLSPEC_ALIGN(8) imageFormatProperties;
+ VkExternalMemoryFeatureFlagsNV externalMemoryFeatures;
+ VkExternalMemoryHandleTypeFlagsNV exportFromImportedHandleTypes;
+ VkExternalMemoryHandleTypeFlagsNV compatibleHandleTypes;
+} VkExternalImageFormatPropertiesNV;
+
+typedef struct VkExternalImageFormatPropertiesNV_host
+{
+ VkImageFormatProperties_host imageFormatProperties;
+ VkExternalMemoryFeatureFlagsNV externalMemoryFeatures;
+ VkExternalMemoryHandleTypeFlagsNV exportFromImportedHandleTypes;
+ VkExternalMemoryHandleTypeFlagsNV compatibleHandleTypes;
+} VkExternalImageFormatPropertiesNV_host;
+
+typedef struct VkFormatProperties
+{
+ VkFormatFeatureFlags linearTilingFeatures;
+ VkFormatFeatureFlags optimalTilingFeatures;
+ VkFormatFeatureFlags bufferFeatures;
+} VkFormatProperties;
+
typedef struct VkMemoryType
{
VkMemoryPropertyFlags propertyFlags;
@@ -2135,8 +2153,12 @@ extern void (*p_vkCmdDrawIndexed)( VkCommandBuffer, uint32_t, uint32_t, uint32_t
uint32_t ) DECLSPEC_HIDDEN;
extern void (*p_vkCmdDrawIndexedIndirect)( VkCommandBuffer, VkBuffer, VkDeviceSize, uint32_t,
uint32_t ) DECLSPEC_HIDDEN;
+extern void (*p_vkCmdDrawIndexedIndirectCountAMD)( VkCommandBuffer, VkBuffer, VkDeviceSize,
+ VkBuffer, VkDeviceSize, uint32_t, uint32_t ) DECLSPEC_HIDDEN;
extern void (*p_vkCmdDrawIndirect)( VkCommandBuffer, VkBuffer, VkDeviceSize, uint32_t,
uint32_t ) DECLSPEC_HIDDEN;
+extern void (*p_vkCmdDrawIndirectCountAMD)( VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer,
+ VkDeviceSize, uint32_t, uint32_t ) DECLSPEC_HIDDEN;
extern void (*p_vkCmdEndQuery)( VkCommandBuffer, VkQueryPool, uint32_t ) DECLSPEC_HIDDEN;
extern void (*p_vkCmdEndRenderPass)( VkCommandBuffer ) DECLSPEC_HIDDEN;
extern void (*p_vkCmdExecuteCommands)( VkCommandBuffer, uint32_t,
@@ -2171,7 +2193,7 @@ extern void (*p_vkCmdSetStencilWriteMask)( VkCommandBuffer, VkStencilFaceFlags,
extern void (*p_vkCmdSetViewport)( VkCommandBuffer, uint32_t, uint32_t,
const VkViewport * ) DECLSPEC_HIDDEN;
extern void (*p_vkCmdUpdateBuffer)( VkCommandBuffer, VkBuffer, VkDeviceSize, VkDeviceSize,
- const uint32_t * ) DECLSPEC_HIDDEN;
+ const void * ) DECLSPEC_HIDDEN;
extern void (*p_vkCmdWaitEvents)( VkCommandBuffer, uint32_t, const VkEvent *, VkPipelineStageFlags,
VkPipelineStageFlags, uint32_t, const VkMemoryBarrier *, uint32_t,
const VkBufferMemoryBarrier *, uint32_t,
@@ -2335,6 +2357,10 @@ extern VkResult (*p_vkGetPhysicalDeviceDisplayPlanePropertiesKHR)( VkPhysicalDev
VkDisplayPlanePropertiesKHR_host * ) DECLSPEC_HIDDEN;
extern VkResult (*p_vkGetPhysicalDeviceDisplayPropertiesKHR)( VkPhysicalDevice, uint32_t *,
VkDisplayPropertiesKHR * ) DECLSPEC_HIDDEN;
+extern VkResult (*p_vkGetPhysicalDeviceExternalImageFormatPropertiesNV)( VkPhysicalDevice,
+ VkFormat, VkImageType, VkImageTiling, VkImageUsageFlags, VkImageCreateFlags,
+ VkExternalMemoryHandleTypeFlagsNV,
+ VkExternalImageFormatPropertiesNV_host * ) DECLSPEC_HIDDEN;
extern void (*p_vkGetPhysicalDeviceFeatures)( VkPhysicalDevice,
VkPhysicalDeviceFeatures * ) DECLSPEC_HIDDEN;
extern void (*p_vkGetPhysicalDeviceFormatProperties)( VkPhysicalDevice, VkFormat,
@@ -2877,6 +2903,69 @@ static inline void release_VkDisplayPlanePropertiesKHR_array( VkDisplayPlaneProp
#endif /* defined(USE_STRUCT_CONVERSION) */
#if defined(USE_STRUCT_CONVERSION)
+extern VkImageFormatProperties_host *convert_VkImageFormatProperties(
+ VkImageFormatProperties_host *out, const VkImageFormatProperties *in ) DECLSPEC_HIDDEN;
+extern void release_VkImageFormatProperties( VkImageFormatProperties *out,
+ VkImageFormatProperties_host *in ) DECLSPEC_HIDDEN;
+extern VkImageFormatProperties_host *convert_VkImageFormatProperties_array(
+ const VkImageFormatProperties *in, int count ) DECLSPEC_HIDDEN;
+extern void release_VkImageFormatProperties_array( VkImageFormatProperties *out,
+ VkImageFormatProperties_host *in, int count ) DECLSPEC_HIDDEN;
+#else /* defined(USE_STRUCT_CONVERSION) */
+static inline VkImageFormatProperties_host *convert_VkImageFormatProperties(
+ VkImageFormatProperties_host *out, const VkImageFormatProperties *in )
+{
+ return (VkImageFormatProperties_host *)in;
+}
+static inline void release_VkImageFormatProperties( VkImageFormatProperties *out,
+ VkImageFormatProperties_host *in )
+{
+}
+static inline VkImageFormatProperties_host *convert_VkImageFormatProperties_array(
+ const VkImageFormatProperties *in, int count )
+{
+ return (VkImageFormatProperties_host *)in;
+}
+static inline void release_VkImageFormatProperties_array( VkImageFormatProperties *out,
+ VkImageFormatProperties_host *in, int count )
+{
+}
+#endif /* defined(USE_STRUCT_CONVERSION) */
+
+#if defined(USE_STRUCT_CONVERSION)
+extern VkExternalImageFormatPropertiesNV_host *convert_VkExternalImageFormatPropertiesNV(
+ VkExternalImageFormatPropertiesNV_host *out,
+ const VkExternalImageFormatPropertiesNV *in ) DECLSPEC_HIDDEN;
+extern void release_VkExternalImageFormatPropertiesNV( VkExternalImageFormatPropertiesNV *out,
+ VkExternalImageFormatPropertiesNV_host *in ) DECLSPEC_HIDDEN;
+extern VkExternalImageFormatPropertiesNV_host *convert_VkExternalImageFormatPropertiesNV_array(
+ const VkExternalImageFormatPropertiesNV *in, int count ) DECLSPEC_HIDDEN;
+extern void release_VkExternalImageFormatPropertiesNV_array(
+ VkExternalImageFormatPropertiesNV *out, VkExternalImageFormatPropertiesNV_host *in,
+ int count ) DECLSPEC_HIDDEN;
+#else /* defined(USE_STRUCT_CONVERSION) */
+static inline VkExternalImageFormatPropertiesNV_host *convert_VkExternalImageFormatPropertiesNV(
+ VkExternalImageFormatPropertiesNV_host *out, const VkExternalImageFormatPropertiesNV *in )
+{
+ return (VkExternalImageFormatPropertiesNV_host *)in;
+}
+static inline void release_VkExternalImageFormatPropertiesNV(
+ VkExternalImageFormatPropertiesNV *out, VkExternalImageFormatPropertiesNV_host *in )
+{
+}
+static inline VkExternalImageFormatPropertiesNV_host *convert_VkExternalImageFormatPropertiesNV_array(
+ const VkExternalImageFormatPropertiesNV *in, int count )
+{
+ return (VkExternalImageFormatPropertiesNV_host *)in;
+}
+static inline void release_VkExternalImageFormatPropertiesNV_array(
+ VkExternalImageFormatPropertiesNV *out, VkExternalImageFormatPropertiesNV_host *in,
+ int count )
+{
+}
+#endif /* defined(USE_STRUCT_CONVERSION) */
+
+#if defined(USE_STRUCT_CONVERSION)
extern VkMemoryHeap_host *convert_VkMemoryHeap( VkMemoryHeap_host *out,
const VkMemoryHeap *in ) DECLSPEC_HIDDEN;
extern void release_VkMemoryHeap( VkMemoryHeap *out, VkMemoryHeap_host *in ) DECLSPEC_HIDDEN;
diff --git a/dlls/vulkan/vulkan_thunks.c b/dlls/vulkan/vulkan_thunks.c
index aea8d64..3e61248 100644
--- a/dlls/vulkan/vulkan_thunks.c
+++ b/dlls/vulkan/vulkan_thunks.c
@@ -1769,12 +1769,8 @@ VkDisplayModePropertiesKHR_host *convert_VkDisplayModePropertiesKHR(
{
TRACE( "(%p, %p)\n", out, in );
- if (!in) return NULL;
-
- out->displayMode = in->displayMode;
- out->parameters = in->parameters;
-
- return out;
+ /* return-only type, skipping conversion */
+ return in ? out : NULL;
}
void release_VkDisplayModePropertiesKHR( VkDisplayModePropertiesKHR *out,
VkDisplayModePropertiesKHR_host *in )
@@ -1825,12 +1821,8 @@ VkDisplayPlanePropertiesKHR_host *convert_VkDisplayPlanePropertiesKHR(
{
TRACE( "(%p, %p)\n", out, in );
- if (!in) return NULL;
-
- out->currentDisplay = in->currentDisplay;
- out->currentStackIndex = in->currentStackIndex;
-
- return out;
+ /* return-only type, skipping conversion */
+ return in ? out : NULL;
}
void release_VkDisplayPlanePropertiesKHR( VkDisplayPlanePropertiesKHR *out,
VkDisplayPlanePropertiesKHR_host *in )
@@ -1876,6 +1868,124 @@ void release_VkDisplayPlanePropertiesKHR_array( VkDisplayPlanePropertiesKHR *out
#endif /* defined(USE_STRUCT_CONVERSION) */
#if defined(USE_STRUCT_CONVERSION)
+VkImageFormatProperties_host *convert_VkImageFormatProperties( VkImageFormatProperties_host *out,
+ const VkImageFormatProperties *in )
+{
+ TRACE( "(%p, %p)\n", out, in );
+
+ /* return-only type, skipping conversion */
+ return in ? out : NULL;
+}
+void release_VkImageFormatProperties( VkImageFormatProperties *out,
+ VkImageFormatProperties_host *in )
+{
+ TRACE( "(%p, %p)\n", out, in );
+
+ if (!in || !out) return;
+
+ out->maxExtent = in->maxExtent;
+ out->maxMipLevels = in->maxMipLevels;
+ out->maxArrayLayers = in->maxArrayLayers;
+ out->sampleCounts = in->sampleCounts;
+ out->maxResourceSize = in->maxResourceSize;
+}
+
+VkImageFormatProperties_host *convert_VkImageFormatProperties_array(
+ const VkImageFormatProperties *in, int count )
+{
+ VkImageFormatProperties_host *out;
+ int i;
+
+ TRACE( "(%p, %d)\n", in, count );
+
+ if (!in) return NULL;
+
+ out = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*out) );
+ for (i = 0; i < count; i++)
+ convert_VkImageFormatProperties( &out[i], &in[i] );
+
+ return out;
+}
+
+void release_VkImageFormatProperties_array( VkImageFormatProperties *out,
+ VkImageFormatProperties_host *in, int count )
+{
+ int i;
+
+ TRACE( "(%p, %p, %d)\n", out, in, count );
+
+ if (!in) return;
+
+ for (i = 0; i < count; i++)
+ release_VkImageFormatProperties( out ? &out[i] : NULL, &in[i] );
+ HeapFree( GetProcessHeap(), 0, in );
+}
+#endif /* defined(USE_STRUCT_CONVERSION) */
+
+#if defined(USE_STRUCT_CONVERSION)
+VkExternalImageFormatPropertiesNV_host *convert_VkExternalImageFormatPropertiesNV(
+ VkExternalImageFormatPropertiesNV_host *out, const VkExternalImageFormatPropertiesNV *in )
+{
+ TRACE( "(%p, %p)\n", out, in );
+
+ if (!in) return NULL;
+
+ convert_VkImageFormatProperties( &out->imageFormatProperties, &in->imageFormatProperties );
+ out->externalMemoryFeatures = in->externalMemoryFeatures;
+ out->exportFromImportedHandleTypes = in->exportFromImportedHandleTypes;
+ out->compatibleHandleTypes = in->compatibleHandleTypes;
+
+ return out;
+}
+void release_VkExternalImageFormatPropertiesNV( VkExternalImageFormatPropertiesNV *out,
+ VkExternalImageFormatPropertiesNV_host *in )
+{
+ TRACE( "(%p, %p)\n", out, in );
+
+ if (!in) return;
+
+ release_VkImageFormatProperties( out ? &out->imageFormatProperties : NULL, &in->imageFormatProperties );
+
+ if (!out) return;
+
+ out->externalMemoryFeatures = in->externalMemoryFeatures;
+ out->exportFromImportedHandleTypes = in->exportFromImportedHandleTypes;
+ out->compatibleHandleTypes = in->compatibleHandleTypes;
+}
+
+VkExternalImageFormatPropertiesNV_host *convert_VkExternalImageFormatPropertiesNV_array(
+ const VkExternalImageFormatPropertiesNV *in, int count )
+{
+ VkExternalImageFormatPropertiesNV_host *out;
+ int i;
+
+ TRACE( "(%p, %d)\n", in, count );
+
+ if (!in) return NULL;
+
+ out = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*out) );
+ for (i = 0; i < count; i++)
+ convert_VkExternalImageFormatPropertiesNV( &out[i], &in[i] );
+
+ return out;
+}
+
+void release_VkExternalImageFormatPropertiesNV_array( VkExternalImageFormatPropertiesNV *out,
+ VkExternalImageFormatPropertiesNV_host *in, int count )
+{
+ int i;
+
+ TRACE( "(%p, %p, %d)\n", out, in, count );
+
+ if (!in) return;
+
+ for (i = 0; i < count; i++)
+ release_VkExternalImageFormatPropertiesNV( out ? &out[i] : NULL, &in[i] );
+ HeapFree( GetProcessHeap(), 0, in );
+}
+#endif /* defined(USE_STRUCT_CONVERSION) */
+
+#if defined(USE_STRUCT_CONVERSION)
VkMemoryHeap_host *convert_VkMemoryHeap( VkMemoryHeap_host *out, const VkMemoryHeap *in )
{
TRACE( "(%p, %p)\n", out, in );
@@ -3046,6 +3156,16 @@ static void null_vkCmdDrawIndexedIndirect( VkCommandBuffer commandBuffer, VkBuff
wine_dbgstr_longlong(offset), drawCount, stride );
}
+static void null_vkCmdDrawIndexedIndirectCountAMD( VkCommandBuffer commandBuffer, VkBuffer buffer,
+ VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset,
+ uint32_t maxDrawCount, uint32_t stride )
+{
+ FIXME( "(%p, %s, %s, %s, %s, %u, %u) not supported\n", commandBuffer,
+ wine_dbgstr_longlong(buffer), wine_dbgstr_longlong(offset),
+ wine_dbgstr_longlong(countBuffer), wine_dbgstr_longlong(countBufferOffset),
+ maxDrawCount, stride );
+}
+
static void null_vkCmdDrawIndirect( VkCommandBuffer commandBuffer, VkBuffer buffer,
VkDeviceSize offset, uint32_t drawCount, uint32_t stride )
{
@@ -3053,6 +3173,16 @@ static void null_vkCmdDrawIndirect( VkCommandBuffer commandBuffer, VkBuffer buff
wine_dbgstr_longlong(offset), drawCount, stride );
}
+static void null_vkCmdDrawIndirectCountAMD( VkCommandBuffer commandBuffer, VkBuffer buffer,
+ VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset,
+ uint32_t maxDrawCount, uint32_t stride )
+{
+ FIXME( "(%p, %s, %s, %s, %s, %u, %u) not supported\n", commandBuffer,
+ wine_dbgstr_longlong(buffer), wine_dbgstr_longlong(offset),
+ wine_dbgstr_longlong(countBuffer), wine_dbgstr_longlong(countBufferOffset),
+ maxDrawCount, stride );
+}
+
static void null_vkCmdEndQuery( VkCommandBuffer commandBuffer, VkQueryPool queryPool,
uint32_t query )
{
@@ -3187,7 +3317,7 @@ static void null_vkCmdSetViewport( VkCommandBuffer commandBuffer, uint32_t first
}
static void null_vkCmdUpdateBuffer( VkCommandBuffer commandBuffer, VkBuffer dstBuffer,
- VkDeviceSize dstOffset, VkDeviceSize dataSize, const uint32_t *pData )
+ VkDeviceSize dstOffset, VkDeviceSize dataSize, const void *pData )
{
FIXME( "(%p, %s, %s, %s, %p) not supported\n", commandBuffer, wine_dbgstr_longlong(dstBuffer),
wine_dbgstr_longlong(dstOffset), wine_dbgstr_longlong(dataSize), pData );
@@ -3764,6 +3894,17 @@ static VkResult null_vkGetPhysicalDeviceDisplayPropertiesKHR( VkPhysicalDevice p
return VK_ERROR_INCOMPATIBLE_DRIVER;
}
+static VkResult null_vkGetPhysicalDeviceExternalImageFormatPropertiesNV(
+ VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkImageTiling tiling,
+ VkImageUsageFlags usage, VkImageCreateFlags flags,
+ VkExternalMemoryHandleTypeFlagsNV externalHandleType,
+ VkExternalImageFormatPropertiesNV_host *pExternalImageFormatProperties )
+{
+ FIXME( "(%p, %d, %d, %d, %u, %u, %u, %p) not supported\n", physicalDevice, format, type,
+ tiling, usage, flags, externalHandleType, pExternalImageFormatProperties );
+ return VK_ERROR_INCOMPATIBLE_DRIVER;
+}
+
static void null_vkGetPhysicalDeviceFeatures( VkPhysicalDevice physicalDevice,
VkPhysicalDeviceFeatures *pFeatures )
{
@@ -4058,8 +4199,12 @@ void (*p_vkCmdDrawIndexed)( VkCommandBuffer, uint32_t, uint32_t, uint32_t, int32
null_vkCmdDrawIndexed;
void (*p_vkCmdDrawIndexedIndirect)( VkCommandBuffer, VkBuffer, VkDeviceSize, uint32_t, uint32_t ) =
null_vkCmdDrawIndexedIndirect;
+void (*p_vkCmdDrawIndexedIndirectCountAMD)( VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer,
+ VkDeviceSize, uint32_t, uint32_t ) = null_vkCmdDrawIndexedIndirectCountAMD;
void (*p_vkCmdDrawIndirect)( VkCommandBuffer, VkBuffer, VkDeviceSize, uint32_t, uint32_t ) =
null_vkCmdDrawIndirect;
+void (*p_vkCmdDrawIndirectCountAMD)( VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer,
+ VkDeviceSize, uint32_t, uint32_t ) = null_vkCmdDrawIndirectCountAMD;
void (*p_vkCmdEndQuery)( VkCommandBuffer, VkQueryPool, uint32_t ) = null_vkCmdEndQuery;
void (*p_vkCmdEndRenderPass)( VkCommandBuffer ) = null_vkCmdEndRenderPass;
void (*p_vkCmdExecuteCommands)( VkCommandBuffer, uint32_t, const VkCommandBuffer * ) =
@@ -4094,7 +4239,7 @@ void (*p_vkCmdSetStencilWriteMask)( VkCommandBuffer, VkStencilFaceFlags, uint32_
void (*p_vkCmdSetViewport)( VkCommandBuffer, uint32_t, uint32_t, const VkViewport * ) =
null_vkCmdSetViewport;
void (*p_vkCmdUpdateBuffer)( VkCommandBuffer, VkBuffer, VkDeviceSize, VkDeviceSize,
- const uint32_t * ) = null_vkCmdUpdateBuffer;
+ const void * ) = null_vkCmdUpdateBuffer;
void (*p_vkCmdWaitEvents)( VkCommandBuffer, uint32_t, const VkEvent *, VkPipelineStageFlags,
VkPipelineStageFlags, uint32_t, const VkMemoryBarrier *, uint32_t,
const VkBufferMemoryBarrier *, uint32_t, const VkImageMemoryBarrier_host * ) =
@@ -4258,6 +4403,10 @@ VkResult (*p_vkGetPhysicalDeviceDisplayPlanePropertiesKHR)( VkPhysicalDevice, ui
VkDisplayPlanePropertiesKHR_host * ) = null_vkGetPhysicalDeviceDisplayPlanePropertiesKHR;
VkResult (*p_vkGetPhysicalDeviceDisplayPropertiesKHR)( VkPhysicalDevice, uint32_t *,
VkDisplayPropertiesKHR * ) = null_vkGetPhysicalDeviceDisplayPropertiesKHR;
+VkResult (*p_vkGetPhysicalDeviceExternalImageFormatPropertiesNV)( VkPhysicalDevice, VkFormat,
+ VkImageType, VkImageTiling, VkImageUsageFlags, VkImageCreateFlags,
+ VkExternalMemoryHandleTypeFlagsNV, VkExternalImageFormatPropertiesNV_host * ) =
+ null_vkGetPhysicalDeviceExternalImageFormatPropertiesNV;
void (*p_vkGetPhysicalDeviceFeatures)( VkPhysicalDevice, VkPhysicalDeviceFeatures * ) =
null_vkGetPhysicalDeviceFeatures;
void (*p_vkGetPhysicalDeviceFormatProperties)( VkPhysicalDevice, VkFormat, VkFormatProperties * ) =
@@ -4648,6 +4797,20 @@ void WINAPI vkCmdDrawIndexedIndirect( VkCommandBuffer commandBuffer, VkBuffer bu
}
/***********************************************************************
+ * vkCmdDrawIndexedIndirectCountAMD (VULKAN.@)
+ */
+void WINAPI vkCmdDrawIndexedIndirectCountAMD( VkCommandBuffer commandBuffer, VkBuffer buffer,
+ VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset,
+ uint32_t maxDrawCount, uint32_t stride )
+{
+ TRACE( "(%p, %s, %s, %s, %s, %u, %u)\n", commandBuffer, wine_dbgstr_longlong(buffer),
+ wine_dbgstr_longlong(offset), wine_dbgstr_longlong(countBuffer),
+ wine_dbgstr_longlong(countBufferOffset), maxDrawCount, stride );
+ p_vkCmdDrawIndexedIndirectCountAMD( commandBuffer, buffer, offset, countBuffer,
+ countBufferOffset, maxDrawCount, stride );
+}
+
+/***********************************************************************
* vkCmdDrawIndirect (VULKAN.@)
*/
void WINAPI vkCmdDrawIndirect( VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset,
@@ -4659,6 +4822,20 @@ void WINAPI vkCmdDrawIndirect( VkCommandBuffer commandBuffer, VkBuffer buffer, V
}
/***********************************************************************
+ * vkCmdDrawIndirectCountAMD (VULKAN.@)
+ */
+void WINAPI vkCmdDrawIndirectCountAMD( VkCommandBuffer commandBuffer, VkBuffer buffer,
+ VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset,
+ uint32_t maxDrawCount, uint32_t stride )
+{
+ TRACE( "(%p, %s, %s, %s, %s, %u, %u)\n", commandBuffer, wine_dbgstr_longlong(buffer),
+ wine_dbgstr_longlong(offset), wine_dbgstr_longlong(countBuffer),
+ wine_dbgstr_longlong(countBufferOffset), maxDrawCount, stride );
+ p_vkCmdDrawIndirectCountAMD( commandBuffer, buffer, offset, countBuffer, countBufferOffset,
+ maxDrawCount, stride );
+}
+
+/***********************************************************************
* vkCmdEndQuery (VULKAN.@)
*/
void WINAPI vkCmdEndQuery( VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query )
@@ -4878,7 +5055,7 @@ void WINAPI vkCmdSetViewport( VkCommandBuffer commandBuffer, uint32_t firstViewp
* vkCmdUpdateBuffer (VULKAN.@)
*/
void WINAPI vkCmdUpdateBuffer( VkCommandBuffer commandBuffer, VkBuffer dstBuffer,
- VkDeviceSize dstOffset, VkDeviceSize dataSize, const uint32_t *pData )
+ VkDeviceSize dstOffset, VkDeviceSize dataSize, const void *pData )
{
TRACE( "(%p, %s, %s, %s, %p)\n", commandBuffer, wine_dbgstr_longlong(dstBuffer),
wine_dbgstr_longlong(dstOffset), wine_dbgstr_longlong(dataSize), pData );
@@ -6036,6 +6213,31 @@ VkResult WINAPI vkGetPhysicalDeviceDisplayPropertiesKHR( VkPhysicalDevice physic
}
/***********************************************************************
+ * vkGetPhysicalDeviceExternalImageFormatPropertiesNV (VULKAN.@)
+ */
+VkResult WINAPI vkGetPhysicalDeviceExternalImageFormatPropertiesNV(
+ VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkImageTiling tiling,
+ VkImageUsageFlags usage, VkImageCreateFlags flags,
+ VkExternalMemoryHandleTypeFlagsNV externalHandleType,
+ VkExternalImageFormatPropertiesNV *pExternalImageFormatProperties )
+{
+ VkExternalImageFormatPropertiesNV_host tmp_pExternalImageFormatProperties, *ptr_pExternalImageFormatProperties;
+ VkResult res;
+
+ TRACE( "(%p, %d, %d, %d, %u, %u, %u, %p)\n", physicalDevice, format, type, tiling, usage,
+ flags, externalHandleType, pExternalImageFormatProperties );
+
+ ptr_pExternalImageFormatProperties = convert_VkExternalImageFormatPropertiesNV(
+ &tmp_pExternalImageFormatProperties, pExternalImageFormatProperties );
+ res = p_vkGetPhysicalDeviceExternalImageFormatPropertiesNV( physicalDevice, format, type,
+ tiling, usage, flags, externalHandleType, ptr_pExternalImageFormatProperties );
+ release_VkExternalImageFormatPropertiesNV( pExternalImageFormatProperties,
+ ptr_pExternalImageFormatProperties );
+
+ return res;
+}
+
+/***********************************************************************
* vkGetPhysicalDeviceFeatures (VULKAN.@)
*/
void WINAPI vkGetPhysicalDeviceFeatures( VkPhysicalDevice physicalDevice,
@@ -6430,7 +6632,9 @@ static const struct function_entry function_table[] =
DEFINE_FUNCTION( vkCmdDraw )
DEFINE_FUNCTION( vkCmdDrawIndexed )
DEFINE_FUNCTION( vkCmdDrawIndexedIndirect )
+ DEFINE_FUNCTION( vkCmdDrawIndexedIndirectCountAMD )
DEFINE_FUNCTION( vkCmdDrawIndirect )
+ DEFINE_FUNCTION( vkCmdDrawIndirectCountAMD )
DEFINE_FUNCTION( vkCmdEndQuery )
DEFINE_FUNCTION( vkCmdEndRenderPass )
DEFINE_FUNCTION( vkCmdExecuteCommands )
@@ -6532,6 +6736,7 @@ static const struct function_entry function_table[] =
DEFINE_FUNCTION( vkGetInstanceProcAddr )
DEFINE_FUNCTION( vkGetPhysicalDeviceDisplayPlanePropertiesKHR )
DEFINE_FUNCTION( vkGetPhysicalDeviceDisplayPropertiesKHR )
+ DEFINE_FUNCTION( vkGetPhysicalDeviceExternalImageFormatPropertiesNV )
DEFINE_FUNCTION( vkGetPhysicalDeviceFeatures )
DEFINE_FUNCTION( vkGetPhysicalDeviceFormatProperties )
DEFINE_FUNCTION( vkGetPhysicalDeviceImageFormatProperties )
--
2.9.0

62
patches/vulkan-Vulkan_Implementation/0007-vulkan-Improve-vkGetPhysicalDeviceWin32PresentationS.patch Normal file
View File

@ -0,0 +1,62 @@
From 133657f27695ca083e6abed70e8aef0e759b9559 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 9 Oct 2016 23:06:34 +0200
Subject: vulkan: Improve vkGetPhysicalDeviceWin32PresentationSupportKHR and
vkCreateWin32SurfaceKHR.
---
dlls/vulkan/vulkan_main.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/dlls/vulkan/vulkan_main.c b/dlls/vulkan/vulkan_main.c
index 55361a4..7700f02 100644
--- a/dlls/vulkan/vulkan_main.c
+++ b/dlls/vulkan/vulkan_main.c
@@ -208,7 +208,8 @@ VkResult WINAPI vkCreateWin32SurfaceKHR( VkInstance instance,
TRACE( "(%p, %p, %p, %p)\n", instance, pCreateInfo, pAllocator, pSurface );
#if defined(HAVE_X11_XLIB_H) && defined(SONAME_LIBX11_XCB)
- if (pXGetXCBConnection && res == VK_ERROR_INCOMPATIBLE_DRIVER)
+ if (pXGetXCBConnection && (res == VK_ERROR_INCOMPATIBLE_DRIVER ||
+ res == VK_ERROR_EXTENSION_NOT_PRESENT))
{
VkAllocationCallbacks_host tmp_pAllocator, *ptr_pAllocator;
VkXcbSurfaceCreateInfoKHR_host tmp_pCreateInfo;
@@ -226,7 +227,8 @@ VkResult WINAPI vkCreateWin32SurfaceKHR( VkInstance instance,
#endif
#if defined(HAVE_X11_XLIB_H)
- if (res == VK_ERROR_INCOMPATIBLE_DRIVER)
+ if (res == VK_ERROR_INCOMPATIBLE_DRIVER ||
+ res == VK_ERROR_EXTENSION_NOT_PRESENT)
{
VkAllocationCallbacks_host tmp_pAllocator, *ptr_pAllocator;
VkXlibSurfaceCreateInfoKHR_host tmp_pCreateInfo;
@@ -268,13 +270,13 @@ static xcb_screen_t *get_xcb_screen( xcb_connection_t *connection, int screen )
VkBool32 WINAPI vkGetPhysicalDeviceWin32PresentationSupportKHR( VkPhysicalDevice physicalDevice,
uint32_t queueFamilyIndex )
{
- VkResult res = VK_ERROR_INCOMPATIBLE_DRIVER;
+ VkBool32 res = VK_FALSE;
TRACE( "(%p, %u)\n", physicalDevice, queueFamilyIndex );
#if defined(HAVE_X11_XLIB_H) && defined(SONAME_LIBX11_XCB)
if (pxcb_get_setup && pxcb_screen_next && pxcb_setup_roots_iterator &&
- pXGetXCBConnection && res == VK_ERROR_INCOMPATIBLE_DRIVER)
+ pXGetXCBConnection && !res)
{
xcb_connection_t *connection = pXGetXCBConnection( display );
xcb_screen_t *screen = get_xcb_screen( connection, XDefaultScreen(display) );
@@ -289,7 +291,7 @@ VkBool32 WINAPI vkGetPhysicalDeviceWin32PresentationSupportKHR( VkPhysicalDevice
#endif
#if defined(HAVE_X11_XLIB_H)
- if (res == VK_ERROR_INCOMPATIBLE_DRIVER)
+ if (!res)
{
Visual *visual = XDefaultVisual( display, XDefaultScreen(display) );
VisualID visual_id = XVisualIDFromVisual( visual );
--
2.9.0