diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-10-03 06:21:03 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-10-03 06:21:03 +0000 |
| commit | 1a9e25147324dbd79de1419bff88ff428396993c (patch) | |
| tree | f297ac22eb5c6a82449302c7b937fb240c5a6701 /Graphics/GraphicsEngineVulkan | |
| parent | Enabled detection of 16-bit float shader support in GL/GLES (diff) | |
| download | DiligentCore-1a9e25147324dbd79de1419bff88ff428396993c.tar.gz DiligentCore-1a9e25147324dbd79de1419bff88ff428396993c.zip | |
Added Vulkan-Headers submodule
Diffstat (limited to 'Graphics/GraphicsEngineVulkan')
4 files changed, 10 insertions, 6 deletions
diff --git a/Graphics/GraphicsEngineVulkan/CMakeLists.txt b/Graphics/GraphicsEngineVulkan/CMakeLists.txt index 897894e7..323b4ccf 100644 --- a/Graphics/GraphicsEngineVulkan/CMakeLists.txt +++ b/Graphics/GraphicsEngineVulkan/CMakeLists.txt @@ -171,6 +171,7 @@ target_include_directories(Diligent-GraphicsEngineVk-static PRIVATE include ../../ThirdParty + ../../ThirdParty/Vulkan-Headers/include ) set(PRIVATE_DEPENDENCIES diff --git a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanHeaders.h b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanHeaders.h index 84b4408c..ee6461fd 100644 --- a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanHeaders.h +++ b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanHeaders.h @@ -31,6 +31,7 @@ # define VK_NO_PROTOTYPES #endif #include "vulkan/vulkan.h" +#define VK_FORMAT_RANGE_SIZE (VK_FORMAT_ASTC_12x12_SRGB_BLOCK - VK_FORMAT_UNDEFINED + 1) #if DILIGENT_USE_VOLK # include "volk/volk.h" diff --git a/Graphics/GraphicsEngineVulkan/src/VulkanTypeConversions.cpp b/Graphics/GraphicsEngineVulkan/src/VulkanTypeConversions.cpp index c9336b79..fb151407 100644 --- a/Graphics/GraphicsEngineVulkan/src/VulkanTypeConversions.cpp +++ b/Graphics/GraphicsEngineVulkan/src/VulkanTypeConversions.cpp @@ -1252,8 +1252,8 @@ RESOURCE_STATE VkAccessFlagsToResourceStates(VkAccessFlagBits AccessFlagBit) case VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT: return RESOURCE_STATE_UNKNOWN; case VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT: return RESOURCE_STATE_UNKNOWN; case VK_ACCESS_CONDITIONAL_RENDERING_READ_BIT_EXT: return RESOURCE_STATE_UNKNOWN; - case VK_ACCESS_COMMAND_PROCESS_READ_BIT_NVX: return RESOURCE_STATE_UNKNOWN; - case VK_ACCESS_COMMAND_PROCESS_WRITE_BIT_NVX: return RESOURCE_STATE_UNKNOWN; + case VK_ACCESS_COMMAND_PREPROCESS_READ_BIT_NV: return RESOURCE_STATE_UNKNOWN; + case VK_ACCESS_COMMAND_PREPROCESS_WRITE_BIT_NV: return RESOURCE_STATE_UNKNOWN; case VK_ACCESS_COLOR_ATTACHMENT_READ_NONCOHERENT_BIT_EXT: return RESOURCE_STATE_UNKNOWN; case VK_ACCESS_SHADING_RATE_IMAGE_READ_BIT_NV: return RESOURCE_STATE_UNKNOWN; case VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_NV: return RESOURCE_STATE_UNKNOWN; diff --git a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanDebug.cpp b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanDebug.cpp index 8046b63b..4feb8692 100644 --- a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanDebug.cpp +++ b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanDebug.cpp @@ -672,11 +672,13 @@ const char* VkObjectTypeToString(VkObjectType ObjectType) case VK_OBJECT_TYPE_DISPLAY_KHR: return "display KHR"; case VK_OBJECT_TYPE_DISPLAY_MODE_KHR: return "display mode KHR"; case VK_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT: return "debug report callback"; - case VK_OBJECT_TYPE_OBJECT_TABLE_NVX: return "object tabke NVX"; - case VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NVX: return "indirect cmd layout NVX"; case VK_OBJECT_TYPE_DEBUG_UTILS_MESSENGER_EXT: return "debug utils messenger"; - case VK_OBJECT_TYPE_VALIDATION_CACHE_EXT: return "validation cache"; - case VK_OBJECT_TYPE_ACCELERATION_STRUCTURE_NV: return "acceleration structure NVX"; + case VK_OBJECT_TYPE_ACCELERATION_STRUCTURE_KHR: return "acceleration structure KHR"; + case VK_OBJECT_TYPE_VALIDATION_CACHE_EXT: return "validation cache EXT"; + case VK_OBJECT_TYPE_PERFORMANCE_CONFIGURATION_INTEL:return "performance configuration INTEL"; + case VK_OBJECT_TYPE_DEFERRED_OPERATION_KHR: return "deferred operation KHR"; + case VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NV: return "indirect commands layout NV"; + case VK_OBJECT_TYPE_PRIVATE_DATA_SLOT_EXT: return "private data slot EXT"; default: return "unknown"; // clang-format on } |