diff options
Diffstat (limited to 'src')
4 files changed, 3 insertions, 6 deletions
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<P>::CommitAsyncFlushesHigh() { | |||
| 817 | const std::size_t size = interval.upper() - interval.lower(); | 817 | const std::size_t size = interval.upper() - interval.lower(); |
| 818 | const VAddr cpu_addr = interval.lower(); | 818 | const VAddr cpu_addr = interval.lower(); |
| 819 | ForEachBufferInRange(cpu_addr, size, [&](BufferId buffer_id, Buffer& buffer) { | 819 | ForEachBufferInRange(cpu_addr, size, [&](BufferId buffer_id, Buffer& buffer) { |
| 820 | boost::container::small_vector<BufferCopy, 1> copies; | ||
| 821 | buffer.ForEachDownloadRangeAndClear( | 820 | buffer.ForEachDownloadRangeAndClear( |
| 822 | cpu_addr, size, [&](u64 range_offset, u64 range_size) { | 821 | cpu_addr, size, [&](u64 range_offset, u64 range_size) { |
| 823 | const VAddr buffer_addr = buffer.CpuAddr(); | 822 | const VAddr buffer_addr = buffer.CpuAddr(); |
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<GraphicsPipeline> ShaderCache::CreateGraphicsPipeline( | |||
| 441 | 441 | ||
| 442 | std::array<const Shader::Info*, Maxwell::MaxShaderStage> infos{}; | 442 | std::array<const Shader::Info*, Maxwell::MaxShaderStage> infos{}; |
| 443 | 443 | ||
| 444 | OGLProgram source_program; | ||
| 445 | std::array<std::string, 5> sources; | 444 | std::array<std::string, 5> sources; |
| 446 | std::array<std::vector<u32>, 5> sources_spirv; | 445 | std::array<std::vector<u32>, 5> sources_spirv; |
| 447 | Shader::Backend::Bindings binding; | 446 | Shader::Backend::Bindings binding; |
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<VkBuffer, VkDeviceSize> Uint8Pass::Assemble(u32 num_vertices, VkBuffer | |||
| 258 | update_descriptor_queue.AddBuffer(src_buffer, src_offset, num_vertices); | 258 | update_descriptor_queue.AddBuffer(src_buffer, src_offset, num_vertices); |
| 259 | update_descriptor_queue.AddBuffer(staging.buffer, staging.offset, staging_size); | 259 | update_descriptor_queue.AddBuffer(staging.buffer, staging.offset, staging_size); |
| 260 | const void* const descriptor_data{update_descriptor_queue.UpdateData()}; | 260 | const void* const descriptor_data{update_descriptor_queue.UpdateData()}; |
| 261 | const VkBuffer buffer{staging.buffer}; | ||
| 262 | 261 | ||
| 263 | scheduler.RequestOutsideRenderPassOperationContext(); | 262 | scheduler.RequestOutsideRenderPassOperationContext(); |
| 264 | scheduler.Record([this, buffer, descriptor_data, num_vertices](vk::CommandBuffer cmdbuf) { | 263 | scheduler.Record([this, descriptor_data, num_vertices](vk::CommandBuffer cmdbuf) { |
| 265 | static constexpr u32 DISPATCH_SIZE = 1024; | 264 | static constexpr u32 DISPATCH_SIZE = 1024; |
| 266 | static constexpr VkMemoryBarrier WRITE_BARRIER{ | 265 | static constexpr VkMemoryBarrier WRITE_BARRIER{ |
| 267 | .sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER, | 266 | .sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER, |
| @@ -319,7 +318,7 @@ std::pair<VkBuffer, VkDeviceSize> QuadIndexedPass::Assemble( | |||
| 319 | const void* const descriptor_data{update_descriptor_queue.UpdateData()}; | 318 | const void* const descriptor_data{update_descriptor_queue.UpdateData()}; |
| 320 | 319 | ||
| 321 | scheduler.RequestOutsideRenderPassOperationContext(); | 320 | scheduler.RequestOutsideRenderPassOperationContext(); |
| 322 | scheduler.Record([this, buffer = staging.buffer, descriptor_data, num_tri_vertices, base_vertex, | 321 | scheduler.Record([this, descriptor_data, num_tri_vertices, base_vertex, |
| 323 | index_shift](vk::CommandBuffer cmdbuf) { | 322 | index_shift](vk::CommandBuffer cmdbuf) { |
| 324 | static constexpr u32 DISPATCH_SIZE = 1024; | 323 | static constexpr u32 DISPATCH_SIZE = 1024; |
| 325 | static constexpr VkMemoryBarrier WRITE_BARRIER{ | 324 | static constexpr VkMemoryBarrier WRITE_BARRIER{ |
diff --git a/src/video_core/vulkan_common/vulkan_wrapper.cpp b/src/video_core/vulkan_common/vulkan_wrapper.cpp index bbf0fccae..70898004a 100644 --- a/src/video_core/vulkan_common/vulkan_wrapper.cpp +++ b/src/video_core/vulkan_common/vulkan_wrapper.cpp | |||
| @@ -202,7 +202,7 @@ void SetObjectName(const DeviceDispatch* dld, VkDevice device, T handle, VkObjec | |||
| 202 | const VkDebugUtilsObjectNameInfoEXT name_info{ | 202 | const VkDebugUtilsObjectNameInfoEXT name_info{ |
| 203 | .sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT, | 203 | .sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT, |
| 204 | .pNext = nullptr, | 204 | .pNext = nullptr, |
| 205 | .objectType = VK_OBJECT_TYPE_IMAGE, | 205 | .objectType = type, |
| 206 | .objectHandle = reinterpret_cast<u64>(handle), | 206 | .objectHandle = reinterpret_cast<u64>(handle), |
| 207 | .pObjectName = name, | 207 | .pObjectName = name, |
| 208 | }; | 208 | }; |