redstrate/graph
Archived
1
Fork 0
Code Activity

Implement clang tidy changes

Browse source
This commit is contained in:
Joshua Goins 2018-10-26 20:56:06 -04:00
parent d5d9c9ee23
commit 918520cc9d
5 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/renderer.h
View file

@ -46,14 +46,14 @@ public:
void render(World& world, Camera& camera, RenderTarget* target);
RenderTarget* createSurfaceRenderTarget(VkSurfaceKHR surface, RenderTarget* oldRenderTarget = nullptr);
RenderTarget* createSurfaceRenderTarget(VkSurfaceKHR surface, RenderTarget* oldTarget = nullptr);
void destroyRenderTarget(RenderTarget* target);
void takeScreenshot(RenderTarget* target);
VkShaderModule createShader(const char* path);
uint32_t findMemoryType(const uint32_t typeFilter, const VkMemoryPropertyFlags properties);
uint32_t findMemoryType(uint32_t typeFilter, VkMemoryPropertyFlags properties);
void fillMeshBuffers(Mesh* mesh);
void destroyMeshBuffers(Mesh* mesh);

14
src/main.cpp
View file

@ -43,7 +43,7 @@ int toInt(const std::string &str) {
int num;
if((ss >> num).fail())
return -1;
else
return num;
}
@ -94,7 +94,7 @@ void writeConfig() {
file << "fullscreen=" << windowFullscreen << "\n";
}
int main(int, char*[]) {
int main(int argc, char* argv[]) {
readConfig();
window = SDL_CreateWindow("Graph",
@ -104,12 +104,12 @@ int main(int, char*[]) {
windowHeight,
SDL_WINDOW_VULKAN |
SDL_WINDOW_RESIZABLE);
if(!window)
if(window == nullptr)
return -1;
SDL_SetWindowFullscreen(window, windowFullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0);
SDL_SetWindowFullscreen(window, windowFullscreen == 1 ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0);
Renderer* renderer = new Renderer();
auto renderer = new Renderer();
VkSurfaceKHR surface = nullptr;
SDL_Vulkan_CreateSurface(window, renderer->getInstance(), &surface);
@ -141,7 +141,7 @@ int main(int, char*[]) {
World world;
world.meshes.push_back(mesh);
Light* light = new Light();
auto light = new Light();
light->position.y = 5;
world.lights.push_back(light);
@ -153,7 +153,7 @@ int main(int, char*[]) {
bool running = true;
while(running) {
SDL_Event event = {};
while(SDL_PollEvent(&event)) {
while(SDL_PollEvent(&event) > 0) {
if(event.type == SDL_QUIT)
running = false;

2
src/postpass.cpp
View file

@ -32,7 +32,7 @@ void PostPass::createDescriptorSet(RenderTarget* target) {
allocInfo.descriptorSetCount = target->numImages;
// FIXME: lol what
VkDescriptorSetLayout* layouts = new VkDescriptorSetLayout[target->numImages];
auto layouts = new VkDescriptorSetLayout[target->numImages];
for(uint32_t i = 0; i < target->numImages; i++)
layouts[i] = setLayout_;

38
src/renderer.cpp
View file

@ -51,10 +51,10 @@ Renderer::~Renderer() {
void Renderer::render(World& world, Camera& camera, RenderTarget* target) {
vkAcquireNextImageKHR(device_, target->swapchain, UINT64_MAX, target->imageAvailableSemaphore, nullptr, &target->currentImage);
vkWaitForFences(device_, 1, &target->fences[target->currentImage], true, UINT64_MAX);
vkWaitForFences(device_, 1, &target->fences[target->currentImage], VK_TRUE, UINT64_MAX);
vkResetFences(device_, 1, &target->fences[target->currentImage]);
const VkCommandBuffer commandBuffer = target->commandBuffers[target->currentImage];
VkCommandBuffer commandBuffer = target->commandBuffers[target->currentImage];
VkCommandBufferBeginInfo beginInfo = {};
beginInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
@ -121,7 +121,7 @@ void Renderer::render(World& world, Camera& camera, RenderTarget* target) {
RenderTarget* Renderer::createSurfaceRenderTarget(VkSurfaceKHR surface, RenderTarget* oldTarget) {
vkDeviceWaitIdle(device_);
RenderTarget* target = new RenderTarget();
auto target = new RenderTarget();
target->surface = surface;
VkSurfaceCapabilitiesKHR surfaceCapabilities = {};
@ -132,7 +132,7 @@ RenderTarget* Renderer::createSurfaceRenderTarget(VkSurfaceKHR surface, RenderTa
uint32_t surfaceFormatCount = 0;
vkGetPhysicalDeviceSurfaceFormatsKHR(physicalDevice_, surface, &surfaceFormatCount, nullptr);
VkSurfaceFormatKHR* surfaceFormats = new VkSurfaceFormatKHR[surfaceFormatCount];
auto surfaceFormats = new VkSurfaceFormatKHR[surfaceFormatCount];
vkGetPhysicalDeviceSurfaceFormatsKHR(physicalDevice_, surface, &surfaceFormatCount, surfaceFormats);
uint32_t chosenFormat = 0;
@ -141,7 +141,7 @@ RenderTarget* Renderer::createSurfaceRenderTarget(VkSurfaceKHR surface, RenderTa
chosenFormat = i;
}
VkBool32 supported = false;
VkBool32 supported = VK_FALSE;
vkGetPhysicalDeviceSurfaceSupportKHR(physicalDevice_, queueIndices.presentation, surface, &supported);
VkSwapchainCreateInfoKHR swapchainCreateInfo = {};
@ -158,14 +158,14 @@ RenderTarget* Renderer::createSurfaceRenderTarget(VkSurfaceKHR surface, RenderTa
swapchainCreateInfo.preTransform = surfaceCapabilities.currentTransform;
swapchainCreateInfo.compositeAlpha = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR;
swapchainCreateInfo.presentMode = VK_PRESENT_MODE_FIFO_KHR;
swapchainCreateInfo.clipped = true;
swapchainCreateInfo.clipped = VK_TRUE;
if(oldTarget)
if(oldTarget != nullptr)
swapchainCreateInfo.oldSwapchain = oldTarget->swapchain;
vkCreateSwapchainKHR(device_, &swapchainCreateInfo, nullptr, &target->swapchain);
if(oldTarget)
if(oldTarget != nullptr)
destroyRenderTarget(oldTarget);
delete[] surfaceFormats;
@ -467,7 +467,7 @@ void Renderer::takeScreenshot(RenderTarget* target) {
1, &imageMemoryBarrier);
}
const VkImage srcImage = target->swapchainImages[0]; // FIXME: use previous image
VkImage srcImage = target->swapchainImages[0]; // FIXME: use previous image
// change offscreen image to transfer src layout
{
@ -572,7 +572,7 @@ void Renderer::takeScreenshot(RenderTarget* target) {
vkQueueSubmit(graphicsQueue_, 1, &submitInfo, fence);
vkWaitForFences(device_, 1, &fence, true, -1);
vkWaitForFences(device_, 1, &fence, VK_TRUE, -1);
vkDestroyFence(device_, fence, nullptr);
vkFreeCommandBuffers(device_, commandPool_, 1, &commandBuffer);
@ -591,7 +591,7 @@ void Renderer::takeScreenshot(RenderTarget* target) {
file << "P6\n" << target->extent.width << "\n" << target->extent.height << "\n" << 255 << "\n";
for(uint32_t y = 0; y < target->extent.height; y++) {
const unsigned int* row = reinterpret_cast<const unsigned int*>(data);
auto row = reinterpret_cast<const unsigned int*>(data);
for(uint32_t x = 0; x < target->extent.width; x++) {
file.write(reinterpret_cast<const char*>(row), 3);
row++;
@ -629,8 +629,8 @@ VkShaderModule Renderer::createShader(const char* path) {
}
uint32_t Renderer::findMemoryType(const uint32_t typeFilter, const VkMemoryPropertyFlags properties) {
for (uint32_t i = 0; i < deviceMemoryProperties_.memoryTypeCount; i++) {
if ((typeFilter & (1 << i)) && (deviceMemoryProperties_.memoryTypes[i].propertyFlags & properties) == properties) {
for(uint32_t i = 0; i < deviceMemoryProperties_.memoryTypeCount; i++) {
if((typeFilter & (1 << i)) && (deviceMemoryProperties_.memoryTypes[i].propertyFlags & properties) == properties) {
return i;
}
}
@ -708,13 +708,13 @@ void Renderer::createInstance() {
uint32_t layerCount = 0;
vkEnumerateInstanceLayerProperties(&layerCount, nullptr);
VkLayerProperties* availableLayers = new VkLayerProperties[layerCount];
auto availableLayers = new VkLayerProperties[layerCount];
vkEnumerateInstanceLayerProperties(&layerCount, availableLayers);
std::vector<const char*> enabledLayers;
#ifdef DEBUG
for(uint32_t i = 0; i < layerCount; i++) {
if(!strcmp(availableLayers[i].layerName, "VK_LAYER_LUNARG_standard_validation"))
if(strcmp(availableLayers[i].layerName, "VK_LAYER_LUNARG_standard_validation") == 0)
enabledLayers.push_back("VK_LAYER_LUNARG_standard_validation");
}
#endif
@ -724,13 +724,13 @@ void Renderer::createInstance() {
uint32_t extensionCount = 0;
vkEnumerateInstanceExtensionProperties(nullptr, &extensionCount, nullptr);
VkExtensionProperties* availableExtensions = new VkExtensionProperties[extensionCount];
auto availableExtensions = new VkExtensionProperties[extensionCount];
vkEnumerateInstanceExtensionProperties(nullptr, &extensionCount, availableExtensions);
std::vector<const char*> enabledExtensions;
#ifdef DEBUG
for(uint32_t i = 0; i < extensionCount; i++) {
if(!strcmp(availableExtensions[i].extensionName, "VK_EXT_debug_utils")) {
if(strcmp(availableExtensions[i].extensionName, "VK_EXT_debug_utils") == 0) {
enabledExtensions.push_back("VK_EXT_debug_utils");
enableDebug = true;
}
@ -775,7 +775,7 @@ void Renderer::createLogicalDevice() {
uint32_t physicalDeviceCount = 0;
vkEnumeratePhysicalDevices(instance_, &physicalDeviceCount, nullptr);
VkPhysicalDevice* physicalDevices = new VkPhysicalDevice[physicalDeviceCount];
auto physicalDevices = new VkPhysicalDevice[physicalDeviceCount];
vkEnumeratePhysicalDevices(instance_, &physicalDeviceCount, physicalDevices);
for(uint32_t i = 0; i < physicalDeviceCount; i++) {
@ -792,7 +792,7 @@ void Renderer::createLogicalDevice() {
uint32_t queueFamilyPropertiesCount = 0;
vkGetPhysicalDeviceQueueFamilyProperties(physicalDevice_, &queueFamilyPropertiesCount, nullptr);
VkQueueFamilyProperties* queueFamilyProperties = new VkQueueFamilyProperties[queueFamilyPropertiesCount];
auto queueFamilyProperties = new VkQueueFamilyProperties[queueFamilyPropertiesCount];
vkGetPhysicalDeviceQueueFamilyProperties(physicalDevice_, &queueFamilyPropertiesCount, queueFamilyProperties);
for(uint32_t i = 0; i < queueFamilyPropertiesCount; i++) {

14
src/worldpass.cpp
View file

@ -36,11 +36,11 @@ void WorldPass::render(VkCommandBuffer commandBuffer, World& world, Camera& came
};
ShaderLight* data;
vkMapMemory(renderer_.getDevice(), lightMemory_, 0, sizeof(float) * (4 + 3) * 32, 0, (void**)&data);
vkMapMemory(renderer_.getDevice(), lightMemory_, 0, sizeof(float) * (4 + 3) * 32, 0, reinterpret_cast<void**>(&data));
for(size_t i = 0; i < world.lights.size(); i++) {
data->position = glm::vec4(world.lights[i]->position, 0.0);
data->color = world.lights[i]->color;
for(const auto& light : world.lights) {
data->position = glm::vec4(light->position, 0.0);
data->color = light->color;
data++;
}
@ -210,8 +210,8 @@ void WorldPass::createPipeline() {
VkPipelineDepthStencilStateCreateInfo depthState = {};
depthState.sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO;
depthState.depthTestEnable = true;
depthState.depthWriteEnable = true;
depthState.depthTestEnable = VK_TRUE;
depthState.depthWriteEnable = VK_TRUE;
depthState.depthCompareOp = VK_COMPARE_OP_LESS;
VkPipelineColorBlendStateCreateInfo colorBlending = {};
@ -307,7 +307,7 @@ void WorldPass::createDescriptorSet() {
vkUpdateDescriptorSets(renderer_.getDevice(), 1, &descriptorWrite, 0, nullptr);
float* data;
vkMapMemory(renderer_.getDevice(), lightMemory_, 0, sizeof(float) * (4 + 3) * 32, 0, (void**)&data);
vkMapMemory(renderer_.getDevice(), lightMemory_, 0, sizeof(float) * (4 + 3) * 32, 0, reinterpret_cast<void**>(&data));
for(uint32_t i = 0; i < (4 + 3) * 32; i++)
data[i] = 0.0f;