From 0edd2f24e35c45c4f49c431c9e737f8a50da8711 Mon Sep 17 00:00:00 2001
From: Xiao Qi <xiaoqi.loh@digipen.edu>
Date: Wed, 23 Nov 2022 13:02:33 +0800
Subject: [PATCH] Added VS and FS shaders to tile singular textures Added
 shader stage flag bit for vertex shaders

---
 Assets/Shaders/TestCube_Tile_FS.glsl          |  48 ++++++++++++
 Assets/Shaders/TestCube_Tile_FS.shshaderb     | Bin 0 -> 2185 bytes
 .../Shaders/TestCube_Tile_FS.shshaderb.shmeta |   3 +
 Assets/Shaders/TestCube_Tile_VS.glsl          |  74 ++++++++++++++++++
 Assets/Shaders/TestCube_Tile_VS.shshaderb     | Bin 0 -> 4205 bytes
 .../Shaders/TestCube_Tile_VS.shshaderb.shmeta |   3 +
 .../GlobalData/SHGraphicsGlobalData.cpp       |   2 +-
 7 files changed, 129 insertions(+), 1 deletion(-)
 create mode 100644 Assets/Shaders/TestCube_Tile_FS.glsl
 create mode 100644 Assets/Shaders/TestCube_Tile_FS.shshaderb
 create mode 100644 Assets/Shaders/TestCube_Tile_FS.shshaderb.shmeta
 create mode 100644 Assets/Shaders/TestCube_Tile_VS.glsl
 create mode 100644 Assets/Shaders/TestCube_Tile_VS.shshaderb
 create mode 100644 Assets/Shaders/TestCube_Tile_VS.shshaderb.shmeta

diff --git a/Assets/Shaders/TestCube_Tile_FS.glsl b/Assets/Shaders/TestCube_Tile_FS.glsl
new file mode 100644
index 00000000..84403a7c
--- /dev/null
+++ b/Assets/Shaders/TestCube_Tile_FS.glsl
@@ -0,0 +1,48 @@
+#version 450
+#extension GL_ARB_separate_shader_objects : enable
+#extension GL_ARB_shading_language_420pack : enable
+#extension GL_EXT_nonuniform_qualifier : require
+
+struct MatPropData
+{
+  vec2 tileMult;
+  uint textureIndex;
+};
+
+layout(location = 0) in struct
+{
+  vec4 vertPos; // location 0
+  vec2 uv; // location = 1
+  vec4 normal; // location = 2
+
+} In;
+
+// material stuff
+layout(location = 3) flat in struct
+{
+  int materialIndex;
+  uint eid;
+  uint lightLayerIndex;
+} In2;
+
+layout (set = 0, binding = 1) uniform sampler2D textures[]; // for textures (global)
+layout (std430, set = 3, 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;
+
+void main()
+{
+  position = In.vertPos;
+  normals = In.normal;
+  albedo = texture(textures[nonuniformEXT(MatProp.data[In2.materialIndex].textureIndex)], In.uv);
+
+  outEntityID = In2.eid;
+  lightLayerIndices = In2.lightLayerIndex;
+}
\ No newline at end of file
diff --git a/Assets/Shaders/TestCube_Tile_FS.shshaderb b/Assets/Shaders/TestCube_Tile_FS.shshaderb
new file mode 100644
index 0000000000000000000000000000000000000000..c7444c7d62831fed446340965286f26e5e41220e
GIT binary patch
literal 2185
zcmY+FTXPge6vrF(LJYSc0wNM8#5)==21F67LXlciwG=61sc%!mP7_)uGwV!mioE%u
z)ED3URK8f{|JO4uLsy+W*FKkjpQ&B>ZOMc)IJthxm=k8%oHY+xleu6{%3=cl<BgX8
z+3~-`m(7yd-}@om`RV&Kx6Q0}b6?e|D|7q8l?Udu8Hf9m>Hc)1@%hHqo!g{7X9l4H
zxzC$3W+)CFX0F8Xn&_<PqUeg~J<(m!SE3c&C05N!8mL2K{#K%)ZcV1?_ID4{#?G@k
z^EPdsXSuD@>gmsR=9^bz<Wh@ik(CFF?7*g5o44oL>=)%(A`c^#Rk<kLv#LH!e_dpS
zd**B{|1$o`lP8nuPCA><)5aecHZ5Ff)7;gn<c=)0LY^+pm9t`z_X9?X=+8VdqcHcp
zYMggfz+t5MPHR5SSpFy<+1l?_jcmhU1INYD%NQ^z)pk}G-5LZeca@QvVA}ecpo4E#
zJhgd+e`Ma4?(GY|sI3rdZL8vsGrw0?^GBJ_RCjE!al9++<3-_-$9fg)^wZ_oWf$;`
z<V(br$JQ<@NTx9yRhSJQC#Qf8z1|S->PjD&bsRd>iSl8WFBSq5eDq*l{(mf(6z<@;
zpJvClZllS`Zta$v%0CJ_RxSKa>775`eI(1Nuye26bF%=<M0MEHhyyx1+t<Mwoo&Yt
z*66%DI#@F!C+cgG>HS+(kGbNk(S{!zpDy>_5g&_IM8qWGoOo}d4if3H4{AbveN8%t
zSTH#k<YACs&M+{a%Kp2)ed2EQWIpWHJ`6Z=hd$|#?-rdmxTs(Fn(k8{`LZPXPefM~
z&$o>ZPKkb*lUVHcJ00w?5x*=>Jh@giKi>(l*x}?jBThf~$brs#VY?)qd6Q1R+3Dw{
zbGQ$-#P)mOed!^_3zpDB?2-4ze^s0ErZ_#4qkp1)O_5jSAnv;4x5Uw@eNCK$joj$$
z4u{^aizg^LtJ1-m*|C$0{lK;=IT1%E@0vK6B_i^o-w;I{*Cm5Xo2R|=uJjWkeB422
zU$Bw${Z8gy#O0%&|6|GIZ+jk^4auB1>t~Y5MgQcxBMyedQxBd00&Mud5GTIxXW#JO
z)h<wrJ>p>dN0yQJwtjij3nKP_w|<~V-uHD8_HT59JwuQ2mn0L<TgUjzlCcxdPM{MH
z79WVfC*}v24?Fv|s)5H%5x5hB54_0DOrMDG?{_-iA2#xX-7OKjfSo(w$hU}{81UQ_
z(R0iTwx4(Q9~HyQTO#gZXAX838#%!Eo`^YO4to2tvlGvopvU<8l8KKv5&yLaJMp{`
L`oDU;d!qjU5ckEN

literal 0
HcmV?d00001

diff --git a/Assets/Shaders/TestCube_Tile_FS.shshaderb.shmeta b/Assets/Shaders/TestCube_Tile_FS.shshaderb.shmeta
new file mode 100644
index 00000000..d19dc36d
--- /dev/null
+++ b/Assets/Shaders/TestCube_Tile_FS.shshaderb.shmeta
@@ -0,0 +1,3 @@
+Name: TestCube_Tile_FS
+ID: 39265233
+Type: 2
diff --git a/Assets/Shaders/TestCube_Tile_VS.glsl b/Assets/Shaders/TestCube_Tile_VS.glsl
new file mode 100644
index 00000000..31a448fe
--- /dev/null
+++ b/Assets/Shaders/TestCube_Tile_VS.glsl
@@ -0,0 +1,74 @@
+#version 450
+#extension GL_KHR_vulkan_glsl : enable
+
+//#include "ShaderDescriptorDefinitions.glsl"
+
+
+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;
+
+struct MatPropData
+{
+  vec2 tileMult;
+  uint textureIndex;
+};
+
+layout(location = 0) out struct
+{
+  vec4 vertPos; // location 0
+  vec2 uv; // location = 1
+  vec4 normal; // location = 2
+
+} Out;
+
+// material stuff
+layout(location = 3) out struct
+{
+  int materialIndex;
+  uint eid;
+  uint lightLayerIndex;
+
+} Out2;
+
+layout(set = 2, binding = 0) uniform CameraData
+{
+  vec4 position; 
+  mat4 vpMat;
+  mat4 viewMat;
+  mat4 perspectiveMat;
+  mat4 orthoMat;
+} cameraData;
+
+layout (std430, set = 3, binding = 0) buffer MaterialProperties     // For materials 
+{
+  MatPropData data[];
+} MatProp;
+
+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);
+
+  // uvs for texturing in fragment shader
+  Out.uv = aUV * MatProp.data[gl_InstanceIndex].tileMult;
+
+  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);
+
+  // clip space for rendering
+  gl_Position = cameraData.vpMat * worldTransform * vec4 (aVertexPos, 1.0f);
+}
\ No newline at end of file
diff --git a/Assets/Shaders/TestCube_Tile_VS.shshaderb b/Assets/Shaders/TestCube_Tile_VS.shshaderb
new file mode 100644
index 0000000000000000000000000000000000000000..9f83665663ad873e8c70d38c5227866e929b07d9
GIT binary patch
literal 4205
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
UkGGLGpdFCCQP=N3b~*|D4~}t61^@s6

literal 0
HcmV?d00001

diff --git a/Assets/Shaders/TestCube_Tile_VS.shshaderb.shmeta b/Assets/Shaders/TestCube_Tile_VS.shshaderb.shmeta
new file mode 100644
index 00000000..0603263f
--- /dev/null
+++ b/Assets/Shaders/TestCube_Tile_VS.shshaderb.shmeta
@@ -0,0 +1,3 @@
+Name: TestCube_Tile_VS
+ID: 44231040
+Type: 2
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGraphicsGlobalData.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGraphicsGlobalData.cpp
index d0fbaf2c..87234a6b 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGraphicsGlobalData.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGraphicsGlobalData.cpp
@@ -90,7 +90,7 @@ namespace SHADE
     SHVkDescriptorSetLayout::Binding materialDataBinding
     {
       .Type = vk::DescriptorType::eStorageBufferDynamic,
-      .Stage = vk::ShaderStageFlagBits::eFragment,
+      .Stage = vk::ShaderStageFlagBits::eFragment | vk::ShaderStageFlagBits::eVertex,
       .BindPoint = SHGraphicsConstants::DescriptorSetBindings::BATCHED_PER_INST_DATA,
       .DescriptorCount = 1,
     };
-- 
2.40.1