OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vulkan: Update the XML and headers to 1.3.204

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14707>
This commit is contained in:
Samuel Pitoiset
2021-11-19 16:44:15 +01:00
committed by Marge Bot
parent a429b3dd33
commit 6a3928615b
23 changed files with 3347 additions and 1638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/vulkan/vk_platform.h
View File

@@ -2,7 +2,7 @@
// File: vk_platform.h // File: vk_platform.h
// //
/* /*
** Copyright 2014-2021 The Khronos Group Inc. ** Copyright 2014-2022 The Khronos Group Inc.
** **
** SPDX-License-Identifier: Apache-2.0 ** SPDX-License-Identifier: Apache-2.0
*/ */
@@ -42,7 +42,7 @@ extern "C"
#define VKAPI_CALL __stdcall #define VKAPI_CALL __stdcall
#define VKAPI_PTR VKAPI_CALL #define VKAPI_PTR VKAPI_CALL
#elif defined(__ANDROID__) && defined(__ARM_ARCH) && __ARM_ARCH < 7 #elif defined(__ANDROID__) && defined(__ARM_ARCH) && __ARM_ARCH < 7
#error "Vulkan isn't supported for the 'armeabi' NDK ABI" #error "Vulkan is not supported for the 'armeabi' NDK ABI"
#elif defined(__ANDROID__) && defined(__ARM_ARCH) && __ARM_ARCH >= 7 && defined(__ARM_32BIT_STATE) #elif defined(__ANDROID__) && defined(__ARM_ARCH) && __ARM_ARCH >= 7 && defined(__ARM_32BIT_STATE)
// On Android 32-bit ARM targets, Vulkan functions use the "hardfloat" // On Android 32-bit ARM targets, Vulkan functions use the "hardfloat"
// calling convention, i.e. float parameters are passed in registers. This // calling convention, i.e. float parameters are passed in registers. This

2
include/vulkan/vulkan.h
View File

@@ -2,7 +2,7 @@
#define VULKAN_H_ 1 #define VULKAN_H_ 1
/* /*
** Copyright 2015-2021 The Khronos Group Inc. ** Copyright 2015-2022 The Khronos Group Inc.
** **
** SPDX-License-Identifier: Apache-2.0 ** SPDX-License-Identifier: Apache-2.0
*/ */

4
include/vulkan/vulkan_android.h
View File

