refactor(render): update gfx-hal and use staging and index buffers.

also some minor changes to types because of deprecation
and a bunch of readability improvements

1 files changed, 554 insertions, 538 deletions

diff --git a/stockton-render/src/draw/context.rs b/stockton-render/src/draw/context.rs
index 53f92cf..7a20651 100644
--- a/stockton-render/src/draw/context.rs
+++ b/stockton-render/src/draw/context.rs
@@ -14,239 +14,210 @@
 // with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Deals with all the Vulkan/HAL details.
-use crate::error as error;
-use crate::error::{CreationError, FrameError};
+//! In the end, this takes in vertices and renders them to a window.
+//! You'll need something else to actually generate the vertices though.
 
 use std::mem::{ManuallyDrop, size_of};
-use std::convert::TryInto;
-
-use winit::{EventsLoop, WindowBuilder};
-
+use winit::window::Window;
 use arrayvec::ArrayVec;
 
-use hal::*;
-use hal::device::Device;
-use hal::format::{AsFormat, Rgba8Srgb as ColorFormat, Format, ChannelType};
-use hal::pool::CommandPool;
-use hal::queue::{QueueGroup, Submission};
-use hal::window::SwapchainConfig;
-
-use hal::Instance as InstanceTrait;
-
-#[cfg(feature = "gl")]
-use back::glutin as glutin;
-
-use stockton_types::Vector2;
-use super::buffer::StagedBuffer;
+use hal::{
+	prelude::*,
+	queue::{Submission},
+	window::SwapchainConfig
+};
+use stockton_types::{Vector2, Vector3};
 
-type ModifiableBuffer<'a> = StagedBuffer<'a>;
+use crate::types::*;
+use crate::error;
+use super::buffer::{StagedBuffer, ModifiableBuffer};
 
+/// Entry point name for shaders
 const ENTRY_NAME: &str = "main";
-const COLOR_RANGE: image::SubresourceRange = image::SubresourceRange {
-	aspects: format::Aspects::COLOR,
-    levels: 0..1,
-    layers: 0..1,
+
+/// Defines the colour range we use.
+const COLOR_RANGE: hal::image::SubresourceRange = hal::image::SubresourceRange {
+	aspects: hal::format::Aspects::COLOR,
+	levels: 0..1,
+	layers: 0..1,
 };
 
+/// Source for vertex shader. TODO
 const VERTEX_SOURCE: &str = include_str!("./data/stockton.vert");
-const FRAGMENT_SOURCE: &str = include_str!("./data/stockton.frag");
 
-const VERTEX_BUFFER_BATCH_SIZE: u64 = 10;
-const VERTEX_BUFFER_INITIAL_BATCHES: u64 = 1;
+/// Source for fragment shader. TODO
+const FRAGMENT_SOURCE: &str = include_str!("./data/stockton.frag");
 
-/// Represents a triangle in 2D (screen) space.
+/// Represents a point of a vertices, including U/V information.
 #[derive(Debug, Clone, Copy)]
-pub struct Tri2 (pub [Vector2; 3]);
-
-/// Easy conversion to proper format.
-impl From<Tri2> for [f32; 15] {
-	fn from(tri: Tri2) -> [f32; 15] {
-	    [tri.0[0].x, tri.0[0].y, 1.0, 0.0, 0.0,
-	     tri.0[1].x, tri.0[1].y, 0.0, 1.0, 0.0,
-	     tri.0[2].x, tri.0[2].y, 0.0, 0.0, 1.0]
-	}
-}
-
-const TRI2_SIZE_F32: usize = 15;
-const TRI2_SIZE_BYTES: usize = size_of::<f32>() * TRI2_SIZE_F32;
-
-#[cfg(not(feature = "gl"))]
-type Instance = back::Instance;
-
-#[cfg(feature = "gl")]
-type Instance = ();
+pub struct UVPoint (pub Vector2, pub Vector3);
 
 /// Contains all the hal related stuff.
 /// In the end, this takes some 3D points and puts it on the screen.
 // TODO: Settings for clear colour, buffer sizes, etc
 pub struct RenderingContext<'a> {
-	pub events_loop: winit::EventsLoop,
-	surface: <back::Backend as hal::Backend>::Surface,
+	// Parents for most of these things
+	instance: ManuallyDrop<back::Instance>,
+	device: ManuallyDrop<Device>,
+
+	// Render destination
+	surface: ManuallyDrop<Surface>,
+	swapchain: ManuallyDrop<Swapchain>,
+	viewport: hal::pso::Viewport,
+	
+	imageviews: Vec<ImageView>,
+	framebuffers: Vec<Framebuffer>,
+	current_frame: usize,
+	frames_in_flight: usize,
+	
+	// Sync objects
+	// TODO: Collect these together?
+	get_image: Vec<Semaphore>,
+	render_complete: Vec<Semaphore>,
+	present_complete: Vec<Fence>,
+
+	// Pipeline
+	renderpass: ManuallyDrop<RenderPass>,
+	descriptor_set_layouts: ManuallyDrop<DescriptorSetLayout>,
+	pipeline_layout: ManuallyDrop<PipelineLayout>,
+	pipeline: ManuallyDrop<GraphicsPipeline>,
+
+	// Command pool and buffers
+	cmd_pool: ManuallyDrop<CommandPool>,
+	cmd_buffers: Vec<CommandBuffer>,
+	queue_group: QueueGroup,
+
+	// Vertex and index buffers
+	// These are both staged
+	pub vert_buffer: ManuallyDrop<StagedBuffer<'a, UVPoint>>,
+	pub index_buffer: ManuallyDrop<StagedBuffer<'a, (u16, u16, u16)>>,
+}
 
