diff options
| author | 2020-05-22 21:03:57 -0300 | |
|---|---|---|
| committer | 2020-06-07 04:32:57 -0300 | |
| commit | abcea1bb188cb4db0ee7e27bea26d6458c881c2d (patch) | |
| tree | 80d0ac5c2bb51d321c36c0d46c0f5284f18a3a3a /src/video_core/renderer_vulkan | |
| parent | vk_pipeline_cache: Use generic shader cache (diff) | |
| download | yuzu-abcea1bb188cb4db0ee7e27bea26d6458c881c2d.tar.gz yuzu-abcea1bb188cb4db0ee7e27bea26d6458c881c2d.tar.xz yuzu-abcea1bb188cb4db0ee7e27bea26d6458c881c2d.zip | |
rasterizer_cache: Remove files and includes
The rasterizer cache is no longer used. Each cache has its own generic
implementation optimized for the cached data.
Diffstat (limited to 'src/video_core/renderer_vulkan')
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_buffer_cache.h | 1 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_pipeline_cache.cpp | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.h b/src/video_core/renderer_vulkan/vk_buffer_cache.h index a54583e7d..65cb3c8ad 100644 --- a/src/video_core/renderer_vulkan/vk_buffer_cache.h +++ b/src/video_core/renderer_vulkan/vk_buffer_cache.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | 8 | ||
| 9 | #include "common/common_types.h" | 9 | #include "common/common_types.h" |
| 10 | #include "video_core/buffer_cache/buffer_cache.h" | 10 | #include "video_core/buffer_cache/buffer_cache.h" |
| 11 | #include "video_core/rasterizer_cache.h" | ||
| 12 | #include "video_core/renderer_vulkan/vk_memory_manager.h" | 11 | #include "video_core/renderer_vulkan/vk_memory_manager.h" |
| 13 | #include "video_core/renderer_vulkan/vk_staging_buffer_pool.h" | 12 | #include "video_core/renderer_vulkan/vk_staging_buffer_pool.h" |
| 14 | #include "video_core/renderer_vulkan/vk_stream_buffer.h" | 13 | #include "video_core/renderer_vulkan/vk_stream_buffer.h" |
diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp index 20cbeb671..150d86b62 100644 --- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp | |||
| @@ -335,12 +335,11 @@ VKPipelineCache::DecompileShaders(const GraphicsPipelineCacheKey& key) { | |||
| 335 | } | 335 | } |
| 336 | 336 | ||
| 337 | const GPUVAddr gpu_addr = GetShaderAddress(system, program_enum); | 337 | const GPUVAddr gpu_addr = GetShaderAddress(system, program_enum); |
| 338 | const auto cpu_addr = memory_manager.GpuToCpuAddress(gpu_addr); | 338 | const std::optional<VAddr> cpu_addr = memory_manager.GpuToCpuAddress(gpu_addr); |
| 339 | const auto shader = cpu_addr ? TryGet(*cpu_addr) : null_shader; | 339 | Shader* const shader = cpu_addr ? TryGet(*cpu_addr) : null_shader.get(); |
| 340 | ASSERT(shader); | ||
| 341 | 340 | ||
| 342 | const std::size_t stage = index == 0 ? 0 : index - 1; // Stage indices are 0 - 5 | 341 | const std::size_t stage = index == 0 ? 0 : index - 1; // Stage indices are 0 - 5 |
| 343 | const auto program_type = GetShaderType(program_enum); | 342 | const ShaderType program_type = GetShaderType(program_enum); |
| 344 | const auto& entries = shader->GetEntries(); | 343 | const auto& entries = shader->GetEntries(); |
| 345 | program[stage] = { | 344 | program[stage] = { |
| 346 | Decompile(device, shader->GetIR(), program_type, shader->GetRegistry(), specialization), | 345 | Decompile(device, shader->GetIR(), program_type, shader->GetRegistry(), specialization), |