Skip to content

Commit 13ee6f9

Browse files
committed
some clang tidy stuff
1 parent b3ae600 commit 13ee6f9

File tree

4 files changed

+44
-28
lines changed

4 files changed

+44
-28
lines changed

.clang-tidy

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
Checks: >
2+
clang-analyzer-*,
3+
bugprone-*,
4+
performance-*,
5+
readability-*,
6+
modernize-*,
7+
cppcoreguidelines-*,
8+
misc-*,
9+
-clang-analyzer-alpha.*,
10+
-cppcoreguidelines-pro-type-union-access,
11+
-cppcoreguidelines-pro-type-reinterpret-cast,
12+
-cppcoreguidelines-pro-bounds-pointer-arithmetic,
13+
-cppcoreguidelines-avoid-magic-numbers,
14+
-modernize-use-trailing-return-type,
15+
-readability-magic-numbers
16+
17+
WarningsAsErrors: ''
18+
19+
HeaderFilterRegex: '.*'
20+
FormatStyle: file
21+
22+
CheckOptions:
23+
- { key: modernize-use-nullptr.NullMacros, value: 'NULL' }
24+
- { key: readability-identifier-naming.VariableCase, value: camelBack }
25+
- { key: readability-identifier-naming.ClassCase, value: CamelCase }
26+
- { key: readability-identifier-naming.FunctionCase, value: camelBack }
27+
- { key: readability-function-size.LineThreshold, value: '200' }

