From 7c5f0406d094d7ac15801ec7a39fe4fc6cc63c4e Mon Sep 17 00:00:00 2001 From: OLEGSHA Date: Mon, 27 Mar 2023 22:39:41 +0200 Subject: [PATCH] TMP / Fixed vulkan_{pick_device,pipeline}.cpp --- desktop/graphics/vulkan_pick_device.cpp | 2 +- desktop/graphics/vulkan_pipeline.cpp | 26 ++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/desktop/graphics/vulkan_pick_device.cpp b/desktop/graphics/vulkan_pick_device.cpp index ea19a75..062512a 100644 --- a/desktop/graphics/vulkan_pick_device.cpp +++ b/desktop/graphics/vulkan_pick_device.cpp @@ -13,7 +13,7 @@ bool checkDeviceExtensions(VkPhysicalDevice device, CstrUtils::CstrHashSet toFind(deviceExtensions.cbegin(), deviceExtensions.cend()); - uint32_t extensionCount; + uint32_t extensionCount = 0; vkEnumerateDeviceExtensionProperties(device, nullptr, &extensionCount, nullptr); diff --git a/desktop/graphics/vulkan_pipeline.cpp b/desktop/graphics/vulkan_pipeline.cpp index 3b2baf3..931b134 100644 --- a/desktop/graphics/vulkan_pipeline.cpp +++ b/desktop/graphics/vulkan_pipeline.cpp @@ -7,14 +7,14 @@ namespace progressia::desktop { -Pipeline::Pipeline(Vulkan &vulkan) : vulkan(vulkan) { +Pipeline::Pipeline(Vulkan &vulkan) : layout(), vk(), vulkan(vulkan) { auto &adapter = vulkan.getAdapter(); // Shaders - auto vertShader = createShaderModule(adapter.loadVertexShader()); - auto fragShader = createShaderModule(adapter.loadFragmentShader()); + auto *vertShader = createShaderModule(adapter.loadVertexShader()); + auto *fragShader = createShaderModule(adapter.loadFragmentShader()); VkPipelineShaderStageCreateInfo vertShaderStageInfo{}; vertShaderStageInfo.sType = @@ -80,13 +80,13 @@ Pipeline::Pipeline(Vulkan &vulkan) : vulkan(vulkan) { rasterizer.depthClampEnable = VK_FALSE; rasterizer.rasterizerDiscardEnable = VK_FALSE; rasterizer.polygonMode = VK_POLYGON_MODE_FILL; - rasterizer.lineWidth = 1.0f; + rasterizer.lineWidth = 1.0F; rasterizer.cullMode = VK_CULL_MODE_BACK_BIT; rasterizer.frontFace = VK_FRONT_FACE_COUNTER_CLOCKWISE; rasterizer.depthBiasEnable = VK_FALSE; - rasterizer.depthBiasConstantFactor = 0.0f; // Optional - rasterizer.depthBiasClamp = 0.0f; // Optional - rasterizer.depthBiasSlopeFactor = 0.0f; // Optional + rasterizer.depthBiasConstantFactor = 0.0F; // Optional + rasterizer.depthBiasClamp = 0.0F; // Optional + rasterizer.depthBiasSlopeFactor = 0.0F; // Optional // Multisampling (disabled) @@ -95,7 +95,7 @@ Pipeline::Pipeline(Vulkan &vulkan) : vulkan(vulkan) { VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO; multisampling.sampleShadingEnable = VK_FALSE; multisampling.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; - multisampling.minSampleShading = 1.0f; // Optional + multisampling.minSampleShading = 1.0F; // Optional multisampling.pSampleMask = nullptr; // Optional multisampling.alphaToCoverageEnable = VK_FALSE; // Optional multisampling.alphaToOneEnable = VK_FALSE; // Optional @@ -137,10 +137,10 @@ Pipeline::Pipeline(Vulkan &vulkan) : vulkan(vulkan) { colorBlending.logicOp = VK_LOGIC_OP_COPY; // Optional colorBlending.attachmentCount = 1; colorBlending.pAttachments = &colorBlendAttachment; - colorBlending.blendConstants[0] = 0.0f; // Optional - colorBlending.blendConstants[1] = 0.0f; // Optional - colorBlending.blendConstants[2] = 0.0f; // Optional - colorBlending.blendConstants[3] = 0.0f; // Optional + colorBlending.blendConstants[0] = 0.0F; // Optional + colorBlending.blendConstants[1] = 0.0F; // Optional + colorBlending.blendConstants[2] = 0.0F; // Optional + colorBlending.blendConstants[3] = 0.0F; // Optional // Pipeline @@ -201,7 +201,7 @@ VkShaderModule Pipeline::createShaderModule(const std::vector &bytecode) { // Important - the buffer must be aligned properly. std::vector does that. createInfo.pCode = reinterpret_cast(bytecode.data()); - VkShaderModule shaderModule; + VkShaderModule shaderModule = nullptr; vulkan.handleVkResult("Could not load shader", vkCreateShaderModule(vulkan.getDevice(), &createInfo, nullptr, &shaderModule));