early-access version 3602

README.md

@@ -1,7 +1,7 @@
 yuzu emulator early access
 =============
 
-This is the source code for early-access 3601.
+This is the source code for early-access 3602.
 
 ## Legal Notice
 

src/video_core/renderer_opengl/gl_texture_cache.h

@@ -144,6 +144,10 @@ public:
         return state_tracker;
     }
 
+    void CheckFeedbackLoop(ImageView& image_view) const noexcept {
+        // OpenGL does not require a barrier for attachment feedback loops.
+    }
+
 private:
     struct StagingBuffers {
         explicit StagingBuffers(GLenum storage_flags_, GLenum map_flags_);

src/video_core/renderer_vulkan/pipeline_helper.h

@@ -175,6 +175,7 @@ public:
     std::array<f32, 4> words{};
 };
 
+template <bool CheckFeedbackLoop = false>
 inline void PushImageDescriptors(TextureCache& texture_cache,
                                  GuestDescriptorQueue& guest_descriptor_queue,
                                  const Shader::Info& info, RescalingPushConstant& rescaling,
@@ -192,6 +193,9 @@ inline void PushImageDescriptors(TextureCache& texture_cache,
             const VkImageView vk_image_view{image_view.Handle(desc.type)};
             guest_descriptor_queue.AddSampledImage(vk_image_view, sampler);
             rescaling.PushTexture(texture_cache.IsRescaling(image_view));
+            if constexpr (CheckFeedbackLoop) {
+                texture_cache.CheckFeedbackLoop(image_view);
+            }
         }
     }
     for (const auto& desc : info.image_descriptors) {
@@ -203,6 +207,9 @@ inline void PushImageDescriptors(TextureCache& texture_cache,
             const VkImageView vk_image_view{image_view.StorageView(desc.type, desc.format)};
             guest_descriptor_queue.AddImage(vk_image_view);
             rescaling.PushImage(texture_cache.IsRescaling(image_view));
+            if constexpr (CheckFeedbackLoop) {
+                texture_cache.CheckFeedbackLoop(image_view);
+            }
         }
     }
 }

src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp

@@ -457,8 +457,8 @@ void GraphicsPipeline::ConfigureImpl(bool is_indexed) {
     const VideoCommon::ImageViewInOut* views_it{views.data()};
     const auto prepare_stage{[&](size_t stage) LAMBDA_FORCEINLINE {
         buffer_cache.BindHostStageBuffers(stage);
-        PushImageDescriptors(texture_cache, guest_descriptor_queue, stage_infos[stage], rescaling,
-                             samplers_it, views_it);
+        PushImageDescriptors<true>(texture_cache, guest_descriptor_queue, stage_infos[stage],
+                                   rescaling, samplers_it, views_it);
         const auto& info{stage_infos[0]};
         if (info.uses_render_area) {
             render_area.uses_render_area = true;

src/video_core/renderer_vulkan/vk_scheduler.h

@@ -106,6 +106,15 @@ public:
         return *master_semaphore;
     }
 
+    [[nodiscard]] bool IsRenderpassImage(VkImage image) const noexcept {
+        for (u32 i = 0; i < num_renderpass_images; i++) {
+            if (image == renderpass_images[i]) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     std::mutex submit_mutex;
 
 private:

src/video_core/renderer_vulkan/vk_texture_cache.cpp

@@ -861,6 +861,12 @@ VkBuffer TextureCacheRuntime::GetTemporaryBuffer(size_t needed_size) {
     return *buffers[level];
 }
 
+void TextureCacheRuntime::CheckFeedbackLoop(ImageView& image_view) {
+    if (scheduler.IsRenderpassImage(image_view.ImageHandle())) {
+        scheduler.RequestOutsideRenderPassOperationContext();
+    }
+}
+
 void TextureCacheRuntime::ReinterpretImage(Image& dst, Image& src,
                                            std::span<const VideoCommon::ImageCopy> copies) {
     std::vector<VkBufferImageCopy> vk_in_copies(copies.size());

src/video_core/renderer_vulkan/vk_texture_cache.h

@@ -103,6 +103,8 @@ public:
 
     [[nodiscard]] VkBuffer GetTemporaryBuffer(size_t needed_size);
 
+    void CheckFeedbackLoop(ImageView& image_view);
+
     const Device& device;
     Scheduler& scheduler;
     MemoryAllocator& memory_allocator;

src/video_core/texture_cache/texture_cache.h

@@ -2374,6 +2374,11 @@ bool TextureCache<P>::IsFullClear(ImageViewId id) {
            scissor.max_y >= size.height;
 }
 
+template <class P>
+void TextureCache<P>::CheckFeedbackLoop(ImageView& image_view) {
+    runtime.CheckFeedbackLoop(image_view);
+}
+
 template <class P>
 void TextureCache<P>::CreateChannel(struct Tegra::Control::ChannelState& channel) {
     VideoCommon::ChannelSetupCaches<TextureCacheChannelInfo>::CreateChannel(channel);

src/video_core/texture_cache/texture_cache_base.h

@@ -224,6 +224,9 @@ public:
 
     [[nodiscard]] bool IsRescaling(const ImageViewBase& image_view) const noexcept;
 
+    /// Handle feedback loops during draws.
+    void CheckFeedbackLoop(ImageView& image_view);
+
     /// Create channel state.
     void CreateChannel(Tegra::Control::ChannelState& channel) final override;