Metal fixes

armory3d · Sep 16, 2024 · 8947a4e · 8947a4e
1 parent b4ffc80
commit 8947a4e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/base/sources/context.ts b/base/sources/context.ts
@@ -46,11 +46,7 @@ type context_t = {
 	///if (arm_direct3d12 || arm_vulkan || arm_metal)
 	pathtrace_mode?: path_trace_mode_t;
 	///end
-	///if (arm_direct3d12 || arm_vulkan) // || arm_metal)
 	viewport_mode?: viewport_mode_t;
-	///else
-	viewport_mode?: viewport_mode_t;
-	///end
 	///if (arm_android || arm_ios)
 	render_mode?: render_mode_t;
 	///else
@@ -334,7 +330,7 @@ function context_create(): context_t {
 	///if (arm_direct3d12 || arm_vulkan || arm_metal)
 	c.pathtrace_mode = path_trace_mode_t.CORE;
 	///end
-	///if (arm_direct3d12 || arm_vulkan) // || arm_metal)
+	///if (arm_direct3d12 || arm_vulkan)
 	c.viewport_mode = viewport_mode_t.PATH_TRACE;
 	///else
 	c.viewport_mode = viewport_mode_t.LIT;

diff --git a/base/sources/enums.ts b/base/sources/enums.ts
@@ -55,14 +55,14 @@ enum viewport_mode_t {
 	METALLIC = 5,
 	OPACITY = 6,
 	HEIGHT = 7,
-	PATH_TRACE = 8,
-	EMISSION = 9,
-	SUBSURFACE = 10,
-	TEXCOORD = 11,
-	OBJECT_NORMAL = 12,
-	MATERIAL_ID = 13,
-	OBJECT_ID = 14,
-	MASK = 15,
+	EMISSION = 8,
+	SUBSURFACE = 9,
+	TEXCOORD = 10,
+	OBJECT_NORMAL = 11,
+	MATERIAL_ID = 12,
+	OBJECT_ID = 13,
+	MASK = 14,
+	PATH_TRACE = 15,
 }
 
 enum channel_type_t {

diff --git a/base/sources/render_path_deferred.ts b/base/sources/render_path_deferred.ts
@@ -47,7 +47,7 @@ function render_path_deferred_init() {
 		t.name = "buf";
 		t.width = 0;
 		t.height = 0;
-		///if (arm_direct3d12 || arm_vulkan)// || arm_metal)
+		///if (arm_direct3d12 || arm_vulkan)
 		// Match raytrace_target format
 		// Will cause "The render target format in slot 0 does not match that specified by the current pipeline state"
 		t.format = "RGBA64";