diff options
| author | 2020-03-18 18:05:03 -0300 | |
|---|---|---|
| committer | 2020-03-18 20:03:19 -0300 | |
| commit | 38c1e77f014c0b7edacd374748f100f08ae39981 (patch) | |
| tree | bcfb0b729b7e899dae8d7a081d6e56b5799b4cbd /src | |
| parent | vk_staging_buffer_pool: Silence unused constant warning (diff) | |
| download | yuzu-38c1e77f014c0b7edacd374748f100f08ae39981.tar.gz yuzu-38c1e77f014c0b7edacd374748f100f08ae39981.tar.xz yuzu-38c1e77f014c0b7edacd374748f100f08ae39981.zip | |
vk_texture_cache: Silence misc warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_texture_cache.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp index 73d92a5ae..26175921b 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp | |||
| @@ -52,6 +52,9 @@ vk::ImageType SurfaceTargetToImage(SurfaceTarget target) { | |||
| 52 | return vk::ImageType::e2D; | 52 | return vk::ImageType::e2D; |
| 53 | case SurfaceTarget::Texture3D: | 53 | case SurfaceTarget::Texture3D: |
| 54 | return vk::ImageType::e3D; | 54 | return vk::ImageType::e3D; |
| 55 | case SurfaceTarget::TextureBuffer: | ||
| 56 | UNREACHABLE(); | ||
| 57 | return {}; | ||
| 55 | } | 58 | } |
| 56 | UNREACHABLE_MSG("Unknown texture target={}", static_cast<u32>(target)); | 59 | UNREACHABLE_MSG("Unknown texture target={}", static_cast<u32>(target)); |
| 57 | return {}; | 60 | return {}; |
| @@ -273,7 +276,6 @@ void CachedSurface::UploadImage(const std::vector<u8>& staging_buffer) { | |||
| 273 | 276 | ||
| 274 | for (u32 level = 0; level < params.num_levels; ++level) { | 277 | for (u32 level = 0; level < params.num_levels; ++level) { |
| 275 | vk::BufferImageCopy copy = GetBufferImageCopy(level); | 278 | vk::BufferImageCopy copy = GetBufferImageCopy(level); |
| 276 | const auto& dld = device.GetDispatchLoader(); | ||
| 277 | if (image->GetAspectMask() == | 279 | if (image->GetAspectMask() == |
| 278 | (vk::ImageAspectFlagBits::eDepth | vk::ImageAspectFlagBits::eStencil)) { | 280 | (vk::ImageAspectFlagBits::eDepth | vk::ImageAspectFlagBits::eStencil)) { |
| 279 | vk::BufferImageCopy depth = copy; | 281 | vk::BufferImageCopy depth = copy; |
| @@ -422,7 +424,6 @@ void VKTextureCache::ImageCopy(Surface& src_surface, Surface& dst_surface, | |||
| 422 | dst_base_layer, num_layers, copy_params.dest_level, 1, vk::PipelineStageFlagBits::eTransfer, | 424 | dst_base_layer, num_layers, copy_params.dest_level, 1, vk::PipelineStageFlagBits::eTransfer, |
| 423 | vk::AccessFlagBits::eTransferWrite, vk::ImageLayout::eTransferDstOptimal); | 425 | vk::AccessFlagBits::eTransferWrite, vk::ImageLayout::eTransferDstOptimal); |
| 424 | 426 | ||
| 425 | const auto& dld{device.GetDispatchLoader()}; | ||
| 426 | const vk::ImageSubresourceLayers src_subresource( | 427 | const vk::ImageSubresourceLayers src_subresource( |
| 427 | src_surface->GetAspectMask(), copy_params.source_level, copy_params.source_z, num_layers); | 428 | src_surface->GetAspectMask(), copy_params.source_level, copy_params.source_z, num_layers); |
| 428 | const vk::ImageSubresourceLayers dst_subresource( | 429 | const vk::ImageSubresourceLayers dst_subresource( |
| @@ -458,7 +459,6 @@ void VKTextureCache::ImageBlit(View& src_view, View& dst_view, | |||
| 458 | dst_view->GetImageSubresourceLayers(), {dst_top_left, dst_bot_right}); | 459 | dst_view->GetImageSubresourceLayers(), {dst_top_left, dst_bot_right}); |
| 459 | const bool is_linear = copy_config.filter == Tegra::Engines::Fermi2D::Filter::Linear; | 460 | const bool is_linear = copy_config.filter == Tegra::Engines::Fermi2D::Filter::Linear; |
| 460 | 461 | ||
| 461 | const auto& dld{device.GetDispatchLoader()}; | ||
| 462 | scheduler.Record([src_image = src_view->GetImage(), dst_image = dst_view->GetImage(), blit, | 462 | scheduler.Record([src_image = src_view->GetImage(), dst_image = dst_view->GetImage(), blit, |
| 463 | is_linear](auto cmdbuf, auto& dld) { | 463 | is_linear](auto cmdbuf, auto& dld) { |
| 464 | cmdbuf.blitImage(src_image, vk::ImageLayout::eTransferSrcOptimal, dst_image, | 464 | cmdbuf.blitImage(src_image, vk::ImageLayout::eTransferSrcOptimal, dst_image, |