diff --git a/WickedEngine/wiGraphicsDevice_Vulkan.cpp b/WickedEngine/wiGraphicsDevice_Vulkan.cpp index 50576aafd..8cde303b6 100644 --- a/WickedEngine/wiGraphicsDevice_Vulkan.cpp +++ b/WickedEngine/wiGraphicsDevice_Vulkan.cpp @@ -616,21 +616,13 @@ namespace vulkan_internal { ss += "[Vulkan Warning]: "; ss += callback_data->pMessage; - wi::backlog::post(ss, wi::backlog::LogLevel::Warning); + wi::helper::DebugOut(ss, wi::helper::DebugLevel::Warning); } else if (message_severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT) { ss += "[Vulkan Error]: "; ss += callback_data->pMessage; -#if 1 - wi::backlog::post(ss, wi::backlog::LogLevel::Error); -#else - OutputDebugStringA(callback_data->pMessage); - OutputDebugStringA("\n"); -#endif -//#ifdef _DEBUG -// assert(0); -//#endif // _DEBUG + wi::helper::DebugOut(ss, wi::helper::DebugLevel::Error); } return VK_FALSE; @@ -7190,6 +7182,24 @@ using namespace vulkan_internal; const VkDeviceSize zero = {}; vkCmdBindVertexBuffers2(commandlist.GetCommandBuffer(), 0, 1, &nullBuffer, &zero, &zero, &zero); + + if (CheckCapability(GraphicsDeviceCapability::VARIABLE_RATE_SHADING)) + { + VkExtent2D fragmentSize = {}; + fragmentSize.width = 1; + fragmentSize.height = 1; + + VkFragmentShadingRateCombinerOpKHR combiner[] = { + VK_FRAGMENT_SHADING_RATE_COMBINER_OP_KEEP_KHR, + VK_FRAGMENT_SHADING_RATE_COMBINER_OP_KEEP_KHR + }; + + vkCmdSetFragmentShadingRateKHR( + commandlist.GetCommandBuffer(), + &fragmentSize, + combiner + ); + } } return cmd; diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index d176d7db5..854d27e80 100644 --- a/WickedEngine/wiVersion.cpp +++ b/WickedEngine/wiVersion.cpp @@ -9,7 +9,7 @@ namespace wi::version // minor features, major updates, breaking compatibility changes const int minor = 71; // minor bug fixes, alterations, refactors, updates - const int revision = 573; + const int revision = 574; const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);