X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Fvulkan%2Fmesh-vk.cc;h=540501eb18118a016f564bc010bf2bb0972ae7f9;hb=05d269a194496bcef85da78652b947f5bf1c9bcf;hp=2c55013f7f515569173af9e31c1d801cf2779ce1;hpb=8d1aef17df1bf15491ce4fd35242adcd58a9c411;p=demo

diff --git a/src/vulkan/mesh-vk.cc b/src/vulkan/mesh-vk.cc
index 2c55013..540501e 100644
--- a/src/vulkan/mesh-vk.cc
+++ b/src/vulkan/mesh-vk.cc
@@ -1,4 +1,5 @@
 #include <vulkan/vulkan.h>
+#include "allocator.h"
 #include "mesh-vk.h"
 
 MeshVK::MeshVK()
@@ -49,33 +50,86 @@ bool MeshVK::update_vertex_data()
 
 	/* create the buffers */
 
-	if(!(vk_vertices = vku_create_buffer(vertices.size() * sizeof(Vec3),
-					VK_BUFFER_USAGE_VERTEX_BUFFER_BIT))) {
+	int vsz = vertices.size() * sizeof(Vec3);
+	if(!(vk_vertices = vku_create_buffer(vsz,
+	                                     VK_BUFFER_USAGE_VERTEX_BUFFER_BIT))) {
 		fprintf(stderr, "Failed to create the buffer for the vertices.\n");
 		return false;
 	}
 
-	if(!(vk_normals = vku_create_buffer(normals.size() * sizeof(Vec3),
-					VK_BUFFER_USAGE_VERTEX_BUFFER_BIT))) {
+	int nsz = normals.size() * sizeof(Vec3);
+	if(!(vk_normals = vku_create_buffer(nsz,
+	                                    VK_BUFFER_USAGE_VERTEX_BUFFER_BIT))) {
+		vku_destroy_buffer(vk_vertices);
+
 		fprintf(stderr, "Failed to create the buffer for the normals.\n");
 		return false;
 	}
 
-	if(!(vk_tex_coords = vku_create_buffer(tex_coords.size() * sizeof(Vec2),
-					VK_BUFFER_USAGE_VERTEX_BUFFER_BIT))) {
+	int tsz = tex_coords.size() * sizeof(Vec2);
+	if(!(vk_tex_coords = vku_create_buffer(tsz,
+	                                       VK_BUFFER_USAGE_VERTEX_BUFFER_BIT))) {
+		vku_destroy_buffer(vk_vertices);
+		vku_destroy_buffer(vk_normals);
+
 		fprintf(stderr,
-				"Failed to create the buffer for the texture coordinates.\n");
+		        "Failed to create the buffer for the texture coordinates.\n");
 		return false;
 	}
 
-	if(!(vk_indices = vku_create_buffer(indices.size() * 2,
-					VK_BUFFER_USAGE_INDEX_BUFFER_BIT))) {
+	int isz = indices.size() * 2;
+	if(!(vk_indices = vku_create_buffer(isz,
+	                                    VK_BUFFER_USAGE_INDEX_BUFFER_BIT))) {
+		vku_destroy_buffer(vk_vertices);
+		vku_destroy_buffer(vk_normals);
+		vku_destroy_buffer(vk_tex_coords);
+
 		fprintf(stderr, "Failed to create the indices buffer.\n");
 		return false;
 	}
 
-	//TODO XXX
-	/* map the buffers */
+	/* write the buffers */
+
+	if(!vku_write_memory(vk_vertices->mem_pool, vsz, (void *)vertices.data())) {
+		fprintf(stderr, "Failed to write the vertices to GPU.\n");
+		return false;
+	}
+	if(vkBindBufferMemory(vk_device, vk_vertices->buf, vk_vertices->mem_pool,
+	                      0) != VK_SUCCESS) {
+		fprintf(stderr, "Failed to bind the vertex buffer memory\n");
+		return false;
+	}
+
+	if(!vku_write_memory(vk_normals->mem_pool, nsz, (void *)normals.data())) {
+		fprintf(stderr, "Failed to write the normals to GPU.\n");
+		return false;
+	}
+	if(vkBindBufferMemory(vk_device, vk_normals->buf, vk_normals->mem_pool, 0)
+	        != VK_SUCCESS) {
+		fprintf(stderr, "Failed to bind the normal buffer memory\n");
+		return false;
+	}
+
+	if(!vku_write_memory(vk_tex_coords->mem_pool, tsz,
+	                     (void *)tex_coords.data())) {
+		fprintf(stderr, "Failed to write the texture coordinates to GPU.\n");
+		return false;
+	}
+	if(vkBindBufferMemory(vk_device, vk_tex_coords->buf,
+	                      vk_tex_coords->mem_pool, 0) != VK_SUCCESS) {
+		fprintf(stderr, "Failed to bind the tex coordinates buffer memory.\n");
+		return false;
+	}
+
+	if(!vku_write_memory(vk_indices->mem_pool, isz, (void *)indices.data())) {
+		fprintf(stderr, "Failed to write the indices to GPU.\n");
+		return false;
+	}
+	if(vkBindBufferMemory(vk_device, vk_indices->buf, vk_indices->mem_pool, 0)
+	        != VK_SUCCESS) {
+		fprintf(stderr, "Failed to bind the index buffer memory.\n");
+		return false;
+	}
 
 	return true;
 }