diff --git a/src/xrt/targets/sdl_test/sdl_swapchain.c b/src/xrt/targets/sdl_test/sdl_swapchain.c
index 3a967e3ff..648d49abb 100644
--- a/src/xrt/targets/sdl_test/sdl_swapchain.c
+++ b/src/xrt/targets/sdl_test/sdl_swapchain.c
@@ -15,97 +15,33 @@
 #include <inttypes.h>
 
 
-static int64_t
-vk_format_to_gl(int64_t format)
-{
-	switch (format) {
-	case 4 /*   VK_FORMAT_R5G6B5_UNORM_PACK16      */: return 0;       // GL_RGB565?
-	case 23 /*  VK_FORMAT_R8G8B8_UNORM             */: return GL_RGB8; // Should not be used, colour precision.
-	case 29 /*  VK_FORMAT_R8G8B8_SRGB              */: return GL_SRGB8;
-	case 30 /*  VK_FORMAT_B8G8R8_UNORM             */: return 0;
-	case 37 /*  VK_FORMAT_R8G8B8A8_UNORM           */: return GL_RGBA8; // Should not be used, colour precision.
-	case 43 /*  VK_FORMAT_R8G8B8A8_SRGB            */: return GL_SRGB8_ALPHA8;
-	case 44 /*  VK_FORMAT_B8G8R8A8_UNORM           */: return 0;
-	case 50 /*  VK_FORMAT_B8G8R8A8_SRGB            */: return 0;
-	case 64 /*  VK_FORMAT_A2B10G10R10_UNORM_PACK32 */: return GL_RGB10_A2;
-	case 84 /*  VK_FORMAT_R16G16B16_UNORM          */: return GL_RGB16;
-	case 90 /*  VK_FORMAT_R16G16B16_SFLOAT         */: return GL_RGB16F;
-	case 91 /*  VK_FORMAT_R16G16B16A16_UNORM       */: return GL_RGBA16;
-	case 97 /*  VK_FORMAT_R16G16B16A16_SFLOAT      */: return GL_RGBA16F;
-	case 124 /* VK_FORMAT_D16_UNORM                */: return GL_DEPTH_COMPONENT16;
-	case 125 /* VK_FORMAT_X8_D24_UNORM_PACK32      */: return 0; // GL_DEPTH_COMPONENT24?
-	case 126 /* VK_FORMAT_D32_SFLOAT               */: return GL_DEPTH_COMPONENT32F;
-	case 127 /* VK_FORMAT_S8_UINT                  */: return 0; // GL_STENCIL_INDEX8?
-	case 129 /* VK_FORMAT_D24_UNORM_S8_UINT        */: return GL_DEPTH24_STENCIL8;
-	case 130 /* VK_FORMAT_D32_SFLOAT_S8_UINT       */: return GL_DEPTH32F_STENCIL8;
-	default: U_LOG_W("Cannot convert VK format %" PRIu64 " to GL format!", format); return 0;
-	}
-}
-
 static void
 post_init_setup(struct sdl_swapchain *ssc, struct sdl_program *sp, const struct xrt_swapchain_create_info *info)
 {
 	ST_DEBUG(sp, "CREATE");
 
-	// Setup fields
-	ssc->sp = sp;
-	ssc->w = (int)info->width;
-	ssc->h = (int)info->height;
-
-
 	sdl_make_current(sp);
 
-	GLuint binding_enum = 0;
-	GLuint tex_target = 0;
-	ogl_texture_target_for_swapchain_info(info, &tex_target, &binding_enum);
-
-	uint32_t image_count = ssc->base.base.base.image_count;
-	GLuint gl_format = vk_format_to_gl(info->format);
-
-	glCreateTextures(tex_target, image_count, ssc->textures);
-	CHECK_GL();
-	glCreateMemoryObjectsEXT(image_count, ssc->memory);
-	CHECK_GL();
-
-	for (uint32_t i = 0; i < image_count; i++) {
-		GLint dedicated = ssc->base.base.images[i].use_dedicated_allocation ? GL_TRUE : GL_FALSE;
-		glMemoryObjectParameterivEXT(ssc->memory[i], GL_DEDICATED_MEMORY_OBJECT_EXT, &dedicated);
-		CHECK_GL();
-
-		// The below function consumes the handle, need to reference it.
-		xrt_graphics_buffer_handle_t handle = u_graphics_buffer_ref(ssc->base.base.images[i].handle);
-
-		glImportMemoryFdEXT(               //
-		    ssc->memory[i],                //
-		    ssc->base.base.images[i].size, //
-		    GL_HANDLE_TYPE_OPAQUE_FD_EXT,  //
-		    (GLint)handle);                //
-		CHECK_GL();
-
-		if (info->array_size == 1) {
-			glTextureStorageMem2DEXT( //
-			    ssc->textures[i],     //
-			    info->mip_count,      //
-			    gl_format,            //
-			    info->width,          //
-			    info->height,         //
-			    ssc->memory[i],       //
-			    0);                   //
-		} else {
-			glTextureStorageMem3DEXT( //
-			    ssc->textures[i],     //
-			    info->mip_count,      //
-			    gl_format,            //
-			    info->width,          //
-			    info->height,         //
-			    info->array_size,     //
-			    ssc->memory[i],       //
-			    0);                   //
-		}
-		CHECK_GL();
-	}
+	struct ogl_import_results results = XRT_STRUCT_INIT;
+	bool bret = ogl_import_from_native(  //
+	    ssc->base.base.images,           // native_images
+	    ssc->base.base.base.image_count, // native_count
+	    info,                            // info
+	    &results);                       // results
+	assert(bret);
+	(void)bret;
 
 	sdl_make_uncurrent(sp);
+
+	// Setup fields
+	ssc->sp = sp;
+	ssc->w = (int)results.width;
+	ssc->h = (int)results.height;
+
+	for (uint32_t i = 0; i < results.image_count; i++) {
+		ssc->memory[i] = results.memories[i];
+		ssc->textures[i] = results.textures[i];
+	}
 }
 
 static void