[TEST] Remove the whole geometry shader changes

src/video_core/renderer_vulkan/vk_scheduler.cpp

@@ -410,7 +410,6 @@ void Scheduler::EndRenderPass()
         Record([num_images = num_renderpass_images,
                        images = renderpass_images,
                        ranges = renderpass_image_ranges,
-                       consumer_stages = device.AttachmentConsumerStages(),
                        has_transform_feedback = device.IsExtTransformFeedbackSupported()](
                           vk::CommandBuffer cmdbuf) {
             static constexpr VkAccessFlags SHADER_ACCESS =
@@ -459,7 +458,7 @@ void Scheduler::EndRenderPass()
             }
             cmdbuf.EndRenderPass();
             cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT |
-                                   VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, consumer_stages,
+                                   VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, vk::PIPELINE_STAGE_GRAPHICS_COMPUTE,
                                    0, nullptr, nullptr, vk::Span(barriers.data(), num_images));
             if (has_transform_feedback) {
                 static constexpr VkMemoryBarrier XFB_OUTPUT_BARRIER{

src/video_core/vulkan_common/vulkan_device.h

@@ -1023,21 +1023,6 @@ FN_MAX_LIMIT_LIST
         return features2.features.multiViewport;
     }
 
-    VkPipelineStageFlags AttachmentConsumerStages() const {
-        VkPipelineStageFlags stages = VK_PIPELINE_STAGE_VERTEX_SHADER_BIT |
-                                      VK_PIPELINE_STAGE_TESSELLATION_CONTROL_SHADER_BIT |
-                                      VK_PIPELINE_STAGE_TESSELLATION_EVALUATION_SHADER_BIT |
-                                      VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |
-                                      VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |
-                                      VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT |
-                                      VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |
-                                      VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT;
-        if (features2.features.geometryShader) {
-            stages |= VK_PIPELINE_STAGE_GEOMETRY_SHADER_BIT;
-        }
-        return stages;
-    }
-
     /// Returns true if the device supports VK_KHR_maintenance1.
     bool IsKhrMaintenance1Supported() const {
         return extensions.maintenance1;