fix vk device lost

jmorton06 · Sep 14, 2024 · 2d57072 · 2d57072
1 parent 1da08de
commit 2d57072
Show file tree

Hide file tree

Showing 25 changed files with 1,364 additions and 1,190 deletions.
diff --git a/Lumos/Assets/Shaders/Buffers.glslh b/Lumos/Assets/Shaders/Buffers.glslh
@@ -23,7 +23,13 @@ struct Light
 	float angle;
 };
 
-layout(set = 1,binding = 6) uniform UniformMaterialData
+layout(set = 1, binding = 0) uniform sampler2D u_AlbedoMap;
+layout(set = 1, binding = 1) uniform sampler2D u_MetallicMap;
+layout(set = 1, binding = 2) uniform sampler2D u_RoughnessMap;
+layout(set = 1, binding = 3) uniform sampler2D u_NormalMap;
+layout(set = 1, binding = 4) uniform sampler2D u_AOMap;
+layout(set = 1, binding = 5) uniform sampler2D u_EmissiveMap;
+layout(set = 1, binding = 6) uniform UniformMaterialData
 {
 	vec4  AlbedoColour;
 	float Roughness;
@@ -40,6 +46,12 @@ layout(set = 1,binding = 6) uniform UniformMaterialData
 	float workflow;
 } u_MaterialData;
 
