From 77d72742ea51e93b411370420a05af5c23ce1e3a Mon Sep 17 00:00:00 2001
From: saschawillems <webmaster@saschawillems.de>
Date: Thu, 5 May 2016 13:03:56 +0200
Subject: [PATCH] Pass references framebuffers and sizes as references to the
 text overlay, recreate command buffers on resize

---
 data/shaders/textoverlay/mesh.vert     |   5 ++
 data/shaders/textoverlay/mesh.vert.spv | Bin 2552 -> 2332 bytes
 data/shaders/textoverlay/text.vert     |   5 ++
 data/shaders/textoverlay/text.vert.spv | Bin 984 -> 764 bytes
 textoverlay/textoverlay.cpp            |  71 +++++++++++++++----------
 5 files changed, 53 insertions(+), 28 deletions(-)

diff --git a/data/shaders/textoverlay/mesh.vert b/data/shaders/textoverlay/mesh.vert
index df49c062..ab841aa9 100644
--- a/data/shaders/textoverlay/mesh.vert
+++ b/data/shaders/textoverlay/mesh.vert
@@ -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;
diff --git a/data/shaders/textoverlay/mesh.vert.spv b/data/shaders/textoverlay/mesh.vert.spv
index 54e8d7b11f11b0a06121ef92d15173d3dd879a0f..c993b8bc09bf00906e1c60457bd395daf256237a 100644
GIT binary patch
literal 2332
zcmZ9M+foxj5QayRAc`kM4xTU&6%|E9KomJf4QfhIi`=Fb*b1v5n@U3IomBY*`ba*N
zH&*$7yW6ljsm}EOcTaau_avFF!b#^&=+ooME?#}EOW3(y*B$Mp^2hRIyR$nvGdqRH
zIhTnX@j0&#D=XRef(H62Nw4Ir<ecQ9<dWpFWL#2|tV=TbbZP&kKv|tCm8+{C)~ap4
z>9xF$Uv2MsyMC)0Zh!K3I_-abWC|L!YTawp4!oLQotd6$dOM$8PLa~J<it=<c+hzl
zw)VZcbU5k@8b?&bQLp@pVLfa~6_<_b4;nEA<}UKtsw8&q6*M9!|86%VT&q_%{Z_?q
zb^Nb_Vq+d1Ti6adLD-OgCh7@1`gQGFYa5Y2I;+_VxjpXUbCC~y-w$_v?m}#Q>0>>p
z?R6AgY83B=_Ji$EdN%5N(1?xXnwG68S8R*Y>qqBu(R_5rGT|!zj(l>_yu?)k{|l5W
z=^T9>k+8t@6ij_!`kBVO1u(A%JG}%`JD6S?URO?f$s#VRq?2&?ugl+hl#6iO8>z0q
zmliS1M~~cHh`9J1HKxyjIkzIQb8yG!;#lOy?@&TL)_dxw-(wP%;n5gIn77aUSlEl&
z!Ms;6zX@<g(yv>RYg7n~J}9kQdtNdme`*6`&kOe?I{ZR{nUUE~OSd~=2h&?P^JixG
zo1K|qCm;PIAGMILPdmQw_=B0L<?ENuS+j$gvBevdPCV{EqEpNkj@ZN6i33M$F#jKL
z1HxCd=Ox6NNbptZtYP76+KCm%j%NpFJUQ&GF+*~InW5b;pXi*i90lp*wEi$ttAV@R
zl{j~}O#Fw^sMqfFNIJ7I{5-*M7Jo^)<zG&8{K?0BixOfQj{irUo6~FN9QS46^IHsW
z9A9$to42<??!^Qz$_{@<!h2ZKY2FRkZ2Zgf7O?R~z}T4WfP}eXWB%Y(WzK6KmC#dW
zgFn3-lfawLP3ia)B<6EVI{Z(?;mmCb=isfTJJQD`@8v`9?@8cT#!X0vV@Af^PdNIu
zshiW^2NKTXkDWRGP+V-267u6i&CGR5!h7Ui+#8Ia-RZIP|L-&-4&LgYm7cDDP8g15
zwLXy!m#%+4;nMX#6~}q}v8U^QCQNR8sFimBXLT${PtP69J$QdB67Ipf#GihwN>(Hr
zdXc=FH3=NTqE>1n7jF!^<$4k6$FW`tQ;)@ZB^?f7S*-7>hg>BIG4LZkzXv$0?X~oD
cyf?yd2+QJqOWyojarh96-xBzbyyhi;0ra1ihyVZp

literal 2552
zcmZ9NYjYG;5Qc|jH=rnp$VJ7tN$`rshyhUqazQqdm7o;)y0s)z%jjk%wYw=Tzett8
zK!1|I$}d*=JTuel!bx?y-?#g8_c^C0nVnfWo+QWkIg#un)jE^RfRjYss`Uc;WHMLs
z?argl@@Txjyn1Z~Iysfhs!HGK<aB8__<hjJa=}Z;N#s@J6!JRq2674c7`caRBeVR>
zp#P?LgI(=Tcm2nW?kGL%4SVCXJ9^sNPlw&&$xrFtc=UV>t}O3&2fe(1)a$3+)vGIq
zy}h54CYh#tX~Nh~aWsBV3=et(Y&rYO@(ERP_DkGmF(`(ZaE-G6EUzfBXCdbCZteG6
zSzbco=aRR;{XzF(I^0c%<MdY`Y{hHqD@NHkD{|Q5WxRJ^@>xE9l>L?(7e4O?-{v4Y
zyqk^2y?ig7_<RL@M}xt{*W^yUXP0&h{di-CJ#(cke>g0>QCom*mb^V26#J?76S3AF
zWc{aOI>s#XEuxQ}6xfaOEwj9GTI(9VLqhefVGkzzn&q2wZynR^rhCLR%Nc;%&C*|_
zk~aH%t9isF_MOD`C-#k|vGXPNF7*38VtW_+K7qHW>HE0M>k7{Na_ZpBA!qL3wB?+!
zHXidCw*}KeyPAmcEdgt(QqOUGgvo12?6dClKC%1OkjN$X|Gp}}wT*j**iQ>B=h+w0
ziYxF!1xxI==-s&V`(28wvo*^15qsvdWHs*sNUVJxYYyE)F0jkq#QIy{6SXaWv&Oz}
z_+Q38hJ;@nZxHdmxA9{AzPEd<=lxmFUaWTpZLGZUV&@_1oyB%<_{Gjg<U5aTKF@!S
z-xts=#C4^{7qN}M1b!23yxcsNvk*D-Dfaa?+8*@Vm)LJq&N}a)TZnnBBaU~u2!0oA
zUi+G_=SnVkYb=1Pd#GxN7bje!oDu!*i5l-?TQly~d59i7*C$AlJiBB5t627HAL3QC
z?-uw@jpZW$I(EFxMr|8!J!j({V$Q(ZHNMUn-RF5-#{2{0_hGEH{aX`rW9_vX-@-5d
z3gRr?X16mZ4xj(AoFjeCmsp>3aSm}N^f^1?bt*5RFC&YHZ)3c7`5q!4F&|(X<K0Hg
zhuHFek;gqBA?}lpo~~ef|347p-G7S6xq@59mh+8*`>f`?uZNu6`&~iYZ@hlr@lW#V
z`y8>pG4|}cet|fTp38HKjf*o~$A0llU&6^p|2MFw`~M0o=Zapx#+IAz|7Oii_x}x?
z`;FH>-Ty7HwT-b?=Rhv{xQ#vi?qbief!;(shjVGX_i-1I-(e!1n{R7Q-es@$X00`}
z{;1W)mWy0l*!B~-zQdMNT#@S!`mxr1#2m(%-|s;#@^!GM^L-DNQ(Ten_j=|Zz!_t%
MZM67bqHZAn0Z}=ussI20

