sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VkRenderWindow: Default to RGBA8 if supported

This commit is contained in:
Lynix 2020-04-13 15:11:35 +02:00
parent f1811df6f6
commit 75241ed8f0
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/Nazara/VulkanRenderer/VkRenderWindow.hpp
View File

@ -68,9 +68,8 @@ namespace Nz
std::size_t m_currentFrame; std::size_t m_currentFrame;
Clock m_clock; Clock m_clock;
VkColorSpaceKHR m_colorSpace;
VkFormat m_colorFormat;
VkFormat m_depthStencilFormat; VkFormat m_depthStencilFormat;
VkSurfaceFormatKHR m_surfaceFormat;
std::optional<VulkanMultipleFramebuffer> m_framebuffer; std::optional<VulkanMultipleFramebuffer> m_framebuffer;
std::optional<VulkanRenderPass> m_renderPass; std::optional<VulkanRenderPass> m_renderPass;
std::shared_ptr<VulkanDevice> m_device; std::shared_ptr<VulkanDevice> m_device;

29
src/Nazara/VulkanRenderer/VkRenderWindow.cpp
View File

@ -85,12 +85,25 @@ namespace Nz
return false; return false;
} }
if (surfaceFormats.size() == 1 && surfaceFormats[0].format == VK_FORMAT_UNDEFINED) m_surfaceFormat = [&] () -> VkSurfaceFormatKHR
m_colorFormat = VK_FORMAT_B8G8R8A8_UNORM; {
else if (surfaceFormats.size() == 1 && surfaceFormats.front().format == VK_FORMAT_UNDEFINED)
m_colorFormat = surfaceFormats[0].format; {
// If the list contains one undefined format, it means any format can be used
return { VK_FORMAT_R8G8B8A8_UNORM, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR };
}
else
{
// Search for RGBA8 and default to first format
for (const VkSurfaceFormatKHR& surfaceFormat : surfaceFormats)
{
if (surfaceFormat.format == VK_FORMAT_R8G8B8A8_UNORM)
return surfaceFormat;
}
m_colorSpace = surfaceFormats[0].colorSpace; return surfaceFormats.front();
}
}();
if (!parameters.depthFormats.empty()) if (!parameters.depthFormats.empty())
{ {
@ -305,7 +318,7 @@ namespace Nz
{ {
{ {
0, // VkAttachmentDescriptionFlags flags; 0, // VkAttachmentDescriptionFlags flags;
m_colorFormat, // VkFormat format; m_surfaceFormat.format, // VkFormat format;
VK_SAMPLE_COUNT_1_BIT, // VkSampleCountFlagBits samples; VK_SAMPLE_COUNT_1_BIT, // VkSampleCountFlagBits samples;
VK_ATTACHMENT_LOAD_OP_CLEAR, // VkAttachmentLoadOp loadOp; VK_ATTACHMENT_LOAD_OP_CLEAR, // VkAttachmentLoadOp loadOp;
VK_ATTACHMENT_STORE_OP_STORE, // VkAttachmentStoreOp storeOp; VK_ATTACHMENT_STORE_OP_STORE, // VkAttachmentStoreOp storeOp;
@ -444,8 +457,8 @@ namespace Nz
0, 0,
surface, surface,
imageCount, imageCount,
m_colorFormat, m_surfaceFormat.format,
m_colorSpace, m_surfaceFormat.colorSpace,
extent, extent,
1, 1,
VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,