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

Fix minor stuff

Browse Source
This commit is contained in:
Jérôme Leclercq
2020-09-04 16:14:11 +02:00
parent 33e60a97b6
commit 385927b05a
7 changed files with 46 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
include/Nazara/VulkanRenderer/Wrapper/CommandBuffer.inl
View File

@@ -120,14 +120,7 @@ namespace Nz
inline void CommandBuffer::BeginDebugRegion(const char* label)
{
Vk::Device* device = m_pool->GetDevice();
if (device->vkCmdBeginDebugUtilsLabelEXT)
{
VkDebugUtilsLabelEXT debugLabel = { VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT };
debugLabel.pLabelName = label;
device->vkCmdBeginDebugUtilsLabelEXT(m_handle, &debugLabel);
}
return BeginDebugRegion(label, Nz::Color(0, 0, 0, 0));
}
inline void CommandBuffer::BeginDebugRegion(const char* label, Nz::Color color)
@@ -135,12 +128,17 @@ namespace Nz
Vk::Device* device = m_pool->GetDevice();
if (device->vkCmdBeginDebugUtilsLabelEXT)
{
VkDebugUtilsLabelEXT debugLabel = { VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT };
debugLabel.pLabelName = label;
debugLabel.color[0] = color.r / 255.f;
debugLabel.color[1] = color.g / 255.f;
debugLabel.color[2] = color.b / 255.f;
debugLabel.color[3] = color.a / 255.f;
VkDebugUtilsLabelEXT debugLabel = {
VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT,
nullptr,
label,
{
color.r / 255.f,
color.g / 255.f,
color.b / 255.f,
color.a / 255.f
}
};
device->vkCmdBeginDebugUtilsLabelEXT(m_handle, &debugLabel);
}
@@ -299,14 +297,7 @@ namespace Nz
inline void CommandBuffer::InsertDebugLabel(const char* label)
{
Vk::Device* device = m_pool->GetDevice();
if (device->vkCmdInsertDebugUtilsLabelEXT)
{
VkDebugUtilsLabelEXT debugLabel = { VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT };
debugLabel.pLabelName = label;
device->vkCmdInsertDebugUtilsLabelEXT(m_handle, &debugLabel);
}
return InsertDebugLabel(label, Nz::Color(0, 0, 0, 0));
}
inline void CommandBuffer::InsertDebugLabel(const char* label, Nz::Color color)
@@ -314,12 +305,17 @@ namespace Nz
Vk::Device* device = m_pool->GetDevice();
if (device->vkCmdInsertDebugUtilsLabelEXT)
{
VkDebugUtilsLabelEXT debugLabel = { VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT };
debugLabel.pLabelName = label;
debugLabel.color[0] = color.r / 255.f;
debugLabel.color[1] = color.g / 255.f;
debugLabel.color[2] = color.b / 255.f;
debugLabel.color[3] = color.a / 255.f;
VkDebugUtilsLabelEXT debugLabel = {
VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT,
nullptr,
label,
{
color.r / 255.f,
color.g / 255.f,
color.b / 255.f,
color.a / 255.f
}
};
device->vkCmdInsertDebugUtilsLabelEXT(m_handle, &debugLabel);
}

2
include/Nazara/VulkanRenderer/Wrapper/Instance.hpp
View File

@@ -56,7 +56,7 @@ namespace Nz
~Instance();
bool Create(const VkInstanceCreateInfo& createInfo, const VkAllocationCallbacks* allocator = nullptr);
inline bool Create(const std::string& appName, UInt32 appVersion, const std::string& engineName, UInt32 engineVersion, const std::vector<const char*>& layers, const std::vector<const char*>& extensions, const VkAllocationCallbacks* allocator = nullptr);
inline bool Create(const std::string& appName, UInt32 appVersion, const std::string& engineName, UInt32 engineVersion, UInt32 apiVersion, const std::vector<const char*>& layers, const std::vector<const char*>& extensions, const VkAllocationCallbacks* allocator = nullptr);
inline void Destroy();
bool EnumeratePhysicalDevices(std::vector<VkPhysicalDevice>* physicalDevices);

5
include/Nazara/VulkanRenderer/Wrapper/Instance.inl
View File

@@ -12,7 +12,7 @@ namespace Nz
{
namespace Vk
{
inline bool Instance::Create(const std::string& appName, UInt32 appVersion, const std::string& engineName, UInt32 engineVersion, const std::vector<const char*>& layers, const std::vector<const char*>& extensions, const VkAllocationCallbacks* allocator)
inline bool Instance::Create(const std::string& appName, UInt32 appVersion, const std::string& engineName, UInt32 engineVersion, UInt32 apiVersion, const std::vector<const char*>& layers, const std::vector<const char*>& extensions, const VkAllocationCallbacks* allocator)
{
VkApplicationInfo appInfo =
{
@@ -21,7 +21,8 @@ namespace Nz
appName.data(),
appVersion,
engineName.data(),
engineVersion
engineVersion,
apiVersion
};
VkInstanceCreateInfo instanceInfo =