From c7c51b0f61b9427ed9cf56c163ee451fdda0ff02 Mon Sep 17 00:00:00 2001 From: azhirnov Date: Wed, 19 Aug 2020 17:47:39 +0300 Subject: formatting --- .../include/PipelineStateVkImpl.hpp | 4 ++-- .../include/VulkanUtilities/VulkanPhysicalDevice.hpp | 10 +++++----- Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp | 6 +++--- .../GraphicsEngineVulkan/src/RenderDeviceVkImpl.cpp | 2 +- .../src/VulkanUtilities/VulkanPhysicalDevice.cpp | 18 +++++++++--------- 5 files changed, 20 insertions(+), 20 deletions(-) (limited to 'Graphics/GraphicsEngineVulkan') diff --git a/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.hpp index 01f37a76..452ae315 100644 --- a/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.hpp +++ b/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.hpp @@ -157,8 +157,8 @@ private: PipelineLayout m_PipelineLayout; std::array m_ResourceLayoutIndex; - bool m_HasStaticResources = false; - bool m_HasNonStaticResources = false; + bool m_HasStaticResources = false; + bool m_HasNonStaticResources = false; }; } // namespace Diligent diff --git a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanPhysicalDevice.hpp b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanPhysicalDevice.hpp index 17bc2e4a..177012c8 100644 --- a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanPhysicalDevice.hpp +++ b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanPhysicalDevice.hpp @@ -40,7 +40,7 @@ public: struct ExtensionFeatures { #ifdef VK_NV_mesh_shader - VkPhysicalDeviceMeshShaderFeaturesNV MeshShader; + VkPhysicalDeviceMeshShaderFeaturesNV MeshShader; #endif }; @@ -56,8 +56,8 @@ public: VulkanPhysicalDevice& operator = (VulkanPhysicalDevice&&) = delete; // clang-format on - static std::unique_ptr Create(VkPhysicalDevice vkDevice, - std::shared_ptr Instance); + static std::unique_ptr Create(VkPhysicalDevice vkDevice, + std::shared_ptr Instance); // clang-format off uint32_t FindQueueFamily (VkQueueFlags QueueFlags) const; @@ -77,8 +77,8 @@ public: VkFormatProperties GetPhysicalDeviceFormatProperties(VkFormat imageFormat) const; private: - VulkanPhysicalDevice(VkPhysicalDevice vkDevice, - std::shared_ptr Instance); + VulkanPhysicalDevice(VkPhysicalDevice vkDevice, + std::shared_ptr Instance); const VkPhysicalDevice m_VkDevice; VkPhysicalDeviceProperties m_Properties = {}; diff --git a/Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp b/Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp index 58aea393..8c2b7e10 100644 --- a/Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp +++ b/Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp @@ -204,17 +204,17 @@ void EngineFactoryVkImpl::CreateDeviceAndContextsVk(const EngineVkCreateInfo& _E // To enable some device extensions you must enable instance extension VK_KHR_get_physical_device_properties2 // and add feature description to DeviceCreateInfo.pNext. bool SupportsFeatures2 = Instance->IsExtensionEnabled(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME); - void** NextExt = const_cast(&DeviceCreateInfo.pNext); + void** NextExt = const_cast(&DeviceCreateInfo.pNext); // Enable mesh shader extension. #ifdef VK_NV_mesh_shader - VkPhysicalDeviceMeshShaderFeaturesNV MeshShaderFeats = PhysicalDevice->GetExtFeatures().MeshShader; + VkPhysicalDeviceMeshShaderFeaturesNV MeshShaderFeats = PhysicalDevice->GetExtFeatures().MeshShader; if (SupportsFeatures2 && PhysicalDevice->IsExtensionSupported(VK_NV_MESH_SHADER_EXTENSION_NAME)) { DeviceExtensions.push_back(VK_NV_MESH_SHADER_EXTENSION_NAME); *NextExt = &MeshShaderFeats; - NextExt = &MeshShaderFeats.pNext; + NextExt = &MeshShaderFeats.pNext; } #endif diff --git a/Graphics/GraphicsEngineVulkan/src/RenderDeviceVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/RenderDeviceVkImpl.cpp index 66ea8716..97448cf4 100644 --- a/Graphics/GraphicsEngineVulkan/src/RenderDeviceVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/RenderDeviceVkImpl.cpp @@ -181,7 +181,7 @@ RenderDeviceVkImpl::RenderDeviceVkImpl(IReferenceCounters* Features.TextureUAVExtendedFormats = vkDeviceFeatures.shaderStorageImageExtendedFormats != VK_FALSE; // All devices that supports mesh shader also supports task shader, so it is not necessary to use two separate features. - Features.MeshShaders = vkExtFeatures.MeshShader.meshShader != VK_FALSE && vkExtFeatures.MeshShader.taskShader != VK_FALSE; + Features.MeshShaders = vkExtFeatures.MeshShader.meshShader != VK_FALSE && vkExtFeatures.MeshShader.taskShader != VK_FALSE; const auto& vkDeviceLimits = m_PhysicalDevice->GetProperties().limits; auto& TexCaps = m_DeviceCaps.TexCaps; diff --git a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanPhysicalDevice.cpp b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanPhysicalDevice.cpp index f18d6872..a4f99102 100644 --- a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanPhysicalDevice.cpp +++ b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanPhysicalDevice.cpp @@ -33,15 +33,15 @@ namespace VulkanUtilities { -std::unique_ptr VulkanPhysicalDevice::Create(VkPhysicalDevice vkDevice, - std::shared_ptr Instance) +std::unique_ptr VulkanPhysicalDevice::Create(VkPhysicalDevice vkDevice, + std::shared_ptr Instance) { auto* PhysicalDevice = new VulkanPhysicalDevice{vkDevice, Instance}; return std::unique_ptr{PhysicalDevice}; } -VulkanPhysicalDevice::VulkanPhysicalDevice(VkPhysicalDevice vkDevice, - std::shared_ptr Instance) : +VulkanPhysicalDevice::VulkanPhysicalDevice(VkPhysicalDevice vkDevice, + std::shared_ptr Instance) : m_VkDevice{vkDevice} { VERIFY_EXPR(m_VkDevice != VK_NULL_HANDLE); @@ -70,17 +70,17 @@ VulkanPhysicalDevice::VulkanPhysicalDevice(VkPhysicalDevice vkDe if (Instance->IsExtensionEnabled(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME)) { - VkPhysicalDeviceFeatures2 Feats2 = {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2}; - VkPhysicalDeviceProperties2 Props2 = {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2}; - void** NextFeat = &Feats2.pNext; + VkPhysicalDeviceFeatures2 Feats2 = {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2}; + VkPhysicalDeviceProperties2 Props2 = {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2}; + void** NextFeat = &Feats2.pNext; //void** NextProp = &Props2.pNext; // Enable mesh shader extension. #ifdef VK_NV_mesh_shader if (IsExtensionSupported(VK_NV_MESH_SHADER_EXTENSION_NAME)) { - *NextFeat = &m_ExtFeatures.MeshShader; - NextFeat = &m_ExtFeatures.MeshShader.pNext; + *NextFeat = &m_ExtFeatures.MeshShader; + NextFeat = &m_ExtFeatures.MeshShader.pNext; m_ExtFeatures.MeshShader.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_FEATURES_NV; } #endif -- cgit v1.2.3