From d8133778d078356501ea6e30ce9408edb9b0c19b Mon Sep 17 00:00:00 2001 From: Jonathan Bradley Date: Thu, 28 Sep 2023 16:15:56 -0400 Subject: image buffer should get the image bytes, not the model bytes --- src/entities.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/entities.cpp') diff --git a/src/entities.cpp b/src/entities.cpp index 4b43e81..8fa5127 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -380,7 +380,6 @@ void EntityType_Load(EntityType &et) { assert(pixels != nullptr && "sbti_load failed to load image."); uint32_t imageSizeBytes = pixelWidth * pixelHeight * pixelChannels; - AssetHandle textureAssetHandle{AM_Register(pixels, imageSizeBytes, imagePath)}; VkFormat imageFormat = VK_FORMAT_R8G8B8A8_SRGB; if (pixelChannels == 3) { @@ -454,14 +453,13 @@ void EntityType_Load(EntityType &et) { }; vkCreateImageView(vkDevice, &vkImageViewCreateInfo, vkAllocator, &et.textureImageView); - AM_Destroy(textureAssetHandle); // transition image layout and copy to buffer VkBuffer transferImageBuffer; VkDeviceMemory transferImageMemory; void *deviceData; BeginTransferBuffer(imageSizeBytes, transferImageBuffer, transferImageMemory, deviceData); - memcpy(deviceData, gltfData->buffers[0].data, gltfData->buffers[0].size); + memcpy(deviceData, pixels, imageSizeBytes); { VkImageMemoryBarrier vkImageMemoryBarrier; vkImageMemoryBarrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; -- cgit v1.2.3