MeshLoader now uses VulkanDevice for creating buffers

This commit is contained in:
saschawillems 2016-07-16 19:14:11 +02:00
parent 3c944c2bd9
commit 8d7450dbf6
6 changed files with 51 additions and 97 deletions

View file

@ -346,7 +346,7 @@ void VulkanExampleBase::loadMesh(std::string filename, vkMeshLoader::MeshBuffer
void VulkanExampleBase::loadMesh(std::string filename, vkMeshLoader::MeshBuffer * meshBuffer, std::vector<vkMeshLoader::VertexLayout> vertexLayout, vkMeshLoader::MeshCreateInfo *meshCreateInfo)
{
VulkanMeshLoader *mesh = new VulkanMeshLoader();
VulkanMeshLoader *mesh = new VulkanMeshLoader(&vulkanDevice);
#if defined(__ANDROID__)
mesh->assetManager = androidApp->activity->assetManager;
@ -358,8 +358,6 @@ void VulkanExampleBase::loadMesh(std::string filename, vkMeshLoader::MeshBuffer
VkCommandBuffer copyCmd = VulkanExampleBase::createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, false);
mesh->createBuffers(
device,
deviceMemoryProperties,
meshBuffer,
vertexLayout,
meshCreateInfo,