From 56f533f79bd6854b6445b8c873b9fc90cc29ea6f Mon Sep 17 00:00:00 2001 From: lizzie Date: Sat, 29 Aug 2026 18:44:44 +0000 Subject: [PATCH] forgot the merge conflict --- src/video_core/vulkan_common/vulkan_device.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.h index d07d04b85f..2a2a5bb7a9 100644 --- a/src/video_core/vulkan_common/vulkan_device.h +++ b/src/video_core/vulkan_common/vulkan_device.h @@ -94,12 +94,9 @@ VK_DEFINE_HANDLE(VmaAllocator) EXTENSION(EXT, SHADER_VIEWPORT_INDEX_LAYER, shader_viewport_index_layer) \ EXTENSION(EXT, TOOLING_INFO, tooling_info) \ EXTENSION(EXT, VERTEX_ATTRIBUTE_DIVISOR, vertex_attribute_divisor) \ -<<<<<<< HEAD EXTENSION(KHR, CREATE_RENDERPASS_2, create_renderpass2) \ EXTENSION(KHR, DEPTH_STENCIL_RESOLVE, depth_stencil_resolve) \ EXTENSION(EXT, DEVICE_FAULT, device_fault) \ -======= ->>>>>>> 6e75e5837b (oops, fixup) EXTENSION(KHR, DRAW_INDIRECT_COUNT, draw_indirect_count) \ EXTENSION(KHR, DRIVER_PROPERTIES, driver_properties) \ EXTENSION(KHR, PUSH_DESCRIPTOR, push_descriptor) \