-	pub (crate) instance: ManuallyDrop<Instance>,
-	pub (crate) device: ManuallyDrop<<back::Backend as hal::Backend>::Device>,
+impl<'a> RenderingContext<'a> {
+	/// Create a new RenderingContext for the given window.
+	pub fn new(window: &Window) -> Result<Self, error::CreationError> {
+		// Create surface
+		let (instance, mut surface, mut adapters) = unsafe {
+			use hal::Instance;
 
-	swapchain: ManuallyDrop<<back::Backend as hal::Backend>::Swapchain>,
-	
-	viewport: pso::Viewport,
+			let instance = back::Instance::create("stockton", 1).map_err(|_| error::CreationError::WindowError)?;
+			let surface = instance.create_surface(window).map_err(|_| error::CreationError::WindowError)?;
+			let adapters = instance.enumerate_adapters();
 
-	imageviews: Vec<<back::Backend as hal::Backend>::ImageView>,
-	framebuffers: Vec<<back::Backend as hal::Backend>::Framebuffer>,
+			(instance, surface, adapters)
+		};
 
-	renderpass: ManuallyDrop<<back::Backend as hal::Backend>::RenderPass>,
+		// TODO: Properly figure out which adapter to use
+		let adapter = adapters.remove(0);
+
+		// Device & Queue group
+		let (mut device, queue_group) = {
+			let family = adapter
+				.queue_families
+				.iter()
+				.find(|family| {
+					surface.supports_queue_family(family) && family.queue_type().supports_graphics()
+				})
+				.unwrap();
+
+			let mut gpu = unsafe {
+				adapter
+					.physical_device
+					.open(&[(family, &[1.0])], hal::Features::empty())
+					.unwrap()
+			};
 
-	current_frame: usize,
-	// TODO: Collect these together
-	get_image: Vec<<back::Backend as hal::Backend>::Semaphore>,
-	render_complete: Vec<<back::Backend as hal::Backend>::Semaphore>,
-	present_complete: Vec<<back::Backend as hal::Backend>::Fence>,
+			(gpu.device, gpu.queue_groups.pop().unwrap())
+		};
 
-	frames_in_flight: usize,
-	cmd_pools: Vec<ManuallyDrop<<back::Backend as hal::Backend>::CommandPool>>,
-	cmd_buffers: Vec<<back::Backend as hal::Backend>::CommandBuffer>,
-	queue_group: QueueGroup<back::Backend>,
+		// Swapchain
+		let (format, viewport, extent, swapchain, backbuffer) = {
+			use hal::{
+				window::{PresentMode, CompositeAlphaMode},
+				format::{Format, ChannelType},
+				image::Usage,
+				pso::Viewport
+			};
 
-	vert_buffer: ModifiableBuffer<'a>,
-	index_buffer: ModifiableBuffer<'a>,
+			// Figure out what the surface supports
+			let caps = surface.capabilities(&adapter.physical_device);
+			let formats = surface.supported_formats(&adapter.physical_device);
+
+			// Find which settings we'll actually use based on preset preferences
+			let format = formats.map_or(Format::Rgba8Srgb, |formats| {
+				formats.iter()
+					.find(|format| format.base_format().1 == ChannelType::Srgb)
+					.map(|format| *format)
+					.unwrap_or(formats[0])
+			});
+
+			let present_mode = {
+				[PresentMode::MAILBOX, PresentMode::FIFO, PresentMode::RELAXED, PresentMode::IMMEDIATE]
+					.iter()
+					.cloned()
+					.find(|pm| caps.present_modes.contains(*pm))
+					.ok_or(error::CreationError::BadSurface)?
+			};
+			let composite_alpha = {
+				[CompositeAlphaMode::OPAQUE, CompositeAlphaMode::INHERIT, CompositeAlphaMode::PREMULTIPLIED, CompositeAlphaMode::POSTMULTIPLIED]
+					.iter()
+					.cloned()
+					.find(|ca| caps.composite_alpha_modes.contains(*ca))
+					.ok_or(error::CreationError::BadSurface)?
+			};
 
-	descriptor_set_layouts: <back::Backend as hal::Backend>::DescriptorSetLayout,
-	pipeline_layout: ManuallyDrop<<back::Backend as hal::Backend>::PipelineLayout>,
-	pipeline: ManuallyDrop<<back::Backend as hal::Backend>::GraphicsPipeline>,
-	pub (crate) adapter: adapter::Adapter<back::Backend>
-}
+			// Figure out properties for our swapchain
+			let extent = caps.extents.end(); // Size
 
-impl<'a> RenderingContext<'a> {
-	/// Create a new RenderingContext for the given window.
-	pub fn new() -> Result<Self, CreationError> {
-	    let events_loop = EventsLoop::new();
-	    let wb = WindowBuilder::new();
-
-	    // Create surface
-	    #[cfg(not(feature = "gl"))]
-	    let (window, instance, mut surface, mut adapters) = {
-	    	use hal::Instance;
-	    	let window = wb.build(&events_loop).map_err(|_| CreationError::WindowError)?;
-	        let instance = back::Instance::create("stockton", 1);
-	        let surface = instance.create_surface(&window);
-	        let adapters = instance.enumerate_adapters();
-
-	        (window, instance, surface, adapters)
-	    };
-
-	    #[cfg(feature = "gl")]
-	    let (window, instance, mut surface, mut adapters) = {
-	    	use back::glutin::ContextBuilder;
-
-			let glutin_window = ContextBuilder::new().with_vsync(true).build_windowed(wb, &events_loop).unwrap();
-			let (glutin_context, glutin_window) = unsafe {
-				glutin_window.make_current().map_err(|_| CreationError::WindowError)?
-					.split()
+			// Number of frames to pre-render
+			let image_count = if present_mode == PresentMode::MAILBOX {
+				((*caps.image_count.end()) - 1).min((*caps.image_count.start()).max(3))
+			} else {
+				((*caps.image_count.end()) - 1).min((*caps.image_count.start()).max(2))
 			};
 
-			let surface = back::Surface::from_context(glutin_context);
-	    	let adapters = surface.enumerate_adapters();
-
-	    	((), (), surface, adapters)
-	    };
-
-	    // TODO: Properly figure out which adapter to use
-	    let mut adapter = adapters.remove(0);
-
-	    // Device & Queue group
-	    let (mut device, queue_group) = {
-	    	// TODO
-	    	let family = adapter
-	            .queue_families
-	            .iter()
-	            .find(|family| {
-	                surface.supports_queue_family(family) && family.queue_type().supports_graphics()
-	            })
-	            .unwrap();
-
-	    	let mut gpu = unsafe {
-	            adapter
-	                .physical_device
-	                .open(&[(family, &[1.0])], hal::Features::empty())
-	                .unwrap()
-	        };
-
-	        (gpu.queue_groups.pop().unwrap(), gpu.device)
-	    };
-
-	    // Swapchain stuff
-	    let (format, viewport, extent, swapchain, backbuffer) = {
-            use hal::window::{PresentMode, CompositeAlphaMode};
-
-		    let (caps, formats, present_modes) = surface.compatibility(&mut adapter.physical_device);
-
-		    let format = formats.map_or(Format::Rgba8Srgb, |formats| {
-		    	formats.iter()
-		    		.find(|format| format.base_format().1 == ChannelType::Srgb)
-		    		.map(|format| *format)
-		    		.unwrap_or(formats[0])
-		    });
-
-            let present_mode = {
-                [PresentMode::Mailbox, PresentMode::Fifo, PresentMode::Relaxed, PresentMode::Immediate]
-                    .iter()
-                    .cloned()
-                    .find(|pm| present_modes.contains(pm))
-                    .ok_or(CreationError::BadSurface)?
-            };
-            let composite_alpha = {
-                [CompositeAlphaMode::OPAQUE, CompositeAlphaMode::INHERIT, CompositeAlphaMode::PREMULTIPLIED, CompositeAlphaMode::POSTMULTIPLIED]
-                    .iter()
-                    .cloned()
-                    .find(|ca| caps.composite_alpha.contains(*ca))
-                    .ok_or(CreationError::BadSurface)?
-            };
-
-            let extent = caps.extents.end();
-            let image_count = if present_mode == PresentMode::Mailbox {
-                ((*caps.image_count.end()) - 1).min((*caps.image_count.start()).max(3))
-            } else {
-                ((*caps.image_count.end()) - 1).min((*caps.image_count.start()).max(2))
-            };
-
-            let image_layers = 1;
-            let image_usage = if caps.usage.contains(image::Usage::COLOR_ATTACHMENT) {
-                image::Usage::COLOR_ATTACHMENT
-            } else {
-                Err(CreationError::BadSurface)?
+			let image_layers = 1; // Don't support 3D
+			let image_usage = if caps.usage.contains(Usage::COLOR_ATTACHMENT) {
+				Usage::COLOR_ATTACHMENT
+			} else {
+				Err(error::CreationError::BadSurface)?
 			};
 
-		    // Swap config
-		    let swap_config = SwapchainConfig {
-                present_mode,
-                composite_alpha,
-                format,
-                extent: *extent,
-                image_count,
-                image_layers,
-                image_usage,
+			// Swap config
+			let swap_config = SwapchainConfig {
+				present_mode,
+				composite_alpha_mode: composite_alpha,
+				format,
+				extent: *extent,
+				image_count,
+				image_layers,
+				image_usage,
 			};
 
-		    // Viewport
-		    let extent = extent.to_extent();
-		    let viewport = pso::Viewport {
-		    	rect: extent.rect(),
-		    	depth: 0.0..1.0
-		    };
-		    
-		    // Swapchain
-		    let (swapchain, backbuffer) = unsafe {
-		    	device.create_swapchain(&mut surface, swap_config, None)
-		    		.map_err(|e| CreationError::SwapchainError (e))?
-		    };
-
-		    (format, viewport, extent, swapchain, backbuffer)
-	    };
+			// Viewport
+			let extent = extent.to_extent();
+			let viewport = Viewport {
+				rect: extent.rect(),
+				depth: 0.0..1.0
+			};
+			
+			// Swapchain
+			let (swapchain, backbuffer) = unsafe {
+				device.create_swapchain(&mut surface, swap_config, None)
+					.map_err(|e| error::CreationError::SwapchainError (e))?
+			};
+
+			(format, viewport, extent, swapchain, backbuffer)
+		};
 
 		// Renderpass
 		let renderpass = {
-			use hal::pass::*;
-			use hal::pso::PipelineStage;
-			use hal::image::{Access, Layout};
+			use hal::{
+				pass::*,
+				pso::PipelineStage,
+				image::{Access, Layout},
+				memory::Dependencies
+			};
 
 			let attachment = Attachment {
 				format: Some(format),
@@ -265,127 +236,135 @@ impl<'a> RenderingContext<'a> {
 			};
 
 			let dependency = SubpassDependency {
-				passes: None..0,
+				flags: Dependencies::empty(),
+				passes: None..Some(0),
 				stages: PipelineStage::COLOR_ATTACHMENT_OUTPUT..PipelineStage::COLOR_ATTACHMENT_OUTPUT,
 				accesses: Access::empty()
-	                ..(Access::COLOR_ATTACHMENT_READ | Access::COLOR_ATTACHMENT_WRITE)
+					..(Access::COLOR_ATTACHMENT_READ | Access::COLOR_ATTACHMENT_WRITE)
 			};
 
 			unsafe { device.create_render_pass(&[attachment], &[subpass], &[dependency]) }
-	            .map_err(|_| CreationError::OutOfMemoryError)?
+				.map_err(|_| error::CreationError::OutOfMemoryError)?
 		};
 
 		// Subpass
-		let subpass = pass::Subpass {
+		let subpass = hal::pass::Subpass {
 			index: 0,
 			main_pass: &renderpass
 		};
 
-	    // Vertex and index buffers
-	    let (vert_buffer, index_buffer) = {
-	    	use hal::buffer::Usage;
-	    	(
-				ModifiableBuffer::new(&mut device, &adapter, Usage::VERTEX | Usage::TRANSFER_DST),
-				ModifiableBuffer::new(&mut device, &adapter, Usage::TRANSFER_SRC)
-	    	)
-	    };
-
-	    // Command Pools, Buffers, imageviews, framebuffers & Sync objects
-    	let frames_in_flight = backbuffer.len();
-	    let (cmd_pools, cmd_buffers, get_image, render_complete, present_complete, imageviews, framebuffers) = {
-		    let mut cmd_pools = Vec::with_capacity(frames_in_flight);
-		    let mut cmd_buffers = Vec::with_capacity(frames_in_flight);
-		    let mut get_image = Vec::with_capacity(frames_in_flight);
-		    let mut render_complete = Vec::with_capacity(frames_in_flight);
-		    let mut present_complete = Vec::with_capacity(frames_in_flight);
-		    let mut imageviews = Vec::with_capacity(frames_in_flight);
-		    let mut framebuffers = Vec::with_capacity(frames_in_flight);
-
-		    for i in 0..frames_in_flight {
-			    cmd_pools.push(ManuallyDrop::new(unsafe {
-			        device.create_command_pool_typed(&queue_group, pool::CommandPoolCreateFlags::empty())
-			    }.map_err(|_| CreationError::OutOfMemoryError)?));
-
-			    cmd_buffers.push((*cmd_pools[i]).allocate_one(hal::command::Level::Primary));
-			    get_image.push(device.create_semaphore().map_err(|_| CreationError::SyncObjectError)?);
-			    render_complete.push(device.create_semaphore().map_err(|_| CreationError::SyncObjectError)?);
-			    present_complete.push(device.create_fence(true).map_err(|_| CreationError::SyncObjectError)?);
-		    	
-		    	unsafe {
-			    	imageviews.push(device.create_image_view(
-		                &backbuffer[i],
-		                image::ViewKind::D2,
-		                format,
-		                format::Swizzle::NO,
-		                COLOR_RANGE.clone(),
-		            ).map_err(|e| CreationError::ImageViewError (e))?);
-		            framebuffers.push(device.create_framebuffer(
-		            	&renderpass,
-		            	Some(&imageviews[i]),
-		            	extent
-		            ).map_err(|_| CreationError::OutOfMemoryError)?);
-		    	}
-		    }
-
-		    (cmd_pools, cmd_buffers, get_image, render_complete, present_complete, imageviews, framebuffers)
-	    };
-
-	    // Graphics pipeline
-	    let (descriptor_set_layouts, pipeline_layout, pipeline) = Self::create_pipeline(&mut device, extent, &subpass)?;
-
-    	Ok(RenderingContext {
-    		instance: ManuallyDrop::new(instance),
-    		events_loop,
-    		surface,
-
-    		device: ManuallyDrop::new(device),
-    		queue_group,
-    		swapchain: ManuallyDrop::new(swapchain),
-    		viewport,
-
-    		imageviews,
-    		framebuffers,
-
-    		renderpass: ManuallyDrop::new(renderpass),
-    		current_frame: 0,
-
-    		get_image,
-    		render_complete,
-    		present_complete,
-    		frames_in_flight,
-    		cmd_pools,
-    		cmd_buffers,
-
-    		descriptor_set_layouts: descriptor_set_layouts,
-    		pipeline_layout: ManuallyDrop::new(pipeline_layout),
-    		pipeline: ManuallyDrop::new(pipeline),
-
-    		vert_buffer,
-    		index_buffer,
-
-    		adapter
-    	})
+		// Vertex and index buffers
+		let (vert_buffer, index_buffer) = {
+			use hal::buffer::Usage;
+
+			let vert = StagedBuffer::new(&mut device, &adapter, Usage::VERTEX | Usage::TRANSFER_DST)?;
+			let index = StagedBuffer::new(&mut device, &adapter, Usage::TRANSFER_SRC)?;
+			
+			(vert, index)
+		};
+
+		// Command Pool, Buffers, imageviews, framebuffers & Sync objects
+		let frames_in_flight = backbuffer.len();
+		let (cmd_pool, cmd_buffers, get_image, render_complete, present_complete, imageviews, framebuffers) = {
+			use hal::pool::CommandPoolCreateFlags;
+			use hal::command::Level;
+
+			let mut cmd_pool = ManuallyDrop::new(unsafe {
+				device.create_command_pool(queue_group.family, CommandPoolCreateFlags::empty())
+			}.map_err(|_| error::CreationError::OutOfMemoryError)?);
+
+			let mut cmd_buffers = Vec::with_capacity(frames_in_flight);
+			let mut get_image = Vec::with_capacity(frames_in_flight);
+			let mut render_complete = Vec::with_capacity(frames_in_flight);
+			let mut present_complete = Vec::with_capacity(frames_in_flight);
+			let mut imageviews = Vec::with_capacity(frames_in_flight);
+			let mut framebuffers = Vec::with_capacity(frames_in_flight);
+
+			for i in 0..frames_in_flight {
+				unsafe {
+					cmd_buffers.push(cmd_pool.allocate_one(Level::Primary)); // TODO: We can do this all at once outside the loop
+				}
+
+				get_image.push(device.create_semaphore().map_err(|_| error::CreationError::SyncObjectError)?);
+				render_complete.push(device.create_semaphore().map_err(|_| error::CreationError::SyncObjectError)?);
+				present_complete.push(device.create_fence(true).map_err(|_| error::CreationError::SyncObjectError)?);
+				
+				unsafe {
+					use hal::image::ViewKind;
+					use hal::format::Swizzle;
+
+					imageviews.push(device.create_image_view(
+						&backbuffer[i],
+						ViewKind::D2,
+						format,
+						Swizzle::NO,
+						COLOR_RANGE.clone(),
+					).map_err(|e| error::CreationError::ImageViewError (e))?);
+					framebuffers.push(device.create_framebuffer(
+						&renderpass,
+						Some(&imageviews[i]),
+						extent
+					).map_err(|_| error::CreationError::OutOfMemoryError)?);
+				}
+			}
+
+			(cmd_pool, cmd_buffers, get_image, render_complete, present_complete, imageviews, framebuffers)
+		};
+
+		// Graphics pipeline
+		let (descriptor_set_layouts, pipeline_layout, pipeline) = Self::create_pipeline(&mut device, extent, &subpass)?;
+
+		Ok(RenderingContext {
+			instance: ManuallyDrop::new(instance),
+			surface: ManuallyDrop::new(surface),
+
+			device: ManuallyDrop::new(device),
+			queue_group,
+			swapchain: ManuallyDrop::new(swapchain),
+			viewport,
+
+			imageviews,
+			framebuffers,
+
+			renderpass: ManuallyDrop::new(renderpass),
+			current_frame: 0,
+
+			get_image,
+			render_complete,
+			present_complete,
+			frames_in_flight,
+			cmd_pool,
+			cmd_buffers,
+
+			descriptor_set_layouts: ManuallyDrop::new(descriptor_set_layouts),
+			pipeline_layout: ManuallyDrop::new(pipeline_layout),
+			pipeline: ManuallyDrop::new(pipeline),
+
+			vert_buffer: ManuallyDrop::new(vert_buffer),
+			index_buffer: ManuallyDrop::new(index_buffer),
+		})
 	}
 
 	#[allow(clippy::type_complexity)]
-	pub fn create_pipeline(device: &mut <back::Backend as hal::Backend>::Device, extent: image::Extent, subpass: &pass::Subpass<back::Backend>) -> Result<
-    (
-      <back::Backend as hal::Backend>::DescriptorSetLayout,
-      <back::Backend as hal::Backend>::PipelineLayout,
-      <back::Backend as hal::Backend>::GraphicsPipeline,
-    ), error::CreationError> {
-    	use hal::pso::*;
-
-        // Shader modules
-        let (vs_module, fs_module) = {
+	pub fn create_pipeline(device: &mut Device, extent: hal::image::Extent, subpass: &hal::pass::Subpass<back::Backend>) -> Result<
+	(
+	  DescriptorSetLayout,
+	  PipelineLayout,
+	  GraphicsPipeline,
+	), error::CreationError> {
+		use hal::pso::*;
+		use hal::format::Format;
+
+		// Shader modules
+		let (vs_module, fs_module) = {
 			let mut compiler = shaderc::Compiler::new().ok_or(error::CreationError::NoShaderC)?;
 
 			let vertex_compile_artifact = compiler
-				.compile_into_spirv(VERTEX_SOURCE, shaderc::ShaderKind::Vertex, "vertex.vert", "main", None)
+				.compile_into_spirv(VERTEX_SOURCE, shaderc::ShaderKind::Vertex, "vertex.vert", ENTRY_NAME, None)
 				.map_err(|e| error::CreationError::ShaderCError (e))?;
 			
 			let fragment_compile_artifact = compiler
-				.compile_into_spirv(FRAGMENT_SOURCE, shaderc::ShaderKind::Fragment, "fragment.frag", "main", None)
+				.compile_into_spirv(FRAGMENT_SOURCE, shaderc::ShaderKind::Fragment, "fragment.frag", ENTRY_NAME, None)
 				.map_err(|e| error::CreationError::ShaderCError (e))?;
 			
 			// Make into shader module
@@ -397,32 +376,32 @@ impl<'a> RenderingContext<'a> {
 					.create_shader_module(fragment_compile_artifact.as_binary())
 					.map_err(|e| error::CreationError::ShaderModuleFailed (e))?)
 			}
-        };
-
-        // Shader entry points (ShaderStage)
-        let (vs_entry, fs_entry) = (
-        	EntryPoint::<back::Backend> {
-        		entry: ENTRY_NAME,
-        		module: &vs_module,
-        		specialization: Specialization::default()
-        	},
-        	EntryPoint::<back::Backend> {
-        		entry: ENTRY_NAME,
-        		module: &fs_module,
-        		specialization: Specialization::default()
-        	}
-    	);
-
-    	// Shader set
-	    let shaders = GraphicsShaderSet {
-    		vertex: vs_entry,
-    		fragment: Some(fs_entry),
-    		hull: None,
-    		domain: None,
-    		geometry: None
-    	};
-
-    	// Vertex buffers
+		};
+
+		// Shader entry points (ShaderStage)
+		let (vs_entry, fs_entry) = (
+			EntryPoint::<back::Backend> {
+				entry: ENTRY_NAME,
+				module: &vs_module,
+				specialization: Specialization::default()
+			},
+			EntryPoint::<back::Backend> {
+				entry: ENTRY_NAME,
+				module: &fs_module,
+				specialization: Specialization::default()
+			}
+		);
+
+		// Shader set
+		let shaders = GraphicsShaderSet {
+			vertex: vs_entry,
+			fragment: Some(fs_entry),
+			hull: None,
+			domain: None,
+			geometry: None
+		};
+
+		// Vertex buffers
 		let vertex_buffers: Vec<VertexBufferDesc> = vec![VertexBufferDesc {
 			binding: 0,
 			stride: (size_of::<f32>() * 5) as u32,
@@ -445,17 +424,18 @@ impl<'a> RenderingContext<'a> {
 			}
 		}];
 
-    	// Rasterizer
-    	let rasterizer = Rasterizer {
-    		polygon_mode: PolygonMode::Fill,
-    		cull_face: Face::NONE,
-    		front_face: FrontFace::Clockwise,
-    		depth_clamping: false,
-    		depth_bias: None,
-    		conservative: true
-    	};
-
-    	// Depth stencil
+		// Rasterizer
+		let rasterizer = Rasterizer {
+			polygon_mode: PolygonMode::Fill,
+			cull_face: Face::NONE,
+			front_face: FrontFace::Clockwise,
+			depth_clamping: false,
+			depth_bias: None,
+			conservative: true,
+			line_width: hal::pso::State::Static(1.0)
+		};
+
+		// Depth stencil
 		let depth_stencil = DepthStencilDesc {
 			depth: None,
 			depth_bounds: false,
@@ -463,19 +443,19 @@ impl<'a> RenderingContext<'a> {
 		};
 
 		// Descriptor set layout
-    	let set_layout = unsafe {
-	        device.create_descriptor_set_layout(
-	            &[],
-	            &[],
-	        )
-	    }.map_err(|_| error::CreationError::OutOfMemoryError)?;
-
-    	// Pipeline layout
-    	let layout = unsafe {
-    		device.create_pipeline_layout(std::iter::once(&set_layout), &[])
+		let set_layout = unsafe {
+			device.create_descriptor_set_layout(
+				&[],
+				&[],
+			)
+		}.map_err(|_| error::CreationError::OutOfMemoryError)?;
+
+		// Pipeline layout
+		let layout = unsafe {
+			device.create_pipeline_layout(std::iter::once(&set_layout), &[])
 		}.map_err(|_| error::CreationError::OutOfMemoryError)?;
 
-    	// Colour blending
+		// Colour blending
 		let blender = {
 			let blend_state = BlendState {
 				color: BlendOp::Add {
@@ -508,184 +488,211 @@ impl<'a> RenderingContext<'a> {
 		// Input assembler
 		let input_assembler = InputAssemblerDesc::new(Primitive::TriangleList);
 
-    	// Pipeline description
-    	let pipeline_desc = GraphicsPipelineDesc {
-    		shaders,
-    		rasterizer,
-    		vertex_buffers,
-    		blender,
-    		depth_stencil,
-    		multisampling: None,
-    		baked_states,
-    		layout: &layout,
-    		subpass: *subpass,
-    		flags: pso::PipelineCreationFlags::empty(),
-    		parent: pso::BasePipeline::None,
-    		input_assembler,
-    		attributes
-    	};
-
-    	// Pipeline
-    	let pipeline = unsafe {
-    		device.create_graphics_pipeline(&pipeline_desc, None)
-    	}.map_err(|e| error::CreationError::PipelineError (e))?;
-
-    	Ok((set_layout, layout, pipeline))
+		// Pipeline description
+		let pipeline_desc = GraphicsPipelineDesc {
+			shaders,
+			rasterizer,
+			vertex_buffers,
+			blender,
+			depth_stencil,
+			multisampling: None,
+			baked_states,
+			layout: &layout,
+			subpass: *subpass,
+			flags: PipelineCreationFlags::empty(),
+			parent: BasePipeline::None,
+			input_assembler,
+			attributes
+		};
+
+		// Pipeline
+		let pipeline = unsafe {
+			device.create_graphics_pipeline(&pipeline_desc, None)
+		}.map_err(|e| error::CreationError::PipelineError (e))?;
+
+		Ok((set_layout, layout, pipeline))
 	}
 
-    /// Draw a frame that's just cleared to the color specified.
-    pub fn draw_clear(&mut self, color: [f32; 4]) -> Result<(), FrameError> {
-        let get_image = &self.get_image[self.current_frame];
-        let render_complete = &self.render_complete[self.current_frame];
-        
-        // Advance the frame _before_ we start using the `?` operator
-        self.current_frame = (self.current_frame + 1) % self.frames_in_flight;
-
-        // Get the image
-        let (image_index, _) = unsafe {
-            self
-                .swapchain
-                .acquire_image(core::u64::MAX, Some(get_image), None)
-                .map_err(|e| FrameError::AcquireError (e))?
-        };
-        let image_index = image_index as usize;
-
-        // Make sure whatever was last using this has finished
-        let present_complete = &self.present_complete[image_index];
-        unsafe {
-            self.device
-                .wait_for_fence(present_complete, core::u64::MAX)
-                .map_err(|_| FrameError::SyncObjectError)?;
-            self.device
-                .reset_fence(present_complete)
-                .map_err(|_| FrameError::SyncObjectError)?;
-        };
-
-        // Record commands
-        unsafe {
-            let buffer = &mut self.cmd_buffers[image_index];
-            let clear_values = [command::ClearValue::Color(command::ClearColor::Sfloat(color))];
-
-            buffer.begin(false);
-            buffer.begin_render_pass_inline(
-                &self.renderpass,
-                &self.framebuffers[image_index],
-                self.viewport.rect,
-                clear_values.iter(),
-            );
-            buffer.finish();
-        };
-
-        // Make submission object
-        let command_buffers = &self.cmd_buffers[image_index..=image_index];
-        let wait_semaphores: ArrayVec<[_; 1]> = [(get_image, pso::PipelineStage::COLOR_ATTACHMENT_OUTPUT)].into();
-        let signal_semaphores: ArrayVec<[_; 1]> = [render_complete].into();
-
-        let present_wait_semaphores: ArrayVec<[_; 1]> = [render_complete].into();
-
-        let submission = Submission {
-            command_buffers,
-            wait_semaphores,
-            signal_semaphores,
-        };
-
-        // Submit it
-        let command_queue = &mut self.queue_group.queues[0];
-        unsafe {
-            command_queue.submit(submission, Some(present_complete));
-            self.swapchain
-                .present(command_queue, image_index as u32, present_wait_semaphores)
-                .map_err(|_| FrameError::PresentError)?
-        };
-
-        Ok(())
+	/// Draw a frame that's just cleared to the color specified.
+	pub fn draw_clear(&mut self, color: [f32; 4]) -> Result<(), error::FrameError> {
+		let get_image = &self.get_image[self.current_frame];
+		let render_complete = &self.render_complete[self.current_frame];
+		
+		// Advance the frame _before_ we start using the `?` operator
+		self.current_frame = (self.current_frame + 1) % self.frames_in_flight;
+
+		// Get the image
+		let (image_index, _) = unsafe {
+			self
+				.swapchain
+				.acquire_image(core::u64::MAX, Some(get_image), None)
+				.map_err(|e| error::FrameError::AcquireError (e))?
+		};
+		let image_index = image_index as usize;
+
+		// Make sure whatever was last using this has finished
+		let present_complete = &self.present_complete[image_index];
+		unsafe {
+			self.device
+				.wait_for_fence(present_complete, core::u64::MAX)
+				.map_err(|_| error::FrameError::SyncObjectError)?;
+			self.device
+				.reset_fence(present_complete)
+				.map_err(|_| error::FrameError::SyncObjectError)?;
+		};
+
+		// Record commands
+		unsafe {
+			use hal::command::{ClearValue, ClearColor, SubpassContents, CommandBufferFlags};
+
+			let buffer = &mut self.cmd_buffers[image_index];
+			let clear_values = [ClearValue {
+				color: ClearColor {
+					float32: color
+				}
+			}];
+
+			buffer.begin_primary(CommandBufferFlags::EMPTY);
+			buffer.begin_render_pass(
+				&self.renderpass,
+				&self.framebuffers[image_index],
+				self.viewport.rect,
+				clear_values.iter(),
+				SubpassContents::Inline
+			);
+			buffer.end_render_pass();
+			buffer.finish();
+		};
+
+		// Make submission object
+		let command_buffers = &self.cmd_buffers[image_index..=image_index];
+		let wait_semaphores: ArrayVec<[_; 1]> = [(get_image, hal::pso::PipelineStage::COLOR_ATTACHMENT_OUTPUT)].into();
+		let signal_semaphores: ArrayVec<[_; 1]> = [render_complete].into();
+
+		let present_wait_semaphores: ArrayVec<[_; 1]> = [render_complete].into();
+
+		let submission = Submission {
+			command_buffers,
+			wait_semaphores,
+			signal_semaphores,
+		};
+
+		// Submit it
+		let command_queue = &mut self.queue_group.queues[0];
+		unsafe {
+			command_queue.submit(submission, Some(present_complete));
+			self.swapchain
+				.present(command_queue, image_index as u32, present_wait_semaphores)
+				.map_err(|_| error::FrameError::PresentError)?
+		};
+
+		Ok(())
 	}
 
 	pub fn draw_vertices(&mut self) -> Result<(), &'static str> {
-        let get_image = &self.get_image[self.current_frame];
-        let render_complete = &self.render_complete[self.current_frame];
-        
-        // Advance the frame _before_ we start using the `?` operator
-        self.current_frame = (self.current_frame + 1) % self.frames_in_flight;
-
-        // Get the image
-        let (image_index, _) = unsafe {
-            self
-                .swapchain
-                .acquire_image(core::u64::MAX, Some(get_image), None)
-                .map_err(|_| "FrameError::AcquireError")?
-        };
-        let image_index = image_index as usize;
-
-        // Make sure whatever was last using this has finished
-        let present_complete = &self.present_complete[image_index];
-        unsafe {
-            self.device
-                .wait_for_fence(present_complete, core::u64::MAX)
-                .map_err(|_| "FrameError::SyncObjectError")?;
-            self.device
-                .reset_fence(present_complete)
-                .map_err(|_| "FrameError::SyncObjectError")?;
-        };
-
-        // Record commands
-        unsafe {
-            let buffer = &mut self.cmd_buffers[image_index];
-            let clear_values = [command::ClearValue::Color(command::ClearColor::Sfloat([0.0, 0.0, 0.0, 1.0]))];
-
-            buffer.begin(false);
-            {
-				let mut encoder = buffer.begin_render_pass_inline(
+		let get_image = &self.get_image[self.current_frame];
+		let render_complete = &self.render_complete[self.current_frame];
+		
+		// Advance the frame _before_ we start using the `?` operator
+		self.current_frame = (self.current_frame + 1) % self.frames_in_flight;
+
+		// Get the image
+		let (image_index, _) = unsafe {
+			self
+				.swapchain
+				.acquire_image(core::u64::MAX, Some(get_image), None)
+				.map_err(|_| "FrameError::AcquireError")?
+		};
+		let image_index = image_index as usize;
+
+		// Make sure whatever was last using this has finished
+		let present_complete = &self.present_complete[image_index];
+		unsafe {
+			self.device
+				.wait_for_fence(present_complete, core::u64::MAX)
+				.map_err(|_| "FrameError::SyncObjectError")?;
+			self.device
+				.reset_fence(present_complete)
+				.map_err(|_| "FrameError::SyncObjectError")?;
+		};
+
+		// Record commands
+		unsafe {
+			use hal::buffer::{IndexBufferView, SubRange};
+			use hal::command::{SubpassContents, CommandBufferFlags, ClearValue, ClearColor};
+
+			let buffer = &mut self.cmd_buffers[image_index];
+			let clear_values = [ClearValue {
+				color: ClearColor {
+					float32: [0.0, 0.0, 0.0, 1.0]
+				}
+			}];
+
+			// Commit from staging buffers
+			let (vbufs, ibuf) = {
+				let vbufref: &<back::Backend as hal::Backend>::Buffer = self.vert_buffer.commit(
+					&self.device,
+					&mut self.queue_group.queues[0],
+					&mut self.cmd_pool
+				);
+
+				let vbufs: ArrayVec<[_; 1]> = [(vbufref, SubRange::WHOLE)].into();
+				let ibuf = self.index_buffer.commit(
+					&self.device,
+					&mut self.queue_group.queues[0],
+					&mut self.cmd_pool
+				);
+
+				(vbufs, ibuf)
+			};
+
+			buffer.begin_primary(CommandBufferFlags::EMPTY);
+			{
+				buffer.begin_render_pass(
 					&self.renderpass,
 					&self.framebuffers[image_index],
 					self.viewport.rect,
 					clear_values.iter(),
+					SubpassContents::Inline
 				);
-				encoder.bind_graphics_pipeline(&self.pipeline);
-				
-				// Here we must force the Deref impl of ManuallyDrop to play nice.
-				let buffer_ref: &<back::Backend as hal::Backend>::Buffer = &self.map_verts.buffer;
-				let buffers: ArrayVec<[_; 1]> = [(buffer_ref, 0)].into();
+				buffer.bind_graphics_pipeline(&self.pipeline);
+				buffer.end_render_pass();
+				buffer.bind_vertex_buffers(0, vbufs);
 
-				encoder.bind_vertex_buffers(0, buffers);
+				buffer.bind_index_buffer(IndexBufferView {
+					buffer: ibuf,
+					range: SubRange::WHOLE,
+					index_type: hal::IndexType::U16
+				});
 
-				trace!("Requesting draw of {:?} instances ({:?} verts)", self.map_verts.active_instances, self.map_verts.active_verts);
-				encoder.draw(self.map_verts.active_verts.clone(), self.map_verts.active_instances.clone());
+				buffer.draw_indexed(0..6, 0, 0..1);
 			}
-            buffer.finish();
-        };
-
-        // Make submission object
-        let command_buffers = &self.cmd_buffers[image_index..=image_index];
-        let wait_semaphores: ArrayVec<[_; 1]> = [(get_image, pso::PipelineStage::COLOR_ATTACHMENT_OUTPUT)].into();
-        let signal_semaphores: ArrayVec<[_; 1]> = [render_complete].into();
-
-        let present_wait_semaphores: ArrayVec<[_; 1]> = [render_complete].into();
-
-        let submission = Submission {
-            command_buffers,
-            wait_semaphores,
-            signal_semaphores,
-        };
-
-        // Submit it
-        let command_queue = &mut self.queue_group.queues[0];
-        unsafe {
-            command_queue.submit(submission, Some(present_complete));
-            self.swapchain
-                .present(command_queue, image_index as u32, present_wait_semaphores)
-                .map_err(|_| "FrameError::PresentError")?
-        };
-
-        Ok(())
-	}
+			buffer.finish();
+		};
+
+		// Make submission object
+		let command_buffers = &self.cmd_buffers[image_index..=image_index];
+		let wait_semaphores: ArrayVec<[_; 1]> = [(get_image, hal::pso::PipelineStage::COLOR_ATTACHMENT_OUTPUT)].into();
+		let signal_semaphores: ArrayVec<[_; 1]> = [render_complete].into();
+
+		let present_wait_semaphores: ArrayVec<[_; 1]> = [render_complete].into();
 
-	pub fn add_map_vert(&mut self, tri: Tri2) -> Result<(), ()> {
-		// get around the borrow checker
+		let submission = Submission {
+			command_buffers,
+			wait_semaphores,
+			signal_semaphores,
+		};
+
+		// Submit it
+		let command_queue = &mut self.queue_group.queues[0];
 		unsafe {
-			let ctx: *mut Self = &mut *self;
-			self.map_verts.add(tri, ctx.as_mut().unwrap())
-		}
+			command_queue.submit(submission, Some(present_complete));
+			self.swapchain
+				.present(command_queue, image_index as u32, present_wait_semaphores)
+				.map_err(|_| "FrameError::PresentError")?
+		};
+
+		Ok(())
 	}
 }
 
@@ -695,36 +702,45 @@ impl<'a> core::ops::Drop for RenderingContext<'a> {
 		self.device.wait_idle().unwrap();
 
 		unsafe {
-            for fence in self.present_complete.drain(..) {
-                self.device.destroy_fence(fence)
-            }
-            for semaphore in self.render_complete.drain(..) {
-                self.device.destroy_semaphore(semaphore)
-            }
-            for semaphore in self.get_image.drain(..) {
-                self.device.destroy_semaphore(semaphore)
-            }
-            for framebuffer in self.framebuffers.drain(..) {
-                self.device.destroy_framebuffer(framebuffer);
-            }
-            for image_view in self.imageviews.drain(..) {
-                self.device.destroy_image_view(image_view);
-            }
-
-            // self.map_verts.deactivate(self);
-
-            use core::ptr::read;
-            for cmd_pool in self.cmd_pools.drain(..) {
-	            self.device.destroy_command_pool(
-	                ManuallyDrop::into_inner(cmd_pool),
-	            );
-            }
-            self.device
-                .destroy_render_pass(ManuallyDrop::into_inner(read(&self.renderpass)));
-            self.device
-                .destroy_swapchain(ManuallyDrop::into_inner(read(&self.swapchain)));
-            
-            ManuallyDrop::drop(&mut self.device);
+			for fence in self.present_complete.drain(..) {
+				self.device.destroy_fence(fence)
+			}
+			for semaphore in self.render_complete.drain(..) {
+				self.device.destroy_semaphore(semaphore)
+			}
+			for semaphore in self.get_image.drain(..) {
+				self.device.destroy_semaphore(semaphore)
+			}
+			for framebuffer in self.framebuffers.drain(..) {
+				self.device.destroy_framebuffer(framebuffer);
+			}
+			for image_view in self.imageviews.drain(..) {
+				self.device.destroy_image_view(image_view);
+			}
+
+			use core::ptr::read;
+			ManuallyDrop::into_inner(read(&self.vert_buffer)).deactivate(&mut self.device);
+			ManuallyDrop::into_inner(read(&self.index_buffer)).deactivate(&mut self.device);
+
+			self.device.destroy_command_pool(
+				ManuallyDrop::into_inner(read(&self.cmd_pool)),
+			);
+
+			self.device
+				.destroy_render_pass(ManuallyDrop::into_inner(read(&self.renderpass)));
+			self.device
+				.destroy_swapchain(ManuallyDrop::into_inner(read(&self.swapchain)));
+			
+			self.device
+				.destroy_descriptor_set_layout(ManuallyDrop::into_inner(read(&self.descriptor_set_layouts)));
+
+			self.device
+				.destroy_pipeline_layout(ManuallyDrop::into_inner(read(&self.pipeline_layout)));
+
+			self.instance
+				.destroy_surface(ManuallyDrop::into_inner(read(&self.surface)));
+
+			ManuallyDrop::drop(&mut self.device);
 		}
 	}
 }
\ No newline at end of file