diff --git a/base/vulkanMeshLoader.hpp b/base/vulkanMeshLoader.hpp index 5f6298db..b8965ff8 100644 --- a/base/vulkanMeshLoader.hpp +++ b/base/vulkanMeshLoader.hpp @@ -271,8 +271,9 @@ public: AAsset* asset = AAssetManager_open(assetManager, filename.c_str(), AASSET_MODE_STREAMING); assert(asset); size_t size = AAsset_getLength(asset); - assert(size > 0); + assert(size > 0); + void *meshData = malloc(size); AAsset_read(asset, meshData, size); AAsset_close(asset); @@ -291,6 +292,9 @@ public: else { printf("Error parsing '%s': '%s'\n", filename.c_str(), Importer.GetErrorString()); +#if defined(__ANDROID__) + LOGE("Error parsing '%s': '%s'", filename.c_str(), Importer.GetErrorString()); +#endif return false; } } @@ -303,7 +307,7 @@ public: for (unsigned int i = 0; i < m_Entries.size(); i++) { m_Entries[i].vertexBase = numVertices; - numVertices += pScene->mMeshes[i]->mNumVertices;; + numVertices += pScene->mMeshes[i]->mNumVertices; } // Initialize the meshes in the scene one by one diff --git a/base/vulkanandroid.cpp b/base/vulkanandroid.cpp index 5aca8ac7..54d2395e 100644 --- a/base/vulkanandroid.cpp +++ b/base/vulkanandroid.cpp @@ -39,6 +39,7 @@ PFN_vkBindImageMemory vkBindImageMemory; PFN_vkGetImageSubresourceLayout vkGetImageSubresourceLayout; PFN_vkCmdCopyBuffer vkCmdCopyBuffer; PFN_vkCmdCopyImage vkCmdCopyImage; +PFN_vkCmdBlitImage vkCmdBlitImage; PFN_vkCreateSampler vkCreateSampler; PFN_vkDestroySampler vkDestroySampler; PFN_vkDestroyImage vkDestroyImage; @@ -160,6 +161,7 @@ void loadVulkanFunctions(VkInstance instance) vkBindImageMemory = reinterpret_cast(vkGetInstanceProcAddr(instance, "vkBindImageMemory")); vkGetImageSubresourceLayout = reinterpret_cast(vkGetInstanceProcAddr(instance, "vkGetImageSubresourceLayout")); vkCmdCopyImage = reinterpret_cast(vkGetInstanceProcAddr(instance, "vkCmdCopyImage")); + vkCmdBlitImage = reinterpret_cast(vkGetInstanceProcAddr(instance, "vkCmdBlitImage")); vkDestroyImage = reinterpret_cast(vkGetInstanceProcAddr(instance, "vkDestroyImage")); vkCmdCopyBuffer = reinterpret_cast(vkGetInstanceProcAddr(instance, "vkCmdCopyBuffer")); diff --git a/base/vulkanandroid.h b/base/vulkanandroid.h index d55f6248..4b52c5d9 100644 --- a/base/vulkanandroid.h +++ b/base/vulkanandroid.h @@ -58,6 +58,7 @@ extern PFN_vkBindImageMemory vkBindImageMemory; extern PFN_vkGetImageSubresourceLayout vkGetImageSubresourceLayout; extern PFN_vkCmdCopyBuffer vkCmdCopyBuffer; extern PFN_vkCmdCopyImage vkCmdCopyImage; +extern PFN_vkCmdBlitImage vkCmdBlitImage; extern PFN_vkCreateSampler vkCreateSampler; extern PFN_vkDestroySampler vkDestroySampler; extern PFN_vkDestroyImage vkDestroyImage;