summaryrefslogtreecommitdiff
path: root/src/entities.cpp
diff options
context:
space:
mode:
authorJonathan Bradley <jcb@pikum.xyz>2023-09-28 16:15:56 -0400
committerJonathan Bradley <jcb@pikum.xyz>2023-09-28 16:15:56 -0400
commitd8133778d078356501ea6e30ce9408edb9b0c19b (patch)
tree8814d2d90849643b08da6cb52f07a381eb403e60 /src/entities.cpp
parent30c94ea126b7d079731be9e611db4c03b182826f (diff)
image buffer should get the image bytes, not the model bytes
Diffstat (limited to 'src/entities.cpp')
-rw-r--r--src/entities.cpp4
1 files changed, 1 insertions, 3 deletions
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;