diff --git a/src/video_core/renderer_vulkan/pipeline_helper.h b/src/video_core/renderer_vulkan/pipeline_helper.h index 26541a0c1b..9828898fa1 100644 --- a/src/video_core/renderer_vulkan/pipeline_helper.h +++ b/src/video_core/renderer_vulkan/pipeline_helper.h @@ -205,11 +205,14 @@ inline void PushImageDescriptors(TextureCache& texture_cache, const auto& device = texture_cache.runtime.device; const auto fmt_info = MaxwellToVK::SurfaceFormat(device, FormatType::Optimal, true, image_view.format); +#ifdef VK_FORMAT_FEATURE_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT if (!device.IsFormatSupported(fmt_info.format, VK_FORMAT_FEATURE_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT, FormatType::Optimal)) { need_no_compare = true; } +#else +#endif } VkSampler vk_sampler; diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp index facf5e5515..e611d1ec3e 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp @@ -2400,8 +2400,7 @@ Sampler::Sampler(TextureCacheRuntime& runtime, const Tegra::Texture::TSCEntry& t if (compare_enable) { sampler_no_compare = create_sampler(max_anisotropy, false); } else { - sampler_no_compare = sampler; - } + const f32 max_anisotropy_default = static_cast(1U << tsc.max_anisotropy); if (max_anisotropy > max_anisotropy_default) { @@ -2409,8 +2408,7 @@ Sampler::Sampler(TextureCacheRuntime& runtime, const Tegra::Texture::TSCEntry& t if (compare_enable) { sampler_no_compare_default_anisotropy = create_sampler(max_anisotropy_default, false); } else { - sampler_no_compare_default_anisotropy = sampler_default_anisotropy; - } + } } diff --git a/src/video_core/texture_cache/texture_cache_base.h b/src/video_core/texture_cache/texture_cache_base.h index 4b4061f21d..830532cf92 100644 --- a/src/video_core/texture_cache/texture_cache_base.h +++ b/src/video_core/texture_cache/texture_cache_base.h @@ -449,7 +449,9 @@ private: void QueueAsyncUnswizzle(Image& image, ImageId image_id); void TickAsyncUnswizzle(); +public: Runtime& runtime; +private: Tegra::MaxwellDeviceMemoryManager& device_memory; std::deque gpu_page_table_storage;