From 3aeada9fa52cb7a84cabe77d47a54f0acca5dac9 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 2 Sep 2019 16:24:15 +0100 Subject: [PATCH] Don't use deprecated vulkan enum values --- renderdoc/driver/vulkan/vk_msaa_array_conv.cpp | 4 ++-- renderdoc/driver/vulkan/vk_outputwindow.cpp | 6 +++--- renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp | 4 ++-- renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_msaa_array_conv.cpp b/renderdoc/driver/vulkan/vk_msaa_array_conv.cpp index bb9b61be2..2f9d64489 100644 --- a/renderdoc/driver/vulkan/vk_msaa_array_conv.cpp +++ b/renderdoc/driver/vulkan/vk_msaa_array_conv.cpp @@ -354,7 +354,7 @@ void VulkanDebugManager::CopyDepthTex2DMSToArray(VkImage destArray, VkImage srcM { params.w = numStencil == 1 ? 1000 : s; // currentStencil; - ObjDisp(cmd)->CmdSetStencilReference(Unwrap(cmd), VK_STENCIL_FRONT_AND_BACK, s); + ObjDisp(cmd)->CmdSetStencilReference(Unwrap(cmd), VK_STENCIL_FACE_FRONT_AND_BACK, s); ObjDisp(cmd)->CmdPushConstants(Unwrap(cmd), Unwrap(m_ArrayMSPipeLayout), VK_SHADER_STAGE_ALL, 0, sizeof(Vec4u), ¶ms); ObjDisp(cmd)->CmdDraw(Unwrap(cmd), 4, 1, 0, 0); @@ -717,7 +717,7 @@ void VulkanDebugManager::CopyDepthArrayToTex2DMS(VkImage destMS, VkImage srcArra { params.w = numStencil == 1 ? 1000 : s; // currentStencil; - ObjDisp(cmd)->CmdSetStencilReference(Unwrap(cmd), VK_STENCIL_FRONT_AND_BACK, s); + ObjDisp(cmd)->CmdSetStencilReference(Unwrap(cmd), VK_STENCIL_FACE_FRONT_AND_BACK, s); ObjDisp(cmd)->CmdPushConstants(Unwrap(cmd), Unwrap(m_ArrayMSPipeLayout), VK_SHADER_STAGE_ALL, 0, sizeof(Vec4u), ¶ms); ObjDisp(cmd)->CmdDraw(Unwrap(cmd), 4, 1, 0, 0); diff --git a/renderdoc/driver/vulkan/vk_outputwindow.cpp b/renderdoc/driver/vulkan/vk_outputwindow.cpp index 712b9d5a8..7ccf73519 100644 --- a/renderdoc/driver/vulkan/vk_outputwindow.cpp +++ b/renderdoc/driver/vulkan/vk_outputwindow.cpp @@ -197,7 +197,7 @@ void VulkanReplay::OutputWindow::Create(WrappedVulkan *driver, VkDevice device, // sensible defaults VkFormat imformat = VK_FORMAT_B8G8R8A8_SRGB; VkPresentModeKHR presentmode = VK_PRESENT_MODE_FIFO_KHR; - VkColorSpaceKHR imcolspace = VK_COLORSPACE_SRGB_NONLINEAR_KHR; + VkColorSpaceKHR imcolspace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR; VkResult vkr = VK_SUCCESS; @@ -233,7 +233,7 @@ void VulkanReplay::OutputWindow::Create(WrappedVulkan *driver, VkDevice device, { // 1 entry with undefined means no preference, just use our default imformat = VK_FORMAT_B8G8R8A8_SRGB; - imcolspace = VK_COLORSPACE_SRGB_NONLINEAR_KHR; + imcolspace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR; } else { @@ -247,7 +247,7 @@ void VulkanReplay::OutputWindow::Create(WrappedVulkan *driver, VkDevice device, { imformat = formats[i].format; imcolspace = formats[i].colorSpace; - RDCASSERT(imcolspace == VK_COLORSPACE_SRGB_NONLINEAR_KHR); + RDCASSERT(imcolspace == VK_COLOR_SPACE_SRGB_NONLINEAR_KHR); break; } } diff --git a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp index 07aa8b85f..d2f63b420 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp @@ -434,7 +434,7 @@ ReplayStatus WrappedVulkan::Initialise(VkInitParams ¶ms, uint64_t sectionVer else if(ObjDisp(m_Instance)->CreateDebugReportCallbackEXT) { VkDebugReportCallbackCreateInfoEXT debugInfo = {}; - debugInfo.sType = VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT; + debugInfo.sType = VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT; debugInfo.pfnCallback = &DebugReportCallbackStatic; debugInfo.pUserData = this; debugInfo.flags = VK_DEBUG_REPORT_WARNING_BIT_EXT | @@ -743,7 +743,7 @@ VkResult WrappedVulkan::vkCreateInstance(const VkInstanceCreateInfo *pCreateInfo else if(ObjDisp(m_Instance)->CreateDebugReportCallbackEXT) { VkDebugReportCallbackCreateInfoEXT debugInfo = {}; - debugInfo.sType = VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT; + debugInfo.sType = VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT; debugInfo.pNext = NULL; debugInfo.pfnCallback = &DebugReportCallbackStatic; debugInfo.pUserData = this; diff --git a/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp index 46e9295b7..62919d600 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp @@ -1747,13 +1747,13 @@ static ObjData GetObjData(VkDebugReportObjectTypeEXT objType, uint64_t object) castType = VK_OBJECT_TYPE_DISPLAY_KHR; else if(objType == VK_DEBUG_REPORT_OBJECT_TYPE_DISPLAY_MODE_KHR_EXT) castType = VK_OBJECT_TYPE_DISPLAY_MODE_KHR; - else if(objType == VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_EXT) + else if(objType == VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT_EXT) castType = VK_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT; else if(objType == VK_DEBUG_REPORT_OBJECT_TYPE_OBJECT_TABLE_NVX_EXT) castType = VK_OBJECT_TYPE_OBJECT_TABLE_NVX; else if(objType == VK_DEBUG_REPORT_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NVX_EXT) castType = VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NVX; - else if(objType == VK_DEBUG_REPORT_OBJECT_TYPE_VALIDATION_CACHE_EXT) + else if(objType == VK_DEBUG_REPORT_OBJECT_TYPE_VALIDATION_CACHE_EXT_EXT) castType = VK_OBJECT_TYPE_VALIDATION_CACHE_EXT; else if(objType == VK_DEBUG_REPORT_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION_EXT) castType = VK_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION;