From 296728ec46eebd0086cb130d7a74ef7ce83c9e1c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 27 Jul 2021 06:17:50 -0400 Subject: vk_compute_pass: Remove unused captures Resolves two compiler warnings. --- src/video_core/renderer_vulkan/vk_compute_pass.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/video_core/renderer_vulkan/vk_compute_pass.cpp b/src/video_core/renderer_vulkan/vk_compute_pass.cpp index 73157a15d..561cf5e11 100644 --- a/src/video_core/renderer_vulkan/vk_compute_pass.cpp +++ b/src/video_core/renderer_vulkan/vk_compute_pass.cpp @@ -258,10 +258,9 @@ std::pair Uint8Pass::Assemble(u32 num_vertices, VkBuffer update_descriptor_queue.AddBuffer(src_buffer, src_offset, num_vertices); update_descriptor_queue.AddBuffer(staging.buffer, staging.offset, staging_size); const void* const descriptor_data{update_descriptor_queue.UpdateData()}; - const VkBuffer buffer{staging.buffer}; scheduler.RequestOutsideRenderPassOperationContext(); - scheduler.Record([this, buffer, descriptor_data, num_vertices](vk::CommandBuffer cmdbuf) { + scheduler.Record([this, descriptor_data, num_vertices](vk::CommandBuffer cmdbuf) { static constexpr u32 DISPATCH_SIZE = 1024; static constexpr VkMemoryBarrier WRITE_BARRIER{ .sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER, @@ -319,7 +318,7 @@ std::pair QuadIndexedPass::Assemble( const void* const descriptor_data{update_descriptor_queue.UpdateData()}; scheduler.RequestOutsideRenderPassOperationContext(); - scheduler.Record([this, buffer = staging.buffer, descriptor_data, num_tri_vertices, base_vertex, + scheduler.Record([this, descriptor_data, num_tri_vertices, base_vertex, index_shift](vk::CommandBuffer cmdbuf) { static constexpr u32 DISPATCH_SIZE = 1024; static constexpr VkMemoryBarrier WRITE_BARRIER{ -- cgit v1.2.3 From 075a744e384c6d1180c9c219a70df55f141f9baa Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 27 Jul 2021 06:23:49 -0400 Subject: gl_shader_cache: Remove unused variable --- src/video_core/renderer_opengl/gl_shader_cache.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp index 8d6cc074c..1f4dda17e 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp @@ -441,7 +441,6 @@ std::unique_ptr ShaderCache::CreateGraphicsPipeline( std::array infos{}; - OGLProgram source_program; std::array sources; std::array, 5> sources_spirv; Shader::Backend::Bindings binding; -- cgit v1.2.3 From ec56a17acd786c19022e71f2e87bc5d50b4df72e Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 27 Jul 2021 06:24:35 -0400 Subject: buffer_cache: Remove unused small_vector in CommitAsyncFlushesHigh() Given this is non-trivial, the constructor is required to execute, so this removes a bit of redundant codegen. --- src/video_core/buffer_cache/buffer_cache.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index 24c858104..3b43554f9 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -817,7 +817,6 @@ void BufferCache

::CommitAsyncFlushesHigh() { const std::size_t size = interval.upper() - interval.lower(); const VAddr cpu_addr = interval.lower(); ForEachBufferInRange(cpu_addr, size, [&](BufferId buffer_id, Buffer& buffer) { - boost::container::small_vector copies; buffer.ForEachDownloadRangeAndClear( cpu_addr, size, [&](u64 range_offset, u64 range_size) { const VAddr buffer_addr = buffer.CpuAddr(); -- cgit v1.2.3