claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Text overlay class

Browse source
This commit is contained in:
saschawillems 2016-05-15 16:14:32 +02:00
parent 4198e2e64f
commit 99b9ff220d
1 changed files with 34 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

49
base/vulkantextoverlay.hpp
View file

@ -30,7 +30,7 @@
#define STB_NUM_CHARS STB_FONT_consolas_24_latin1_NUM_CHARS #define STB_NUM_CHARS STB_FONT_consolas_24_latin1_NUM_CHARS
// Max. number of chars the text overlay buffer can hold // Max. number of chars the text overlay buffer can hold
#define MAX_CHAR_COUNT 2048 #define MAX_CHAR_COUNT 512
// Mostly self-contained text overlay class // Mostly self-contained text overlay class
// todo : comment // todo : comment
@ -61,7 +61,6 @@ private:
VkPipeline pipeline; VkPipeline pipeline;
VkRenderPass renderPass; VkRenderPass renderPass;
VkCommandPool commandPool; VkCommandPool commandPool;
std::vector<VkCommandBuffer> cmdBuffers;
std::vector<VkFramebuffer*> frameBuffers; std::vector<VkFramebuffer*> frameBuffers;
std::vector<VkPipelineShaderStageCreateInfo> shaderStages; std::vector<VkPipelineShaderStageCreateInfo> shaderStages;
@ -72,25 +71,31 @@ private:
uint32_t numLetters; uint32_t numLetters;
// Try to find appropriate memory type for a memory allocation // Try to find appropriate memory type for a memory allocation
VkBool32 getMemoryType(uint32_t typeBits, VkFlags properties, uint32_t *typeIndex) uint32_t getMemoryType(uint32_t typeBits, VkFlags properties)
{
for (uint32_t i = 0; i < 32; i++)
{
if ((typeBits & 1) == 1)
{ {
for (int i = 0; i < 32; i++) {
if ((typeBits & 1) == 1) {
if ((deviceMemoryProperties.memoryTypes[i].propertyFlags & properties) == properties) if ((deviceMemoryProperties.memoryTypes[i].propertyFlags & properties) == properties)
{ {
*typeIndex = i; return i;
return true;
} }
} }
typeBits >>= 1; typeBits >>= 1;
} }
return false;
// todo : throw error
return 0;
} }
public: public:
enum TextAlign { alignLeft, alignCenter, alignRight }; enum TextAlign { alignLeft, alignCenter, alignRight };
bool visible = true; bool visible = true;
bool invalidated = false;
std::vector<VkCommandBuffer> cmdBuffers;
VulkanTextOverlay( VulkanTextOverlay(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
@ -181,7 +186,7 @@ public:
vkGetBufferMemoryRequirements(device, buffer, &memReqs); vkGetBufferMemoryRequirements(device, buffer, &memReqs);
allocInfo.allocationSize = memReqs.size; allocInfo.allocationSize = memReqs.size;
getMemoryType(memReqs.memoryTypeBits, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &allocInfo.memoryTypeIndex); allocInfo.memoryTypeIndex = getMemoryType(memReqs.memoryTypeBits, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT);
VK_CHECK_RESULT(vkAllocateMemory(device, &allocInfo, nullptr, &memory)); VK_CHECK_RESULT(vkAllocateMemory(device, &allocInfo, nullptr, &memory));
VK_CHECK_RESULT(vkBindBufferMemory(device, buffer, memory, 0)); VK_CHECK_RESULT(vkBindBufferMemory(device, buffer, memory, 0));
@ -204,7 +209,7 @@ public:
VK_CHECK_RESULT(vkCreateImage(device, &imageInfo, nullptr, &image)); VK_CHECK_RESULT(vkCreateImage(device, &imageInfo, nullptr, &image));
allocInfo.allocationSize = STB_FONT_WIDTH * STB_NUM_CHARS; allocInfo.allocationSize = STB_FONT_WIDTH * STB_NUM_CHARS;
getMemoryType(memReqs.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, &allocInfo.memoryTypeIndex); allocInfo.memoryTypeIndex = getMemoryType(memReqs.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
VK_CHECK_RESULT(vkAllocateMemory(device, &allocInfo, nullptr, &imageMemory)); VK_CHECK_RESULT(vkAllocateMemory(device, &allocInfo, nullptr, &imageMemory));
VK_CHECK_RESULT(vkBindImageMemory(device, image, imageMemory, 0)); VK_CHECK_RESULT(vkBindImageMemory(device, image, imageMemory, 0));
@ -228,7 +233,7 @@ public:
allocInfo.allocationSize = memReqs.size; allocInfo.allocationSize = memReqs.size;
// Get memory type index for a host visible buffer // Get memory type index for a host visible buffer
getMemoryType(memReqs.memoryTypeBits, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &allocInfo.memoryTypeIndex); allocInfo.memoryTypeIndex = getMemoryType(memReqs.memoryTypeBits, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT);
VK_CHECK_RESULT(vkAllocateMemory(device, &allocInfo, nullptr, &stagingBuffer.memory)); VK_CHECK_RESULT(vkAllocateMemory(device, &allocInfo, nullptr, &stagingBuffer.memory));
VK_CHECK_RESULT(vkBindBufferMemory(device, stagingBuffer.buffer, stagingBuffer.memory, 0)); VK_CHECK_RESULT(vkBindBufferMemory(device, stagingBuffer.buffer, stagingBuffer.memory, 0));
@ -629,6 +634,8 @@ public:
for (int32_t i = 0; i < cmdBuffers.size(); ++i) for (int32_t i = 0; i < cmdBuffers.size(); ++i)
{ {
std::cout << "update text cmd buff " << i << " with fb " << *frameBuffers[i] << std::endl;
renderPassBeginInfo.framebuffer = *frameBuffers[i]; renderPassBeginInfo.framebuffer = *frameBuffers[i];
VK_CHECK_RESULT(vkBeginCommandBuffer(cmdBuffers[i], &cmdBufInfo)); VK_CHECK_RESULT(vkBeginCommandBuffer(cmdBuffers[i], &cmdBufInfo));
@ -652,7 +659,6 @@ public:
vkCmdDraw(cmdBuffers[i], 4, 1, j * 4, 0); vkCmdDraw(cmdBuffers[i], 4, 1, j * 4, 0);
} }
vkCmdEndRenderPass(cmdBuffers[i]); vkCmdEndRenderPass(cmdBuffers[i]);
VK_CHECK_RESULT(vkEndCommandBuffer(cmdBuffers[i])); VK_CHECK_RESULT(vkEndCommandBuffer(cmdBuffers[i]));
@ -661,19 +667,30 @@ public:
// Submit the text command buffers to a queue // Submit the text command buffers to a queue
// Does a queue wait idle // Does a queue wait idle
void submit(VkQueue queue, uint32_t bufferindex) void submit(VkQueue queue, uint32_t bufferindex, VkSubmitInfo submitInfo)
{ {
if (!visible) if (!visible)
{ {
return; return;
} }
VkSubmitInfo submitInfo = {};
submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; submitInfo.commandBufferCount = 1;
submitInfo.pCommandBuffers = &cmdBuffers[bufferindex]; submitInfo.pCommandBuffers = &cmdBuffers[bufferindex];
submitInfo.commandBufferCount = 1;
VK_CHECK_RESULT(vkQueueSubmit(queue, 1, &submitInfo, VK_NULL_HANDLE)); VK_CHECK_RESULT(vkQueueSubmit(queue, 1, &submitInfo, VK_NULL_HANDLE));
VK_CHECK_RESULT(vkQueueWaitIdle(queue)); }
void reallocateCommandBuffers()
{
vkFreeCommandBuffers(device, commandPool, cmdBuffers.size(), cmdBuffers.data());
VkCommandBufferAllocateInfo cmdBufAllocateInfo =
vkTools::initializers::commandBufferAllocateInfo(
commandPool,
VK_COMMAND_BUFFER_LEVEL_PRIMARY,
(uint32_t)cmdBuffers.size());
VK_CHECK_RESULT(vkAllocateCommandBuffers(device, &cmdBufAllocateInfo, cmdBuffers.data()));
} }
}; };