@@ -2,7 +2,7 @@
#define VULKAN_ANDROID_H_ 1 #define VULKAN_ANDROID_H_ 1
/* /*
** Copyright 2015-2021 The Khronos Group Inc. ** Copyright 2015-2022 The Khronos Group Inc.
** **
** SPDX-License-Identifier: Apache-2.0 ** SPDX-License-Identifier: Apache-2.0
*/ */
@@ -95,7 +95,7 @@ typedef struct VkAndroidHardwareBufferFormatProperties2ANDROID {
void* pNext; void* pNext;
VkFormat format; VkFormat format;
uint64_t externalFormat; uint64_t externalFormat;
VkFormatFeatureFlags2KHR formatFeatures; VkFormatFeatureFlags2 formatFeatures;
VkComponentMapping samplerYcbcrConversionComponents; VkComponentMapping samplerYcbcrConversionComponents;
VkSamplerYcbcrModelConversion suggestedYcbcrModel; VkSamplerYcbcrModelConversion suggestedYcbcrModel;
VkSamplerYcbcrRange suggestedYcbcrRange; VkSamplerYcbcrRange suggestedYcbcrRange;

132
include/vulkan/vulkan_beta.h
View File

@@ -2,7 +2,7 @@
#define VULKAN_BETA_H_ 1 #define VULKAN_BETA_H_ 1
/* /*
** Copyright 2015-2021 The Khronos Group Inc. ** Copyright 2015-2022 The Khronos Group Inc.
** **
** SPDX-License-Identifier: Apache-2.0 ** SPDX-License-Identifier: Apache-2.0
*/ */
@@ -99,6 +99,12 @@ typedef enum VkVideoCodingQualityPresetFlagBitsKHR {
VK_VIDEO_CODING_QUALITY_PRESET_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF VK_VIDEO_CODING_QUALITY_PRESET_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
} VkVideoCodingQualityPresetFlagBitsKHR; } VkVideoCodingQualityPresetFlagBitsKHR;
typedef VkFlags VkVideoCodingQualityPresetFlagsKHR; typedef VkFlags VkVideoCodingQualityPresetFlagsKHR;
typedef struct VkQueueFamilyQueryResultStatusProperties2KHR {
VkStructureType sType;
void* pNext;
VkBool32 supported;
} VkQueueFamilyQueryResultStatusProperties2KHR;
typedef struct VkVideoQueueFamilyProperties2KHR { typedef struct VkVideoQueueFamilyProperties2KHR {
VkStructureType sType; VkStructureType sType;
void* pNext; void* pNext;
@@ -384,7 +390,7 @@ typedef VkFlags VkVideoEncodeFlagsKHR;
typedef enum VkVideoEncodeRateControlFlagBitsKHR { typedef enum VkVideoEncodeRateControlFlagBitsKHR {
VK_VIDEO_ENCODE_RATE_CONTROL_DEFAULT_KHR = 0, VK_VIDEO_ENCODE_RATE_CONTROL_DEFAULT_KHR = 0,
VK_VIDEO_ENCODE_RATE_CONTROL_RESET_BIT_KHR = 0x00000001, VK_VIDEO_ENCODE_RATE_CONTROL_RESERVED_0_BIT_KHR = 0x00000001,
VK_VIDEO_ENCODE_RATE_CONTROL_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF VK_VIDEO_ENCODE_RATE_CONTROL_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
} VkVideoEncodeRateControlFlagBitsKHR; } VkVideoEncodeRateControlFlagBitsKHR;
typedef VkFlags VkVideoEncodeRateControlFlagsKHR; typedef VkFlags VkVideoEncodeRateControlFlagsKHR;
@@ -409,18 +415,27 @@ typedef struct VkVideoEncodeInfoKHR {
const VkVideoReferenceSlotKHR* pSetupReferenceSlot; const VkVideoReferenceSlotKHR* pSetupReferenceSlot;
uint32_t referenceSlotCount; uint32_t referenceSlotCount;
const VkVideoReferenceSlotKHR* pReferenceSlots; const VkVideoReferenceSlotKHR* pReferenceSlots;
uint32_t precedingExternallyEncodedBytes;
} VkVideoEncodeInfoKHR; } VkVideoEncodeInfoKHR;
typedef struct VkVideoEncodeRateControlLayerInfoKHR {
VkStructureType sType;
const void* pNext;
uint32_t averageBitrate;
uint32_t maxBitrate;
uint32_t frameRateNumerator;
uint32_t frameRateDenominator;
uint32_t virtualBufferSizeInMs;
uint32_t initialVirtualBufferSizeInMs;
} VkVideoEncodeRateControlLayerInfoKHR;
typedef struct VkVideoEncodeRateControlInfoKHR { typedef struct VkVideoEncodeRateControlInfoKHR {
VkStructureType sType; VkStructureType sType;
const void* pNext; const void* pNext;
VkVideoEncodeRateControlFlagsKHR flags; VkVideoEncodeRateControlFlagsKHR flags;
VkVideoEncodeRateControlModeFlagBitsKHR rateControlMode; VkVideoEncodeRateControlModeFlagBitsKHR rateControlMode;
uint32_t averageBitrate; uint8_t layerCount;
uint16_t peakToAverageBitrateRatio; const VkVideoEncodeRateControlLayerInfoKHR* pLayerConfigs;
uint16_t frameRateNumerator;
uint16_t frameRateDenominator;
uint32_t virtualBufferSizeInMs;
} VkVideoEncodeRateControlInfoKHR; } VkVideoEncodeRateControlInfoKHR;
typedef void (VKAPI_PTR *PFN_vkCmdEncodeVideoKHR)(VkCommandBuffer commandBuffer, const VkVideoEncodeInfoKHR* pEncodeInfo); typedef void (VKAPI_PTR *PFN_vkCmdEncodeVideoKHR)(VkCommandBuffer commandBuffer, const VkVideoEncodeInfoKHR* pEncodeInfo);
@@ -435,7 +450,7 @@ VKAPI_ATTR void VKAPI_CALL vkCmdEncodeVideoKHR(
#define VK_EXT_video_encode_h264 1 #define VK_EXT_video_encode_h264 1
#include "vk_video/vulkan_video_codec_h264std.h" #include "vk_video/vulkan_video_codec_h264std.h"
#include "vk_video/vulkan_video_codec_h264std_encode.h" #include "vk_video/vulkan_video_codec_h264std_encode.h"
#define VK_EXT_VIDEO_ENCODE_H264_SPEC_VERSION 2 #define VK_EXT_VIDEO_ENCODE_H264_SPEC_VERSION 3
#define VK_EXT_VIDEO_ENCODE_H264_EXTENSION_NAME "VK_EXT_video_encode_h264" #define VK_EXT_VIDEO_ENCODE_H264_EXTENSION_NAME "VK_EXT_video_encode_h264"
typedef enum VkVideoEncodeH264CapabilityFlagBitsEXT { typedef enum VkVideoEncodeH264CapabilityFlagBitsEXT {
@@ -476,6 +491,14 @@ typedef enum VkVideoEncodeH264CreateFlagBitsEXT {
VK_VIDEO_ENCODE_H264_CREATE_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF VK_VIDEO_ENCODE_H264_CREATE_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF
} VkVideoEncodeH264CreateFlagBitsEXT; } VkVideoEncodeH264CreateFlagBitsEXT;
typedef VkFlags VkVideoEncodeH264CreateFlagsEXT; typedef VkFlags VkVideoEncodeH264CreateFlagsEXT;
typedef enum VkVideoEncodeH264RateControlStructureFlagBitsEXT {
VK_VIDEO_ENCODE_H264_RATE_CONTROL_STRUCTURE_UNKNOWN_EXT = 0,
VK_VIDEO_ENCODE_H264_RATE_CONTROL_STRUCTURE_FLAT_BIT_EXT = 0x00000001,
VK_VIDEO_ENCODE_H264_RATE_CONTROL_STRUCTURE_DYADIC_BIT_EXT = 0x00000002,
VK_VIDEO_ENCODE_H264_RATE_CONTROL_STRUCTURE_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF
} VkVideoEncodeH264RateControlStructureFlagBitsEXT;
typedef VkFlags VkVideoEncodeH264RateControlStructureFlagsEXT;
typedef struct VkVideoEncodeH264CapabilitiesEXT { typedef struct VkVideoEncodeH264CapabilitiesEXT {
VkStructureType sType; VkStructureType sType;
const void* pNext; const void* pNext;
@@ -533,9 +556,6 @@ typedef struct VkVideoEncodeH264NaluSliceEXT {
const VkVideoEncodeH264DpbSlotInfoEXT* pRefFinalList0Entries; const VkVideoEncodeH264DpbSlotInfoEXT* pRefFinalList0Entries;
uint8_t refFinalList1EntryCount; uint8_t refFinalList1EntryCount;
const VkVideoEncodeH264DpbSlotInfoEXT* pRefFinalList1Entries; const VkVideoEncodeH264DpbSlotInfoEXT* pRefFinalList1Entries;
uint32_t precedingNaluBytes;
uint8_t minQp;
uint8_t maxQp;
} VkVideoEncodeH264NaluSliceEXT; } VkVideoEncodeH264NaluSliceEXT;
typedef struct VkVideoEncodeH264VclFrameInfoEXT { typedef struct VkVideoEncodeH264VclFrameInfoEXT {
@@ -565,12 +585,48 @@ typedef struct VkVideoEncodeH264ProfileEXT {
StdVideoH264ProfileIdc stdProfileIdc; StdVideoH264ProfileIdc stdProfileIdc;
} VkVideoEncodeH264ProfileEXT; } VkVideoEncodeH264ProfileEXT;
typedef struct VkVideoEncodeH264RateControlInfoEXT {
VkStructureType sType;
const void* pNext;
uint32_t gopFrameCount;
uint32_t idrPeriod;
uint32_t consecutiveBFrameCount;
VkVideoEncodeH264RateControlStructureFlagBitsEXT rateControlStructure;
uint8_t temporalLayerCount;
} VkVideoEncodeH264RateControlInfoEXT;
typedef struct VkVideoEncodeH264QpEXT {
int32_t qpI;
int32_t qpP;
int32_t qpB;
} VkVideoEncodeH264QpEXT;
typedef struct VkVideoEncodeH264FrameSizeEXT {
uint32_t frameISize;
uint32_t framePSize;
uint32_t frameBSize;
} VkVideoEncodeH264FrameSizeEXT;
typedef struct VkVideoEncodeH264RateControlLayerInfoEXT {
VkStructureType sType;
const void* pNext;
uint8_t temporalLayerId;
VkBool32 useInitialRcQp;
VkVideoEncodeH264QpEXT initialRcQp;
VkBool32 useMinQp;
VkVideoEncodeH264QpEXT minQp;
VkBool32 useMaxQp;
VkVideoEncodeH264QpEXT maxQp;
VkBool32 useMaxFrameSize;
VkVideoEncodeH264FrameSizeEXT maxFrameSize;
} VkVideoEncodeH264RateControlLayerInfoEXT;
#define VK_EXT_video_encode_h265 1 #define VK_EXT_video_encode_h265 1
#include "vk_video/vulkan_video_codec_h265std.h" #include "vk_video/vulkan_video_codec_h265std.h"
#include "vk_video/vulkan_video_codec_h265std_encode.h" #include "vk_video/vulkan_video_codec_h265std_encode.h"
#define VK_EXT_VIDEO_ENCODE_H265_SPEC_VERSION 2 #define VK_EXT_VIDEO_ENCODE_H265_SPEC_VERSION 3
#define VK_EXT_VIDEO_ENCODE_H265_EXTENSION_NAME "VK_EXT_video_encode_h265" #define VK_EXT_VIDEO_ENCODE_H265_EXTENSION_NAME "VK_EXT_video_encode_h265"
typedef VkFlags VkVideoEncodeH265CapabilityFlagsEXT; typedef VkFlags VkVideoEncodeH265CapabilityFlagsEXT;
@@ -599,6 +655,14 @@ typedef enum VkVideoEncodeH265CtbSizeFlagBitsEXT {
VK_VIDEO_ENCODE_H265_CTB_SIZE_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF VK_VIDEO_ENCODE_H265_CTB_SIZE_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF
} VkVideoEncodeH265CtbSizeFlagBitsEXT; } VkVideoEncodeH265CtbSizeFlagBitsEXT;
typedef VkFlags VkVideoEncodeH265CtbSizeFlagsEXT; typedef VkFlags VkVideoEncodeH265CtbSizeFlagsEXT;
typedef enum VkVideoEncodeH265RateControlStructureFlagBitsEXT {
VK_VIDEO_ENCODE_H265_RATE_CONTROL_STRUCTURE_UNKNOWN_EXT = 0,
VK_VIDEO_ENCODE_H265_RATE_CONTROL_STRUCTURE_FLAT_BIT_EXT = 0x00000001,
VK_VIDEO_ENCODE_H265_RATE_CONTROL_STRUCTURE_DYADIC_BIT_EXT = 0x00000002,
VK_VIDEO_ENCODE_H265_RATE_CONTROL_STRUCTURE_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF
} VkVideoEncodeH265RateControlStructureFlagBitsEXT;
typedef VkFlags VkVideoEncodeH265RateControlStructureFlagsEXT;
typedef struct VkVideoEncodeH265CapabilitiesEXT { typedef struct VkVideoEncodeH265CapabilitiesEXT {
VkStructureType sType; VkStructureType sType;
const void* pNext; const void* pNext;
@@ -693,6 +757,42 @@ typedef struct VkVideoEncodeH265ProfileEXT {
StdVideoH265ProfileIdc stdProfileIdc; StdVideoH265ProfileIdc stdProfileIdc;
} VkVideoEncodeH265ProfileEXT; } VkVideoEncodeH265ProfileEXT;
typedef struct VkVideoEncodeH265RateControlInfoEXT {
VkStructureType sType;
const void* pNext;
uint32_t gopFrameCount;
uint32_t idrPeriod;
uint32_t consecutiveBFrameCount;
VkVideoEncodeH265RateControlStructureFlagBitsEXT rateControlStructure;
uint8_t subLayerCount;
} VkVideoEncodeH265RateControlInfoEXT;
typedef struct VkVideoEncodeH265QpEXT {
int32_t qpI;
int32_t qpP;
int32_t qpB;
} VkVideoEncodeH265QpEXT;
typedef struct VkVideoEncodeH265FrameSizeEXT {
uint32_t frameISize;
uint32_t framePSize;
uint32_t frameBSize;
} VkVideoEncodeH265FrameSizeEXT;
typedef struct VkVideoEncodeH265RateControlLayerInfoEXT {
VkStructureType sType;
const void* pNext;
uint8_t temporalId;
VkBool32 useInitialRcQp;
VkVideoEncodeH265QpEXT initialRcQp;
VkBool32 useMinQp;
VkVideoEncodeH265QpEXT minQp;
VkBool32 useMaxQp;
VkVideoEncodeH265QpEXT maxQp;
VkBool32 useMaxFrameSize;
VkVideoEncodeH265FrameSizeEXT maxFrameSize;
} VkVideoEncodeH265RateControlLayerInfoEXT;
#define VK_EXT_video_decode_h264 1 #define VK_EXT_video_decode_h264 1

2319
include/vulkan/vulkan_core.h
View File

File diff suppressed because it is too large Load Diff

2
include/vulkan/vulkan_directfb.h
View File

@@ -2,7 +2,7 @@
#define VULKAN_DIRECTFB_H_ 1 #define VULKAN_DIRECTFB_H_ 1
/* /*
** Copyright 2015-2021 The Khronos Group Inc. ** Copyright 2015-2022 The Khronos Group Inc.
** **
** SPDX-License-Identifier: Apache-2.0 ** SPDX-License-Identifier: Apache-2.0
*/ */

2
include/vulkan/vulkan_fuchsia.h
View File

@@ -2,7 +2,7 @@
#define VULKAN_FUCHSIA_H_ 1 #define VULKAN_FUCHSIA_H_ 1
/* /*
** Copyright 2015-2021 The Khronos Group Inc. ** Copyright 2015-2022 The Khronos Group Inc.
** **
** SPDX-License-Identifier: Apache-2.0 ** SPDX-License-Identifier: Apache-2.0
*/ */

2
include/vulkan/vulkan_ggp.h
View File

@@ -2,7 +2,7 @@
#define VULKAN_GGP_H_ 1 #define VULKAN_GGP_H_ 1
/* /*
** Copyright 2015-2021 The Khronos Group Inc. ** Copyright 2015-2022 The Khronos Group Inc.
** **
** SPDX-License-Identifier: Apache-2.0 ** SPDX-License-Identifier: Apache-2.0
*/ */

2
include/vulkan/vulkan_ios.h
View File

@@ -2,7 +2,7 @@
#define VULKAN_IOS_H_ 1 #define VULKAN_IOS_H_ 1
/* /*
** Copyright 2015-2021 The Khronos Group Inc. ** Copyright 2015-2022 The Khronos Group Inc.
** **
** SPDX-License-Identifier: Apache-2.0 ** SPDX-License-Identifier: Apache-2.0
*/ */

2
include/vulkan/vulkan_macos.h
View File

@@ -2,7 +2,7 @@
#define VULKAN_MACOS_H_ 1 #define VULKAN_MACOS_H_ 1
/* /*
** Copyright 2015-2021 The Khronos Group Inc. ** Copyright 2015-2022 The Khronos Group Inc.
** **
** SPDX-License-Identifier: Apache-2.0 ** SPDX-License-Identifier: Apache-2.0
*/ */

2
include/vulkan/vulkan_metal.h
View File

@@ -2,7 +2,7 @@
#define VULKAN_METAL_H_ 1 #define VULKAN_METAL_H_ 1
/* /*
** Copyright 2015-2021 The Khronos Group Inc. ** Copyright 2015-2022 The Khronos Group Inc.
** **
** SPDX-License-Identifier: Apache-2.0 ** SPDX-License-Identifier: Apache-2.0
*/ */

2
include/vulkan/vulkan_screen.h
View File

@@ -2,7 +2,7 @@
#define VULKAN_SCREEN_H_ 1 #define VULKAN_SCREEN_H_ 1
/* /*
** Copyright 2015-2021 The Khronos Group Inc. ** Copyright 2015-2022 The Khronos Group Inc.
** **
** SPDX-License-Identifier: Apache-2.0 ** SPDX-License-Identifier: Apache-2.0
*/ */

2
include/vulkan/vulkan_vi.h
View File

@@ -2,7 +2,7 @@
#define VULKAN_VI_H_ 1 #define VULKAN_VI_H_ 1
/* /*
** Copyright 2015-2021 The Khronos Group Inc. ** Copyright 2015-2022 The Khronos Group Inc.
** **
** SPDX-License-Identifier: Apache-2.0 ** SPDX-License-Identifier: Apache-2.0
*/ */

2
include/vulkan/vulkan_wayland.h
View File

@@ -2,7 +2,7 @@
#define VULKAN_WAYLAND_H_ 1 #define VULKAN_WAYLAND_H_ 1
/* /*
** Copyright 2015-2021 The Khronos Group Inc. ** Copyright 2015-2022 The Khronos Group Inc.
** **
** SPDX-License-Identifier: Apache-2.0 ** SPDX-License-Identifier: Apache-2.0
*/ */

2
include/vulkan/vulkan_win32.h
View File

@@ -2,7 +2,7 @@
#define VULKAN_WIN32_H_ 1 #define VULKAN_WIN32_H_ 1
/* /*
** Copyright 2015-2021 The Khronos Group Inc. ** Copyright 2015-2022 The Khronos Group Inc.
** **
** SPDX-License-Identifier: Apache-2.0 ** SPDX-License-Identifier: Apache-2.0
*/ */

2
include/vulkan/vulkan_xcb.h
View File

@@ -2,7 +2,7 @@
#define VULKAN_XCB_H_ 1 #define VULKAN_XCB_H_ 1
/* /*
** Copyright 2015-2021 The Khronos Group Inc. ** Copyright 2015-2022 The Khronos Group Inc.
** **
** SPDX-License-Identifier: Apache-2.0 ** SPDX-License-Identifier: Apache-2.0
*/ */

2
include/vulkan/vulkan_xlib.h
View File

@@ -2,7 +2,7 @@
#define VULKAN_XLIB_H_ 1 #define VULKAN_XLIB_H_ 1
/* /*
** Copyright 2015-2021 The Khronos Group Inc. ** Copyright 2015-2022 The Khronos Group Inc.
** **
** SPDX-License-Identifier: Apache-2.0 ** SPDX-License-Identifier: Apache-2.0
*/ */

2
include/vulkan/vulkan_xlib_xrandr.h
View File

@@ -2,7 +2,7 @@
#define VULKAN_XLIB_XRANDR_H_ 1 #define VULKAN_XLIB_XRANDR_H_ 1
/* /*
** Copyright 2015-2021 The Khronos Group Inc. ** Copyright 2015-2022 The Khronos Group Inc.
** **
** SPDX-License-Identifier: Apache-2.0 ** SPDX-License-Identifier: Apache-2.0
*/ */

12
src/gallium/frontends/lavapipe/lvp_cmd_buffer.c
View File

@@ -551,7 +551,7 @@ VKAPI_ATTR void VKAPI_CALL lvp_CmdBindDescriptorSets(
} }
VKAPI_ATTR void VKAPI_CALL lvp_CmdBeginRenderingKHR(VkCommandBuffer commandBuffer, VKAPI_ATTR void VKAPI_CALL lvp_CmdBeginRendering(VkCommandBuffer commandBuffer,
const VkRenderingInfoKHR* pRenderingInfo const VkRenderingInfoKHR* pRenderingInfo
) )
{ {
@@ -563,13 +563,13 @@ VKAPI_ATTR void VKAPI_CALL lvp_CmdBeginRenderingKHR(VkCommandBuffer
if (!cmd) if (!cmd)
return; return;
cmd->type = VK_CMD_BEGIN_RENDERING_KHR; cmd->type = VK_CMD_BEGIN_RENDERING;
list_addtail(&cmd->cmd_link, &queue->cmds); list_addtail(&cmd->cmd_link, &queue->cmds);
if (pRenderingInfo) { if (pRenderingInfo) {
cmd->u.begin_rendering_khr.rendering_info = vk_zalloc(queue->alloc, sizeof(VkRenderingInfoKHR), 8, VK_SYSTEM_ALLOCATION_SCOPE_COMMAND); cmd->u.begin_rendering.rendering_info = vk_zalloc(queue->alloc, sizeof(VkRenderingInfoKHR), 8, VK_SYSTEM_ALLOCATION_SCOPE_COMMAND);
memcpy((void*)cmd->u.begin_rendering_khr.rendering_info, pRenderingInfo, sizeof(VkRenderingInfoKHR)); memcpy((void*)cmd->u.begin_rendering.rendering_info, pRenderingInfo, sizeof(VkRenderingInfoKHR));
VkRenderingInfoKHR *tmp_dst1 = (void *) cmd->u.begin_rendering_khr.rendering_info; (void) tmp_dst1; VkRenderingInfoKHR *tmp_dst1 = (void *) cmd->u.begin_rendering.rendering_info; (void) tmp_dst1;
VkRenderingInfoKHR *tmp_src1 = (void *) pRenderingInfo; (void) tmp_src1; VkRenderingInfoKHR *tmp_src1 = (void *) pRenderingInfo; (void) tmp_src1;
const VkBaseInStructure *pnext = tmp_dst1->pNext; const VkBaseInStructure *pnext = tmp_dst1->pNext;
@@ -635,6 +635,6 @@ VKAPI_ATTR void VKAPI_CALL lvp_CmdBeginRenderingKHR(VkCommandBuffer
memcpy((void*)tmp_dst1->pStencilAttachment, tmp_src1->pStencilAttachment, sizeof(VkRenderingAttachmentInfoKHR)); memcpy((void*)tmp_dst1->pStencilAttachment, tmp_src1->pStencilAttachment, sizeof(VkRenderingAttachmentInfoKHR));
} }
} else { } else {
cmd->u.begin_rendering_khr.rendering_info = NULL; cmd->u.begin_rendering.rendering_info = NULL;
} }
} }

134
src/gallium/frontends/lavapipe/lvp_execute.c
View File

@@ -880,7 +880,7 @@ static void handle_vertex_buffers(struct vk_cmd_queue_entry *cmd,
static void handle_vertex_buffers2(struct vk_cmd_queue_entry *cmd, static void handle_vertex_buffers2(struct vk_cmd_queue_entry *cmd,
struct rendering_state *state) struct rendering_state *state)
{ {
struct vk_cmd_bind_vertex_buffers2_ext *vcb = &cmd->u.bind_vertex_buffers2_ext; struct vk_cmd_bind_vertex_buffers2 *vcb = &cmd->u.bind_vertex_buffers2;
vertex_buffers(vcb->first_binding, vertex_buffers(vcb->first_binding,
vcb->binding_count, vcb->binding_count,
@@ -1825,7 +1825,7 @@ get_load_op(VkAttachmentLoadOp op, bool resuming)
static void handle_begin_rendering(struct vk_cmd_queue_entry *cmd, static void handle_begin_rendering(struct vk_cmd_queue_entry *cmd,
struct rendering_state *state) struct rendering_state *state)
{ {
const VkRenderingInfoKHR *info = cmd->u.begin_rendering_khr.rendering_info; const VkRenderingInfo *info = cmd->u.begin_rendering.rendering_info;
bool resuming = (info->flags & VK_RENDERING_RESUMING_BIT_KHR) == VK_RENDERING_RESUMING_BIT_KHR; bool resuming = (info->flags & VK_RENDERING_RESUMING_BIT_KHR) == VK_RENDERING_RESUMING_BIT_KHR;
bool suspending = (info->flags & VK_RENDERING_SUSPENDING_BIT_KHR) == VK_RENDERING_SUSPENDING_BIT_KHR; bool suspending = (info->flags & VK_RENDERING_SUSPENDING_BIT_KHR) == VK_RENDERING_SUSPENDING_BIT_KHR;
assert(!state->pass); assert(!state->pass);
@@ -2094,8 +2094,8 @@ static void handle_set_viewport_with_count(struct vk_cmd_queue_entry *cmd,
struct rendering_state *state) struct rendering_state *state)
{ {
set_viewport(UINT32_MAX, set_viewport(UINT32_MAX,
cmd->u.set_viewport_with_count_ext.viewport_count, cmd->u.set_viewport_with_count.viewport_count,
cmd->u.set_viewport_with_count_ext.viewports, cmd->u.set_viewport_with_count.viewports,
state); state);
} }
@@ -2135,8 +2135,8 @@ static void handle_set_scissor_with_count(struct vk_cmd_queue_entry *cmd,
struct rendering_state *state) struct rendering_state *state)
{ {
set_scissor(UINT32_MAX, set_scissor(UINT32_MAX,
cmd->u.set_scissor_with_count_ext.scissor_count, cmd->u.set_scissor_with_count.scissor_count,
cmd->u.set_scissor_with_count_ext.scissors, cmd->u.set_scissor_with_count.scissors,
state); state);
} }
@@ -2312,11 +2312,11 @@ copy_depth_box(ubyte *dst,
} }
} }
static void handle_copy_image_to_buffer2_khr(struct vk_cmd_queue_entry *cmd, static void handle_copy_image_to_buffer2(struct vk_cmd_queue_entry *cmd,
struct rendering_state *state) struct rendering_state *state)
{ {
int i; int i;
struct VkCopyImageToBufferInfo2KHR *copycmd = cmd->u.copy_image_to_buffer2_khr.copy_image_to_buffer_info; struct VkCopyImageToBufferInfo2 *copycmd = cmd->u.copy_image_to_buffer2.copy_image_to_buffer_info;
LVP_FROM_HANDLE(lvp_image, src_image, copycmd->srcImage); LVP_FROM_HANDLE(lvp_image, src_image, copycmd->srcImage);
struct pipe_box box, dbox; struct pipe_box box, dbox;
struct pipe_transfer *src_t, *dst_t; struct pipe_transfer *src_t, *dst_t;
@@ -2397,7 +2397,7 @@ static void handle_copy_buffer_to_image(struct vk_cmd_queue_entry *cmd,
struct rendering_state *state) struct rendering_state *state)
{ {
int i; int i;
struct VkCopyBufferToImageInfo2KHR *copycmd = cmd->u.copy_buffer_to_image2_khr.copy_buffer_to_image_info; struct VkCopyBufferToImageInfo2 *copycmd = cmd->u.copy_buffer_to_image2.copy_buffer_to_image_info;
LVP_FROM_HANDLE(lvp_image, dst_image, copycmd->dstImage); LVP_FROM_HANDLE(lvp_image, dst_image, copycmd->dstImage);
struct pipe_box box, sbox; struct pipe_box box, sbox;
struct pipe_transfer *src_t, *dst_t; struct pipe_transfer *src_t, *dst_t;
@@ -2481,7 +2481,7 @@ static void handle_copy_image(struct vk_cmd_queue_entry *cmd,
struct rendering_state *state) struct rendering_state *state)
{ {
int i; int i;
struct VkCopyImageInfo2KHR *copycmd = cmd->u.copy_image2_khr.copy_image_info; struct VkCopyImageInfo2 *copycmd = cmd->u.copy_image2.copy_image_info;
LVP_FROM_HANDLE(lvp_image, src_image, copycmd->srcImage); LVP_FROM_HANDLE(lvp_image, src_image, copycmd->srcImage);
LVP_FROM_HANDLE(lvp_image, dst_image, copycmd->dstImage); LVP_FROM_HANDLE(lvp_image, dst_image, copycmd->dstImage);
@@ -2519,7 +2519,7 @@ static void handle_copy_buffer(struct vk_cmd_queue_entry *cmd,
struct rendering_state *state) struct rendering_state *state)
{ {
int i; int i;
struct VkCopyBufferInfo2KHR *copycmd = cmd->u.copy_buffer2_khr.copy_buffer_info; VkCopyBufferInfo2 *copycmd = cmd->u.copy_buffer2.copy_buffer_info;
for (i = 0; i < copycmd->regionCount; i++) { for (i = 0; i < copycmd->regionCount; i++) {
struct pipe_box box = { 0 }; struct pipe_box box = { 0 };
@@ -2534,7 +2534,7 @@ static void handle_blit_image(struct vk_cmd_queue_entry *cmd,
struct rendering_state *state) struct rendering_state *state)
{ {
int i; int i;
struct VkBlitImageInfo2KHR *blitcmd = cmd->u.blit_image2_khr.blit_image_info; VkBlitImageInfo2 *blitcmd = cmd->u.blit_image2.blit_image_info;
LVP_FROM_HANDLE(lvp_image, src_image, blitcmd->srcImage); LVP_FROM_HANDLE(lvp_image, src_image, blitcmd->srcImage);
LVP_FROM_HANDLE(lvp_image, dst_image, blitcmd->dstImage); LVP_FROM_HANDLE(lvp_image, dst_image, blitcmd->dstImage);
struct pipe_blit_info info; struct pipe_blit_info info;
@@ -3205,7 +3205,7 @@ static void handle_resolve_image(struct vk_cmd_queue_entry *cmd,
struct rendering_state *state) struct rendering_state *state)
{ {
int i; int i;
struct VkResolveImageInfo2KHR *resolvecmd = cmd->u.resolve_image2_khr.resolve_image_info; VkResolveImageInfo2 *resolvecmd = cmd->u.resolve_image2.resolve_image_info;
LVP_FROM_HANDLE(lvp_image, src_image, resolvecmd->srcImage); LVP_FROM_HANDLE(lvp_image, src_image, resolvecmd->srcImage);
LVP_FROM_HANDLE(lvp_image, dst_image, resolvecmd->dstImage); LVP_FROM_HANDLE(lvp_image, dst_image, resolvecmd->dstImage);
struct pipe_blit_info info; struct pipe_blit_info info;
@@ -3696,21 +3696,21 @@ static void handle_set_vertex_input(struct vk_cmd_queue_entry *cmd,
static void handle_set_cull_mode(struct vk_cmd_queue_entry *cmd, static void handle_set_cull_mode(struct vk_cmd_queue_entry *cmd,
struct rendering_state *state) struct rendering_state *state)
{ {
state->rs_state.cull_face = vk_cull_to_pipe(cmd->u.set_cull_mode_ext.cull_mode); state->rs_state.cull_face = vk_cull_to_pipe(cmd->u.set_cull_mode.cull_mode);
state->rs_dirty = true; state->rs_dirty = true;
} }
static void handle_set_front_face(struct vk_cmd_queue_entry *cmd, static void handle_set_front_face(struct vk_cmd_queue_entry *cmd,
struct rendering_state *state) struct rendering_state *state)
{ {
state->rs_state.front_ccw = (cmd->u.set_front_face_ext.front_face == VK_FRONT_FACE_COUNTER_CLOCKWISE); state->rs_state.front_ccw = (cmd->u.set_front_face.front_face == VK_FRONT_FACE_COUNTER_CLOCKWISE);
state->rs_dirty = true; state->rs_dirty = true;
} }
static void handle_set_primitive_topology(struct vk_cmd_queue_entry *cmd, static void handle_set_primitive_topology(struct vk_cmd_queue_entry *cmd,
struct rendering_state *state) struct rendering_state *state)
{ {
state->info.mode = vk_conv_topology(cmd->u.set_primitive_topology_ext.primitive_topology); state->info.mode = vk_conv_topology(cmd->u.set_primitive_topology.primitive_topology);
state->rs_dirty = true; state->rs_dirty = true;
} }
@@ -3718,55 +3718,55 @@ static void handle_set_primitive_topology(struct vk_cmd_queue_entry *cmd,
static void handle_set_depth_test_enable(struct vk_cmd_queue_entry *cmd, static void handle_set_depth_test_enable(struct vk_cmd_queue_entry *cmd,
struct rendering_state *state) struct rendering_state *state)
{ {
state->dsa_dirty |= state->dsa_state.depth_enabled != cmd->u.set_depth_test_enable_ext.depth_test_enable; state->dsa_dirty |= state->dsa_state.depth_enabled != cmd->u.set_depth_test_enable.depth_test_enable;
state->dsa_state.depth_enabled = cmd->u.set_depth_test_enable_ext.depth_test_enable; state->dsa_state.depth_enabled = cmd->u.set_depth_test_enable.depth_test_enable;
} }
static void handle_set_depth_write_enable(struct vk_cmd_queue_entry *cmd, static void handle_set_depth_write_enable(struct vk_cmd_queue_entry *cmd,
struct rendering_state *state) struct rendering_state *state)
{ {
state->dsa_dirty |= state->dsa_state.depth_writemask != cmd->u.set_depth_write_enable_ext.depth_write_enable; state->dsa_dirty |= state->dsa_state.depth_writemask != cmd->u.set_depth_write_enable.depth_write_enable;
state->dsa_state.depth_writemask = cmd->u.set_depth_write_enable_ext.depth_write_enable; state->dsa_state.depth_writemask = cmd->u.set_depth_write_enable.depth_write_enable;
} }
static void handle_set_depth_compare_op(struct vk_cmd_queue_entry *cmd, static void handle_set_depth_compare_op(struct vk_cmd_queue_entry *cmd,
struct rendering_state *state) struct rendering_state *state)
{ {
state->dsa_dirty |= state->dsa_state.depth_func != cmd->u.set_depth_compare_op_ext.depth_compare_op; state->dsa_dirty |= state->dsa_state.depth_func != cmd->u.set_depth_compare_op.depth_compare_op;
state->dsa_state.depth_func = cmd->u.set_depth_compare_op_ext.depth_compare_op; state->dsa_state.depth_func = cmd->u.set_depth_compare_op.depth_compare_op;
} }
static void handle_set_depth_bounds_test_enable(struct vk_cmd_queue_entry *cmd, static void handle_set_depth_bounds_test_enable(struct vk_cmd_queue_entry *cmd,
struct rendering_state *state) struct rendering_state *state)
{ {
state->dsa_dirty |= state->dsa_state.depth_bounds_test != cmd->u.set_depth_bounds_test_enable_ext.depth_bounds_test_enable; state->dsa_dirty |= state->dsa_state.depth_bounds_test != cmd->u.set_depth_bounds_test_enable.depth_bounds_test_enable;
state->dsa_state.depth_bounds_test = cmd->u.set_depth_bounds_test_enable_ext.depth_bounds_test_enable; state->dsa_state.depth_bounds_test = cmd->u.set_depth_bounds_test_enable.depth_bounds_test_enable;
} }
static void handle_set_stencil_test_enable(struct vk_cmd_queue_entry *cmd, static void handle_set_stencil_test_enable(struct vk_cmd_queue_entry *cmd,
struct rendering_state *state) struct rendering_state *state)
{ {
state->dsa_dirty |= state->dsa_state.stencil[0].enabled != cmd->u.set_stencil_test_enable_ext.stencil_test_enable || state->dsa_dirty |= state->dsa_state.stencil[0].enabled != cmd->u.set_stencil_test_enable.stencil_test_enable ||
state->dsa_state.stencil[1].enabled != cmd->u.set_stencil_test_enable_ext.stencil_test_enable; state->dsa_state.stencil[1].enabled != cmd->u.set_stencil_test_enable.stencil_test_enable;
state->dsa_state.stencil[0].enabled = cmd->u.set_stencil_test_enable_ext.stencil_test_enable; state->dsa_state.stencil[0].enabled = cmd->u.set_stencil_test_enable.stencil_test_enable;
state->dsa_state.stencil[1].enabled = cmd->u.set_stencil_test_enable_ext.stencil_test_enable; state->dsa_state.stencil[1].enabled = cmd->u.set_stencil_test_enable.stencil_test_enable;
} }
static void handle_set_stencil_op(struct vk_cmd_queue_entry *cmd, static void handle_set_stencil_op(struct vk_cmd_queue_entry *cmd,
struct rendering_state *state) struct rendering_state *state)
{ {
if (cmd->u.set_stencil_op_ext.face_mask & VK_STENCIL_FACE_FRONT_BIT) { if (cmd->u.set_stencil_op.face_mask & VK_STENCIL_FACE_FRONT_BIT) {
state->dsa_state.stencil[0].func = cmd->u.set_stencil_op_ext.compare_op; state->dsa_state.stencil[0].func = cmd->u.set_stencil_op.compare_op;
state->dsa_state.stencil[0].fail_op = vk_conv_stencil_op(cmd->u.set_stencil_op_ext.fail_op); state->dsa_state.stencil[0].fail_op = vk_conv_stencil_op(cmd->u.set_stencil_op.fail_op);
state->dsa_state.stencil[0].zpass_op = vk_conv_stencil_op(cmd->u.set_stencil_op_ext.pass_op); state->dsa_state.stencil[0].zpass_op = vk_conv_stencil_op(cmd->u.set_stencil_op.pass_op);
state->dsa_state.stencil[0].zfail_op = vk_conv_stencil_op(cmd->u.set_stencil_op_ext.depth_fail_op); state->dsa_state.stencil[0].zfail_op = vk_conv_stencil_op(cmd->u.set_stencil_op.depth_fail_op);
} }
if (cmd->u.set_stencil_op_ext.face_mask & VK_STENCIL_FACE_BACK_BIT) { if (cmd->u.set_stencil_op.face_mask & VK_STENCIL_FACE_BACK_BIT) {
state->dsa_state.stencil[1].func = cmd->u.set_stencil_op_ext.compare_op; state->dsa_state.stencil[1].func = cmd->u.set_stencil_op.compare_op;
state->dsa_state.stencil[1].fail_op = vk_conv_stencil_op(cmd->u.set_stencil_op_ext.fail_op); state->dsa_state.stencil[1].fail_op = vk_conv_stencil_op(cmd->u.set_stencil_op.fail_op);
state->dsa_state.stencil[1].zpass_op = vk_conv_stencil_op(cmd->u.set_stencil_op_ext.pass_op); state->dsa_state.stencil[1].zpass_op = vk_conv_stencil_op(cmd->u.set_stencil_op.pass_op);
state->dsa_state.stencil[1].zfail_op = vk_conv_stencil_op(cmd->u.set_stencil_op_ext.depth_fail_op); state->dsa_state.stencil[1].zfail_op = vk_conv_stencil_op(cmd->u.set_stencil_op.depth_fail_op);
} }
state->dsa_dirty = true; state->dsa_dirty = true;
} }
@@ -3782,8 +3782,8 @@ static void handle_set_line_stipple(struct vk_cmd_queue_entry *cmd,
static void handle_set_depth_bias_enable(struct vk_cmd_queue_entry *cmd, static void handle_set_depth_bias_enable(struct vk_cmd_queue_entry *cmd,
struct rendering_state *state) struct rendering_state *state)
{ {
state->rs_dirty |= state->depth_bias.enabled != cmd->u.set_depth_bias_enable_ext.depth_bias_enable; state->rs_dirty |= state->depth_bias.enabled != cmd->u.set_depth_bias_enable.depth_bias_enable;
state->depth_bias.enabled = cmd->u.set_depth_bias_enable_ext.depth_bias_enable; state->depth_bias.enabled = cmd->u.set_depth_bias_enable.depth_bias_enable;
} }
static void handle_set_logic_op(struct vk_cmd_queue_entry *cmd, static void handle_set_logic_op(struct vk_cmd_queue_entry *cmd,
@@ -3803,14 +3803,14 @@ static void handle_set_patch_control_points(struct vk_cmd_queue_entry *cmd,
static void handle_set_primitive_restart_enable(struct vk_cmd_queue_entry *cmd, static void handle_set_primitive_restart_enable(struct vk_cmd_queue_entry *cmd,
struct rendering_state *state) struct rendering_state *state)
{ {
state->info.primitive_restart = cmd->u.set_primitive_restart_enable_ext.primitive_restart_enable; state->info.primitive_restart = cmd->u.set_primitive_restart_enable.primitive_restart_enable;
} }
static void handle_set_rasterizer_discard_enable(struct vk_cmd_queue_entry *cmd, static void handle_set_rasterizer_discard_enable(struct vk_cmd_queue_entry *cmd,
struct rendering_state *state) struct rendering_state *state)
{ {
state->rs_dirty |= state->rs_state.rasterizer_discard != cmd->u.set_rasterizer_discard_enable_ext.rasterizer_discard_enable; state->rs_dirty |= state->rs_state.rasterizer_discard != cmd->u.set_rasterizer_discard_enable.rasterizer_discard_enable;
state->rs_state.rasterizer_discard = cmd->u.set_rasterizer_discard_enable_ext.rasterizer_discard_enable; state->rs_state.rasterizer_discard = cmd->u.set_rasterizer_discard_enable.rasterizer_discard_enable;
} }
static void handle_set_color_write_enable(struct vk_cmd_queue_entry *cmd, static void handle_set_color_write_enable(struct vk_cmd_queue_entry *cmd,
@@ -3845,13 +3845,13 @@ static void lvp_execute_cmd_buffer(struct lvp_cmd_buffer *cmd_buffer,
case VK_CMD_SET_VIEWPORT: case VK_CMD_SET_VIEWPORT:
handle_set_viewport(cmd, state); handle_set_viewport(cmd, state);
break; break;
case VK_CMD_SET_VIEWPORT_WITH_COUNT_EXT: case VK_CMD_SET_VIEWPORT_WITH_COUNT:
handle_set_viewport_with_count(cmd, state); handle_set_viewport_with_count(cmd, state);
break; break;
case VK_CMD_SET_SCISSOR: case VK_CMD_SET_SCISSOR:
handle_set_scissor(cmd, state); handle_set_scissor(cmd, state);
break; break;
case VK_CMD_SET_SCISSOR_WITH_COUNT_EXT: case VK_CMD_SET_SCISSOR_WITH_COUNT:
handle_set_scissor_with_count(cmd, state); handle_set_scissor_with_count(cmd, state);
break; break;
case VK_CMD_SET_LINE_WIDTH: case VK_CMD_SET_LINE_WIDTH:
@@ -3884,7 +3884,7 @@ static void lvp_execute_cmd_buffer(struct lvp_cmd_buffer *cmd_buffer,
case VK_CMD_BIND_VERTEX_BUFFERS: case VK_CMD_BIND_VERTEX_BUFFERS:
handle_vertex_buffers(cmd, state); handle_vertex_buffers(cmd, state);
break; break;
case VK_CMD_BIND_VERTEX_BUFFERS2_EXT: case VK_CMD_BIND_VERTEX_BUFFERS2:
handle_vertex_buffers2(cmd, state); handle_vertex_buffers2(cmd, state);
break; break;
case VK_CMD_DRAW: case VK_CMD_DRAW:
@@ -3923,20 +3923,20 @@ static void lvp_execute_cmd_buffer(struct lvp_cmd_buffer *cmd_buffer,
emit_compute_state(state); emit_compute_state(state);
handle_dispatch_indirect(cmd, state); handle_dispatch_indirect(cmd, state);
break; break;
case VK_CMD_COPY_BUFFER2_KHR: case VK_CMD_COPY_BUFFER2:
handle_copy_buffer(cmd, state); handle_copy_buffer(cmd, state);
break; break;
case VK_CMD_COPY_IMAGE2_KHR: case VK_CMD_COPY_IMAGE2:
handle_copy_image(cmd, state); handle_copy_image(cmd, state);
break; break;
case VK_CMD_BLIT_IMAGE2_KHR: case VK_CMD_BLIT_IMAGE2:
handle_blit_image(cmd, state); handle_blit_image(cmd, state);
break; break;
case VK_CMD_COPY_BUFFER_TO_IMAGE2_KHR: case VK_CMD_COPY_BUFFER_TO_IMAGE2:
handle_copy_buffer_to_image(cmd, state); handle_copy_buffer_to_image(cmd, state);
break; break;
case VK_CMD_COPY_IMAGE_TO_BUFFER2_KHR: case VK_CMD_COPY_IMAGE_TO_BUFFER2:
handle_copy_image_to_buffer2_khr(cmd, state); handle_copy_image_to_buffer2(cmd, state);
break; break;
case VK_CMD_UPDATE_BUFFER: case VK_CMD_UPDATE_BUFFER:
handle_update_buffer(cmd, state); handle_update_buffer(cmd, state);
@@ -3953,7 +3953,7 @@ static void lvp_execute_cmd_buffer(struct lvp_cmd_buffer *cmd_buffer,
case VK_CMD_CLEAR_ATTACHMENTS: case VK_CMD_CLEAR_ATTACHMENTS:
handle_clear_attachments(cmd, state); handle_clear_attachments(cmd, state);
break; break;
case VK_CMD_RESOLVE_IMAGE2_KHR: case VK_CMD_RESOLVE_IMAGE2:
handle_resolve_image(cmd, state); handle_resolve_image(cmd, state);
break; break;
case VK_CMD_SET_EVENT: case VK_CMD_SET_EVENT:
@@ -4051,37 +4051,37 @@ static void lvp_execute_cmd_buffer(struct lvp_cmd_buffer *cmd_buffer,
case VK_CMD_SET_VERTEX_INPUT_EXT: case VK_CMD_SET_VERTEX_INPUT_EXT:
handle_set_vertex_input(cmd, state); handle_set_vertex_input(cmd, state);
break; break;
case VK_CMD_SET_CULL_MODE_EXT: case VK_CMD_SET_CULL_MODE:
handle_set_cull_mode(cmd, state); handle_set_cull_mode(cmd, state);
break; break;
case VK_CMD_SET_FRONT_FACE_EXT: case VK_CMD_SET_FRONT_FACE:
handle_set_front_face(cmd, state); handle_set_front_face(cmd, state);
break; break;
case VK_CMD_SET_PRIMITIVE_TOPOLOGY_EXT: case VK_CMD_SET_PRIMITIVE_TOPOLOGY:
handle_set_primitive_topology(cmd, state); handle_set_primitive_topology(cmd, state);
break; break;
case VK_CMD_SET_DEPTH_TEST_ENABLE_EXT: case VK_CMD_SET_DEPTH_TEST_ENABLE:
handle_set_depth_test_enable(cmd, state); handle_set_depth_test_enable(cmd, state);
break; break;
case VK_CMD_SET_DEPTH_WRITE_ENABLE_EXT: case VK_CMD_SET_DEPTH_WRITE_ENABLE:
handle_set_depth_write_enable(cmd, state); handle_set_depth_write_enable(cmd, state);
break; break;
case VK_CMD_SET_DEPTH_COMPARE_OP_EXT: case VK_CMD_SET_DEPTH_COMPARE_OP:
handle_set_depth_compare_op(cmd, state); handle_set_depth_compare_op(cmd, state);
break; break;
case VK_CMD_SET_DEPTH_BOUNDS_TEST_ENABLE_EXT: case VK_CMD_SET_DEPTH_BOUNDS_TEST_ENABLE:
handle_set_depth_bounds_test_enable(cmd, state); handle_set_depth_bounds_test_enable(cmd, state);
break; break;
case VK_CMD_SET_STENCIL_TEST_ENABLE_EXT: case VK_CMD_SET_STENCIL_TEST_ENABLE:
handle_set_stencil_test_enable(cmd, state); handle_set_stencil_test_enable(cmd, state);
break; break;
case VK_CMD_SET_STENCIL_OP_EXT: case VK_CMD_SET_STENCIL_OP:
handle_set_stencil_op(cmd, state); handle_set_stencil_op(cmd, state);
break; break;
case VK_CMD_SET_LINE_STIPPLE_EXT: case VK_CMD_SET_LINE_STIPPLE_EXT:
handle_set_line_stipple(cmd, state); handle_set_line_stipple(cmd, state);
break; break;
case VK_CMD_SET_DEPTH_BIAS_ENABLE_EXT: case VK_CMD_SET_DEPTH_BIAS_ENABLE:
handle_set_depth_bias_enable(cmd, state); handle_set_depth_bias_enable(cmd, state);
break; break;
case VK_CMD_SET_LOGIC_OP_EXT: case VK_CMD_SET_LOGIC_OP_EXT:
@@ -4090,19 +4090,19 @@ static void lvp_execute_cmd_buffer(struct lvp_cmd_buffer *cmd_buffer,
case VK_CMD_SET_PATCH_CONTROL_POINTS_EXT: case VK_CMD_SET_PATCH_CONTROL_POINTS_EXT:
handle_set_patch_control_points(cmd, state); handle_set_patch_control_points(cmd, state);
break; break;
case VK_CMD_SET_PRIMITIVE_RESTART_ENABLE_EXT: case VK_CMD_SET_PRIMITIVE_RESTART_ENABLE:
handle_set_primitive_restart_enable(cmd, state); handle_set_primitive_restart_enable(cmd, state);
break; break;
case VK_CMD_SET_RASTERIZER_DISCARD_ENABLE_EXT: case VK_CMD_SET_RASTERIZER_DISCARD_ENABLE:
handle_set_rasterizer_discard_enable(cmd, state); handle_set_rasterizer_discard_enable(cmd, state);
break; break;
case VK_CMD_SET_COLOR_WRITE_ENABLE_EXT: case VK_CMD_SET_COLOR_WRITE_ENABLE_EXT:
handle_set_color_write_enable(cmd, state); handle_set_color_write_enable(cmd, state);
break; break;
case VK_CMD_BEGIN_RENDERING_KHR: case VK_CMD_BEGIN_RENDERING:
handle_begin_rendering(cmd, state); handle_begin_rendering(cmd, state);
break; break;
case VK_CMD_END_RENDERING_KHR: case VK_CMD_END_RENDERING:
handle_end_rendering(cmd, state); handle_end_rendering(cmd, state);
break; break;
case VK_CMD_SET_DEVICE_MASK: case VK_CMD_SET_DEVICE_MASK:

2349
src/vulkan/registry/vk.xml
View File

File diff suppressed because it is too large Load Diff

2
src/vulkan/util/vk_cmd_queue_gen.py
View File

@@ -40,6 +40,8 @@ MANUAL_COMMANDS = ['CmdPushDescriptorSetKHR', # This script doesn't
'CmdDrawMultiEXT', # The size of the elements is specified in a stride param 'CmdDrawMultiEXT', # The size of the elements is specified in a stride param
'CmdDrawMultiIndexedEXT', # The size of the elements is specified in a stride param 'CmdDrawMultiIndexedEXT', # The size of the elements is specified in a stride param
'CmdBindDescriptorSets', # The VkPipelineLayout object could be released before the command is executed 'CmdBindDescriptorSets', # The VkPipelineLayout object could be released before the command is executed
'CmdBeginRendering', # The VkPipelineLayout object could be released before the command is executed
'CmdBeginRenderingKHR', # The VkPipelineLayout object could be released before the command is executed
] ]
TEMPLATE_H = Template(COPYRIGHT + """\ TEMPLATE_H = Template(COPYRIGHT + """\

1
src/vulkan/util/vk_commands_gen.py
View File

@@ -47,6 +47,7 @@ MANUAL_COMMANDS = ['CmdPushDescriptorSetKHR', # This script doesn't
'CmdCopyImageToBuffer', 'CmdCopyImageToBuffer',
'CmdBlitImage', 'CmdBlitImage',
'CmdResolveImage', 'CmdResolveImage',
'CmdBeginRendering',
'CmdBeginRenderingKHR', 'CmdBeginRenderingKHR',
] ]