From f7bb8606be51cad79602516b518bac81bc42619b Mon Sep 17 00:00:00 2001 From: Brandon Mak Date: Wed, 22 Feb 2023 16:39:21 +0800 Subject: [PATCH] Shader, text, asset manager events and generic data desc sets - Made shader for shiniy effect (half done) - Text objects in scene now use a UI component for better scaling - Asset manager now creates an event for compilation of assets - Descriptor for generic data is implemented --- Assets/Materials/ShinyHightlight.shmat | 8 ++ Assets/Materials/ShinyHightlight.shmat.shmeta | 3 + Assets/Scenes/MainGame.shade | 23 +++- Assets/Shaders/DeferredComposite_CS.glsl | 4 + Assets/Shaders/DeferredComposite_CS.shshaderb | Bin 9621 -> 9949 bytes Assets/Shaders/ShinyHighlight_FS.glsl | 84 +++++++++++++++ Assets/Shaders/ShinyHighlight_FS.shshaderb | Bin 0 -> 3829 bytes .../ShinyHighlight_FS.shshaderb.shmeta | 3 + Assets/Shaders/ShinyHighlight_VS.glsl | 99 ++++++++++++++++++ Assets/Shaders/ShinyHighlight_VS.shshaderb | Bin 0 -> 5705 bytes .../ShinyHighlight_VS.shshaderb.shmeta | 3 + .../src/Assets/Events/SHAssetManagerEvents.h | 20 ++++ .../Compilers/SHShaderSourceCompiler.cpp | 10 ++ SHADE_Engine/src/Events/SHEventDefines.h | 1 + .../GenericData/SHGraphicsGenericData.cpp | 53 ++++++++++ .../GenericData/SHGraphicsGenericData.h | 51 +++++++++ .../GlobalData/SHGlobalDescriptorSets.cpp | 16 +-- .../GlobalData/SHGlobalDescriptorSets.h | 4 +- .../MiddleEnd/Interface/SHGraphicsSystem.cpp | 74 ++++++++++--- .../MiddleEnd/Interface/SHGraphicsSystem.h | 10 ++ .../SHTextRenderingSubSystem.cpp | 2 +- .../MiddleEnd/Textures/SHTextureLibrary.cpp | 33 +++--- .../MiddleEnd/Textures/SHTextureLibrary.h | 17 ++- .../SHTrajectoryRenderingSubSystem.cpp | 2 +- .../Graphics/RenderGraph/SHRenderGraph.cpp | 2 +- .../RenderGraph/SHRenderGraphNode.cpp | 2 +- .../src/Graphics/Shaders/SHVkShaderModule.cpp | 5 + .../src/Graphics/Shaders/SHVkShaderModule.h | 1 + 28 files changed, 481 insertions(+), 49 deletions(-) create mode 100644 Assets/Materials/ShinyHightlight.shmat create mode 100644 Assets/Materials/ShinyHightlight.shmat.shmeta create mode 100644 Assets/Shaders/ShinyHighlight_FS.glsl create mode 100644 Assets/Shaders/ShinyHighlight_FS.shshaderb create mode 100644 Assets/Shaders/ShinyHighlight_FS.shshaderb.shmeta create mode 100644 Assets/Shaders/ShinyHighlight_VS.glsl create mode 100644 Assets/Shaders/ShinyHighlight_VS.shshaderb create mode 100644 Assets/Shaders/ShinyHighlight_VS.shshaderb.shmeta create mode 100644 SHADE_Engine/src/Assets/Events/SHAssetManagerEvents.h create mode 100644 SHADE_Engine/src/Graphics/MiddleEnd/GenericData/SHGraphicsGenericData.cpp create mode 100644 SHADE_Engine/src/Graphics/MiddleEnd/GenericData/SHGraphicsGenericData.h diff --git a/Assets/Materials/ShinyHightlight.shmat b/Assets/Materials/ShinyHightlight.shmat new file mode 100644 index 00000000..bb521519 --- /dev/null +++ b/Assets/Materials/ShinyHightlight.shmat @@ -0,0 +1,8 @@ +- VertexShader: 37048829 + FragmentShader: 45685219 + SubPass: G-Buffer Write + Properties: + data.color: {x: 1, y: 1, z: 1, w: 1} + data.textureIndex: 57342922 + data.alpha: 0 + data.beta: {x: 1, y: 1, z: 1} \ No newline at end of file diff --git a/Assets/Materials/ShinyHightlight.shmat.shmeta b/Assets/Materials/ShinyHightlight.shmat.shmeta new file mode 100644 index 00000000..6ab0ac19 --- /dev/null +++ b/Assets/Materials/ShinyHightlight.shmat.shmeta @@ -0,0 +1,3 @@ +Name: ShinyHightlight +ID: 122370915 +Type: 7 diff --git a/Assets/Scenes/MainGame.shade b/Assets/Scenes/MainGame.shade index 438b5a29..83f23f1b 100644 --- a/Assets/Scenes/MainGame.shade +++ b/Assets/Scenes/MainGame.shade @@ -8599,7 +8599,7 @@ IsActive: true Renderable Component: Mesh: 136892700 - Material: 131956078 + Material: 122370915 IsActive: true RigidBody Component: Type: Dynamic @@ -9571,7 +9571,11 @@ Name: =====Text==== IsActive: true NumberOfChildren: 3 - Components: ~ + Components: + Canvas Component: + Canvas Width: 1920 + Canvas Height: 1080 + IsActive: true Scripts: ~ - EID: 237 Name: Score @@ -9587,6 +9591,9 @@ Text: My name is Brandon. Font: 176667660 IsActive: true + UI Component: + Canvas ID: 199 + IsActive: true Scripts: ~ - EID: 206 Name: Timer @@ -9602,6 +9609,9 @@ Text: My name is Brandon. Font: 176667660 IsActive: true + UI Component: + Canvas ID: 199 + IsActive: true Scripts: ~ - EID: 139 Name: Multiplier @@ -9617,6 +9627,9 @@ Text: TEST Font: 176667660 IsActive: true + UI Component: + Canvas ID: 199 + IsActive: true Scripts: ~ - EID: 198 Name: ====Raccoon==== @@ -9687,6 +9700,7 @@ aimingLength: 1 throwItem: false rayDistance: 0.75 + rayHeight: 0.100000001 - EID: 3 Name: HoldingPoint IsActive: true @@ -9713,11 +9727,12 @@ Pitch: 0 Yaw: 360 Roll: 1.28065994e-06 - Width: 1920 - Height: 1080 + Width: 1728 + Height: 832 Near: 0.00999999978 Far: 10000 Perspective: true + FOV: 90 IsActive: true Camera Arm Component: Arm Pitch: 0 diff --git a/Assets/Shaders/DeferredComposite_CS.glsl b/Assets/Shaders/DeferredComposite_CS.glsl index 745b93e0..f17c9d84 100644 --- a/Assets/Shaders/DeferredComposite_CS.glsl +++ b/Assets/Shaders/DeferredComposite_CS.glsl @@ -26,6 +26,7 @@ layout(set = 3, binding = 3, r32ui) uniform uimage2D lightLayerData; layout(set = 3, binding = 4, r8) uniform image2D ssaoBlurredImage; layout(set = 3, binding = 5, rgba8) uniform image2D positionWorldSpace; layout(set = 3, binding = 6, rgba8) uniform image2D targetImage; +layout(set = 3, binding = 7, rgba8) uniform image2D objectVFXImage; layout (set = 4, binding = 0) uniform sampler2D shadowMaps[]; // for textures (global) @@ -141,6 +142,9 @@ void main() float ssaoVal = imageLoad (ssaoBlurredImage, globalThread).r; fragColor *= ssaoVal; + vec4 objectVFXColor = imageLoad (objectVFXImage, globalThread); + fragColor += objectVFXColor.rgb * objectVFXColor.a; + // store result into result image imageStore(targetImage, ivec2(gl_GlobalInvocationID.xy), vec4(fragColor.rgb, 1.0f)); diff --git a/Assets/Shaders/DeferredComposite_CS.shshaderb b/Assets/Shaders/DeferredComposite_CS.shshaderb index ff474e272b60daadce873126ae23984c156a834f..e5a0a7303892bd790d631d8261d5fe2977587f76 100644 GIT binary patch delta 663 zcmZ9JO)o=H5Qe9%URn|Lk=j_Gi46-Pu@RC+LK+clM0{0SZI#w-%Tm(VTG&|$u@aWt zgdbrgvGrd(?{%Aqlbp^w&rE0L%)MFpUQLdCjhlZW;Z&zt$l}&xXD`WyGvnBH$jr?j z7YpZ`OIwR>)oq$Z&9R-oJX6b+i{eo$c~?$%B(3lmMI+p0>+sV@(bV_-(!aQT#hoDD z^xk6c(TvLI%u(VQt2CV<{3G-fI?SEGmu|ok*hvcAW1IM54ezmcAQV%Xe(<*Un)ryf zc8RFNJopy8hrYw+c}E|1A744*3p_=;5L3S5S+v-ibuoe20a{E~M@G}7si%kM0Lq_6 zQ={d-HV;tXnj{q|pjAj*jl>SopV-SFr-(16Tn(m}nDU>{Wwcf$Uu&qKAFykTp|u@z zE1}kJ0PatEL9(`R5+t;nSMk+ggXa1?HGDChHaiWNaGSXS(+1XQ+=s2h^nc~MgZ!j` P1sZE&HLiQJ!`avmRb)rb delta 339 zcmXwzzYf7r6vj_gZ=)h15+;di48mX~F&jj%)}NxqY!_a@YLbXokUL1sUcdu*7vI;^ zNlw1={qFg5zr)L*R6W-v4m0K1B8E7Ulij1VSEePteyObK`i4jiO(wE0X`y#ftHf`$ za-LR)m{CT{40RiI3fY8by#dQZTNu1SxA0^et@1@fHwtg(G==A$9%k4xM}3Em#Ey3^ z;K`T_$^pGsXaK`^&Nktfs6Wt&Sn*d^@MMfXTPKVdtQ$9m3FPO;I9z~6U|hffzI$LH O4)Mc09O+{v$ov3tWg=Ms diff --git a/Assets/Shaders/ShinyHighlight_FS.glsl b/Assets/Shaders/ShinyHighlight_FS.glsl new file mode 100644 index 00000000..511c0704 --- /dev/null +++ b/Assets/Shaders/ShinyHighlight_FS.glsl @@ -0,0 +1,84 @@ +#version 450 +#extension GL_ARB_separate_shader_objects : enable +#extension GL_ARB_shading_language_420pack : enable +#extension GL_EXT_nonuniform_qualifier : require + +struct MatPropData +{ + int textureIndex; + float highlightPosition; +}; + +struct GenericData +{ + //! Delta time + float dt; + + //! Elapsed time of the application + float elapsedTime; + + //! Viewport width of the scene (excluding imgui, that means smaller than window) + uint viewportWidth; + + //! Ditto but for height + uint viewportHeight; +}; + + +layout(location = 0) in struct +{ + vec4 vertPos; // location 0 + vec2 uv; // location = 1 + vec4 normal; // location = 2 + vec4 worldPos; // location = 3 +} In; + +// material stuff +layout(location = 4) flat in struct +{ + int materialIndex; + uint eid; + uint lightLayerIndex; + vec3 screenSpacePos; + +} In2; + +layout (set = 0, binding = 0) uniform GenericDataBuffer +{ + GenericData data; +} genericDataBuffer; + +layout (set = 0, binding = 1) uniform sampler2D textures[]; // for textures (global) +layout (std430, set = 2, binding = 0) buffer MaterialProperties // For materials +{ + MatPropData data[]; +} MatProp; + +layout(location = 0) out vec4 position; +layout(location = 1) out uint outEntityID; +layout(location = 2) out uint lightLayerIndices; +layout(location = 3) out vec4 normals; +layout(location = 4) out vec4 albedo; +layout(location = 5) out vec4 worldSpacePosition; +layout(location = 6) out vec4 objectVFX; + +void main() +{ + position = In.vertPos; + normals = In.normal; + albedo = texture(textures[nonuniformEXT(MatProp.data[In2.materialIndex].textureIndex)], In.uv); + worldSpacePosition = In.worldPos; + + outEntityID = In2.eid; + lightLayerIndices = In2.lightLayerIndex; + + float vpHeight = float (In2.screenSpacePos.y); + float scanlineScale = 300.0f * (1.0f - In2.screenSpacePos.z); + + float lowerLimit = vpHeight - scanlineScale; + float upperLimit = vpHeight + scanlineScale; + if (gl_FragCoord.y > lowerLimit && gl_FragCoord.y < upperLimit) + objectVFX = vec4(1.0f); + else + objectVFX = vec4(0.0f, 0.0f, 0.0f, 1.0f); +} \ No newline at end of file diff --git a/Assets/Shaders/ShinyHighlight_FS.shshaderb b/Assets/Shaders/ShinyHighlight_FS.shshaderb new file mode 100644 index 0000000000000000000000000000000000000000..fea73931ac0cab9fef9813b505f0739019fdbdb5 GIT binary patch literal 3829 zcmZ9OYjYG;5QYzAcY{H0aubo51O(+05CKu-l7z5{E)q!uypF@pWHT_CS!ZVheABZ0 z3;q(cEdA#1@vG&f$|~Pyb~+h2RHtw6>F(2~&n!Ft*zSrowE6I`bDP|V+vd6hliTGs z%i;?D)1CqUx#YizkGL&vap8_PdvD1L!d^Rzx_O#;Q4)lYqom`ux<;|T*;;H(_VQrz z-1#$v-tLBq48-1{e>HJv)sGS!FNn5@c8m6lj*2dbE{U#+J{5IDI~9k0DqPZ#s&(#n z1+6JUv*k_Qp7wfS*U$Vs^m;3P5N2L_|3TQ!d(UFzQn_C2C!N0E3B7Y?&vgCvL&e!b z9FCWyNk55}(`?oIrtinmaujCrkKk|Ky47sWdhKr4>*Y`4(2Jua^nxf;rf4lBR}rVg zMM*pE2US2_i0b+4u3q$@oA#nSN{gPZc^Y7v`$&npwP(D%WfUZHabetbU+Qv7xIs`Na3ocFV^++TNxWV`9- z3t8H|?&rQT4Hq_<4Li?Vpf}VH@YK2zbyi{#hp@xewf8mo6fevoKPIS-8Ig^%<6{LR z(xT>Z@iM>kA$J6a7Im1sTE??N=ovoh2%}&fOV5g$TKuy0jP9KF?D_V_&#)w-*LW(P~)q5<9(Ii^50UG|TTsLB1lL zUgD#d=Cc#hzg5{QIj8%}%X)2tyT`}cxcgzJv2>k{8rShn-7nvgQ8s9yGv`&ESx2W9 z{LDIft<;(I2@wlFIL3Ss=^uH~ zAr@HXjZZf|5J7fxTADD0}K6VlbEJ)Q!$eqFa8xxqNeWi10Hj z_&F2jv6-;*n2mVW2eT0qoAttG0o#iraCXlYk27Pldbslm5sP}ztv|bk0ynNbL*mH$ zBvI>_Xut6MW}tIFWBN-iV6k5+b!G<}_z`jN#2S@EFTi4lL&Tx}O(OinL1*T$?Ul}* zjg|U|Qm3aZ_U{x2Tdji`r4GaEYKuCoPG%PW0ZseM;?zlu>N5SHkO$-dcS!Op;^^c) zD9*x0Y;@+GH7cE1r+(tIm;1*yDw)|uC(f8SeZoc@^l=e3dN3hACSuXs!{Wr`4D|Mh zIC;Q9_=)?v_$Cp4;-VidZTOFs@}S2xcU(F-O`nv^;=I<&wYZ!+Db|>ib(3zENPO#b-p+Yx>-CI=_KcKfizIQ;I?# zc8Pe8yt&JYiSH#5_AAQBn@2bNUdiBjbB5n189R91COY_I;%|tKiYz{}_hxCIQnurg zPl(1vVDMG3C#B`1Z-kl};!P1g_Andhwx=c8_V6xj&rQkrzE|zU_(;SIWB;MF z-IB~(!$)l944cLHSTgxczbzSz#axsO20QziOKgV!L~?ci9qH`?>O!U;9q|q`X32Balrrp literal 0 HcmV?d00001 diff --git a/Assets/Shaders/ShinyHighlight_FS.shshaderb.shmeta b/Assets/Shaders/ShinyHighlight_FS.shshaderb.shmeta new file mode 100644 index 00000000..3c17101d --- /dev/null +++ b/Assets/Shaders/ShinyHighlight_FS.shshaderb.shmeta @@ -0,0 +1,3 @@ +Name: ShinyHighlight_FS +ID: 45685219 +Type: 2 diff --git a/Assets/Shaders/ShinyHighlight_VS.glsl b/Assets/Shaders/ShinyHighlight_VS.glsl new file mode 100644 index 00000000..c0268737 --- /dev/null +++ b/Assets/Shaders/ShinyHighlight_VS.glsl @@ -0,0 +1,99 @@ +#version 450 +#extension GL_KHR_vulkan_glsl : enable + +layout(location = 0) in vec3 aVertexPos; +layout(location = 1) in vec2 aUV; +layout(location = 2) in vec3 aNormal; +layout(location = 3) in vec3 aTangent; +layout(location = 4) in mat4 worldTransform; +layout(location = 8) in uvec2 integerData; +layout(location = 9) in uvec4 aBoneIndices; +layout(location = 10) in vec4 aBoneWeights; +layout(location = 11) in uint firstBoneIndex; + +layout(location = 0) out struct +{ + vec4 vertPos; // location 0 + vec2 uv; // location = 1 + vec4 normal; // location = 2 + vec4 worldPos; // location = 3 + +} Out; + +struct GenericData +{ + //! Delta time + float dt; + + //! Elapsed time of the application + float elapsedTime; + + //! Viewport width of the scene (excluding imgui, that means smaller than window) + uint viewportWidth; + + //! Ditto but for height + uint viewportHeight; +}; + +// material stuff +layout(location = 4) out struct +{ + int materialIndex; + uint eid; + uint lightLayerIndex; + vec3 screenSpacePos; + + +} Out2; + +layout(set = 1, binding = 0) uniform CameraData +{ + vec4 position; + mat4 vpMat; + mat4 viewMat; + mat4 projMat; +} cameraData; + +layout (set = 0, binding = 0) uniform GenericDataBuffer +{ + GenericData data; +} genericDataBuffer; + +void main() +{ + Out2.materialIndex = gl_InstanceIndex; + Out2.eid = integerData[0]; + Out2.lightLayerIndex = integerData[1]; + + // for transforming gBuffer position and normal data + mat4 modelViewMat = cameraData.viewMat * worldTransform; + + // gBuffer position will be in view space + Out.vertPos = modelViewMat * vec4(aVertexPos, 1.0f); + + Out.worldPos = worldTransform * vec4 (aVertexPos, 1.0f); + + // uvs for texturing in fragment shader + Out.uv = aUV; + + mat3 transposeInv = mat3 (transpose(inverse(modelViewMat))); + + // normals are also in view space + Out.normal.rgb = transposeInv * aNormal.rgb; + Out.normal.rgb = normalize (Out.normal.rgb); + + // Get center of object in world position + vec4 worldPos = vec4(worldTransform[3][0], worldTransform[3][1], worldTransform[3][2], 1.0f); + + // transform to clip space + worldPos = cameraData.vpMat * worldPos; + worldPos.xyz /= worldPos.w; + + // transform to screen space + worldPos.xy = ((worldPos.xy + vec2(1.0f)) * vec2 (0.5f)) * vec2 (genericDataBuffer.data.viewportWidth, genericDataBuffer.data.viewportHeight); + + Out2.screenSpacePos = worldPos.xyz; + + // clip space for rendering + gl_Position = cameraData.vpMat * worldTransform * vec4 (aVertexPos, 1.0f); +} \ No newline at end of file diff --git a/Assets/Shaders/ShinyHighlight_VS.shshaderb b/Assets/Shaders/ShinyHighlight_VS.shshaderb new file mode 100644 index 0000000000000000000000000000000000000000..9818708504495b5706c860c5448aa90b2077dc57 GIT binary patch literal 5705 zcmZ9O`*&Pb6~}LrW>QKEluD@zHEje_OKTOVRisTHn6?HIY-oL;;W~4ZUYyK~Gn2H% z2L(mI7f?m;U7sk{_X}TjE&nQiaVGd0X?z(%gF4rZ)g{MB(CpQ-ITK->3^Onj6 za6NE|-QZ5J51arGgUjGG@OSV}a0LwWZ;1KdBwb52Q`7TPGc!}u_s!Qko%vq>d^4MG z=B;eLk$1CtKVQl8TUYVRTlMC0qv|k%N42gI)>zLPj#@IhDlet|tedCJ;)SUo&4k)1OYyXWfB!gxjk$a&gB>mS=xL|j?VrvY{WJK6&3)N#ZO1Y%(%??K2wz$A z@bbb!W^MLSo1@`{V0edKVqSc`##Mj!{;Ia-{A|`8G{_ihmUn22>tS8;?xo#Vec)tY&f4XSSD)0AUA@BD3WsHw>s(f49u=&Q-{pMT?c9r@TX6@_1F;?~+IK~GP z+}hQ*F#;Dp_Cuc=uHyJmmfRrD-c;k%jr0CRF1f4Y>{~TX-MHsL#K}e66g{IcasQW&veevz6JGA?Ls``mik9@up?XG7%-gk#JI)aNn+5g~-(Jy*#tb393 zTc}^$>B#5)q#}+*8)fl)Lo9n0>zl})O zG2R%VeGI?YllFT`-ToT43*DHFz@h(j%xi$W{_4ILIqjR6jny9Un~}9!*Bh8!-#zJn z6SFpX^QrsZ8gx7(Sus|WOZ8@g*~w{G=`lGDDkl#NlpgV`F?^;h?OMO}N5t;?LQ>u;Rv$~z15 z_y@o+&~6@e-=&=PyP3`D`D$19oyyq{*Vqq|#zL|-nex=2i&uW9=w3eI2b+`QRIaE_j_XwVLq{qRbFJ)W^LbOwoWZe!1kLr>~*g7w`CAnO!sP^xsOG zy#DHbkMuYHKT6rPwX6Gm(yqRh`AVtpqo?lA+z#vd4~)M<`ucuu1Fo;``Oj8#&(pt2 zwBL)}@5BwjZ^$9CY+}9rFsjAHNB=0CV{5F^9T7 zk>f4M=CJpXV+>h7a%@L7hu;%(sE+~dJDJ}OCV+Nxj5F^7@}ciR_MKlOM*BN}KJwep})k)b)#64Qi zh3?w=M6Jh=t#uOES9SfY&2PX5zzLxLH1qvH|F|FO`o!KIMD`pua6>(}4+3l60kqAP z=Y0}coBPu?2jmk($Ti2DR`#Q6>*u8wS+^&6+3T*PI_5!XPDxCLb6?1^#u$;BO6M2!_MinHYZ<4XT*S32an&Al z%DCu(esae3nEPNim;}~oAJ#E118w2Af*gL<6@F)twT0igil23a-+5$h@tz+;b`9gT z?Fa6w%dE{a+R6NBFab6LbB!~92FR;>W}gMdc_-CB2lSDToO0&8!2ATz|8WrYJz4UR z^Yf)o+=DNm%Lzx^1K*PO;3;5^z%%9h_#&LK+GG8vkzK!fFP=fy*I~{2$VJSv$i`If z#Fx;GiFcuoT*Q1C*%;3u-o#gsjTr*2qmNwd`>V*t%ia3HGM#d7%9{ z@Knitz2q-4dnaCI{uX!%Yy^H2Tx*p1+dx~VymQ|vxrqBNdc;j4N8I<2wME?bk>zH~ z8h(ImF8QeI60)^vi~jr&*}YcJ;Ya9~fW!XiBNs70MmDB;4nIM^1mYa@k&B-G6nW6o z!T0}X=yJkgoaf;huQ2}{YygwM8q|%^?wj}(m;lu`@#~Uz&2i-4fZZVe&iE~|KJxl_ zXMYFwfw&vLFFB@F?hhqrjp6sllC$P`&woNTUVrVr=Xj5QMs|ID+`|FpzktiYJK-MH L_4_Z~*bn{(aS`y8 literal 0 HcmV?d00001 diff --git a/Assets/Shaders/ShinyHighlight_VS.shshaderb.shmeta b/Assets/Shaders/ShinyHighlight_VS.shshaderb.shmeta new file mode 100644 index 00000000..f036de5a --- /dev/null +++ b/Assets/Shaders/ShinyHighlight_VS.shshaderb.shmeta @@ -0,0 +1,3 @@ +Name: ShinyHighlight_VS +ID: 37048829 +Type: 2 diff --git a/SHADE_Engine/src/Assets/Events/SHAssetManagerEvents.h b/SHADE_Engine/src/Assets/Events/SHAssetManagerEvents.h new file mode 100644 index 00000000..aaf367e3 --- /dev/null +++ b/SHADE_Engine/src/Assets/Events/SHAssetManagerEvents.h @@ -0,0 +1,20 @@ +#pragma once + +#include +#include + +namespace SHADE +{ + struct SHCompileAssetEvent + { + //! Name of the shader. Should just contain stem from file path. + std::string shaderName; + + //! NEw binary data for shader module to use + std::vector newBinaryData; + + //! Extension to check for type + std::string ext; + }; +} + diff --git a/SHADE_Engine/src/Assets/Libraries/Compilers/SHShaderSourceCompiler.cpp b/SHADE_Engine/src/Assets/Libraries/Compilers/SHShaderSourceCompiler.cpp index fd1f6d8a..eb0b677c 100644 --- a/SHADE_Engine/src/Assets/Libraries/Compilers/SHShaderSourceCompiler.cpp +++ b/SHADE_Engine/src/Assets/Libraries/Compilers/SHShaderSourceCompiler.cpp @@ -11,6 +11,8 @@ #include "SHpch.h" #include "SHShaderSourceCompiler.h" #include "shaderc/shaderc.hpp" +#include "Assets/Events/SHAssetManagerEvents.h" +#include "Events/SHEventManager.hpp" #include #include @@ -140,6 +142,14 @@ namespace SHADE return{}; } + SHCompileAssetEvent compileShaderEvent + { + .shaderName = std::filesystem::path (data->name).stem().string(), + .newBinaryData = data->spirvBinary, + .ext = GLSL_EXTENSION.data(), + }; + SHEventManager::BroadcastEvent(compileShaderEvent, SH_ASSET_COMPILE_EVENT); + return CompileShaderSourceToBinary(path, *data); } diff --git a/SHADE_Engine/src/Events/SHEventDefines.h b/SHADE_Engine/src/Events/SHEventDefines.h index fa5bcafb..3ba64580 100644 --- a/SHADE_Engine/src/Events/SHEventDefines.h +++ b/SHADE_Engine/src/Events/SHEventDefines.h @@ -26,4 +26,5 @@ constexpr SHEventIdentifier SH_GRAPHICS_LIGHT_ENABLE_SHADOW_EVENT { 17 }; constexpr SHEventIdentifier SH_BUTTON_CLICK_EVENT { 18 }; constexpr SHEventIdentifier SH_PHYSICS_COLLIDER_DRAW_EVENT { 19 }; constexpr SHEventIdentifier SH_WINDOW_RESIZE_EVENT { 20 }; +constexpr SHEventIdentifier SH_ASSET_COMPILE_EVENT { 21 }; diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/GenericData/SHGraphicsGenericData.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/GenericData/SHGraphicsGenericData.cpp new file mode 100644 index 00000000..b77c20f9 --- /dev/null +++ b/SHADE_Engine/src/Graphics/MiddleEnd/GenericData/SHGraphicsGenericData.cpp @@ -0,0 +1,53 @@ +#include "SHpch.h" +#include "SHGraphicsGenericData.h" +#include "Graphics/Devices/SHVkLogicalDevice.h" +#include "Graphics/MiddleEnd/Interface/SHGraphicsConstants.h" +#include "Graphics/Descriptors/SHVkDescriptorSetGroup.h" +#include "Graphics/Buffers/SHVkBuffer.h" + + +namespace SHADE +{ + void SHGraphicsGenericData::Init(Handle logicalDevice, Handle descSet) noexcept + { + alignedGpuStructSize = logicalDevice->PadUBOSize(sizeof (GpuStruct)); + + gpuBuffer = logicalDevice->CreateBuffer(alignedGpuStructSize * SHGraphicsConstants::NUM_FRAME_BUFFERS, nullptr, alignedGpuStructSize * SHGraphicsConstants::NUM_FRAME_BUFFERS, vk::BufferUsageFlagBits::eUniformBuffer, VMA_MEMORY_USAGE_AUTO, VMA_ALLOCATION_CREATE_MAPPED_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT, "Generic Data"); + + std::array gpuBufferArray{ gpuBuffer }; + + // We use index 0 because the descriptor set is standalone created from a single desc set layout. What the driver sees is that this set is at index 0 during updating. + static constexpr uint8_t SET_0 = 0; + + descSet->ModifyWriteDescBuffer(SET_0, SHGraphicsConstants::DescriptorSetBindings::GENERIC_DATA, std::span>{ gpuBufferArray.data(), gpuBufferArray.size()}, 0, sizeof(GpuStruct)); + + descSet->UpdateDescriptorSetBuffer(SET_0, SHGraphicsConstants::DescriptorSetBindings::GENERIC_DATA); + + } + + void SHGraphicsGenericData::UpdateBuffer(uint32_t frameIndex) noexcept + { + gpuBuffer->WriteToMemory(&data, sizeof(GpuStruct), 0, alignedGpuStructSize * frameIndex); + } + + void SHGraphicsGenericData::SetDt(float dt) noexcept + { + data.dt = dt; + } + + void SHGraphicsGenericData::UpdateElapsedTime(float dt) noexcept + { + data.elapsedTime += dt; + } + + void SHGraphicsGenericData::SetViewportWidth(uint32_t width) noexcept + { + data.viewportWidth = width; + } + + void SHGraphicsGenericData::SetViewportHeight(uint32_t height) noexcept + { + data.viewportHeight = height; + } + +} \ No newline at end of file diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/GenericData/SHGraphicsGenericData.h b/SHADE_Engine/src/Graphics/MiddleEnd/GenericData/SHGraphicsGenericData.h new file mode 100644 index 00000000..a9a590f6 --- /dev/null +++ b/SHADE_Engine/src/Graphics/MiddleEnd/GenericData/SHGraphicsGenericData.h @@ -0,0 +1,51 @@ +#pragma once + +#include +#include "Resource/SHHandle.h" + +namespace SHADE +{ + class SHVkDescriptorSetGroup; + class SHVkBuffer; + class SHVkLogicalDevice; + + class SHGraphicsGenericData + { + public: + struct GpuStruct + { + //! Delta time + float dt{ 0.0f }; + + //! Elapsed time of the application + float elapsedTime{ 0.0f }; + + //! Viewport width of the scene (excluding imgui, that means smaller than window) + uint32_t viewportWidth{ 0 }; + + //! Ditto but for height + uint32_t viewportHeight{ 0 }; + }; + private: + + //! This will be access + GpuStruct data; + + //! Buffer to hold the generic data + Handle gpuBuffer; + + //! gpu struct size for GPU to use + uint32_t alignedGpuStructSize; + + public: + void Init (Handle logicalDevice, Handle descSet) noexcept; + void UpdateBuffer(uint32_t frameIndex) noexcept; + + void SetDt (float dt) noexcept; + void UpdateElapsedTime (float dt) noexcept; + void SetViewportWidth(uint32_t width) noexcept; + void SetViewportHeight(uint32_t height) noexcept; + + }; +} + diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGlobalDescriptorSets.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGlobalDescriptorSets.cpp index fd94968e..e079b933 100644 --- a/SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGlobalDescriptorSets.cpp +++ b/SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGlobalDescriptorSets.cpp @@ -2,11 +2,13 @@ #include "SHGlobalDescriptorSets.h" #include "Graphics/MiddleEnd/Lights/SHLightingSubSystem.h" #include "Graphics/Commands/SHVkCommandBuffer.h" +#include "Graphics/MiddleEnd/GenericData/SHGraphicsGenericData.h" +#include "Graphics/Devices/SHVkLogicalDevice.h" namespace SHADE { - Handle SHGlobalDescriptorSets::staticGlobalDataDescriptorSet; + Handle SHGlobalDescriptorSets::genericAndTextureDataDescSet; Handle SHGlobalDescriptorSets::lightingSubSystem; //void SHGlobalDescriptorSets::BindLightingData(Handle cmdBuffer, SH_PIPELINE_TYPE pipelineType, uint32_t firstSet) noexcept @@ -20,11 +22,13 @@ namespace SHADE lightingSubSystem->BindDescSet(cmdBuffer, setIndex, frameIndex); } - void SHGlobalDescriptorSets::BindStaticGlobalData(Handle cmdBuffer, SH_PIPELINE_TYPE pipelineType, uint32_t setIndex) noexcept + void SHGlobalDescriptorSets::BindGenericAndTextureData(Handle device, Handle cmdBuffer, SH_PIPELINE_TYPE pipelineType, uint32_t setIndex, uint32_t frameIndex) noexcept { + uint32_t alignedGenericStructSize = device->PadUBOSize(sizeof(SHGraphicsGenericData::GpuStruct)); + // Bind descriptor set for static global data - static std::array TEX_DYNAMIC_OFFSET{ 0 }; - cmdBuffer->BindDescriptorSet(staticGlobalDataDescriptorSet, pipelineType, setIndex, std::span{ TEX_DYNAMIC_OFFSET.data(), 1 }); + static std::array TEX_DYNAMIC_OFFSET = { alignedGenericStructSize, }; + cmdBuffer->BindDescriptorSet(genericAndTextureDataDescSet, pipelineType, setIndex, std::span{ TEX_DYNAMIC_OFFSET.data(), 1 }); } /***************************************************************************/ @@ -43,9 +47,9 @@ namespace SHADE lightingSubSystem = system; } - void SHGlobalDescriptorSets::SetStaticGlobalDataDescriptorSet(Handle staticGlobalDescSet) noexcept + void SHGlobalDescriptorSets::SetStaticGlobalDataDescriptorSet(Handle descSet) noexcept { - staticGlobalDataDescriptorSet = staticGlobalDescSet; + genericAndTextureDataDescSet = descSet; } } \ No newline at end of file diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGlobalDescriptorSets.h b/SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGlobalDescriptorSets.h index 2e2dca7d..4ee09a6a 100644 --- a/SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGlobalDescriptorSets.h +++ b/SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGlobalDescriptorSets.h @@ -15,7 +15,7 @@ namespace SHADE private: //! Static global descriptor sets for miscellaneous data and textures - static Handle staticGlobalDataDescriptorSet; + static Handle genericAndTextureDataDescSet; //! Lighting sub system required to get information to bind descriptor sets for light data static Handle lightingSubSystem; @@ -25,7 +25,7 @@ namespace SHADE /* PUBLIC MEMBER FUNCTIONS */ /*-----------------------------------------------------------------------*/ static void BindLightingData (Handle cmdBuffer, SH_PIPELINE_TYPE pipelineType, uint32_t setIndex, uint32_t frameIndex) noexcept; - static void BindStaticGlobalData (Handle cmdBuffer, SH_PIPELINE_TYPE pipelineType, uint32_t setIndex) noexcept; + static void BindGenericAndTextureData (Handle device, Handle cmdBuffer, SH_PIPELINE_TYPE pipelineType, uint32_t setIndex, uint32_t frameIndex) noexcept; /*-----------------------------------------------------------------------*/ /* SETTERS AND GETTERS */ diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp index 297a86ae..c2a6d010 100644 --- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp +++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp @@ -47,6 +47,7 @@ of DigiPen Institute of Technology is prohibited. #include "Events/SHEvent.h" #include "Graphics/MiddleEnd/Lights/SHLightComponent.h" #include "Input/SHInputManager.h" +#include "Assets/Events/SHAssetManagerEvents.h" namespace SHADE { @@ -210,6 +211,7 @@ namespace SHADE renderGraph->Init("World Render Graph", device, swapchain, &resourceManager, renderContextCmdPools); renderGraph->AddResource("Position", { SH_RENDER_GRAPH_RESOURCE_FLAGS::COLOR, SH_RENDER_GRAPH_RESOURCE_FLAGS::INPUT, SH_RENDER_GRAPH_RESOURCE_FLAGS::STORAGE }, true, windowDims.first, windowDims.second, vk::Format::eR32G32B32A32Sfloat); renderGraph->AddResource("Position World Space", { SH_RENDER_GRAPH_RESOURCE_FLAGS::COLOR, SH_RENDER_GRAPH_RESOURCE_FLAGS::INPUT, SH_RENDER_GRAPH_RESOURCE_FLAGS::STORAGE }, true, windowDims.first, windowDims.second, vk::Format::eR32G32B32A32Sfloat); + renderGraph->AddResource("Object VFX", { SH_RENDER_GRAPH_RESOURCE_FLAGS::COLOR, SH_RENDER_GRAPH_RESOURCE_FLAGS::INPUT, SH_RENDER_GRAPH_RESOURCE_FLAGS::STORAGE }, true, windowDims.first, windowDims.second, vk::Format::eR32G32B32A32Sfloat); renderGraph->AddResource("Normals", { SH_RENDER_GRAPH_RESOURCE_FLAGS::COLOR, SH_RENDER_GRAPH_RESOURCE_FLAGS::INPUT, SH_RENDER_GRAPH_RESOURCE_FLAGS::STORAGE }, true, windowDims.first, windowDims.second, vk::Format::eR32G32B32A32Sfloat); //worldRenderGraph->AddResource("Tangents", { SH_ATT_DESC_TYPE_FLAGS::COLOR, SH_ATT_DESC_TYPE_FLAGS::INPUT, SH_ATT_DESC_TYPE_FLAGS::STORAGE }, windowDims.first, windowDims.second, vk::Format::eR32G32B32A32Sfloat); renderGraph->AddResource("Albedo", { SH_RENDER_GRAPH_RESOURCE_FLAGS::COLOR, SH_RENDER_GRAPH_RESOURCE_FLAGS::INPUT, SH_RENDER_GRAPH_RESOURCE_FLAGS::STORAGE }, true, windowDims.first, windowDims.second); @@ -235,7 +237,8 @@ namespace SHADE "Depth Buffer", "SSAO", "SSAO Blur", - "Position World Space" + "Position World Space", + "Object VFX" }, {}); // no predecessors @@ -249,6 +252,7 @@ namespace SHADE gBufferSubpass->AddColorOutput("Normals"); gBufferSubpass->AddColorOutput("Albedo"); gBufferSubpass->AddColorOutput("Position World Space"); + gBufferSubpass->AddColorOutput("Object VFX"); gBufferSubpass->AddDepthOutput("Depth Buffer", SH_RENDER_GRAPH_RESOURCE_FLAGS::DEPTH_STENCIL); usableSubpassesMapping.emplace (std::string (SHGraphicsConstants::RenderGraphEntityNames::GBUFFER_WRITE_SUBPASS.data()), gBufferSubpass); @@ -297,15 +301,15 @@ namespace SHADE "Albedo", "Scene", "SSAO Blur", - "Position World Space" + "Position World Space", + "Object VFX" }, { SHGraphicsConstants::RenderGraphEntityNames::GBUFFER_PASS .data()}); - /*-----------------------------------------------------------------------*/ /* DEFERRED COMPOSITE SUBPASS INIT */ /*-----------------------------------------------------------------------*/ - auto deferredCompositeCompute = deferredCompositeNode->AddNodeCompute(SHGraphicsConstants::RenderGraphEntityNames::DEFERRED_COMPOSITE_COMPUTE.data(), deferredCompositeShader, {"Position", "Normals", "Albedo", "Light Layer Indices", "SSAO Blur", "Position World Space", "Scene"}, {}, SHLightingSubSystem::MAX_SHADOWS); + auto deferredCompositeCompute = deferredCompositeNode->AddNodeCompute(SHGraphicsConstants::RenderGraphEntityNames::DEFERRED_COMPOSITE_COMPUTE.data(), deferredCompositeShader, {"Position", "Normals", "Albedo", "Light Layer Indices", "SSAO Blur", "Position World Space", "Scene", "Object VFX"}, {}, SHLightingSubSystem::MAX_SHADOWS); deferredCompositeCompute->AddPreComputeFunction([=](Handle cmdBuffer, uint32_t frameIndex) { lightingSubSystem->PrepareShadowMapsForRead(cmdBuffer); @@ -409,7 +413,6 @@ namespace SHADE InitRenderGraph(); - // Create Semaphore for (auto& semaHandle : graphSemaphores) { @@ -491,12 +494,34 @@ namespace SHADE void SHGraphicsSystem::InitEvents(void) noexcept { - std::shared_ptr> thisReceiver + std::shared_ptr> lightEnableShadowReceiver { std::make_shared>(this, &SHGraphicsSystem::ReceiveLightEnableShadowEvent) }; - ReceiverPtr receiver = std::dynamic_pointer_cast(thisReceiver); - SHEventManager::SubscribeTo(SH_GRAPHICS_LIGHT_ENABLE_SHADOW_EVENT, receiver); + ReceiverPtr lightEnableShadowReceivePtr = std::dynamic_pointer_cast(lightEnableShadowReceiver); + SHEventManager::SubscribeTo(SH_GRAPHICS_LIGHT_ENABLE_SHADOW_EVENT, lightEnableShadowReceivePtr); + + std::shared_ptr> compileAssetReceiever + { + std::make_shared>(this, &SHGraphicsSystem::ReceiveCompileAssetEvent) + }; + ReceiverPtr compileAssetReceivePtr = std::dynamic_pointer_cast(compileAssetReceiever); + SHEventManager::SubscribeTo(SH_ASSET_COMPILE_EVENT, compileAssetReceivePtr); + } + + void SHGraphicsSystem::InitGenericDataAndTexturesDescSet(void) noexcept + { + // descriptor set for generic data and textures + genericAndTextureDescSet = descPool->Allocate(SHGraphicsPredefinedData::GetPredefinedDescSetLayouts(SHGraphicsPredefinedData::PredefinedDescSetLayoutTypes::STATIC_DATA), { SHTextureLibrary::DEFAULT_MAX_TEXTURES }); + + for (auto set : genericAndTextureDescSet->GetVkHandle()) + SET_VK_OBJ_NAME(device, vk::ObjectType::eDescriptorSet, set, "[Descriptor Set] Static Globals"); + + SHGlobalDescriptorSets::SetStaticGlobalDataDescriptorSet(genericAndTextureDescSet); + + // Create buffer for generic data and attach to descriptor set + graphicsGenericData.Init(device, genericAndTextureDescSet); + } /*---------------------------------------------------------------------------------*/ @@ -507,6 +532,7 @@ namespace SHADE InitBoilerplate(); InitMiddleEnd(); InitSubsystems(); + InitGenericDataAndTexturesDescSet(); InitBuiltInResources(); InitEvents(); } @@ -536,7 +562,7 @@ namespace SHADE */ /***************************************************************************/ - void SHGraphicsSystem::Run(double) noexcept + void SHGraphicsSystem::Run(double dt) noexcept { if (window->IsMinimized() || renderContext.GetWindowIsDead()) { @@ -572,6 +598,9 @@ namespace SHADE auto cameraSystem = SHSystemManager::GetSystem(); + graphicsGenericData.SetDt(dt); + graphicsGenericData.UpdateElapsedTime(dt); + graphicsGenericData.UpdateBuffer(frameIndex); { #ifdef SHEDITOR @@ -860,6 +889,23 @@ namespace SHADE return eventPtr->handle; } + SHEventHandle SHGraphicsSystem::ReceiveCompileAssetEvent(SHEventPtr eventPtr) noexcept + { + auto const& EVENT_DATA = reinterpret_cast*>(eventPtr.get())->data; + + auto denseIterators = SHVkInstance::GetResourceManager().GetDenseAccess(); + for (auto it = denseIterators.first; it != denseIterators.second; ++it) + { + if (it->GetName() == EVENT_DATA->shaderName) + { + it->OnChange(); + break; + } + } + + return eventPtr->handle; + } + Handle SHGraphicsSystem::AddMaterial(Handle vertShader, Handle fragShader, Handle subpass) { // Retrieve pipeline from pipeline storage or create if unavailable @@ -980,12 +1026,11 @@ namespace SHADE device->WaitIdle(); texLibrary.BuildTextures ( - device, graphicsTexCmdBuffer, graphicsQueue, descPool + device, graphicsTexCmdBuffer, graphicsQueue, genericAndTextureDescSet ); device->WaitIdle(); graphicsTexCmdBuffer.Free(); graphicsTexCmdBuffer = {}; - SHGlobalDescriptorSets::SetStaticGlobalDataDescriptorSet(texLibrary.GetTextureDescriptorSetGroup()); - + //SHGlobalDescriptorSets::SetStaticGlobalDataDescriptorSet(texLibrary.GetTextureDescriptorSetGroup()); } Handle SHGraphicsSystem::GetTextureHandle(SHTexture::Index textureId) const @@ -1134,6 +1179,10 @@ namespace SHADE resizeWidth = newWidth; resizeHeight = newHeight; + graphicsGenericData.SetViewportWidth(resizeWidth); + graphicsGenericData.SetViewportHeight(resizeHeight); + + renderContext.SetIsResized(true); } @@ -1186,6 +1235,7 @@ namespace SHADE SHEventManager::BroadcastEvent(newEvent, SH_WINDOW_RESIZE_EVENT); + #else #endif diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h index 21d18be1..0b98f843 100644 --- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h +++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h @@ -37,6 +37,7 @@ of DigiPen Institute of Technology is prohibited. #include "Graphics/MiddleEnd/Interface/SHRenderer.h" #include "Graphics/Events/SHGraphicsEvents.h" #include "Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderingSubSystem.h" +#include "Graphics/MiddleEnd/GenericData/SHGraphicsGenericData.h" namespace SHADE { @@ -106,6 +107,7 @@ namespace SHADE void InitSubsystems (void) noexcept; void InitBuiltInResources (void); void InitEvents (void) noexcept; + void InitGenericDataAndTexturesDescSet (void) noexcept; public: class SH_API BeginRoutine final : public SHSystemRoutine @@ -181,6 +183,11 @@ namespace SHADE /*-----------------------------------------------------------------------*/ SHEventHandle ReceiveLightEnableShadowEvent (SHEventPtr eventPtr) noexcept; + /*-----------------------------------------------------------------------*/ + /* Asset Events */ + /*-----------------------------------------------------------------------*/ + SHEventHandle ReceiveCompileAssetEvent (SHEventPtr eventPtr) noexcept; + /*-----------------------------------------------------------------------------*/ /* Material Functions */ /*-----------------------------------------------------------------------------*/ @@ -433,6 +440,7 @@ namespace SHADE SHResourceHub resourceManager; SHMeshLibrary meshLibrary; SHTextureLibrary texLibrary; + SHGraphicsGenericData graphicsGenericData; SHFontLibrary fontLibrary; SHSamplerCache samplerCache; SHMaterialInstanceCache materialInstanceCache; @@ -490,6 +498,8 @@ namespace SHADE Handle debugDrawFilledDepthPipeline; Handle shadowMapPipeline; // initialized only when a shadow map is needed + Handle genericAndTextureDescSet; + // Built-In Textures Handle defaultTexture; diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/TextRendering/SHTextRenderingSubSystem.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/TextRendering/SHTextRenderingSubSystem.cpp index 7a7bea17..a866041e 100644 --- a/SHADE_Engine/src/Graphics/MiddleEnd/TextRendering/SHTextRenderingSubSystem.cpp +++ b/SHADE_Engine/src/Graphics/MiddleEnd/TextRendering/SHTextRenderingSubSystem.cpp @@ -194,7 +194,7 @@ namespace SHADE cmdBuffer->BindPipeline(pipeline); // Bind global data - SHGlobalDescriptorSets::BindStaticGlobalData(cmdBuffer, SH_PIPELINE_TYPE::GRAPHICS, staticGlobalSetIndex); + SHGlobalDescriptorSets::BindGenericAndTextureData(logicalDevice, cmdBuffer, SH_PIPELINE_TYPE::GRAPHICS, staticGlobalSetIndex, frameIndex); // Bind camera data renderer->BindDescriptorSet(cmdBuffer, SH_PIPELINE_TYPE::GRAPHICS, cameraSetIndex, frameIndex); diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Textures/SHTextureLibrary.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Textures/SHTextureLibrary.cpp index 0578e7a2..fd2f3ac7 100644 --- a/SHADE_Engine/src/Graphics/MiddleEnd/Textures/SHTextureLibrary.cpp +++ b/SHADE_Engine/src/Graphics/MiddleEnd/Textures/SHTextureLibrary.cpp @@ -63,7 +63,7 @@ namespace SHADE isDirty = true; } - void SHTextureLibrary::BuildTextures(Handle device, Handle cmdBuffer, Handle graphicsQueue, Handle descPool) + void SHTextureLibrary::BuildTextures(Handle device, Handle cmdBuffer, Handle graphicsQueue, Handle descSet/*, Handle descPool*/) { // Don't do anything if there are no updates if (!isDirty) @@ -162,27 +162,28 @@ namespace SHADE /* Build Descriptor Set with all the Textures only if there are textures */ if (!texOrder.empty()) { - if (texDescriptors) - { - texDescriptors.Free(); - } - texDescriptors = descPool->Allocate - ( - { SHGraphicsPredefinedData::GetPredefinedDescSetLayouts(SHGraphicsPredefinedData::PredefinedDescSetLayoutTypes::STATIC_DATA) }, - { static_cast(texOrder.size()) } - ); -#ifdef _DEBUG - for (auto set : texDescriptors->GetVkHandle()) - SET_VK_OBJ_NAME(device, vk::ObjectType::eDescriptorSet, set, "[Descriptor Set] Static Globals"); -#endif + +// if (descSet) +// { +// descSet.Free(); +// } +// descSet = descPool->Allocate +// ( +// { SHGraphicsPredefinedData::GetPredefinedDescSetLayouts(SHGraphicsPredefinedData::PredefinedDescSetLayoutTypes::STATIC_DATA) }, +// { static_cast(texOrder.size()) } +// ); +//#ifdef _DEBUG +// for (auto set : descSet->GetVkHandle()) +// SET_VK_OBJ_NAME(device, vk::ObjectType::eDescriptorSet, set, "[Descriptor Set] Static Globals"); +//#endif static constexpr uint32_t TEX_DESCRIPTOR_SET_INDEX = 0; - texDescriptors->ModifyWriteDescImage + descSet->ModifyWriteDescImage ( TEX_DESCRIPTOR_SET_INDEX, SHGraphicsConstants::DescriptorSetBindings::IMAGE_AND_SAMPLERS_DATA, combinedImageSamplers ); - texDescriptors->UpdateDescriptorSetImages + descSet->UpdateDescriptorSetImages ( TEX_DESCRIPTOR_SET_INDEX, SHGraphicsConstants::DescriptorSetBindings::IMAGE_AND_SAMPLERS_DATA diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Textures/SHTextureLibrary.h b/SHADE_Engine/src/Graphics/MiddleEnd/Textures/SHTextureLibrary.h index 5b7e4914..bbc72a1a 100644 --- a/SHADE_Engine/src/Graphics/MiddleEnd/Textures/SHTextureLibrary.h +++ b/SHADE_Engine/src/Graphics/MiddleEnd/Textures/SHTextureLibrary.h @@ -66,6 +66,13 @@ namespace SHADE class SHTextureLibrary { public: + //! This exists because a poor decision was made to place the textures and + //! generic data as 2 bindings in a single layout. Because of this, the recreation + //! of the texture library would mean the recreation of the desc set that also + //! involves the generic data, which is bad bad bad. Solution is to separate the + //! 2 desc sets. + static constexpr uint32_t DEFAULT_MAX_TEXTURES = 2000; + /*-----------------------------------------------------------------------------*/ /* Usage Functions */ /*-----------------------------------------------------------------------------*/ @@ -112,7 +119,7 @@ namespace SHADE /*! \brief - Finalises all changes to the Texture Library into the GPU buffers. + Finalizes all changes to the Texture Library into the GPU buffers. \param device Device used to create and update the buffers. @@ -123,12 +130,12 @@ namespace SHADE queue. */ /***************************************************************************/ - void BuildTextures(Handle device, Handle cmdBuffer, Handle graphicsQueue, Handle descPool); + void BuildTextures(Handle device, Handle cmdBuffer, Handle graphicsQueue, Handle descSet/*, Handle descPool*/); /*-----------------------------------------------------------------------------*/ /* Getter Functions */ /*-----------------------------------------------------------------------------*/ - Handle GetTextureDescriptorSetGroup() const noexcept { return texDescriptors; } + //Handle GetTextureDescriptorSetGroup() const noexcept { return descSet; } /***************************************************************************/ /*! * @@ -173,8 +180,8 @@ namespace SHADE std::vector> texOrder; // CPU Storage std::vector, Handle, vk::ImageLayout>> combinedImageSamplers; - // GPU Storage - Handle texDescriptors; + //// GPU Storage + //Handle descSet; // Flags bool isDirty = true; diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderingSubSystem.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderingSubSystem.cpp index 740ffa92..802d085d 100644 --- a/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderingSubSystem.cpp +++ b/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderingSubSystem.cpp @@ -164,7 +164,7 @@ namespace SHADE cmdBuffer->BindPipeline(pipeline); // Bind global data - SHGlobalDescriptorSets::BindStaticGlobalData(cmdBuffer, SH_PIPELINE_TYPE::GRAPHICS, staticGlobalSetIndex); + SHGlobalDescriptorSets::BindGenericAndTextureData(logicalDevice, cmdBuffer, SH_PIPELINE_TYPE::GRAPHICS, staticGlobalSetIndex, frameIndex); // Bind camera data renderer->BindDescriptorSet(cmdBuffer, SH_PIPELINE_TYPE::GRAPHICS, cameraSetIndex, frameIndex); diff --git a/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraph.cpp b/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraph.cpp index c312535e..654cae77 100644 --- a/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraph.cpp +++ b/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraph.cpp @@ -584,7 +584,7 @@ namespace SHADE if (node->renderpass) { // bind static global data - SHGlobalDescriptorSets::BindStaticGlobalData(cmdBuffer, SH_PIPELINE_TYPE::GRAPHICS, descMappings.at(SHPredefinedDescriptorTypes::STATIC_DATA)); + SHGlobalDescriptorSets::BindGenericAndTextureData(renderGraphStorage->logicalDevice, cmdBuffer, SH_PIPELINE_TYPE::GRAPHICS, descMappings.at(SHPredefinedDescriptorTypes::STATIC_DATA), frameIndex); // Bind all the buffers required for meshes for (auto& [buffer, bindingPoint] : MESH_DATA) diff --git a/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraphNode.cpp b/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraphNode.cpp index b0d83172..b032ca1e 100644 --- a/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraphNode.cpp +++ b/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraphNode.cpp @@ -664,7 +664,7 @@ namespace SHADE commandBuffer->ForceSetPipelineLayout(SHGraphicsPredefinedData::GetSystemData(SHGraphicsPredefinedData::SystemType::RENDER_GRAPH_NODE_COMPUTE).dummyPipelineLayout, SH_PIPELINE_TYPE::COMPUTE); // bind static global data - SHGlobalDescriptorSets::BindStaticGlobalData(commandBuffer, SH_PIPELINE_TYPE::COMPUTE, descMappings.at(SHPredefinedDescriptorTypes::STATIC_DATA)); + SHGlobalDescriptorSets::BindGenericAndTextureData(graphStorage->logicalDevice, commandBuffer, SH_PIPELINE_TYPE::COMPUTE, descMappings.at(SHPredefinedDescriptorTypes::STATIC_DATA), frameIndex); // bind lighting data SHGlobalDescriptorSets::BindLightingData(commandBuffer, SH_PIPELINE_TYPE::COMPUTE, descMappings.at(SHPredefinedDescriptorTypes::LIGHTS), frameIndex); diff --git a/SHADE_Engine/src/Graphics/Shaders/SHVkShaderModule.cpp b/SHADE_Engine/src/Graphics/Shaders/SHVkShaderModule.cpp index fa6b3182..9cf01b6b 100644 --- a/SHADE_Engine/src/Graphics/Shaders/SHVkShaderModule.cpp +++ b/SHADE_Engine/src/Graphics/Shaders/SHVkShaderModule.cpp @@ -112,4 +112,9 @@ namespace SHADE return reflectedData; } + std::string SHVkShaderModule::GetName(void) const noexcept + { + return shaderName; + } + } \ No newline at end of file diff --git a/SHADE_Engine/src/Graphics/Shaders/SHVkShaderModule.h b/SHADE_Engine/src/Graphics/Shaders/SHVkShaderModule.h index 492710f2..e0e1a2fb 100644 --- a/SHADE_Engine/src/Graphics/Shaders/SHVkShaderModule.h +++ b/SHADE_Engine/src/Graphics/Shaders/SHVkShaderModule.h @@ -77,6 +77,7 @@ namespace SHADE vk::ShaderStageFlagBits GetShaderStageFlagBits (void) const noexcept; vk::ShaderModule GetVkShaderModule (void) const noexcept; SHShaderReflected const& GetReflectedData (void) const noexcept; + std::string GetName (void) const noexcept; }; }