2 files changed, 15 insertions, 8 deletions
diff --git a/include/api-test/vk-device-types.hpp b/include/api-test/vk-device-types.hpp
index 987eb13..b069883 100644
--- a/include/api-test/vk-device-types.hpp
+++ b/include/api-test/vk-device-types.hpp
@@ -69,5 +69,18 @@ struct device_pipeline {
     VkPipelineBindPoint bind_point;
     pipeline_desc       desc;
 
-    bindless_model*     bindless = nullptr;
+    // bindless_model*     bindless = nullptr;
+};
+
+
+struct surface_desc {
+
+};
+
+struct device_surface {
+    VkSurfaceKHR vk_surface;
+    VkSwapchainKHR vk_swapchain;
+
+    handle<device_texture> swapchain_images;
+    uint32_t image_index;
 };
diff --git a/include/api-test/vk-device.hpp b/include/api-test/vk-device.hpp
index 32a0707..5b71529 100644
--- a/include/api-test/vk-device.hpp
+++ b/include/api-test/vk-device.hpp
@@ -15,12 +15,6 @@ using VmaAllocator = struct VmaAllocator_T*;
 
 class window;
 
-struct vksurface {
-    VkSurfaceKHR vk_surface;
-    VkSwapchainKHR vk_swapchain;
-    uint32_t image_index;
-};
-
 struct vksemaphore {
     VkSemaphore vk_semaphore = nullptr;
     uint64_t value = 0U;
@@ -89,7 +83,7 @@ class vkdevice {
 
     void submit(std::span<command_buffer> buffers, vksemaphore* wait, vksemaphore* signal);
 
-    void present(vksurface& surface, const vksemaphore& semaphore);
+    void present(device_surface& surface, const vksemaphore& semaphore);
 
     private:
     vkdevice(const window& window);