From eddd724e7c72d21f7ff974ed66ea32e36366e61a Mon Sep 17 00:00:00 2001 From: Sascha Willems Date: Wed, 23 Oct 2019 20:45:54 +0200 Subject: [PATCH] Removed unused compute shader ubo members --- .../computenbody/particle_calculate.comp | 2 -- .../computenbody/particle_calculate.comp.spv | Bin 4640 -> 4536 bytes .../computenbody/particle_integrate.comp | 2 -- .../computenbody/particle_integrate.comp.spv | Bin 1624 -> 1536 bytes examples/computenbody/computenbody.cpp | 6 +----- 5 files changed, 1 insertion(+), 9 deletions(-) diff --git a/data/shaders/computenbody/particle_calculate.comp b/data/shaders/computenbody/particle_calculate.comp index 9ae3d5b2..7d46a339 100644 --- a/data/shaders/computenbody/particle_calculate.comp +++ b/data/shaders/computenbody/particle_calculate.comp @@ -18,8 +18,6 @@ layout (local_size_x = 256) in; layout (binding = 1) uniform UBO { float deltaT; - float destX; - float destY; int particleCount; } ubo; diff --git a/data/shaders/computenbody/particle_calculate.comp.spv b/data/shaders/computenbody/particle_calculate.comp.spv index 37ba965fda824ef3040e32ad70295bda15af60c1..63d6804506e0b683182b5339f8f7da3983d9ea2f 100644 GIT binary patch literal 4536 zcmaKuX>(Ln5QZ-qhD1>@2)I)NsGuSW3NDB+niwKzB8e!dgdrIvFlICvaM!4~FDUN& zzOT4^@gtw{Kj@Eet+LAJx%V~>DfFb?>h8Du^y$;*oSP}M%xg`ONl9zcmi&-pqdjSX zNs_6_lvH-D?OVHOtTD9cyrt(Daa2-B1C5!+%p!6!xTP{YqGKv3gQJ-*-wsSx09MJEeF<>wG>y!uRXME#ga37ZF;LjG9n!;tFE(SJD7HRPA)wrj|piEZo=z+wE6NPY6N z$m07g0oR_M>-uM7dq(;*esVGc-8$u6OWU)Pb1ma$0q48cu}FRLGtlg#dnh5z>s>Hz z4$^&=fa}i7b?uX>(Q}oXjqdqrJMT24`Q@xf+cRvgX92du_%o3DO2B%pVF_?7q=FLi zTp-sB=bi^=jqWA-Tt=S+mf)B7ez?F%*lSTsK+gGBBHgdN^R<1a(Sz#_=>MMECOGrQ zIS!z=L4>^-JND{%`t5LnJ+7m=zqlv2qFcYb_3HEf)~6SiN4~qTBmQo5xv!YxoAKLf9{Jx{V>Z(9 z7xDT|26FaF{ckRTx?I$8I(k+|Yx)k(#GVfp0DVehOUQ*lzx%Pj+L31wdUKw$u_KSZ z*jEYt9H8Gko{P4+XW~0k_dHztPwHKUv~J~Z)N%pxLg3JU5mLW0dbb?i9MRv4(I@tI z1)Tieyq}k#J5SyoYM&2W&;062@ zkX7I??@dVk%INRS=;nyC-HI+3XS)quZWwr;+JnH{=2DMbHFR@D-)=#7kMhym5p;QL z_nW32zEO0!9$s=CIR@l}V-jcq5#Kk;{|+Gc zOdfw{&fSi5Pj@5l0oHgIa9%s|ULYUy?n8I3eB{0#-P~c1=k^QaHOB+MnDJE4xQ9|b zNq@f`!M!!^Vc@<_0Qz@yU~||SnFAIxi!GG^vOAY8PfTFhn?@9o&#;bd$9-kJeUa< z0At#bF93P%67ofm^((vIFXf!PBYGb9=w&!#%oE?OSJ3AJ*RckB6Zv07*B@v48oHct zME*F_*WrwDoyh+N`hVqr6QBMbekGNVZvi>;9O}G{H70uYHhOc<-o>8Sv-jZSAEvMN z@O|(OkS{aaUVi|hMswPO=J)tv9^*dE@ezdw~xv}vxs ziR*s`XUvbRe3uUjjMrn0l=HHG1>9-(W}0`X;Ws7tR>JckcUJ bAm_TV@9)qLmBW4ObB=dD>QVZ;?E>%**pqc_ literal 4640 zcmaKuX>(Ln5QZ-dL!zQA3Me8qfC?%CqM(9^iHRW^O(anP7nmd?M28F}1B#%65ycHu z-1mLow-0{gGyVtt5w2BM`8;=S>(mr_Q*XNa?LOUo`kZ@{-1zxTNir^JN}7}JliD*i z84r^rCnOV7+0oV8wRp5TxcH*wON}@w$)$nDOlD;sIRR`d4h`!#0kncCte2k(Ok}*s z@iQKI1S3yG{aWp2d_%*7rF)QhEc0zCZ|W#l`itex;hmL%Vs)r8+}W1;bIHlb8(O=m zmQQueWUy4O7W^%KWNABpa zpy!i$##Ba!Yyvgq<|BKub#m@p&WG54Z2Q<*DyKQmLhng^6BBixs6C2q-32LIt8qR$ zYbygo)m_qgvMxgw2L?*z(nva#8lOv6pbVuk&FNV%zb@w1I6iVTC0)ezu5DS@-nOZ& zrLSdEZ|BDLTAqB;jWW8mI8qvHD^`oOp8DbL0G?GDS*dOebKzN)YNy4u?P*gf4hwXZXdT%NO-4c4;4bM=Wi2Imaryf?vlmU7;m;Bpx^ z3E9Cc&1amoJWtQjC+xZC=5~G53>jS1o|3IQ6FCtSfH857vCg`3_F^5+v%apjb$#@= zBAvnMneEwF(?`EE)fU=gnI8F_slM3fcj)Fj4V(-sKbLNdSD#Lf=pQpFVDmvpAwLuQ zIHbC3^dFD3hWx6`wuan!*v2|@ALCC%>XV;A7QY7tVC`v{u73^@o{|1Q%|9VI1GxN!xLX`7#F9oEzy*u_c7wLWrU=H^DOxHexY@V;&9CXi7+jVCn ztu1Fi+MZ>7KMS#aj6WBtuK=RoCFtWa+nz22K8xt6fV>FE)x%uN;q2MH#r#{*&9w}_ zy!Xa}v$3y5EdV*!^ZM~SNqN_6`<};4{2tcyf6sFhocZH?H={R0gk8jry?f4nA6($f zx1+khIGelB?O)!0^?9!=({igK-)`)P--B+vaS=a;e(1@@!HivWYv6tUr@pnK8s8zm&E}E+jT&>1K7SIg?+hU4tknPF5~#~XALpRg z`e;hui}SD-fQ3Mx(%1rW5zy~`oUeA|S&UwvXDN2%(dYXWc`iWLZywJ@TirA9JyZ8Q zto;Z5UW~MF<*)Q|DRL$7(Z33*Uug|zcNs88%y%_<<9siNlm9B4=Nfd^$vZ>sOMvyv zuO9iYKsSG!O$)kQ+=naCTS5JOXv3D@OFi#LJ8+$R^m!F}W1k&x@=|EqcAnu2L&pPhM`pj<)zkeHn-$Z-!ZfG0h*}GTw<^H0lThJSOx)n}7a^8k+PI+@` zd-v*dn)_#beuFlHpO|M6DYRYJkBoadfNn2J?`a8nJMb~@7NmY<%y%ogIpS=G(BHH+eg<3gm>(I4~YW z{0{VaAmVqT%L$)|ALAU&cQ-Jnan>KnIP>Y>1>_E9@%LujJxKSo2YDZ`$KAknQ<3)r z`B?V=x@+Yl_g-{!hrKVepCzw39t3-V{JxBP2wi>*Oyb@e_b_l@vw;5npoh2F{vQGQ z0|&Bw9DuVY{njra9|g-m%h;oc`y;= zfb%xi81LfkNbir*eAAEzK|k=l)jpJQOOSEbF?&hqyq8{ zAZMOqowu>Z#LV7Aub+k DdDMN* diff --git a/data/shaders/computenbody/particle_integrate.comp b/data/shaders/computenbody/particle_integrate.comp index 85ad6e37..4ac2e07a 100644 --- a/data/shaders/computenbody/particle_integrate.comp +++ b/data/shaders/computenbody/particle_integrate.comp @@ -17,8 +17,6 @@ layout (local_size_x = 256) in; layout (binding = 1) uniform UBO { float deltaT; - float destX; - float destY; int particleCount; } ubo; diff --git a/data/shaders/computenbody/particle_integrate.comp.spv b/data/shaders/computenbody/particle_integrate.comp.spv index 4c55a1cf6d4303b77452dd0be6536d9e4135e066..477a12a924a7e06ec529d14109858220e967eefd 100644 GIT binary patch delta 33 pcmcb?)4;PKi;VfpPLo#`BveFr_gvvoNS^W@HIx0sxL!2crN0 delta 119 zcmZqRxxup`i&3AIL4|>Vff0yPQj1F>fHWHeM2rb476}$(2diVAT*!D{)dNX|GEkNS fh+$&PKsHE>XR|F+CL=c+SeqbFKydR)=5QtevA+%g diff --git a/examples/computenbody/computenbody.cpp b/examples/computenbody/computenbody.cpp index 2da46ef4..af51be87 100644 --- a/examples/computenbody/computenbody.cpp +++ b/examples/computenbody/computenbody.cpp @@ -1,7 +1,7 @@ /* * Vulkan Example - Compute shader N-body simulation using two passes and shared compute shader memory * -* Copyright (C) 2016 by Sascha Willems - www.saschawillems.de +* Copyright (C) by Sascha Willems - www.saschawillems.de * * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) */ @@ -81,8 +81,6 @@ public: VkDescriptorSet descriptorSetBlur; struct computeUBO { // Compute shader uniform block object float deltaT; // Frame delta time - float destX; // x position of the attractor - float destY; // y position of the attractor int32_t particleCount; } ubo; } compute; @@ -682,8 +680,6 @@ public: void updateComputeUniformBuffers() { compute.ubo.deltaT = paused ? 0.0f : frameTimer * 0.05f; - compute.ubo.destX = sin(glm::radians(timer * 360.0f)) * 0.75f; - compute.ubo.destY = 0.0f; memcpy(compute.uniformBuffer.mapped, &compute.ubo, sizeof(compute.ubo)); }