+
+layout(set = 2, binding = 0) uniform sampler2DArray uShadowMap;
+layout(set = 2, binding = 1) uniform samplerCube uEnvMap;
+layout(set = 2, binding = 2) uniform samplerCube uIrrMap;
+layout(set = 2, binding = 3) uniform sampler2D uBRDFLUT;
+layout(set = 2, binding = 4) uniform sampler2D uSSAOMap;
 layout(set = 2, binding = 5) uniform UniformSceneData
 {
 	Light lights[MAX_LIGHTS];

diff --git a/Lumos/Assets/Shaders/CompiledSPV/Batch2D.frag.spv b/Lumos/Assets/Shaders/CompiledSPV/Batch2D.frag.spv
diff --git a/Lumos/Assets/Shaders/CompiledSPV/Batch2D.vert.spv b/Lumos/Assets/Shaders/CompiledSPV/Batch2D.vert.spv
diff --git a/Lumos/Assets/Shaders/CompiledSPV/DepthPrePass.frag.spv b/Lumos/Assets/Shaders/CompiledSPV/DepthPrePass.frag.spv
diff --git a/Lumos/Assets/Shaders/CompiledSPV/DepthPrePassAlpha.frag.spv b/Lumos/Assets/Shaders/CompiledSPV/DepthPrePassAlpha.frag.spv
diff --git a/Lumos/Assets/Shaders/CompiledSPV/ForwardPBR.vert.spv b/Lumos/Assets/Shaders/CompiledSPV/ForwardPBR.vert.spv
diff --git a/Lumos/Assets/Shaders/CompiledSPV/ForwardPBRAnim.vert.spv b/Lumos/Assets/Shaders/CompiledSPV/ForwardPBRAnim.vert.spv
diff --git a/Lumos/Assets/Shaders/CompiledSPV/Headers/Batch2Dfragspv.hpp b/Lumos/Assets/Shaders/CompiledSPV/Headers/Batch2Dfragspv.hpp
@@ -5,7 +5,7 @@
 
 constexpr uint32_t spirv_Batch2Dfragspv_size = 5584;
 constexpr std::array<uint32_t, 1396> spirv_Batch2Dfragspv = {
-    0x07230203, 0x00010000, 0x000D000B, 0x00000101, 0x00000000, 0x00020011, 0x00000001, 0x0006000B, 
+    0x07230203, 0x00010000, 0x000D000A, 0x00000101, 0x00000000, 0x00020011, 0x00000001, 0x0006000B, 
 0x00000001, 0x4C534C47, 0x6474732E, 0x3035342E, 0x00000000, 0x0003000E, 0x00000000, 0x00000001, 
 0x0007000F, 0x00000004, 0x00000004, 0x6E69616D, 0x00000000, 0x00000022, 0x000000FF, 0x00030010, 
 0x00000004, 0x00000007, 0x00030003, 0x00000002, 0x000001C2, 0x00090004, 0x415F4C47, 0x735F4252, 

diff --git a/Lumos/Assets/Shaders/CompiledSPV/Headers/Batch2Dvertspv.hpp b/Lumos/Assets/Shaders/CompiledSPV/Headers/Batch2Dvertspv.hpp
@@ -5,7 +5,7 @@
 
 constexpr uint32_t spirv_Batch2Dvertspv_size = 2012;
 constexpr std::array<uint32_t, 503> spirv_Batch2Dvertspv = {
-    0x07230203, 0x00010000, 0x000D000B, 0x0000003E, 0x00000000, 0x00020011, 0x00000001, 0x0006000B, 
+    0x07230203, 0x00010000, 0x000D000A, 0x0000003E, 0x00000000, 0x00020011, 0x00000001, 0x0006000B, 
 0x00000001, 0x4C534C47, 0x6474732E, 0x3035342E, 0x00000000, 0x0003000E, 0x00000000, 0x00000001, 
 0x000B000F, 0x00000000, 0x00000004, 0x6E69616D, 0x00000000, 0x0000000D, 0x00000019, 0x00000026, 
 0x0000002C, 0x00000033, 0x0000003B, 0x00030003, 0x00000002, 0x000001C2, 0x00090004, 0x415F4C47, 

diff --git a/Lumos/Assets/Shaders/CompiledSPV/Headers/DepthPrePassAlphafragspv.hpp b/Lumos/Assets/Shaders/CompiledSPV/Headers/DepthPrePassAlphafragspv.hpp
diff --git a/Lumos/Assets/Shaders/CompiledSPV/Headers/DepthPrePassfragspv.hpp b/Lumos/Assets/Shaders/CompiledSPV/Headers/DepthPrePassfragspv.hpp
diff --git a/Lumos/Assets/Shaders/CompiledSPV/Headers/ForwardPBRAnimvertspv.hpp b/Lumos/Assets/Shaders/CompiledSPV/Headers/ForwardPBRAnimvertspv.hpp
diff --git a/Lumos/Assets/Shaders/CompiledSPV/Headers/ForwardPBRvertspv.hpp b/Lumos/Assets/Shaders/CompiledSPV/Headers/ForwardPBRvertspv.hpp
diff --git a/Lumos/Assets/Shaders/CompiledSPV/Headers/ShadowAlphafragspv.hpp b/Lumos/Assets/Shaders/CompiledSPV/Headers/ShadowAlphafragspv.hpp
diff --git a/Lumos/Assets/Shaders/CompiledSPV/Headers/ShadowAnimvertspv.hpp b/Lumos/Assets/Shaders/CompiledSPV/Headers/ShadowAnimvertspv.hpp
diff --git a/Lumos/Assets/Shaders/CompiledSPV/Headers/Shadowfragspv.hpp b/Lumos/Assets/Shaders/CompiledSPV/Headers/Shadowfragspv.hpp
diff --git a/Lumos/Assets/Shaders/CompiledSPV/Headers/Shadowvertspv.hpp b/Lumos/Assets/Shaders/CompiledSPV/Headers/Shadowvertspv.hpp
diff --git a/Lumos/Assets/Shaders/CompiledSPV/Headers/Textfragspv.hpp b/Lumos/Assets/Shaders/CompiledSPV/Headers/Textfragspv.hpp
@@ -5,7 +5,7 @@
 
 constexpr uint32_t spirv_Textfragspv_size = 8708;
 constexpr std::array<uint32_t, 2177> spirv_Textfragspv = {
-    0x07230203, 0x00010000, 0x000D000B, 0x00000184, 0x00000000, 0x00020011, 0x00000001, 0x00020011, 
+    0x07230203, 0x00010000, 0x000D000A, 0x00000184, 0x00000000, 0x00020011, 0x00000001, 0x00020011, 
 0x00000032, 0x0006000B, 0x00000001, 0x4C534C47, 0x6474732E, 0x3035342E, 0x00000000, 0x0003000E, 
 0x00000000, 0x00000001, 0x0007000F, 0x00000004, 0x00000004, 0x6E69616D, 0x00000000, 0x0000003F, 
 0x00000182, 0x00030010, 0x00000004, 0x00000007, 0x00030003, 0x00000002, 0x000001C2, 0x00090004, 

diff --git a/Lumos/Assets/Shaders/CompiledSPV/Shadow.frag.spv b/Lumos/Assets/Shaders/CompiledSPV/Shadow.frag.spv
diff --git a/Lumos/Assets/Shaders/CompiledSPV/Shadow.vert.spv b/Lumos/Assets/Shaders/CompiledSPV/Shadow.vert.spv
diff --git a/Lumos/Assets/Shaders/CompiledSPV/ShadowAlpha.frag.spv b/Lumos/Assets/Shaders/CompiledSPV/ShadowAlpha.frag.spv
diff --git a/Lumos/Assets/Shaders/CompiledSPV/ShadowAnim.vert.spv b/Lumos/Assets/Shaders/CompiledSPV/ShadowAnim.vert.spv
diff --git a/Lumos/Assets/Shaders/CompiledSPV/Text.frag.spv b/Lumos/Assets/Shaders/CompiledSPV/Text.frag.spv
diff --git a/Lumos/Assets/Shaders/PBRResources.glslh b/Lumos/Assets/Shaders/PBRResources.glslh
diff --git a/Lumos/Source/Lumos/Platform/Vulkan/VKRenderer.cpp b/Lumos/Source/Lumos/Platform/Vulkan/VKRenderer.cpp
@@ -678,8 +678,7 @@ file.close();
 			//Decrease Pool capcity by 1
 			//Check if capacity is 0
 			//Add to free list if empty
-
-			return false;
+            return false;
 		}
 
         void VKRenderer::ReleaseDescriptorPools()