diff options
| author | 2020-03-30 05:15:37 -0300 | |
|---|---|---|
| committer | 2020-04-13 17:33:59 -0300 | |
| commit | 6cfe2a72467dd8897d4823b61d3a82eebbf2dd5d (patch) | |
| tree | b678746d957c457bdf07e559a886a237c4923a91 | |
| parent | renderer_vulkan: Catch device losses in more places (diff) | |
| download | yuzu-6cfe2a72467dd8897d4823b61d3a82eebbf2dd5d.tar.gz yuzu-6cfe2a72467dd8897d4823b61d3a82eebbf2dd5d.tar.xz yuzu-6cfe2a72467dd8897d4823b61d3a82eebbf2dd5d.zip | |
renderer_vulkan: Remove Nvidia checkpoints
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_device.h | 5 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_rasterizer.cpp | 10 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/wrapper.cpp | 13 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/wrapper.h | 6 |
4 files changed, 0 insertions, 34 deletions
diff --git a/src/video_core/renderer_vulkan/vk_device.h b/src/video_core/renderer_vulkan/vk_device.h index 60d64572a..f596a6086 100644 --- a/src/video_core/renderer_vulkan/vk_device.h +++ b/src/video_core/renderer_vulkan/vk_device.h | |||
| @@ -173,11 +173,6 @@ public: | |||
| 173 | return ext_transform_feedback; | 173 | return ext_transform_feedback; |
| 174 | } | 174 | } |
| 175 | 175 | ||
| 176 | /// Returns true if the device supports VK_NV_device_diagnostic_checkpoints. | ||
| 177 | bool IsNvDeviceDiagnosticCheckpoints() const { | ||
| 178 | return nv_device_diagnostic_checkpoints; | ||
| 179 | } | ||
| 180 | |||
| 181 | /// Returns the vendor name reported from Vulkan. | 176 | /// Returns the vendor name reported from Vulkan. |
| 182 | std::string_view GetVendorName() const { | 177 | std::string_view GetVendorName() const { |
| 183 | return vendor_name; | 178 | return vendor_name; |
diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 33cbc0bb6..ec9494c00 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp | |||
| @@ -347,11 +347,6 @@ void RasterizerVulkan::Draw(bool is_indexed, bool is_instanced) { | |||
| 347 | 347 | ||
| 348 | buffer_bindings.Bind(scheduler); | 348 | buffer_bindings.Bind(scheduler); |
| 349 | 349 | ||
| 350 | if (device.IsNvDeviceDiagnosticCheckpoints()) { | ||
| 351 | scheduler.Record( | ||
| 352 | [&pipeline](vk::CommandBuffer cmdbuf) { cmdbuf.SetCheckpointNV(&pipeline); }); | ||
| 353 | } | ||
| 354 | |||
| 355 | BeginTransformFeedback(); | 350 | BeginTransformFeedback(); |
| 356 | 351 | ||
| 357 | const auto pipeline_layout = pipeline.GetLayout(); | 352 | const auto pipeline_layout = pipeline.GetLayout(); |
| @@ -478,11 +473,6 @@ void RasterizerVulkan::DispatchCompute(GPUVAddr code_addr) { | |||
| 478 | TransitionImages(image_views, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, | 473 | TransitionImages(image_views, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, |
| 479 | VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT); | 474 | VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT); |
| 480 | 475 | ||
| 481 | if (device.IsNvDeviceDiagnosticCheckpoints()) { | ||
| 482 | scheduler.Record( | ||
| 483 | [&pipeline](vk::CommandBuffer cmdbuf) { cmdbuf.SetCheckpointNV(nullptr); }); | ||
| 484 | } | ||
| 485 | |||
| 486 | scheduler.Record([grid_x = launch_desc.grid_dim_x, grid_y = launch_desc.grid_dim_y, | 476 | scheduler.Record([grid_x = launch_desc.grid_dim_x, grid_y = launch_desc.grid_dim_y, |
| 487 | grid_z = launch_desc.grid_dim_z, pipeline_handle = pipeline.GetHandle(), | 477 | grid_z = launch_desc.grid_dim_z, pipeline_handle = pipeline.GetHandle(), |
| 488 | layout = pipeline.GetLayout(), | 478 | layout = pipeline.GetLayout(), |
diff --git a/src/video_core/renderer_vulkan/wrapper.cpp b/src/video_core/renderer_vulkan/wrapper.cpp index 9b94dfff1..f88eaad6b 100644 --- a/src/video_core/renderer_vulkan/wrapper.cpp +++ b/src/video_core/renderer_vulkan/wrapper.cpp | |||
| @@ -61,7 +61,6 @@ void Load(VkDevice device, DeviceDispatch& dld) noexcept { | |||
| 61 | X(vkCmdPipelineBarrier); | 61 | X(vkCmdPipelineBarrier); |
| 62 | X(vkCmdPushConstants); | 62 | X(vkCmdPushConstants); |
| 63 | X(vkCmdSetBlendConstants); | 63 | X(vkCmdSetBlendConstants); |
| 64 | X(vkCmdSetCheckpointNV); | ||
| 65 | X(vkCmdSetDepthBias); | 64 | X(vkCmdSetDepthBias); |
| 66 | X(vkCmdSetDepthBounds); | 65 | X(vkCmdSetDepthBounds); |
| 67 | X(vkCmdSetScissor); | 66 | X(vkCmdSetScissor); |
| @@ -116,7 +115,6 @@ void Load(VkDevice device, DeviceDispatch& dld) noexcept { | |||
| 116 | X(vkGetFenceStatus); | 115 | X(vkGetFenceStatus); |
| 117 | X(vkGetImageMemoryRequirements); | 116 | X(vkGetImageMemoryRequirements); |
| 118 | X(vkGetQueryPoolResults); | 117 | X(vkGetQueryPoolResults); |
| 119 | X(vkGetQueueCheckpointDataNV); | ||
| 120 | X(vkMapMemory); | 118 | X(vkMapMemory); |
| 121 | X(vkQueueSubmit); | 119 | X(vkQueueSubmit); |
| 122 | X(vkResetFences); | 120 | X(vkResetFences); |
| @@ -409,17 +407,6 @@ DebugCallback Instance::TryCreateDebugCallback( | |||
| 409 | return DebugCallback(messenger, handle, *dld); | 407 | return DebugCallback(messenger, handle, *dld); |
| 410 | } | 408 | } |
| 411 | 409 | ||
| 412 | std::vector<VkCheckpointDataNV> Queue::GetCheckpointDataNV(const DeviceDispatch& dld) const { | ||
| 413 | if (!dld.vkGetQueueCheckpointDataNV) { | ||
| 414 | return {}; | ||
| 415 | } | ||
| 416 | u32 num; | ||
| 417 | dld.vkGetQueueCheckpointDataNV(queue, &num, nullptr); | ||
| 418 | std::vector<VkCheckpointDataNV> checkpoints(num); | ||
| 419 | dld.vkGetQueueCheckpointDataNV(queue, &num, checkpoints.data()); | ||
| 420 | return checkpoints; | ||
| 421 | } | ||
| 422 | |||
| 423 | void Buffer::BindMemory(VkDeviceMemory memory, VkDeviceSize offset) const { | 410 | void Buffer::BindMemory(VkDeviceMemory memory, VkDeviceSize offset) const { |
| 424 | Check(dld->vkBindBufferMemory(owner, handle, memory, offset)); | 411 | Check(dld->vkBindBufferMemory(owner, handle, memory, offset)); |
| 425 | } | 412 | } |
diff --git a/src/video_core/renderer_vulkan/wrapper.h b/src/video_core/renderer_vulkan/wrapper.h index e32312a26..62e252c43 100644 --- a/src/video_core/renderer_vulkan/wrapper.h +++ b/src/video_core/renderer_vulkan/wrapper.h | |||
| @@ -197,7 +197,6 @@ struct DeviceDispatch : public InstanceDispatch { | |||
| 197 | PFN_vkCmdPipelineBarrier vkCmdPipelineBarrier; | 197 | PFN_vkCmdPipelineBarrier vkCmdPipelineBarrier; |
| 198 | PFN_vkCmdPushConstants vkCmdPushConstants; | 198 | PFN_vkCmdPushConstants vkCmdPushConstants; |
| 199 | PFN_vkCmdSetBlendConstants vkCmdSetBlendConstants; | 199 | PFN_vkCmdSetBlendConstants vkCmdSetBlendConstants; |
| 200 | PFN_vkCmdSetCheckpointNV vkCmdSetCheckpointNV; | ||
| 201 | PFN_vkCmdSetDepthBias vkCmdSetDepthBias; | 200 | PFN_vkCmdSetDepthBias vkCmdSetDepthBias; |
| 202 | PFN_vkCmdSetDepthBounds vkCmdSetDepthBounds; | 201 | PFN_vkCmdSetDepthBounds vkCmdSetDepthBounds; |
| 203 | PFN_vkCmdSetScissor vkCmdSetScissor; | 202 | PFN_vkCmdSetScissor vkCmdSetScissor; |
| @@ -252,7 +251,6 @@ struct DeviceDispatch : public InstanceDispatch { | |||
| 252 | PFN_vkGetFenceStatus vkGetFenceStatus; | 251 | PFN_vkGetFenceStatus vkGetFenceStatus; |
| 253 | PFN_vkGetImageMemoryRequirements vkGetImageMemoryRequirements; | 252 | PFN_vkGetImageMemoryRequirements vkGetImageMemoryRequirements; |
| 254 | PFN_vkGetQueryPoolResults vkGetQueryPoolResults; | 253 | PFN_vkGetQueryPoolResults vkGetQueryPoolResults; |
| 255 | PFN_vkGetQueueCheckpointDataNV vkGetQueueCheckpointDataNV; | ||
| 256 | PFN_vkMapMemory vkMapMemory; | 254 | PFN_vkMapMemory vkMapMemory; |
| 257 | PFN_vkQueueSubmit vkQueueSubmit; | 255 | PFN_vkQueueSubmit vkQueueSubmit; |
| 258 | PFN_vkResetFences vkResetFences; | 256 | PFN_vkResetFences vkResetFences; |
| @@ -909,10 +907,6 @@ public: | |||
| 909 | dld->vkCmdPushConstants(handle, layout, flags, offset, size, values); | 907 | dld->vkCmdPushConstants(handle, layout, flags, offset, size, values); |
| 910 | } | 908 | } |
| 911 | 909 | ||
| 912 | void SetCheckpointNV(const void* checkpoint_marker) const noexcept { | ||
| 913 | dld->vkCmdSetCheckpointNV(handle, checkpoint_marker); | ||
| 914 | } | ||
| 915 | |||
| 916 | void SetViewport(u32 first, Span<VkViewport> viewports) const noexcept { | 910 | void SetViewport(u32 first, Span<VkViewport> viewports) const noexcept { |
| 917 | dld->vkCmdSetViewport(handle, first, viewports.size(), viewports.data()); | 911 | dld->vkCmdSetViewport(handle, first, viewports.size(), viewports.data()); |
| 918 | } | 912 | } |