X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Fvulkan%2Fmesh-vk.cc;h=494389b00daa4f2c6ea9ab29529aca6f8cac30d4;hb=c3d7c1b7f8a7f4bcfc7661b6baf166ce0648083a;hp=2f0c5fb8db676d7b29b2fb3632117bd5ff26fae0;hpb=855c42d8e50fff743fd7b1be5e91cb0db18def77;p=demo diff --git a/src/vulkan/mesh-vk.cc b/src/vulkan/mesh-vk.cc index 2f0c5fb..494389b 100644 --- a/src/vulkan/mesh-vk.cc +++ b/src/vulkan/mesh-vk.cc @@ -1,12 +1,17 @@ #include +#include "allocator.h" #include "mesh-vk.h" -MeshVK::MeshVK() {} +MeshVK::MeshVK() +{ +} + MeshVK::MeshVK(const MeshVK &mesh) { indices = mesh.indices; vertices = mesh.vertices; normals = mesh.normals; + tex_coords = mesh.tex_coords; } MeshVK &MeshVK::operator=(const MeshVK &mesh) @@ -18,25 +23,92 @@ MeshVK &MeshVK::operator=(const MeshVK &mesh) indices = mesh.indices; vertices = mesh.vertices; normals = mesh.normals; + tex_coords = mesh.tex_coords; return *this; } MeshVK::~MeshVK() { + vku_destroy_buffer(vk_vertices); + vku_destroy_buffer(vk_normals); + vku_destroy_buffer(vk_tex_coords); + vku_destroy_buffer(vk_indices); + vertices.clear(); normals.clear(); + tex_coords.clear(); + indices.clear(); } -void MeshVK::update_vertex_data() +bool MeshVK::update_vertex_data() { if(vertices.empty()) { printf("empty vertices!\n"); - return; + return false; + } + + /* create the buffers */ + + 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; + } + + 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; + } + + 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"); + return false; + } + + 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; + } + + /* write the buffers */ + + if(!vku_write_memory(vk_vertices->mem_pool, vsz, (void*)vertices.data())) { + fprintf(stderr, "Failed to write the vertices on GPU.\n"); + return false; + } + if(!vku_write_memory(vk_normals->mem_pool, nsz, (void*)normals.data())) { + fprintf(stderr, "Failed to write the normalson GPU.\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 on GPU.\n"); + return false; + } + if(!vku_write_memory(vk_indices->mem_pool, isz, (void*)indices.data())) { + fprintf(stderr, "Failed to write the indices on GPU.\n"); + return false; } -// if(num_vertices != vertices.size()) { -// } + return true; } void MeshVK::draw() const