From acfc32656fb7e9baf14f00e3c32c5ad155121907 Mon Sep 17 00:00:00 2001 From: Gregory Wells Date: Sun, 3 Aug 2025 14:29:26 -0400 Subject: [PATCH] fix some warnings --- .../graphics_pipeline/vulkan_graphics_pipeline.c | 16 ++++++++-------- .../apis/vulkan/src/textures/vulkan_texture.c | 9 +++++---- .../core/src/uniforms/gryphn_uniform_layout.h | 1 + 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/projects/apis/vulkan/src/pipelines/graphics_pipeline/vulkan_graphics_pipeline.c b/projects/apis/vulkan/src/pipelines/graphics_pipeline/vulkan_graphics_pipeline.c index 4ab2ce0..3625a0f 100644 --- a/projects/apis/vulkan/src/pipelines/graphics_pipeline/vulkan_graphics_pipeline.c +++ b/projects/apis/vulkan/src/pipelines/graphics_pipeline/vulkan_graphics_pipeline.c @@ -94,7 +94,7 @@ gnReturnCode createGraphicsPipeline(gnGraphicsPipeline graphicsPipeline, gnDevic for (int i = 0; i < GN_DYNAMIC_STATE_MAX; i++) graphicsPipeline->graphicsPipeline->isDynamic[i] = GN_FALSE; graphicsPipeline->graphicsPipeline->dynamicStates = malloc(sizeof(VkDynamicState) * info.dynamicState.dynamicStateCount); - for (int i = 0; i < info.dynamicState.dynamicStateCount; i++) { + for (uint32_t i = 0; i < info.dynamicState.dynamicStateCount; i++) { graphicsPipeline->graphicsPipeline->isDynamic[info.dynamicState.dynamicStates[i]] = GN_TRUE; graphicsPipeline->graphicsPipeline->dynamicStates[i] = vkGryphnDynamicStateToVulkanDynamicState(info.dynamicState.dynamicStates[i]); } @@ -107,15 +107,15 @@ gnReturnCode createGraphicsPipeline(gnGraphicsPipeline graphicsPipeline, gnDevic int vertexAttributeCount = 0; graphicsPipeline->graphicsPipeline->bindingDescriptions = malloc(sizeof(VkVertexInputBindingDescription) * info.shaderInputLayout.bufferCount); - for (int i = 0; i < info.shaderInputLayout.bufferCount; i++) { + for (uint32_t i = 0; i < info.shaderInputLayout.bufferCount; i++) { graphicsPipeline->graphicsPipeline->bindingDescriptions[i].binding = info.shaderInputLayout.bufferAttributes[i].binding; graphicsPipeline->graphicsPipeline->bindingDescriptions[i].stride = info.shaderInputLayout.bufferAttributes[i].size; graphicsPipeline->graphicsPipeline->bindingDescriptions[i].inputRate = VK_VERTEX_INPUT_RATE_VERTEX; vertexAttributeCount += info.shaderInputLayout.bufferAttributes[i].attributeCount; } graphicsPipeline->graphicsPipeline->attributeDescriptions = malloc(sizeof(VkVertexInputAttributeDescription) * vertexAttributeCount); - for (int i = 0, j = 0; j < info.shaderInputLayout.bufferCount; j++) { - for (int k = 0; k < info.shaderInputLayout.bufferAttributes[j].attributeCount; k++) { + for (uint32_t i = 0, j = 0; j < info.shaderInputLayout.bufferCount; j++) { + for (uint32_t k = 0; k < info.shaderInputLayout.bufferAttributes[j].attributeCount; k++) { graphicsPipeline->graphicsPipeline->attributeDescriptions[i].binding = j; graphicsPipeline->graphicsPipeline->attributeDescriptions[i].location = info.shaderInputLayout.bufferAttributes[j].attributes[k].location; graphicsPipeline->graphicsPipeline->attributeDescriptions[i].offset = info.shaderInputLayout.bufferAttributes[j].attributes[k].offset; @@ -238,10 +238,10 @@ gnReturnCode createGraphicsPipeline(gnGraphicsPipeline graphicsPipeline, gnDevic graphicsPipeline->graphicsPipeline->setCount = info.uniformLayout.setCount; graphicsPipeline->graphicsPipeline->sets = malloc(sizeof(VkDescriptorSetLayout) * info.uniformLayout.setCount); - for (int i = 0; i < info.uniformLayout.setCount; i++) graphicsPipeline->graphicsPipeline->sets[i] = vkGryphnCreateSetLayouts(&info.uniformLayout.sets[i], device->outputDevice->device); + for (uint32_t i = 0; i < info.uniformLayout.setCount; i++) graphicsPipeline->graphicsPipeline->sets[i] = vkGryphnCreateSetLayouts(&info.uniformLayout.sets[i], device->outputDevice->device); graphicsPipeline->graphicsPipeline->ranges = malloc(sizeof(VkPushConstantRange) * info.uniformLayout.pushConstantCount); - for (int i = 0; i < info.uniformLayout.pushConstantCount; i++) { + for (uint32_t i = 0; i < info.uniformLayout.pushConstantCount; i++) { graphicsPipeline->graphicsPipeline->ranges[i] = (VkPushConstantRange) { .offset = info.uniformLayout.pushConstants[i].offset, .size = info.uniformLayout.pushConstants[i].size, @@ -262,7 +262,7 @@ gnReturnCode createGraphicsPipeline(gnGraphicsPipeline graphicsPipeline, gnDevic return VkResultToGnReturnCode(pipelineCode); graphicsPipeline->graphicsPipeline->modules = malloc(sizeof(VkPipelineShaderStageCreateInfo) * info.shaderModuleCount); - for (int i = 0; i < info.shaderModuleCount; i++) { + for (uint32_t i = 0; i < info.shaderModuleCount; i++) { graphicsPipeline->graphicsPipeline->modules[i] = info.shaderModules[i]->shaderModule->shaderStageInfo; } @@ -293,7 +293,7 @@ void destroyGraphicsPipeline(gnGraphicsPipeline graphicsPipeline) { free(graphicsPipeline->graphicsPipeline->bindingDescriptions); free(graphicsPipeline->graphicsPipeline->attributeDescriptions); free(graphicsPipeline->graphicsPipeline->ranges); - for (int i = 0; i < graphicsPipeline->graphicsPipeline->setCount; i++) + for (uint32_t i = 0; i < graphicsPipeline->graphicsPipeline->setCount; i++) vkDestroyDescriptorSetLayout(graphicsPipeline->device->outputDevice->device, graphicsPipeline->graphicsPipeline->sets[i], NULL); free(graphicsPipeline->graphicsPipeline->modules); vkDestroyPipeline(graphicsPipeline->device->outputDevice->device, graphicsPipeline->graphicsPipeline->graphicsPipeline, NULL); diff --git a/projects/apis/vulkan/src/textures/vulkan_texture.c b/projects/apis/vulkan/src/textures/vulkan_texture.c index b02ab59..029e824 100644 --- a/projects/apis/vulkan/src/textures/vulkan_texture.c +++ b/projects/apis/vulkan/src/textures/vulkan_texture.c @@ -3,6 +3,7 @@ #include "output_device/vulkan_output_devices.h" #include "output_device/vulkan_physical_device.h" #include +#include "string.h" VkImageType vkGryphnTextureType(gnTextureType type) { switch(type) { @@ -53,8 +54,8 @@ gnBool vkGryphnIsDepthStencil(gnImageFormat format) { return (format == GN_FORMA void VkTransitionImageLayout(gnDevice device, VkImage image, gnImageFormat format, VkImageLayout oldLayout, VkImageLayout newLayout) { VkCommandBuffer transferBuffer = gnBeginVulkanTransferOperation(device); - VkPipelineStageFlags sourceStage, destinationStage; - VkAccessFlags sourceAccessMask, destinationAccessMask; + VkPipelineStageFlags sourceStage = 0, destinationStage = 0; + VkAccessFlags sourceAccessMask = 0, destinationAccessMask = 0; if (oldLayout == VK_IMAGE_LAYOUT_UNDEFINED && newLayout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL) { sourceAccessMask = 0; @@ -66,8 +67,8 @@ void VkTransitionImageLayout(gnDevice device, VkImage image, gnImageFormat forma sourceAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; sourceStage = VK_PIPELINE_STAGE_TRANSFER_BIT; - destinationStage = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; destinationAccessMask = VK_ACCESS_SHADER_READ_BIT; + destinationStage = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; } else if (oldLayout == VK_IMAGE_LAYOUT_UNDEFINED && newLayout == VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL) { sourceAccessMask = 0; sourceStage = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT; @@ -208,7 +209,7 @@ gnReturnCode createTexture(gnTexture texture, gnDevice device, const gnTextureIn VkResult image_view = vkCreateImageView(device->outputDevice->device, &viewInfo, NULL, &texture->texture->image.imageView); if (image_view != VK_SUCCESS) return VkResultToGnReturnCode(image_view); - VkPhysicalDeviceProperties properties = {}; + VkPhysicalDeviceProperties properties; vkGetPhysicalDeviceProperties(device->outputDevice->physicalDevice, &properties); VkSamplerCreateInfo samplerInfo = { diff --git a/projects/core/src/uniforms/gryphn_uniform_layout.h b/projects/core/src/uniforms/gryphn_uniform_layout.h index 191c4d8..68a949f 100644 --- a/projects/core/src/uniforms/gryphn_uniform_layout.h +++ b/projects/core/src/uniforms/gryphn_uniform_layout.h @@ -1,5 +1,6 @@ #pragma once #include "stdint.h" +#include "stdlib.h" #include "shader_module/gryphn_shader_module.h" typedef enum gnUniformType {