diff --git a/data/shaders/textoverlay/text.vert b/data/shaders/textoverlay/text.vert
index 3143256f..548bfdb2 100644
--- a/data/shaders/textoverlay/text.vert
+++ b/data/shaders/textoverlay/text.vert
@@ -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);
diff --git a/data/shaders/textoverlay/text.vert.spv b/data/shaders/textoverlay/text.vert.spv
index e086b48d97eed46aac126342e8e83812cd11b2f1..fd292c04e550b61b6e0bc16c6e03d5f8db0fae9a 100644
GIT binary patch
literal 764
zcmYk2PfNo<5XHwPsnu$0t!@2BsdyBM2Ngk7JjFu~6|q+l3=+^3+6W%~Y<?;)g73H4
zR5wg^-`kltZzrf6E}JdstJ%I4t7R2ov$|E?9*^!v!+HKZJUKlkqhWzdB&TUB?i}j>
z_LOFTRYg;=qu5mh`YPJLR1jIH?=Lq}kDBny>*F|?O_Eujd<cpyc+T8S=V_i!Gt~!9
zA093Gq?xWgrswoMf0%eo|1@*ZZdE}qR=wCPmL44bVz1X<+=cE9|1o-C-riOfbqDT+
zg+^EBs<?roCp`_<Vcy*Lz2FAAV{%NA{udrIJGhQ89tR3~9eKQ_GYjo??exL}dJXO5
z!lMUfK4m?*Ed>ib@TNnb*VK1)rg!OY+v8FX%zViy^_d6yXPPZOcqfaTZ!wYfOR;Ed
zDDZP9mfmg8X<Kkxo<nmiCwS>7$mI_Ic)pPaetQaL#$2w{6-<8Fb5CbHa))>Dj~t&X
FegS8PCPx4O

literal 984
zcmYk4-7iBy5XDzNC`DDZ^-<i$qonbGNCXj*dgucYeHGzGHo0!4y%O={Z}V4qkvPBY
zZrROr=A4<GId`}D+|G<KQ`#l7ZN{r=a>B;oBk$YtWi##gZtu3&8D&qM{ewNxX3^wv
zE>|(LE-vWz<-w+a1=+H!CEJwcwR7@c8d5X`?Z4WhW|W1Wll$v<*pG)<{4OYV%oCFv
zjBI8Hsn{7;k6y>yG`qDQF?AuwEaff|`+8|d*+cpmPjV<H_m(7+Tv7Va%t9a9ZK{zT
z^Bse??5^)I-(*t<&6Q4|pA~%I&<KYQ9NOT}5jbKv?xm{?F?C(9WlJ#&jF$fxEnsHU
zbc%Cr^`IwlL(#N+Bx~xt9^YYR)rCv)k&LzLF)vELmhhZB=i#;#p)K?vhefKJmk-}@
z>@jx=$DBo1H}1<Ea7D&K*OEMQ&`iIoJR0EX2j*SiI8W`0j1_R*q0ckUuPJ6WTEQD0
zhkju0lA6$;yQKf2-V`0&5sR8{F-7?kvGl0P&~qaeEe+4fO}M7#=y@$AXjzp}OAh^L
gK35O)uFJSH?&VZd!PJMDyfYffh5x~i6d%cc0ckHfYXATM

diff --git a/textoverlay/textoverlay.cpp b/textoverlay/textoverlay.cpp
index 2ec3cd2f..127a991d 100644
--- a/textoverlay/textoverlay.cpp
+++ b/textoverlay/textoverlay.cpp
@@ -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;