fix: some shader and glb loading and memory stuff

MrTroble · Apr 21, 2024 · 7676f67 · 7676f67
1 parent 7e9ae8c
commit 7676f67
Show file tree

Hide file tree

Showing 10 changed files with 2,800 additions and 2,759 deletions.
diff --git a/TGEngine/assets/lightPass.vert b/TGEngine/assets/lightPass.vert
@@ -5,8 +5,6 @@
 	"codes": [
 		{
 			"code": [
-				"#version 450",
-				"#extension GL_KHR_vulkan_glsl: enable",
 				"out gl_PerVertex {",
 				"   vec4 gl_Position;",
 				"};",

diff --git a/TGEngine/assets/test.frag b/TGEngine/assets/test.frag
@@ -6,7 +6,14 @@
 		{
 			"code": [
 				"#version 460",
-				"",
+				"struct ValueSystem {",
+				"   mat4 model;",
+				"   mat4 normalModel;",
+				"   vec4 color;",
+				"   vec4 padding[7];",
+				"};",
+				"layout(binding=2) uniform _system { ValueSystem values; } system;",
+
 				"layout(location=0) out vec4 COLOR;",
 				"layout(location=1) out vec4 NORMAL;",
 				"layout(location=2) out float ROUGHNESS;",

diff --git a/TGEngine/assets/testvec4.vert b/TGEngine/assets/testvec4.vert
@@ -6,6 +6,17 @@
 		{
 			"code": [
 				"#version 460",
+				"struct ValueSystem {",
+				"   mat4 model;",
+				"   mat4 normalModel;",
+				"   vec4 color;",
+				"   vec4 padding[7];",
+				"};",
+				"layout(binding=2) uniform _system { ValueSystem values; } system;",
+				"layout(binding=3) uniform PROJ {",
+				"   mat4 proj;",
+				"} proj;",
+
 				"layout(location=0) in vec4 inpos;",
 				"out gl_PerVertex {",
 				"   vec4 gl_Position;",