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

Pass references framebuffers and sizes as references to the text overlay, recreate command buffers on resize

Browse source
This commit is contained in:
saschawillems 2016-05-05 13:03:56 +02:00
parent 381cd1c733
commit 77d72742ea
5 changed files with 53 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

5
data/shaders/textoverlay/mesh.vert
View file

@ -21,6 +21,11 @@ layout (location = 2) out vec2 outUV;
layout (location = 3) out vec3 outViewVec;
layout (location = 4) out vec3 outLightVec;
out gl_PerVertex
{
vec4 gl_Position;
};
void main()
{
outNormal = inNormal;

BIN
data/shaders/textoverlay/mesh.vert.spv
View file

Binary file not shown.

5
data/shaders/textoverlay/text.vert
View file

@ -5,6 +5,11 @@ layout (location = 1) in vec2 inUV;
layout (location = 0) out vec2 outUV;
out gl_PerVertex
{
vec4 gl_Position;
};
void main(void)
{
gl_Position = vec4(inPos, 0.0, 1.0);

BIN
data/shaders/textoverlay/text.vert.spv
View file

Binary file not shown.

71
textoverlay/textoverlay.cpp
View file

@ -58,13 +58,15 @@ private:
VkPhysicalDeviceMemoryProperties deviceMemoryProperties;
VkFormat colorFormat;
VkFormat depthFormat;
VkExtent2D windowSize;
uint32_t *frameBufferWidth;
uint32_t *frameBufferHeight;
VkSampler sampler;
VkImage image;
VkImageView view;
VkBuffer buffer;
// VkDeviceMemory memory;
VkDeviceMemory memory;
VkDeviceMemory imageMemory;
VkDescriptorPool descriptorPool;
VkDescriptorSetLayout descriptorSetLayout;
@ -74,10 +76,16 @@ private:
VkPipeline pipeline;
VkCommandPool commandPool;
std::vector<VkCommandBuffer> cmdBuffers;
std::vector<VkFramebuffer> frameBuffers;
std::vector<VkFramebuffer*> frameBuffers;
VkRenderPass renderPass;
// Pointer to mapped vertex buffer
glm::vec4 *mapped = nullptr;
stb_fontchar stbFontData[STB_NUM_CHARS];
uint32_t numLetters;
// Try to find appropriate memory type for a memory allocation
VkBool32 getMemoryType(uint32_t typeBits, VkFlags properties, uint32_t *typeIndex)
{
@ -112,29 +120,28 @@ private:
}
public:
// todo : move to private!
stb_fontchar stbFontData[STB_NUM_CHARS];
uint32_t numLetters;
VkDeviceMemory memory;
// Pointer to mapped vertex buffer
glm::vec4 *mapped = nullptr;
VulkanTextOverlay::VulkanTextOverlay(
VkPhysicalDevice physicalDevice,
VkDevice device,
std::vector<VkFramebuffer> framebuffers,
std::vector<VkFramebuffer> &framebuffers,
VkFormat colorformat,
VkFormat depthformat,
VkExtent2D windowsize)
uint32_t *framebufferwidth,
uint32_t *framebufferheight)
{
this->physicalDevice = physicalDevice;
this->device = device;
this->colorFormat = colorformat;
this->depthFormat = depthformat;
this->windowSize = windowsize;
this->frameBuffers = framebuffers;
this->frameBuffers.resize(framebuffers.size());
for (uint32_t i = 0; i < framebuffers.size(); i++)
{
this->frameBuffers[i] = &framebuffers[i];
}
this->frameBufferWidth = framebufferwidth;
this->frameBufferHeight = framebufferheight;
vkGetPhysicalDeviceMemoryProperties(physicalDevice, &deviceMemoryProperties);
cmdBuffers.resize(framebuffers.size());
@ -371,8 +378,8 @@ public:
//shaderStages[1] = loadShader(getAssetPath() + "shaders/base/font.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
// todo : pass asset path
shaderStages[0] = loadShader("../data/shaders/base/font.vert.spv", VK_SHADER_STAGE_VERTEX_BIT);
shaderStages[1] = loadShader("../data/shaders/base/font.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
shaderStages[0] = loadShader("../data/shaders/textoverlay/text.vert.spv", VK_SHADER_STAGE_VERTEX_BIT);
shaderStages[1] = loadShader("../data/shaders/textoverlay/text.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
VkGraphicsPipelineCreateInfo pipelineCreateInfo =
vkTools::initializers::pipelineCreateInfo(
@ -452,7 +459,7 @@ public:
vkTools::checkResult(vkCreateRenderPass(device, &renderPassInfo, nullptr, &renderPass));
}
// Map buffer
void beginTextUpdate()
{
@ -466,8 +473,8 @@ public:
{
assert(mapped != nullptr);
#define CHAR_WIDTH 2.0f * 0.75f / (float)windowSize.width - 1.0f
#define CHAR_HEIGHT 2.0f * 0.75f / (float)windowSize.height - 1.0f
#define CHAR_WIDTH 2.0f * 0.75f / *frameBufferWidth - 1.0f
#define CHAR_HEIGHT 2.0f * 0.75f / *frameBufferHeight - 1.0f
// Generate a uv mapped quad per char in the new text
for (auto letter : text)
@ -522,22 +529,23 @@ public:
VkRenderPassBeginInfo renderPassBeginInfo = vkTools::initializers::renderPassBeginInfo();
renderPassBeginInfo.renderPass = renderPass;
renderPassBeginInfo.renderArea.extent = windowSize;
renderPassBeginInfo.renderArea.extent.width = *frameBufferWidth;
renderPassBeginInfo.renderArea.extent.height = *frameBufferHeight;
renderPassBeginInfo.clearValueCount = 1;
renderPassBeginInfo.pClearValues = clearValues;
for (int32_t i = 0; i < cmdBuffers.size(); ++i)
{
renderPassBeginInfo.framebuffer = frameBuffers[i];
renderPassBeginInfo.framebuffer = *frameBuffers[i];
vkTools::checkResult(vkBeginCommandBuffer(cmdBuffers[i], &cmdBufInfo));
vkCmdBeginRenderPass(cmdBuffers[i], &renderPassBeginInfo, VK_SUBPASS_CONTENTS_INLINE);
VkViewport viewport = vkTools::initializers::viewport((float)windowSize.width, (float)windowSize.height, 0.0f, 1.0f);
VkViewport viewport = vkTools::initializers::viewport((float)*frameBufferWidth, (float)*frameBufferHeight, 0.0f, 1.0f);
vkCmdSetViewport(cmdBuffers[i], 0, 1, &viewport);
VkRect2D scissor = vkTools::initializers::rect2D(windowSize.width, windowSize.height, 0, 0);
VkRect2D scissor = vkTools::initializers::rect2D(*frameBufferWidth, *frameBufferHeight, 0, 0);
vkCmdSetScissor(cmdBuffers[i], 0, 1, &scissor);
vkCmdBindPipeline(cmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
@ -562,8 +570,7 @@ public:
void submit(VkQueue queue, uint32_t bufferindex)
{
VkSubmitInfo submitInfo = {};
submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
submitInfo.commandBufferCount = 1;
submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;submitInfo.commandBufferCount = 1;
submitInfo.pCommandBuffers = &cmdBuffers[bufferindex];
vkTools::checkResult(vkQueueSubmit(queue, 1, &submitInfo, VK_NULL_HANDLE));
@ -680,6 +687,8 @@ public:
vkTools::checkResult(vkEndCommandBuffer(drawCmdBuffers[i]));
}
vkQueueWaitIdle(queue);
}
// Update the text buffer displayed by the text overlay
@ -995,7 +1004,8 @@ public:
frameBuffers,
colorformat,
depthFormat,
windowSize
&width,
&height
);
updateTextOverlay();
}
@ -1034,6 +1044,11 @@ public:
updateUniformBuffers();
updateTextOverlay();
}
virtual void windowResized()
{
updateTextOverlay();
}
};
VulkanExample *vulkanExample;