src/imgui/Imgui.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class Imgui {
2424
[[nodiscard]] float getSaturation() const { return m_saturation; }
2525

2626
static vk::DescriptorSet createDescriptorSet(vk::ImageView imageView, vk::Sampler sampler);
27-
void SetSceneDescriptorSet(const vk::DescriptorSet descriptorSet) { m_sceneImguiId = descriptorSet; };
27+
void setSceneDescriptorSet(const vk::DescriptorSet descriptorSet) { m_sceneImguiId = descriptorSet; };
2828

2929
private:
3030

src/vulkan/VulkanRenderer.cpp

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22

33
#include "../core/Uniforms.hpp"
44
#include "../core/Window.hpp"
5-
#include "Buffer.hpp"
65
#include "VulkanUtils.hpp"
76

8-
#include <cstring>
97
#include <glm/glm.hpp>
108
#include <glm/gtc/matrix_transform.hpp>
9+
#include <utility>
1110

1211
namespace reactor {
13-
VulkanRenderer::VulkanRenderer(const RendererConfig &config) : m_config(config) {
12+
VulkanRenderer::VulkanRenderer(RendererConfig config) : m_config(std::move(config)) {
1413
createCoreVulkanObjects();
1514
createSwapchainAndFrameManager();
1615

@@ -60,22 +59,22 @@ void VulkanRenderer::createSwapchainAndFrameManager() {
6059
}
6160

6261
void VulkanRenderer::createPipelineAndDescriptors() {
63-
std::string vertShaderPath = m_config.vertShaderPath;
64-
std::string fragShaderPath = m_config.fragShaderPath;
62+
const std::string vertShaderPath = m_config.vertShaderPath;
63+
const std::string fragShaderPath = m_config.fragShaderPath;
6564

66-
std::vector bindings = {
65+
const std::vector bindings = {
6766
vk::DescriptorSetLayoutBinding(0, vk::DescriptorType::eUniformBuffer, 1,
6867
vk::ShaderStageFlagBits::eVertex),
6968
};
7069

7170
m_descriptorSet = std::make_unique<DescriptorSet>(m_context->device(), 2, bindings);
7271

73-
std::vector setLayouts = {m_descriptorSet->getLayout()};
72+
const std::vector setLayouts = {m_descriptorSet->getLayout()};
7473

7574
m_pipeline = std::make_unique<Pipeline>(m_context->device(), vk::Format::eR16G16B16A16Sfloat,
7675
vertShaderPath, fragShaderPath, setLayouts, 4);
7776

78-
std::vector compositeBindings = {
77+
const std::vector compositeBindings = {
7978
vk::DescriptorSetLayoutBinding(0, vk::DescriptorType::eCombinedImageSampler, 1, vk::ShaderStageFlagBits::eFragment),
8079
vk::DescriptorSetLayoutBinding(1, vk::DescriptorType::eUniformBuffer, 1, vk::ShaderStageFlagBits::eFragment),
8180
};
@@ -135,7 +134,7 @@ void VulkanRenderer::drawGeometry(vk::CommandBuffer cmd) {
135134
cmd.draw(3, 1, 0, 0);
136135
}
137136

138-
void VulkanRenderer::renderUI(vk::CommandBuffer cmd) {
137+
void VulkanRenderer::renderUI(const vk::CommandBuffer cmd) const {
139138
m_imgui->createFrame();
140139
m_imgui->drawFrame(cmd);
141140
}
@@ -150,17 +149,6 @@ void VulkanRenderer::submitAndPresent(uint32_t imageIndex) {
150149
m_swapchain->get(), imageIndex);
151150
}
152151

153-
void VulkanRenderer::updateUniformBuffer(Buffer *uniformBuffer) {
154-
155-
SceneUBO ubo{};
156-
ubo.view = m_camera->getView();
157-
ubo.projection = m_camera->getProjection();
158-
159-
m_uniformManager->update<SceneUBO>(m_frameManager->getFrameIndex(), ubo);
160-
161-
162-
}
163-
164152
void VulkanRenderer::beginDynamicRendering(vk::CommandBuffer cmd, vk::ImageView imageView,
165153
vk::Extent2D extent, bool clear=true) {
166154
constexpr vk::ClearValue clearColor = vk::ClearColorValue(std::array{0.0f, 0.0f, 0.0f, 1.0f});
@@ -201,9 +189,10 @@ void VulkanRenderer::drawFrame() {
201189
const vk::ImageView msaaView = m_msaaColorViews[frameIdx];
202190
const vk::Image resolveImage = m_resolveImages[frameIdx]->get();
203191

204-
SceneUBO sceneData;
192+
SceneUBO sceneData{};
193+
const auto aspect = static_cast<float>(width) / static_cast<float>(height);
205194
sceneData.view = glm::mat4(1.0);
206-
sceneData.projection = glm::perspective(glm::radians(45.0f), (float)width / (float)height, 0.1f, 100.0f);
195+
sceneData.projection = glm::perspective(glm::radians(45.0F), aspect, 0.1F, 100.0F);
207196
m_uniformManager->update<SceneUBO>(frameIdx, sceneData);
208197

209198
CompositeUBO compositeData;
@@ -347,7 +336,7 @@ void VulkanRenderer::drawFrame() {
347336
// The swapchain image is already in COLOR_ATTACHMENT_OPTIMAL, so no transition is needed.
348337
beginDynamicRendering(cmd, m_swapchain->getImageViews()[imageIndex], extent, false);
349338

350-
m_imgui->SetSceneDescriptorSet(m_sceneViewImageDescriptorSets[frameIdx]);
339+
m_imgui->setSceneDescriptorSet(m_sceneViewImageDescriptorSets[frameIdx]);
351340
renderUI(cmd);
352341
endDynamicRendering(cmd);
353342

src/vulkan/VulkanRenderer.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ namespace reactor {
3838

3939
class VulkanRenderer {
4040
public:
41-
explicit VulkanRenderer(const RendererConfig& config);
41+
explicit VulkanRenderer(RendererConfig config);
4242
~VulkanRenderer();
4343

4444
void run();
@@ -88,9 +88,9 @@ class VulkanRenderer {
8888
void updateUniformBuffer(Buffer* uniformBuffer);
8989
void bindDescriptorSets(vk::CommandBuffer cmd);
9090
void drawGeometry(vk::CommandBuffer cmd);
91-
void renderUI(vk::CommandBuffer cmd);
92-
void endDynamicRendering(vk::CommandBuffer cmd);
93-
void endCommandBuffer(vk::CommandBuffer cmd);
91+
void renderUI(vk::CommandBuffer cmd) const;
92+
static void endDynamicRendering(vk::CommandBuffer cmd);
93+
static void endCommandBuffer(vk::CommandBuffer cmd);
9494
void submitAndPresent(uint32_t imageIndex);
9595

9696

0 commit comments

Comments
 (0)