From 886abea8623e41c10c094af1d822d90e563f5aff Mon Sep 17 00:00:00 2001 From: saschawillems Date: Tue, 31 May 2016 20:07:43 +0200 Subject: [PATCH] Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders --- .../shadowmapomni/cubemapdisplay.frag.spv | Bin 936 -> 936 bytes .../shaders/shadowmapomni/cubemapdisplay.vert | 5 + .../shadowmapomni/cubemapdisplay.vert.spv | Bin 1636 -> 1300 bytes data/shaders/shadowmapomni/offscreen.frag.spv | Bin 712 -> 712 bytes data/shaders/shadowmapomni/offscreen.vert | 5 + data/shaders/shadowmapomni/offscreen.vert.spv | Bin 2200 -> 1848 bytes data/shaders/shadowmapomni/scene.frag.spv | Bin 2668 -> 2668 bytes data/shaders/shadowmapomni/scene.vert | 5 + data/shaders/shadowmapomni/scene.vert.spv | Bin 2712 -> 2376 bytes shadowmappingomni/shadowmappingomni.cpp | 292 +++++++----------- 10 files changed, 120 insertions(+), 187 deletions(-) diff --git a/data/shaders/shadowmapomni/cubemapdisplay.frag.spv b/data/shaders/shadowmapomni/cubemapdisplay.frag.spv index 830467b858fe17b5c015361c63f1a3a6cafe50da..44a0198c093759a8bc5c89118a6ee8ecbb555acf 100644 GIT binary patch delta 12 TcmZ3%zJh&13M2c*RA*)Y8tDVK delta 12 TcmZ3%zJh&13M0qHRA*)Y8twzQ diff --git a/data/shaders/shadowmapomni/cubemapdisplay.vert b/data/shaders/shadowmapomni/cubemapdisplay.vert index 71db9c4b..fef6b5bd 100644 --- a/data/shaders/shadowmapomni/cubemapdisplay.vert +++ b/data/shaders/shadowmapomni/cubemapdisplay.vert @@ -14,6 +14,11 @@ layout (binding = 0) uniform UBO layout (location = 0) out vec3 outUVW; +out gl_PerVertex +{ + vec4 gl_Position; +}; + void main() { outUVW = inPos; diff --git a/data/shaders/shadowmapomni/cubemapdisplay.vert.spv b/data/shaders/shadowmapomni/cubemapdisplay.vert.spv index ff5131ca69250bbd55efb90532ea2e4d11d6009b..2fabb1fe0e0dac0e7d6214fabd8b353ba033d092 100644 GIT binary patch literal 1300 zcmZ9KS#Q%&5QT@N2}^-eN*A`0G%OEDRfP&dLM-h|`Vff#YI(HW#tMeij%){b>|cPN z#INE7iSyYWDR867opa{Qa<6Z*(K~N;PQMHG$f~t$4PmoIYnOX}@L{l>7o+Xnr#mRF zTC)_QSyCQrL3SF(3I0XdqU@Tisb53;FNqfv=?{Xv_xnK}O~WiKq9Feij-o6`k3UBz zMgFfwp*R@_lQ0?2!f_PrKG~UuCts|kO7s1|^h{^P;n7Dcpo&>`v zJBqR*`YtH8;_->4d0fP4B7L)*9UlLN_QUL(%~B>tF1}T2xR0-K^o_W4oc%N% zMHB7RTGKu|POV?hyeZ5AGqd9ZshODt&+025j+zJ3`z);zS2M`99)DWYaE(54c_znevAhQB7St-T{# zS3Y&Y#5=;gK79BWHRdgN{E~b>2XQd>2}ivv+NsBT+Ef^1ra z@|c;v&-A6JLw^?hZ!vtomtwiI%QEicm7?4mcuxxYZpfI0GofdOn=*LU+?J1qnOt*6 zKKxJBA?L1)Jb3TRJE!kEY5e>8+jp+3I2`xu+*ZwTuAxrAIeW5>3_Wq~@JyDy_Z W8fNBx9?JNRoQrdV(fv`U=d!<=JX2Tz literal 1636 zcmZ9L+fEZv6oxk~Ehq{ia!|2Mspl#o291gF0Fo4vCRPb}IT_kX9W66WJ5}Qqub_|Q zQ+Z?J|LvJgio03e>;Knz?Y3B`O&K$x&$M}LvNLZA!p6*)vb`J4gXYFC?QCp4-Na+o z6s;pZbLOJeC-r?2L@{7SazU~nsY@P7iux3E|5nhXtc|9>{b9!+hW%g=q@h3j6m-IY zpB#S<+v)JUk4#bA^?O0w9R=Oc-+Hpy587W$Ntwp$f~lK~(!-;V#@gv6id%_N3YX2i z?rzU-g@dDTkcQs{#b!J@wqzKkQ4))tvi{6z`6x~gq8}lC&c;l#z3oN)-DsEwaXUP- zu_bJyUhm9S(jM3g2Yp%h;m$k7l&ucmA0%vn7Q~h;PY++C@Edl=QTrt6ggxElx~_Y4 zoJcR(y{mRMRhvV8|}`*GH%SYsOb&MMM5V0Py4o+8;92cF|NdV=G296iA?yW`N| zc&mmimzCdn0kV;Qo)J_IMnaxKoLXgL858 zOkZ&9hdr-LI1X1cXmMRS^HKvlzkhI9vY;&FsVXOXL0^)F&66z4pSob|p73<8!@tNe zzjJ5jAL!=94yGO)`7Y}wANya__pEMD!l~zYPCEXp!t5A-xQaC1%jLj^(AQPn^njhZ zV1C;6({%MR-X!dFiW?zdf82YODyeBlb@XF#CtYek0e3aW!t`9GE%Q zCB~e-#{a%F`lBxRp>F!4H}ZpdKRAbZKkzg4NL~8nkmrvW-ub0i-sh5p-M^BRHv(_V zgFbIc=$#$lPtU6oc<00a4j*Q4K5Nq9e<=?!o`g7fSGOviy6@$~%ryxd$8oo%!%d8F tcXE!oTAF~p+?5cIKX&%_Q+cu7lXwz*=$U;!knrxz#oS>0{;JY*$v>cZbVC3D diff --git a/data/shaders/shadowmapomni/offscreen.frag.spv b/data/shaders/shadowmapomni/offscreen.frag.spv index 95ee68023b99ccb8592ecf3d65e6e7cd0b0a3ad2..27510496087b0d3e838ba843f822cdc355d0eb1e 100644 GIT binary patch delta 32 hcmX@XdV+OAh$s&O1A_n%i-2in1{NUAzA-bN2>@0>1YH0C delta 32 hcmX@XdV+OAh^Pny0|O5b3xF{*0}GJm*q9m51OQfc1YQ6D diff --git a/data/shaders/shadowmapomni/offscreen.vert b/data/shaders/shadowmapomni/offscreen.vert index f0306683..ab15c9c2 100644 --- a/data/shaders/shadowmapomni/offscreen.vert +++ b/data/shaders/shadowmapomni/offscreen.vert @@ -21,6 +21,11 @@ layout(push_constant) uniform PushConsts mat4 view; } pushConsts; +out gl_PerVertex +{ + vec4 gl_Position; +}; + void main() { gl_Position = ubo.projection * pushConsts.view * ubo.model * vec4(inPos, 1.0); diff --git a/data/shaders/shadowmapomni/offscreen.vert.spv b/data/shaders/shadowmapomni/offscreen.vert.spv index 1c1e0f2e81a5fdf9fd312431b6d80f4a54f0942c..023dcde58c9aa4273efa913693608e35a52130e5 100644 GIT binary patch literal 1848 zcmZ9M+fvg|6oxmHB8q~D96Vu5J)^ZEATy2!;G$e~hN`2tnLsmbv^1TjRWEr3eIm!F z^2QneFUgYV?yT&!{{63Gc3K#(oN;bUzbUuv(lzJCWjiD1c-N@L!&Y@;vj$_v z6%rzxS$8(kC-gk_!yd*tNm;TcS(g;_8`u6*4in_T`vy${=gpwUfl6p!N7|S zKL$s`_+O5W!d~0!`n~qZZwKDSdadsteR4%b%I7Sq)+yy^cfDpX_z(<+!B?3=QyiVM zC=Q2V)RTW9sS_N1M*I8SgM^RH>JK6+f-bz6aOnAS7<}Q}FnT+VT0u9#CKDbL>W1yk zP#L8rIWB4+9Y)fN?y~geDDLb*QJM)KW-hy7 z>Gy>(8`gBXxw?7=qxOBpu%3&Fo%RZ~!b6J~#?ggw^kRO@B=3if-)o8af&K4C?z|s1 zekT(113UFgYhbqUen{wpy5QB-2X(DVSY|UX7WLYUEw93z)C{+y6^*gp4og~U<wEe|yXBcxe-kl7i=cXpW z4DL$shtD~)|E9Q{-II_X4mC6T2NLcmy}s1Mu;E#452fd8dn6l-Wpz}ggXL>`oMHLe zYQpe`&pEY`llRXVHSs<-CCricOdZs|B>_Ls*Tu}9Wf(Y%+~gu2_l5J{LboM<004Y; At4C^47yIq&YgF~KeX9M(s2cKI~L-#nOYZU(FyL_V%Wb zVzO^x+p2(h33YBun)J2sw$fu5y@PQZM(<$sYZyEjJ1-6?}v=v8GBZHW&Y3+mAoG1A7ezzLLY_(G zq)+$}ap+2-QQ1=$GJ71>f3NP6h%=MPed5VCF8Q2p?7=3)k;`JBgG#cypqrfNS2CGz z5sW#xwkfZ1A}u!VlbH-xN=5=4-J_;=#>tQarvT5jM=_ zwul+ORcz*aH^X$DV)rtPKF#iahSBq`CdSMji15cAJ-hm@xaej?j1Gn5ZeN=JrD~pFf*_KY4(kkpE&`Zd4iF14Ff*_KX^xGRpE&`a@di%- diff --git a/data/shaders/shadowmapomni/scene.vert b/data/shaders/shadowmapomni/scene.vert index 6c9ad09d..fb6d49ab 100644 --- a/data/shaders/shadowmapomni/scene.vert +++ b/data/shaders/shadowmapomni/scene.vert @@ -22,6 +22,11 @@ layout (location = 3) out vec3 outLightVec; layout (location = 4) out vec3 outWorldPos; layout (location = 5) out vec3 outLightPos; +out gl_PerVertex +{ + vec4 gl_Position; +}; + void main() { outColor = inColor; diff --git a/data/shaders/shadowmapomni/scene.vert.spv b/data/shaders/shadowmapomni/scene.vert.spv index ba0930adcab620054bd2796935eda6cd97604067..feb6c4c894ef61ef63fd70bc7bff6d9dc8bac2cf 100644 GIT binary patch literal 2376 zcmZ9M+foxj5QaxW5CuU*4xTW8ctQ~o5Jk>nP$@wz@iG<2R#**LDhVF$sPYN)i7cPW z8>{@k*=<>wR5RUw|2^H)Jxiu(_@r|u^lNo5UA($nlWgbOT#MiH>u=Y`>W$La5z0wMkMznPb907yd2Upiti}mV#O#+WrviH0u9z@kRBp z5k^(uH94jvm81ZZ3TaU8dj(a234f98fGmN80?9O^D zj-#e@95!)_5{m;n9!KtU95!)>5{m;nii>ODPVjz8xCeE?Kzb^8H17goOa^Ch{fjr1z3;l^V)L~&KgbZ9_g%p z*}d91D?U5^F2GDIPropF!Cc6L&0N5!<6@!{XL+tjPv;#>ICe+oW`6E>L*m@w0_WY8 z#vRBHpB^(;>k&3{#kPENiB0^xbZSe-Gxu~nbH|?6iKDL; zH!L08;;u>0Nx-e%>(c4{Yn@HsZ%V*ehTW15#(WIBonZ88Q(d9AqY~ob<7bB7buPX; z67s{LW@b7j;eFB%`h^Y8?ldm__?_+x1GoAoq^IkDARCNjwN6S0OV>Y@VCnj&g%J-Q zf4csMvdIm{&Yh7C&NA$gbg*=;#|akaYVmJqRv7W{@pFIPG&uL?%`Ql|KW~})(#J&! z_=dg$-r|yEF%fM(FL|s#%hKu3H=PN8MM4aCyCx3yR6@P068zM{_XKX|Jd@5j_~2n% goomvM*ZEu+xYhYWIvBztA9ZqGUOWCjLT4m@0eaM&Gynhq literal 2712 zcmZ9N*;3R{5QdMyjJS&m?mCG3f~dG}Y&wIEf?De3RDjeF4GA?9+^($h3G|69pUNAn z{J)blMvm2-?!VX5-5Gm(Mm9UQN&ouY3zwe(*CW}vZLaF?dh=Ctw3{uBj$a?cVyEl% zhS=vu(VS>r)T@6zx_>EPpRDW6*5u2n zRySM?Izbk;y34^**lDE;@505b`@fA;QPOV3LDF6e+F@(_>eyoDG9kJeqI-?|qu%TYrJWo3-LF{cR{vA=W4#}$O_DR={Tk~P(P1wo8PZEXZI6S(v z8)Z?N2;J=M>6gc&BzqNo39&OB@0V^mj#g))ZWbhq;ku4)qg#vPbzMb0qlX;$L%Ls2 z&B>?gdGOUvO2;TcXvO2y@F5C6qBo4(E9p|md(EGmanxSU^a`;)#}VCY3#s@%KjSFL zmGq7Is&9`zhyO6~c!R!oUH}vMbxwA8}s`_0KHk;)A z5$assZ;W%t#Pc>}W{S+akeMkm2bsM@=8X+SW|kcMIEE1qjN33`f|Y&Y!PvLDG{nQM zA%wYbDk5T-JmS&+F@1<`x3|mv$XoV9#&1GovA{O^k-O}NjNez0`GNiO%j@DD*!>jo z4r;}Yo-z9qB96(!x#(rS`Erlhhw=>A1?xHf{0<=JJ?ry3fK1)!nLj->ncoTIs%WpO zqOM`pNX_s=;?UJZ`{mEukkQv9_ZK|)-9qN~!1P=Cl*c8O;<(6KYflk%pA>^Oa8M%dHO<05dg85WOC zO=LDF#Do7(9DGJZ_<@_>De?F*2lG2E9^CxSh{qS)>OCi(S-ntf=5#>>#xd-ocrf~9 z*rfuaSM%x$vltcOk3D*3{#|j=T^5la8)_cYeMQ7R(+~QEjGevdn)r=x8W#p`^EpBrd`@2tab^k(oI_snSbrXgr$65m6Z^*^e89JB z;$U?VeqiXSh3^mC;>?OC4!VYJWUKS3_>FZog@Ie0&%}d49IKOfe5>gH2)!lx3)4Zs A761SM diff --git a/shadowmappingomni/shadowmappingomni.cpp b/shadowmappingomni/shadowmappingomni.cpp index 6f9e16e4..cdea83e8 100644 --- a/shadowmappingomni/shadowmappingomni.cpp +++ b/shadowmappingomni/shadowmappingomni.cpp @@ -115,10 +115,10 @@ public: int32_t width, height; VkFramebuffer frameBuffer; FrameBufferAttachment color, depth; + VkRenderPass renderPass; } offScreenFrameBuf; VkCommandBuffer offScreenCmdBuffer = VK_NULL_HANDLE; - VkRenderPass offscreenRenderpass = VK_NULL_HANDLE; VkFormat fbDepthFormat; VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION) @@ -127,6 +127,7 @@ public: zoomSpeed = 10.0f; timerSpeed *= 0.25f; rotation = { -20.5f, -673.0f, 0.0f }; + enableTextOverlay = true; title = "Vulkan Example - Point light shadows"; } @@ -155,7 +156,7 @@ public: vkDestroyFramebuffer(device, offScreenFrameBuf.frameBuffer, nullptr); - vkDestroyRenderPass(device, offscreenRenderpass, nullptr); + vkDestroyRenderPass(device, offScreenFrameBuf.renderPass, nullptr); // Pipelibes vkDestroyPipeline(device, pipelines.scene, nullptr); @@ -180,8 +181,6 @@ public: void prepareCubeMap() { - VkResult err; - shadowCubeMap.width = TEX_DIM; shadowCubeMap.height = TEX_DIM; @@ -205,35 +204,17 @@ public: VkMemoryAllocateInfo memAllocInfo = vkTools::initializers::memoryAllocateInfo(); VkMemoryRequirements memReqs; - // Allocate command buffer for image copies and layouts - VkCommandBuffer cmdBuffer; - VkCommandBufferAllocateInfo cmdBufAlllocatInfo = - vkTools::initializers::commandBufferAllocateInfo( - cmdPool, - VK_COMMAND_BUFFER_LEVEL_PRIMARY, - 1); - err = vkAllocateCommandBuffers(device, &cmdBufAlllocatInfo, &cmdBuffer); - assert(!err); - - VkCommandBufferBeginInfo cmdBufInfo = - vkTools::initializers::commandBufferBeginInfo(); - - err = vkBeginCommandBuffer(cmdBuffer, &cmdBufInfo); - assert(!err); + VkCommandBuffer layoutCmd = VulkanExampleBase::createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true); // Create cube map image - err = vkCreateImage(device, &imageCreateInfo, nullptr, &shadowCubeMap.image); - assert(!err); + VK_CHECK_RESULT(vkCreateImage(device, &imageCreateInfo, nullptr, &shadowCubeMap.image)); vkGetImageMemoryRequirements(device, shadowCubeMap.image, &memReqs); memAllocInfo.allocationSize = memReqs.size; - - getMemoryType(memReqs.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, &memAllocInfo.memoryTypeIndex); - err = vkAllocateMemory(device, &memAllocInfo, nullptr, &shadowCubeMap.deviceMemory); - assert(!err); - err = vkBindImageMemory(device, shadowCubeMap.image, shadowCubeMap.deviceMemory, 0); - assert(!err); + memAllocInfo.memoryTypeIndex = getMemoryType(memReqs.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT); + VK_CHECK_RESULT(vkAllocateMemory(device, &memAllocInfo, nullptr, &shadowCubeMap.deviceMemory)); + VK_CHECK_RESULT(vkBindImageMemory(device, shadowCubeMap.image, shadowCubeMap.deviceMemory, 0)); // Image barrier for optimal image (target) VkImageSubresourceRange subresourceRange = {}; @@ -242,28 +223,14 @@ public: subresourceRange.levelCount = 1; subresourceRange.layerCount = 6; vkTools::setImageLayout( - cmdBuffer, + layoutCmd, shadowCubeMap.image, VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_PREINITIALIZED, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, subresourceRange); - err = vkEndCommandBuffer(cmdBuffer); - assert(!err); - - VkFence nullFence = { VK_NULL_HANDLE }; - - // Submit command buffer to graphis queue - VkSubmitInfo submitInfo = vkTools::initializers::submitInfo(); - submitInfo.commandBufferCount = 1; - submitInfo.pCommandBuffers = &cmdBuffer; - - err = vkQueueSubmit(queue, 1, &submitInfo, nullFence); - assert(!err); - - err = vkQueueWaitIdle(queue); - assert(!err); + VulkanExampleBase::flushCommandBuffer(layoutCmd, queue, true); // Create sampler VkSamplerCreateInfo sampler = vkTools::initializers::samplerCreateInfo(); @@ -277,10 +244,9 @@ public: sampler.maxAnisotropy = 0; sampler.compareOp = VK_COMPARE_OP_NEVER; sampler.minLod = 0.0f; - sampler.maxLod = 0.0f; + sampler.maxLod = 1.0f; sampler.borderColor = VK_BORDER_COLOR_FLOAT_OPAQUE_WHITE; - err = vkCreateSampler(device, &sampler, nullptr, &shadowCubeMap.sampler); - assert(!err); + VK_CHECK_RESULT(vkCreateSampler(device, &sampler, nullptr, &shadowCubeMap.sampler)); // Create image view VkImageViewCreateInfo view = vkTools::initializers::imageViewCreateInfo(); @@ -291,8 +257,7 @@ public: view.subresourceRange = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 }; view.subresourceRange.layerCount = 6; view.image = shadowCubeMap.image; - err = vkCreateImageView(device, &view, nullptr, &shadowCubeMap.view); - assert(!err); + VK_CHECK_RESULT(vkCreateImageView(device, &view, nullptr, &shadowCubeMap.view)); } // Prepare a new framebuffer for offscreen rendering @@ -305,10 +270,6 @@ public: VkFormat fbColorFormat = FB_COLOR_FORMAT; - VkResult err; - - createSetupCommandBuffer(); - // Color attachment VkImageCreateInfo image = vkTools::initializers::imageCreateInfo(); image.imageType = VK_IMAGE_TYPE_2D; @@ -339,26 +300,24 @@ public: VkMemoryRequirements memReqs; - err = vkCreateImage(device, &image, nullptr, &offScreenFrameBuf.color.image); - assert(!err); + VK_CHECK_RESULT(vkCreateImage(device, &image, nullptr, &offScreenFrameBuf.color.image)); vkGetImageMemoryRequirements(device, offScreenFrameBuf.color.image, &memReqs); memAlloc.allocationSize = memReqs.size; - getMemoryType(memReqs.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, &memAlloc.memoryTypeIndex); - err = vkAllocateMemory(device, &memAlloc, nullptr, &offScreenFrameBuf.color.mem); - assert(!err); + memAlloc.memoryTypeIndex = getMemoryType(memReqs.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT); + VK_CHECK_RESULT(vkAllocateMemory(device, &memAlloc, nullptr, &offScreenFrameBuf.color.mem)); + VK_CHECK_RESULT(vkBindImageMemory(device, offScreenFrameBuf.color.image, offScreenFrameBuf.color.mem, 0)); + + VkCommandBuffer layoutCmd = VulkanExampleBase::createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true); - err = vkBindImageMemory(device, offScreenFrameBuf.color.image, offScreenFrameBuf.color.mem, 0); - assert(!err); vkTools::setImageLayout( - setupCmdBuffer, + layoutCmd, offScreenFrameBuf.color.image, VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL); colorImageView.image = offScreenFrameBuf.color.image; - err = vkCreateImageView(device, &colorImageView, nullptr, &offScreenFrameBuf.color.view); - assert(!err); + VK_CHECK_RESULT(vkCreateImageView(device, &colorImageView, nullptr, &offScreenFrameBuf.color.view)); // Depth stencil attachment image.format = fbDepthFormat; @@ -376,46 +335,38 @@ public: depthStencilView.subresourceRange.baseArrayLayer = 0; depthStencilView.subresourceRange.layerCount = 1; - err = vkCreateImage(device, &image, nullptr, &offScreenFrameBuf.depth.image); - assert(!err); + VK_CHECK_RESULT(vkCreateImage(device, &image, nullptr, &offScreenFrameBuf.depth.image)); vkGetImageMemoryRequirements(device, offScreenFrameBuf.depth.image, &memReqs); memAlloc.allocationSize = memReqs.size; - getMemoryType(memReqs.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, &memAlloc.memoryTypeIndex); - err = vkAllocateMemory(device, &memAlloc, nullptr, &offScreenFrameBuf.depth.mem); - assert(!err); - - err = vkBindImageMemory(device, offScreenFrameBuf.depth.image, offScreenFrameBuf.depth.mem, 0); - assert(!err); + memAlloc.memoryTypeIndex = getMemoryType(memReqs.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT); + VK_CHECK_RESULT(vkAllocateMemory(device, &memAlloc, nullptr, &offScreenFrameBuf.depth.mem)); + VK_CHECK_RESULT(vkBindImageMemory(device, offScreenFrameBuf.depth.image, offScreenFrameBuf.depth.mem, 0)); vkTools::setImageLayout( - setupCmdBuffer, + layoutCmd, offScreenFrameBuf.depth.image, VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT, VK_IMAGE_LAYOUT_PREINITIALIZED, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL); - flushSetupCommandBuffer(); + VulkanExampleBase::flushCommandBuffer(layoutCmd, queue, true); depthStencilView.image = offScreenFrameBuf.depth.image; - err = vkCreateImageView(device, &depthStencilView, nullptr, &offScreenFrameBuf.depth.view); - assert(!err); + VK_CHECK_RESULT(vkCreateImageView(device, &depthStencilView, nullptr, &offScreenFrameBuf.depth.view)); VkImageView attachments[2]; attachments[0] = offScreenFrameBuf.color.view; attachments[1] = offScreenFrameBuf.depth.view; - VkFramebufferCreateInfo fbufCreateInfo = {}; - fbufCreateInfo.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO; - fbufCreateInfo.pNext = NULL; - fbufCreateInfo.renderPass = offscreenRenderpass; + VkFramebufferCreateInfo fbufCreateInfo = vkTools::initializers::framebufferCreateInfo(); + fbufCreateInfo.renderPass = offScreenFrameBuf.renderPass; fbufCreateInfo.attachmentCount = 2; fbufCreateInfo.pAttachments = attachments; fbufCreateInfo.width = offScreenFrameBuf.width; fbufCreateInfo.height = offScreenFrameBuf.height; fbufCreateInfo.layers = 1; - err = vkCreateFramebuffer(device, &fbufCreateInfo, nullptr, &offScreenFrameBuf.frameBuffer); - assert(!err); + VK_CHECK_RESULT(vkCreateFramebuffer(device, &fbufCreateInfo, nullptr, &offScreenFrameBuf.frameBuffer)); } // Updates a single cube map face @@ -536,8 +487,6 @@ public: // Command buffer for rendering and copying all cube map faces void buildOffscreenCommandBuffer() { - VkResult err; - // Create separate command buffer for offscreen // rendering if (offScreenCmdBuffer == VK_NULL_HANDLE) @@ -546,14 +495,12 @@ public: cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY, 1); - VkResult vkRes = vkAllocateCommandBuffers(device, &cmd, &offScreenCmdBuffer); - assert(!vkRes); + VK_CHECK_RESULT(vkAllocateCommandBuffers(device, &cmd, &offScreenCmdBuffer)); } VkCommandBufferBeginInfo cmdBufInfo = vkTools::initializers::commandBufferBeginInfo(); - err = vkBeginCommandBuffer(offScreenCmdBuffer, &cmdBufInfo); - assert(!err); + VK_CHECK_RESULT(vkBeginCommandBuffer(offScreenCmdBuffer, &cmdBufInfo)); VkViewport viewport = vkTools::initializers::viewport( (float)offScreenFrameBuf.width, @@ -598,8 +545,7 @@ public: VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, subresourceRange); - err = vkEndCommandBuffer(offScreenCmdBuffer); - assert(!err); + VK_CHECK_RESULT(vkEndCommandBuffer(offScreenCmdBuffer)); } void reBuildCommandBuffers() @@ -629,14 +575,11 @@ public: renderPassBeginInfo.clearValueCount = 2; renderPassBeginInfo.pClearValues = clearValues; - VkResult err; - for (int32_t i = 0; i < drawCmdBuffers.size(); ++i) { renderPassBeginInfo.framebuffer = frameBuffers[i]; - err = vkBeginCommandBuffer(drawCmdBuffers[i], &cmdBufInfo); - assert(!err); + VK_CHECK_RESULT(vkBeginCommandBuffer(drawCmdBuffers[i], &cmdBufInfo)); vkCmdBeginRenderPass(drawCmdBuffers[i], &renderPassBeginInfo, VK_SUBPASS_CONTENTS_INLINE); @@ -675,41 +618,9 @@ public: vkCmdEndRenderPass(drawCmdBuffers[i]); - err = vkEndCommandBuffer(drawCmdBuffers[i]); - assert(!err); + VK_CHECK_RESULT(vkEndCommandBuffer(drawCmdBuffers[i])); } - } - - void draw() - { - VkResult err; - - // Get next image in the swap chain (back/front buffer) - err = swapChain.acquireNextImage(semaphores.presentComplete, ¤tBuffer); - assert(!err); - - submitPostPresentBarrier(swapChain.buffers[currentBuffer].image); - - // Gather command buffers to be sumitted to the queue - std::vector submitCmdBuffers = { - offScreenCmdBuffer, - drawCmdBuffers[currentBuffer], - }; - submitInfo.commandBufferCount = submitCmdBuffers.size(); - submitInfo.pCommandBuffers = submitCmdBuffers.data(); - - // Submit to queue - err = vkQueueSubmit(queue, 1, &submitInfo, VK_NULL_HANDLE); - assert(!err); - - submitPrePresentBarrier(swapChain.buffers[currentBuffer].image); - - err = swapChain.queuePresent(queue, currentBuffer, semaphores.renderComplete); - assert(!err); - - err = vkQueueWaitIdle(queue); - assert(!err); - } + } void loadMeshes() { @@ -780,8 +691,7 @@ public: poolSizes.data(), 3); - VkResult vkRes = vkCreateDescriptorPool(device, &descriptorPoolInfo, nullptr, &descriptorPool); - assert(!vkRes); + VK_CHECK_RESULT(vkCreateDescriptorPool(device, &descriptorPoolInfo, nullptr, &descriptorPool)); } void setupDescriptorSetLayout() @@ -806,8 +716,7 @@ public: setLayoutBindings.data(), setLayoutBindings.size()); - VkResult err = vkCreateDescriptorSetLayout(device, &descriptorLayout, nullptr, &descriptorSetLayout); - assert(!err); + VK_CHECK_RESULT(vkCreateDescriptorSetLayout(device, &descriptorLayout, nullptr, &descriptorSetLayout)); // 3D scene pipeline layout VkPipelineLayoutCreateInfo pPipelineLayoutCreateInfo = @@ -815,8 +724,7 @@ public: &descriptorSetLayout, 1); - err = vkCreatePipelineLayout(device, &pPipelineLayoutCreateInfo, nullptr, &pipelineLayouts.scene); - assert(!err); + VK_CHECK_RESULT(vkCreatePipelineLayout(device, &pPipelineLayoutCreateInfo, nullptr, &pipelineLayouts.scene)); // Offscreen pipeline layout // Push constants for cube map face view matrices @@ -830,8 +738,7 @@ public: pPipelineLayoutCreateInfo.pushConstantRangeCount = 1; pPipelineLayoutCreateInfo.pPushConstantRanges = &pushConstantRange; - err = vkCreatePipelineLayout(device, &pPipelineLayoutCreateInfo, nullptr, &pipelineLayouts.offscreen); - assert(!err); + VK_CHECK_RESULT(vkCreatePipelineLayout(device, &pPipelineLayoutCreateInfo, nullptr, &pipelineLayouts.offscreen)); } void setupDescriptorSets() @@ -842,11 +749,8 @@ public: &descriptorSetLayout, 1); - VkResult vkRes; - // 3D scene - vkRes = vkAllocateDescriptorSets(device, &allocInfo, &descriptorSets.scene); - assert(!vkRes); + VK_CHECK_RESULT(vkAllocateDescriptorSets(device, &allocInfo, &descriptorSets.scene)); // Image descriptor for the cube map VkDescriptorImageInfo texDescriptor = @@ -873,8 +777,7 @@ public: vkUpdateDescriptorSets(device, sceneDescriptorSets.size(), sceneDescriptorSets.data(), 0, NULL); // Offscreen - vkRes = vkAllocateDescriptorSets(device, &allocInfo, &descriptorSets.offscreen); - assert(!vkRes); + VK_CHECK_RESULT(vkAllocateDescriptorSets(device, &allocInfo, &descriptorSets.offscreen)); std::vector offScreenWriteDescriptorSets = { @@ -888,10 +791,12 @@ public: vkUpdateDescriptorSets(device, offScreenWriteDescriptorSets.size(), offScreenWriteDescriptorSets.data(), 0, NULL); } + // Set up a separate render pass for the offscreen frame buffer + // This is necessary as the offscreen frame buffer attachments + // use formats different to the ones from the visible frame buffer + // and at least the depth one may not be compatible void prepareOffscreenRenderpass() { - VkResult err; - // Create offscreen renderpass (illegal to use the same one) VkAttachmentDescription osAttachments[2] = {}; // Find a suitable depth format @@ -925,31 +830,19 @@ public: depthReference.attachment = 1; depthReference.layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; - VkSubpassDescription osSubpass = {}; - osSubpass.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; - osSubpass.flags = 0; - osSubpass.inputAttachmentCount = 0; - osSubpass.pInputAttachments = nullptr; - osSubpass.colorAttachmentCount = 1; - osSubpass.pColorAttachments = &colorReference; - osSubpass.pResolveAttachments = nullptr; - osSubpass.pDepthStencilAttachment = &depthReference; - osSubpass.preserveAttachmentCount = 0; - osSubpass.pPreserveAttachments = nullptr; + VkSubpassDescription subpass = {}; + subpass.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; + subpass.colorAttachmentCount = 1; + subpass.pColorAttachments = &colorReference; + subpass.pDepthStencilAttachment = &depthReference; - VkRenderPassCreateInfo offscreenRenderpassCreateInfo; - offscreenRenderpassCreateInfo.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO; - offscreenRenderpassCreateInfo.pNext = nullptr; - offscreenRenderpassCreateInfo.flags = 0; - offscreenRenderpassCreateInfo.attachmentCount = 2; - offscreenRenderpassCreateInfo.pAttachments = osAttachments; - offscreenRenderpassCreateInfo.subpassCount = 1; - offscreenRenderpassCreateInfo.pSubpasses = &osSubpass; - offscreenRenderpassCreateInfo.dependencyCount = 0; - offscreenRenderpassCreateInfo.pDependencies = nullptr; + VkRenderPassCreateInfo renderPassCreateInfo = vkTools::initializers::renderPassCreateInfo(); + renderPassCreateInfo.attachmentCount = 2; + renderPassCreateInfo.pAttachments = osAttachments; + renderPassCreateInfo.subpassCount = 1; + renderPassCreateInfo.pSubpasses = &subpass; - err = vkCreateRenderPass(device, &offscreenRenderpassCreateInfo, nullptr, &offscreenRenderpass); - assert(!err); + VK_CHECK_RESULT(vkCreateRenderPass(device, &renderPassCreateInfo, nullptr, &offScreenFrameBuf.renderPass)); } void preparePipelines() @@ -1025,24 +918,21 @@ public: pipelineCreateInfo.stageCount = shaderStages.size(); pipelineCreateInfo.pStages = shaderStages.data(); - VkResult err = vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCreateInfo, nullptr, &pipelines.scene); - assert(!err); + VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCreateInfo, nullptr, &pipelines.scene)); // Cube map display pipeline shaderStages[0] = loadShader(getAssetPath() + "shaders/shadowmapomni/cubemapdisplay.vert.spv", VK_SHADER_STAGE_VERTEX_BIT); shaderStages[1] = loadShader(getAssetPath() + "shaders/shadowmapomni/cubemapdisplay.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT); rasterizationState.cullMode = VK_CULL_MODE_FRONT_BIT; - err = vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCreateInfo, nullptr, &pipelines.cubeMap); - assert(!err); + VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCreateInfo, nullptr, &pipelines.cubeMap)); // Offscreen pipeline shaderStages[0] = loadShader(getAssetPath() + "shaders/shadowmapomni/offscreen.vert.spv", VK_SHADER_STAGE_VERTEX_BIT); shaderStages[1] = loadShader(getAssetPath() + "shaders/shadowmapomni/offscreen.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT); rasterizationState.cullMode = VK_CULL_MODE_BACK_BIT; pipelineCreateInfo.layout = pipelineLayouts.offscreen; - pipelineCreateInfo.renderPass = offscreenRenderpass; - err = vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCreateInfo, nullptr, &pipelines.offscreen); - assert(!err); + pipelineCreateInfo.renderPass = offScreenFrameBuf.renderPass; + VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCreateInfo, nullptr, &pipelines.offscreen)); } // Prepare and initialize uniform buffer containing shader uniforms @@ -1051,6 +941,7 @@ public: // Offscreen vertex shader uniform buffer block createBuffer( VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, + VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, sizeof(uboOffscreenVS), &uboOffscreenVS, &uniformData.offscreen.buffer, @@ -1060,6 +951,7 @@ public: // 3D scene createBuffer( VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, + VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, sizeof(uboVSscene), &uboVSscene, &uniformData.scene.buffer, @@ -1084,8 +976,7 @@ public: uboVSscene.lightPos = lightPos; uint8_t *pData; - VkResult err = vkMapMemory(device, uniformData.scene.memory, 0, sizeof(uboVSscene), 0, (void **)&pData); - assert(!err); + VK_CHECK_RESULT(vkMapMemory(device, uniformData.scene.memory, 0, sizeof(uboVSscene), 0, (void **)&pData)); memcpy(pData, &uboVSscene, sizeof(uboVSscene)); vkUnmapMemory(device, uniformData.scene.memory); } @@ -1103,12 +994,30 @@ public: uboOffscreenVS.lightPos = lightPos; uint8_t *pData; - VkResult err = vkMapMemory(device, uniformData.offscreen.memory, 0, sizeof(uboOffscreenVS), 0, (void **)&pData); - assert(!err); + VK_CHECK_RESULT(vkMapMemory(device, uniformData.offscreen.memory, 0, sizeof(uboOffscreenVS), 0, (void **)&pData)); memcpy(pData, &uboOffscreenVS, sizeof(uboOffscreenVS)); vkUnmapMemory(device, uniformData.offscreen.memory); } + void draw() + { + VulkanExampleBase::prepareFrame(); + + // Submit offscreen rendering command buffer + // todo : use event to ensure that offscreen result is finished bfore render command buffer is started + std::vector submitCmdBuffers = { + offScreenCmdBuffer, + drawCmdBuffers[currentBuffer], + }; + submitCmdBuffers.push_back(drawCmdBuffers[currentBuffer]); + submitInfo.commandBufferCount = submitCmdBuffers.size(); + submitInfo.pCommandBuffers = submitCmdBuffers.data(); + + VK_CHECK_RESULT(vkQueueSubmit(queue, 1, &submitInfo, VK_NULL_HANDLE)); + + VulkanExampleBase::submitFrame(); + } + void prepare() { VulkanExampleBase::prepare(); @@ -1131,9 +1040,7 @@ public: { if (!prepared) return; - vkDeviceWaitIdle(device); draw(); - vkDeviceWaitIdle(device); if (!paused) { updateUniformBufferOffscreen(); @@ -1147,6 +1054,26 @@ public: updateUniformBuffers(); } + virtual void keyPressed(uint32_t keyCode) + { + switch (keyCode) + { + case 0x44: + case GAMEPAD_BUTTON_A: + toggleCubeMapDisplay(); + break; + } + } + + virtual void getOverlayText(VulkanTextOverlay *textOverlay) + { +#if defined(__ANDROID__) + textOverlay->addText("Press \"Button A\" to display depth cubemap", 5.0f, 85.0f, VulkanTextOverlay::alignLeft); +#else + textOverlay->addText("Press \"d\" to display depth cubemap", 5.0f, 85.0f, VulkanTextOverlay::alignLeft); +#endif + } + void toggleCubeMapDisplay() { displayCubeMap = !displayCubeMap; @@ -1163,15 +1090,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) if (vulkanExample != NULL) { vulkanExample->handleMessages(hWnd, uMsg, wParam, lParam); - if (uMsg == WM_KEYDOWN) - { - switch (wParam) - { - case 0x44: - vulkanExample->toggleCubeMapDisplay(); - break; - } - } } return (DefWindowProc(hWnd, uMsg, wParam, lParam)); }