pke: glyph attribute offsets + cleanup

1 files changed, 12 insertions, 4 deletions

diff --git a/src/font.cpp b/src/font.cpp
index c966636..2365897 100644
--- a/src/font.cpp
+++ b/src/font.cpp
@@ -25,14 +25,20 @@ struct FontTypeData {
 } ftd;
 
 struct FontInstanceBufferItem {
-	glm::vec4 bg_color;
 	glm::vec4 fg_color;
+	glm::vec4 bg_color;
 	glm::vec2 sprite_region_min;
 	glm::vec2 sprite_region_max;
 	float width;
 };
 
-const VkDeviceSize instance_buffer_item_size = (sizeof(glm::vec4) * 2) + (sizeof(glm::vec2) * 2) + sizeof(float);
+const VkDeviceSize instance_buffer_item_size = 0
+	+ sizeof(glm::vec4)
+	+ sizeof(glm::vec4)
+	+ sizeof(glm::vec2)
+	+ sizeof(glm::vec2)
+	+ sizeof(float)
+	+ 0;
 
 // BucketContainer<FontType, TextRenderHandle, 2> bktFont;
 
@@ -967,8 +973,10 @@ FontRender FontType_AddStringRender(FontTypeIndex idx_ft, pk_cstr cstr) {
 		submitInfo.pCommandBuffers = &tmpBufferDetails.cmdBuffer;
 		submitInfo.signalSemaphoreCount = 0;
 		submitInfo.pSignalSemaphores = nullptr;
-		vkQueueSubmit(tmpBufferDetails.queue, 1, &submitInfo, nullptr);
-		vkQueueWaitIdle(tmpBufferDetails.queue);
+		vkResult = vkQueueSubmit(tmpBufferDetails.queue, 1, &submitInfo, nullptr);
+		assert(vkResult == VK_SUCCESS);
+		vkResult = vkQueueWaitIdle(tmpBufferDetails.queue);
+		assert(vkResult == VK_SUCCESS);
 	}
 	PKVK_EndBuffer(tmpBufferDetails);