diff --git a/src/graphics/host_gpu/renderer/commandScheduler.cpp b/src/graphics/host_gpu/renderer/commandScheduler.cpp index 101d34130..bc3664574 100644 --- a/src/graphics/host_gpu/renderer/commandScheduler.cpp +++ b/src/graphics/host_gpu/renderer/commandScheduler.cpp @@ -34,7 +34,6 @@ CommandScheduler::CommandPool::CommandPool(GraphicContext& graphics, MasterSemap : m_graphics(graphics), m_master(master) { EXIT_IF(graphics.queue_family == static_cast(-1)); vk::CommandPoolCreateInfo create {}; - create.sType = vk::StructureType::eCommandPoolCreateInfo; create.queueFamilyIndex = graphics.queue_family; create.flags = vk::CommandPoolCreateFlagBits::eTransient | vk::CommandPoolCreateFlagBits::eResetCommandBuffer; @@ -52,7 +51,6 @@ size_t CommandScheduler::CommandPool::Grow() { m_buffers.resize(first + GrowStep); vk::CommandBufferAllocateInfo allocate {}; - allocate.sType = vk::StructureType::eCommandBufferAllocateInfo; allocate.commandPool = m_pool; allocate.level = vk::CommandBufferLevel::ePrimary; allocate.commandBufferCount = static_cast(GrowStep); @@ -378,14 +376,12 @@ uint64_t CommandScheduler::Submit(SubmitInfo submit) { submit.AddSignal(m_master.Handle(), tick); vk::TimelineSemaphoreSubmitInfo timeline_info {}; - timeline_info.sType = vk::StructureType::eTimelineSemaphoreSubmitInfo; timeline_info.waitSemaphoreValueCount = submit.num_wait_semaphores; timeline_info.pWaitSemaphoreValues = submit.wait_ticks.data(); timeline_info.signalSemaphoreValueCount = submit.num_signal_semaphores; timeline_info.pSignalSemaphoreValues = submit.signal_ticks.data(); vk::SubmitInfo submit_info {}; - submit_info.sType = vk::StructureType::eSubmitInfo; submit_info.pNext = &timeline_info; submit_info.waitSemaphoreCount = submit.num_wait_semaphores; submit_info.pWaitSemaphores = submit.wait_semaphores.data(); diff --git a/src/graphics/host_gpu/renderer/context.cpp b/src/graphics/host_gpu/renderer/context.cpp index f5dce5225..9c271b7c4 100644 --- a/src/graphics/host_gpu/renderer/context.cpp +++ b/src/graphics/host_gpu/renderer/context.cpp @@ -34,10 +34,7 @@ void CommandBuffer::Begin() { auto buffer = Handle(); vk::CommandBufferBeginInfo begin_info {}; - begin_info.sType = vk::StructureType::eCommandBufferBeginInfo; - begin_info.pNext = nullptr; - begin_info.flags = vk::CommandBufferUsageFlagBits::eOneTimeSubmit; - begin_info.pInheritanceInfo = nullptr; + begin_info.flags = vk::CommandBufferUsageFlagBits::eOneTimeSubmit; auto result = buffer.begin(&begin_info); @@ -75,7 +72,6 @@ void CommandBuffer::BeginRendering(const RenderState& state) const { std::array colors {}; for (uint32_t i = 0; i < state.num_color_attachments; i++) { const auto& attachment = state.color_attachments[i]; - colors[i].sType = vk::StructureType::eRenderingAttachmentInfo; colors[i].imageView = attachment.image_view; colors[i].imageLayout = attachment.image_layout; colors[i].loadOp = @@ -86,7 +82,6 @@ void CommandBuffer::BeginRendering(const RenderState& state) const { const auto& depth_stencil = state.depth_stencil_attachment; vk::RenderingAttachmentInfo depth {}; - depth.sType = vk::StructureType::eRenderingAttachmentInfo; depth.imageView = depth_stencil.image_view; depth.imageLayout = depth_stencil.image_layout; depth.loadOp = @@ -95,7 +90,6 @@ void CommandBuffer::BeginRendering(const RenderState& state) const { depth.clearValue.depthStencil.depth = std::bit_cast(depth_stencil.clear_value[0]); vk::RenderingAttachmentInfo stencil {}; - stencil.sType = vk::StructureType::eRenderingAttachmentInfo; stencil.imageView = depth_stencil.image_view; stencil.imageLayout = depth_stencil.image_layout; stencil.loadOp = @@ -104,7 +98,6 @@ void CommandBuffer::BeginRendering(const RenderState& state) const { stencil.clearValue.depthStencil.stencil = depth_stencil.clear_value[1]; vk::RenderingInfo rendering {}; - rendering.sType = vk::StructureType::eRenderingInfo; rendering.renderArea.extent = {state.width, state.height}; rendering.layerCount = state.num_layers; rendering.colorAttachmentCount = state.num_color_attachments; diff --git a/src/graphics/host_gpu/renderer/image/blitHelper.cpp b/src/graphics/host_gpu/renderer/image/blitHelper.cpp index c5200f1b6..d6a59fbb3 100644 --- a/src/graphics/host_gpu/renderer/image/blitHelper.cpp +++ b/src/graphics/host_gpu/renderer/image/blitHelper.cpp @@ -95,9 +95,7 @@ vk::Pipeline BlitHelper::GetPipeline(PipelineKey key) { viewport.viewportCount = 1; viewport.scissorCount = 1; vk::PipelineRasterizationStateCreateInfo rasterization {}; - rasterization.polygonMode = vk::PolygonMode::eFill; - rasterization.cullMode = vk::CullModeFlagBits::eNone; - rasterization.lineWidth = 1.0f; + rasterization.lineWidth = 1.0f; vk::PipelineMultisampleStateCreateInfo multisample {}; multisample.rasterizationSamples = samples; vk::PipelineDepthStencilStateCreateInfo depth {}; diff --git a/src/graphics/host_gpu/renderer/masterSemaphore.cpp b/src/graphics/host_gpu/renderer/masterSemaphore.cpp index 09d347cb3..7a79187a9 100644 --- a/src/graphics/host_gpu/renderer/masterSemaphore.cpp +++ b/src/graphics/host_gpu/renderer/masterSemaphore.cpp @@ -7,12 +7,10 @@ namespace Libs::Graphics { MasterSemaphore::MasterSemaphore(GraphicContext& graphics): m_graphics(graphics) { vk::SemaphoreTypeCreateInfo type_info {}; - type_info.sType = vk::StructureType::eSemaphoreTypeCreateInfo; type_info.semaphoreType = vk::SemaphoreType::eTimeline; type_info.initialValue = 0; vk::SemaphoreCreateInfo create_info {}; - create_info.sType = vk::StructureType::eSemaphoreCreateInfo; create_info.pNext = &type_info; const auto result = m_graphics.device.createSemaphore(&create_info, nullptr, &m_semaphore); @@ -47,7 +45,6 @@ void MasterSemaphore::Wait(uint64_t tick) { } vk::SemaphoreWaitInfo wait_info {}; - wait_info.sType = vk::StructureType::eSemaphoreWaitInfo; wait_info.semaphoreCount = 1; wait_info.pSemaphores = &m_semaphore; wait_info.pValues = &tick; diff --git a/src/graphics/host_gpu/renderer/pipeline/descriptorHeap.cpp b/src/graphics/host_gpu/renderer/pipeline/descriptorHeap.cpp index 20dd92bdc..de61c6862 100644 --- a/src/graphics/host_gpu/renderer/pipeline/descriptorHeap.cpp +++ b/src/graphics/host_gpu/renderer/pipeline/descriptorHeap.cpp @@ -63,7 +63,6 @@ bool DescriptorHeap::Allocate(vk::DescriptorSetLayout layout, Batch& batch) { layouts.fill(layout); vk::DescriptorSetAllocateInfo allocate {}; - allocate.sType = vk::StructureType::eDescriptorSetAllocateInfo; allocate.descriptorPool = m_current_pool; allocate.pSetLayouts = layouts.data(); @@ -85,8 +84,6 @@ bool DescriptorHeap::Allocate(vk::DescriptorSetLayout layout, Batch& batch) { void DescriptorHeap::CreatePool() { vk::DescriptorPoolCreateInfo create {}; - create.sType = vk::StructureType::eDescriptorPoolCreateInfo; - create.flags = {}; create.maxSets = DescriptorHeapCount; create.poolSizeCount = static_cast(DescriptorPoolSizes.size()); create.pPoolSizes = DescriptorPoolSizes.data(); diff --git a/src/graphics/host_gpu/renderer/pipeline/descriptors.cpp b/src/graphics/host_gpu/renderer/pipeline/descriptors.cpp index 767ca27c8..4329e38fa 100644 --- a/src/graphics/host_gpu/renderer/pipeline/descriptors.cpp +++ b/src/graphics/host_gpu/renderer/pipeline/descriptors.cpp @@ -1148,7 +1148,6 @@ void RenderExecutor::CommitBindings(CommandBuffer& buffer, m_image_occurrences.assign(descriptors.images.size(), 0); for (const auto& binding: program.bindings.descriptors) { vk::WriteDescriptorSet write {}; - write.sType = vk::StructureType::eWriteDescriptorSet; write.dstBinding = ShaderRecompiler::IR::NativeBinding(program.stage, binding.kind); write.descriptorType = NativeDescriptorType(binding.kind); write.descriptorCount = NativeDescriptorCount(binding); diff --git a/src/graphics/host_gpu/renderer/pipeline/pipelineCache.cpp b/src/graphics/host_gpu/renderer/pipeline/pipelineCache.cpp index 3a1faedc6..f0a9e65e9 100644 --- a/src/graphics/host_gpu/renderer/pipeline/pipelineCache.cpp +++ b/src/graphics/host_gpu/renderer/pipeline/pipelineCache.cpp @@ -228,7 +228,6 @@ struct PipelineCache::ProgramCache { DumpShaderSpirv(stage_name, options.shader_hash, result.spirv); vk::ShaderModuleCreateInfo create_info {}; - create_info.sType = vk::StructureType::eShaderModuleCreateInfo; create_info.codeSize = result.spirv.size() * sizeof(uint32_t); create_info.pCode = result.spirv.data(); vk::ShaderModule module = nullptr; @@ -451,7 +450,6 @@ void PipelineCache::InitializeDriverCache() { } vk::PipelineCacheCreateInfo create {}; - create.sType = vk::StructureType::ePipelineCacheCreateInfo; create.initialDataSize = initial_data.size(); create.pInitialData = initial_data.empty() ? nullptr : initial_data.data(); auto result = m_graphics.device.createPipelineCache(&create, nullptr, &m_driver_cache); diff --git a/src/graphics/host_gpu/renderer/pipeline/shaderResourceBarrier.cpp b/src/graphics/host_gpu/renderer/pipeline/shaderResourceBarrier.cpp index 7f52dcdea..00e907afa 100644 --- a/src/graphics/host_gpu/renderer/pipeline/shaderResourceBarrier.cpp +++ b/src/graphics/host_gpu/renderer/pipeline/shaderResourceBarrier.cpp @@ -28,7 +28,6 @@ vk::PipelineStageFlags ShaderPipelineStages(vk::ShaderStageFlags stages) { VulkanMemoryBarrier MakeShaderWriteDependency() { VulkanMemoryBarrier barrier {}; - barrier.sType = vk::StructureType::eMemoryBarrier; barrier.srcAccessMask = vk::AccessFlagBits::eShaderWrite; barrier.dstAccessMask = vk::AccessFlagBits::eShaderRead | vk::AccessFlagBits::eShaderWrite | vk::AccessFlagBits::eVertexAttributeRead | @@ -41,7 +40,6 @@ VulkanMemoryBarrier MakeShaderWriteDependency() { VulkanMemoryBarrier MakeShaderAccessDependency() { VulkanMemoryBarrier barrier {}; - barrier.sType = vk::StructureType::eMemoryBarrier; barrier.srcAccessMask = vk::AccessFlagBits::eShaderRead | vk::AccessFlagBits::eShaderWrite; barrier.dstAccessMask = vk::AccessFlagBits::eMemoryRead | vk::AccessFlagBits::eMemoryWrite; return barrier; @@ -49,7 +47,6 @@ VulkanMemoryBarrier MakeShaderAccessDependency() { VulkanMemoryBarrier MakeShaderWriteHazardDependency() { VulkanMemoryBarrier barrier {}; - barrier.sType = vk::StructureType::eMemoryBarrier; barrier.srcAccessMask = vk::AccessFlagBits::eMemoryRead | vk::AccessFlagBits::eMemoryWrite; barrier.dstAccessMask = vk::AccessFlagBits::eShaderRead | vk::AccessFlagBits::eShaderWrite; return barrier; @@ -59,7 +56,6 @@ vk::BufferMemoryBarrier MakeGdsDependency(vk::Buffer buffer) { EXIT_IF(buffer == nullptr); vk::BufferMemoryBarrier barrier {}; - barrier.sType = vk::StructureType::eBufferMemoryBarrier; barrier.srcAccessMask = vk::AccessFlagBits::eHostWrite | vk::AccessFlagBits::eTransferWrite | vk::AccessFlagBits::eShaderWrite; barrier.dstAccessMask = vk::AccessFlagBits::eShaderRead | vk::AccessFlagBits::eShaderWrite; diff --git a/src/graphics/host_gpu/renderer/pipeline/shaders.cpp b/src/graphics/host_gpu/renderer/pipeline/shaders.cpp index f62ceec57..1ec7356a6 100644 --- a/src/graphics/host_gpu/renderer/pipeline/shaders.cpp +++ b/src/graphics/host_gpu/renderer/pipeline/shaders.cpp @@ -408,7 +408,6 @@ static void CreateDescriptorLayout(GraphicContext& graphics, PipelineCache::Pipe pipeline.uses_push_descriptors = descriptor_count <= graphics.max_push_descriptors; vk::DescriptorSetLayoutCreateInfo create {}; - create.sType = vk::StructureType::eDescriptorSetLayoutCreateInfo; create.flags = pipeline.uses_push_descriptors ? vk::DescriptorSetLayoutCreateFlagBits::ePushDescriptorKHR : vk::DescriptorSetLayoutCreateFlags {};