Port sponza to the new material format

samples/sponza/assets/arch.001.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- This file is auto generated by ImporterMaterial.cpp -->
-<material shaderProgram="shaders/GBufferGeneric.glslp">
-	<mutators>
+<material shaderProgram="shaders/GBufferGeneric.ankiprog">
+	<mutation>
 		<mutator name="DIFFUSE_TEX" value="1"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
 		<mutator name="ROUGHNESS_TEX" value="1"/>
@@ -9,22 +9,18 @@
 		<mutator name="NORMAL_TEX" value="1"/>
 		<mutator name="PARALLAX" value="0"/>
 		<mutator name="EMISSIVE_TEX" value="0"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
 		
 
-		<input shaderInput="diffTex" value="assets/sponza_arch_diff.ankitex"/>
-		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
-		<input shaderInput="roughnessTex" value="assets/sponza_arch_spec.ankitex"/>
-		<input shaderInput="metallic" value="0.000000"/>
-		<input shaderInput="normalTex" value="assets/sponza_arch_ddn.ankitex"/>
-		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
-		<input shaderInput="subsurface" value="0.000000"/>
+		<input shaderVar="u_diffTex" value="assets/sponza_arch_diff.ankitex"/>
+		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderVar="u_roughnessTex" value="assets/sponza_arch_spec.ankitex"/>
+		<input shaderVar="m_metallic" value="0.000000"/>
+		<input shaderVar="u_normalTex" value="assets/sponza_arch_ddn.ankitex"/>
+		<input shaderVar="m_emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderVar="m_subsurface" value="0.000000"/>
 		
 	</inputs>
 </material>

samples/sponza/assets/arch.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- This file is auto generated by ImporterMaterial.cpp -->
-<material shaderProgram="shaders/GBufferGeneric.glslp">
-	<mutators>
+<material shaderProgram="shaders/GBufferGeneric.ankiprog">
+	<mutation>
 		<mutator name="DIFFUSE_TEX" value="1"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
 		<mutator name="ROUGHNESS_TEX" value="1"/>
@@ -9,22 +9,18 @@
 		<mutator name="NORMAL_TEX" value="1"/>
 		<mutator name="PARALLAX" value="0"/>
 		<mutator name="EMISSIVE_TEX" value="0"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
 		
 
-		<input shaderInput="diffTex" value="assets/sponza_arch_diff_tga.ankitex"/>
-		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
-		<input shaderInput="roughnessTex" value="assets/sponza_arch_spec_tga.ankitex"/>
-		<input shaderInput="metallic" value="0.000000"/>
-		<input shaderInput="normalTex" value="assets/sponza_arch_ddn_tga.ankitex"/>
-		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
-		<input shaderInput="subsurface" value="0.000000"/>
+		<input shaderVar="u_diffTex" value="assets/sponza_arch_diff_tga.ankitex"/>
+		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderVar="u_roughnessTex" value="assets/sponza_arch_spec_tga.ankitex"/>
+		<input shaderVar="m_metallic" value="0.000000"/>
+		<input shaderVar="u_normalTex" value="assets/sponza_arch_ddn_tga.ankitex"/>
+		<input shaderVar="m_emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderVar="m_subsurface" value="0.000000"/>
 		
 	</inputs>
 </material>

samples/sponza/assets/bricks.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- This file is auto generated by ImporterMaterial.cpp -->
-<material shaderProgram="shaders/GBufferGeneric.glslp">
-	<mutators>
+<material shaderProgram="shaders/GBufferGeneric.ankiprog">
+	<mutation>
 		<mutator name="DIFFUSE_TEX" value="1"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
 		<mutator name="ROUGHNESS_TEX" value="1"/>
@@ -9,22 +9,18 @@
 		<mutator name="NORMAL_TEX" value="1"/>
 		<mutator name="PARALLAX" value="0"/>
 		<mutator name="EMISSIVE_TEX" value="0"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
 		
 
-		<input shaderInput="diffTex" value="assets/sponza_bricks_a_diff_tga.ankitex"/>
-		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
-		<input shaderInput="roughnessTex" value="assets/sponza_arch_spec_tga.ankitex"/>
-		<input shaderInput="metallic" value="0.000000"/>
-		<input shaderInput="normalTex" value="assets/sponza_bricks_a_ddn_tga.ankitex"/>
-		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
-		<input shaderInput="subsurface" value="0.000000"/>
+		<input shaderVar="u_diffTex" value="assets/sponza_bricks_a_diff_tga.ankitex"/>
+		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderVar="u_roughnessTex" value="assets/sponza_arch_spec_tga.ankitex"/>
+		<input shaderVar="m_metallic" value="0.000000"/>
+		<input shaderVar="u_normalTex" value="assets/sponza_bricks_a_ddn_tga.ankitex"/>
+		<input shaderVar="m_emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderVar="m_subsurface" value="0.000000"/>
 		
 	</inputs>
 </material>

samples/sponza/assets/ceiling.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- This file is auto generated by ImporterMaterial.cpp -->
-<material shaderProgram="shaders/GBufferGeneric.glslp">
-	<mutators>
+<material shaderProgram="shaders/GBufferGeneric.ankiprog">
+	<mutation>
 		<mutator name="DIFFUSE_TEX" value="1"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
 		<mutator name="ROUGHNESS_TEX" value="1"/>
@@ -9,22 +9,18 @@
 		<mutator name="NORMAL_TEX" value="0"/>
 		<mutator name="PARALLAX" value="0"/>
 		<mutator name="EMISSIVE_TEX" value="0"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
 		
 
-		<input shaderInput="diffTex" value="assets/sponza_ceiling_a_diff_tga.ankitex"/>
-		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
-		<input shaderInput="roughnessTex" value="assets/Sponza_Ceiling_roughness_tga.ankitex"/>
-		<input shaderInput="metallic" value="0.000000"/>
+		<input shaderVar="u_diffTex" value="assets/sponza_ceiling_a_diff_tga.ankitex"/>
+		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderVar="u_roughnessTex" value="assets/Sponza_Ceiling_roughness_tga.ankitex"/>
+		<input shaderVar="m_metallic" value="0.000000"/>
 		
-		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
-		<input shaderInput="subsurface" value="0.000000"/>
+		<input shaderVar="m_emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderVar="m_subsurface" value="0.000000"/>
 		
 	</inputs>
 </material>

samples/sponza/assets/chain.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- This file is auto generated by ImporterMaterial.cpp -->
-<material shaderProgram="shaders/GBufferGeneric.glslp">
-	<mutators>
+<material shaderProgram="shaders/GBufferGeneric.ankiprog">
+	<mutation>
 		<mutator name="DIFFUSE_TEX" value="1"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
 		<mutator name="ROUGHNESS_TEX" value="0"/>
@@ -9,22 +9,18 @@
 		<mutator name="NORMAL_TEX" value="0"/>
 		<mutator name="PARALLAX" value="0"/>
 		<mutator name="EMISSIVE_TEX" value="0"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
 		
 
-		<input shaderInput="diffTex" value="assets/chain_texture_tga.ankitex"/>
-		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
-		<input shaderInput="roughness" value="0.500000"/>
-		<input shaderInput="metallic" value="0.000000"/>
+		<input shaderVar="u_diffTex" value="assets/chain_texture_tga.ankitex"/>
+		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderVar="m_roughness" value="0.500000"/>
+		<input shaderVar="m_metallic" value="0.000000"/>
 		
-		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
-		<input shaderInput="subsurface" value="0.000000"/>
+		<input shaderVar="m_emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderVar="m_subsurface" value="0.000000"/>
 		
 	</inputs>
 </material>

samples/sponza/assets/column_a.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- This file is auto generated by ImporterMaterial.cpp -->
-<material shaderProgram="shaders/GBufferGeneric.glslp">
-	<mutators>
+<material shaderProgram="shaders/GBufferGeneric.ankiprog">
+	<mutation>
 		<mutator name="DIFFUSE_TEX" value="1"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
 		<mutator name="ROUGHNESS_TEX" value="1"/>
@@ -9,22 +9,18 @@
 		<mutator name="NORMAL_TEX" value="1"/>
 		<mutator name="PARALLAX" value="0"/>
 		<mutator name="EMISSIVE_TEX" value="0"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
 		
 
-		<input shaderInput="diffTex" value="assets/sponza_column_a_diff_tga.ankitex"/>
-		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
-		<input shaderInput="roughnessTex" value="assets/sponza_column_a_spec_tga.ankitex"/>
-		<input shaderInput="metallic" value="0.000000"/>
-		<input shaderInput="normalTex" value="assets/sponza_column_a_ddn_tga.ankitex"/>
-		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
-		<input shaderInput="subsurface" value="0.000000"/>
+		<input shaderVar="u_diffTex" value="assets/sponza_column_a_diff_tga.ankitex"/>
+		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderVar="u_roughnessTex" value="assets/sponza_column_a_spec_tga.ankitex"/>
+		<input shaderVar="m_metallic" value="0.000000"/>
+		<input shaderVar="u_normalTex" value="assets/sponza_column_a_ddn_tga.ankitex"/>
+		<input shaderVar="m_emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderVar="m_subsurface" value="0.000000"/>
 		
 	</inputs>
 </material>

samples/sponza/assets/column_b.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- This file is auto generated by ImporterMaterial.cpp -->
-<material shaderProgram="shaders/GBufferGeneric.glslp">
-	<mutators>
+<material shaderProgram="shaders/GBufferGeneric.ankiprog">
+	<mutation>
 		<mutator name="DIFFUSE_TEX" value="1"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
 		<mutator name="ROUGHNESS_TEX" value="1"/>
@@ -9,22 +9,18 @@
 		<mutator name="NORMAL_TEX" value="1"/>
 		<mutator name="PARALLAX" value="0"/>
 		<mutator name="EMISSIVE_TEX" value="0"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
 		
 
-		<input shaderInput="diffTex" value="assets/sponza_column_b_diff_tga.ankitex"/>
-		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
-		<input shaderInput="roughnessTex" value="assets/Sponza_Column_b_roughness_tga.ankitex"/>
-		<input shaderInput="metallic" value="0.000000"/>
-		<input shaderInput="normalTex" value="assets/sponza_column_b_ddn_tga.ankitex"/>
-		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
-		<input shaderInput="subsurface" value="0.000000"/>
+		<input shaderVar="u_diffTex" value="assets/sponza_column_b_diff_tga.ankitex"/>
+		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderVar="u_roughnessTex" value="assets/Sponza_Column_b_roughness_tga.ankitex"/>
+		<input shaderVar="m_metallic" value="0.000000"/>
+		<input shaderVar="u_normalTex" value="assets/sponza_column_b_ddn_tga.ankitex"/>
+		<input shaderVar="m_emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderVar="m_subsurface" value="0.000000"/>
 		
 	</inputs>
 </material>

samples/sponza/assets/column_c.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- This file is auto generated by ImporterMaterial.cpp -->
-<material shaderProgram="shaders/GBufferGeneric.glslp">
-	<mutators>
+<material shaderProgram="shaders/GBufferGeneric.ankiprog">
+	<mutation>
 		<mutator name="DIFFUSE_TEX" value="1"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
 		<mutator name="ROUGHNESS_TEX" value="1"/>
@@ -9,22 +9,18 @@
 		<mutator name="NORMAL_TEX" value="1"/>
 		<mutator name="PARALLAX" value="0"/>
 		<mutator name="EMISSIVE_TEX" value="0"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
 		
 
-		<input shaderInput="diffTex" value="assets/sponza_column_c_diff_tga.ankitex"/>
-		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
-		<input shaderInput="roughnessTex" value="assets/Sponza_Column_c_roughness_tga.ankitex"/>
-		<input shaderInput="metallic" value="0.000000"/>
-		<input shaderInput="normalTex" value="assets/sponza_column_c_ddn_tga.ankitex"/>
-		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
-		<input shaderInput="subsurface" value="0.000000"/>
+		<input shaderVar="u_diffTex" value="assets/sponza_column_c_diff_tga.ankitex"/>
+		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderVar="u_roughnessTex" value="assets/Sponza_Column_c_roughness_tga.ankitex"/>
+		<input shaderVar="m_metallic" value="0.000000"/>
+		<input shaderVar="u_normalTex" value="assets/sponza_column_c_ddn_tga.ankitex"/>
+		<input shaderVar="m_emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderVar="m_subsurface" value="0.000000"/>
 		
 	</inputs>
 </material>

samples/sponza/assets/details.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- This file is auto generated by ImporterMaterial.cpp -->
-<material shaderProgram="shaders/GBufferGeneric.glslp">
-	<mutators>
+<material shaderProgram="shaders/GBufferGeneric.ankiprog">
+	<mutation>
 		<mutator name="DIFFUSE_TEX" value="1"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
 		<mutator name="ROUGHNESS_TEX" value="1"/>
@@ -9,22 +9,18 @@
 		<mutator name="NORMAL_TEX" value="1"/>
 		<mutator name="PARALLAX" value="0"/>
 		<mutator name="EMISSIVE_TEX" value="0"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
 		
 
-		<input shaderInput="diffTex" value="assets/sponza_details_diff.ankitex"/>
-		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
-		<input shaderInput="roughnessTex" value="assets/Sponza_Details_metallic-Sponza_Details_roughness.ankitex"/>
-		<input shaderInput="metallicTex" value="assets/Sponza_Details_metallic-Sponza_Details_roughness.ankitex"/>
-		<input shaderInput="normalTex" value="assets/Sponza_Details_normal.ankitex"/>
-		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
-		<input shaderInput="subsurface" value="0.000000"/>
+		<input shaderVar="u_diffTex" value="assets/sponza_details_diff.ankitex"/>
+		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderVar="u_roughnessTex" value="assets/Sponza_Details_metallic-Sponza_Details_roughness.ankitex"/>
+		<input shaderVar="u_metallicTex" value="assets/Sponza_Details_metallic-Sponza_Details_roughness.ankitex"/>
+		<input shaderVar="u_normalTex" value="assets/Sponza_Details_normal.ankitex"/>
+		<input shaderVar="m_emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderVar="m_subsurface" value="0.000000"/>
 		
 	</inputs>
 </material>

samples/sponza/assets/fabric_a.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- This file is auto generated by ImporterMaterial.cpp -->
-<material shaderProgram="shaders/GBufferGeneric.glslp">
-	<mutators>
+<material shaderProgram="shaders/GBufferGeneric.ankiprog">
+	<mutation>
 		<mutator name="DIFFUSE_TEX" value="1"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
 		<mutator name="ROUGHNESS_TEX" value="1"/>
@@ -9,22 +9,18 @@
 		<mutator name="NORMAL_TEX" value="1"/>
 		<mutator name="PARALLAX" value="0"/>
 		<mutator name="EMISSIVE_TEX" value="0"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
 		
 
-		<input shaderInput="diffTex" value="assets/sponza_fabric_blue_diff.ankitex"/>
-		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
-		<input shaderInput="roughnessTex" value="assets/Sponza_Fabric_metallic-Sponza_Curtain_roughness.ankitex"/>
-		<input shaderInput="metallicTex" value="assets/Sponza_Fabric_metallic-Sponza_Curtain_roughness.ankitex"/>
-		<input shaderInput="normalTex" value="assets/Sponza_Curtain_Red_normal.ankitex"/>
-		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
-		<input shaderInput="subsurface" value="0.100000"/>
+		<input shaderVar="u_diffTex" value="assets/sponza_fabric_blue_diff.ankitex"/>
+		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderVar="u_roughnessTex" value="assets/Sponza_Fabric_metallic-Sponza_Curtain_roughness.ankitex"/>
+		<input shaderVar="u_metallicTex" value="assets/Sponza_Fabric_metallic-Sponza_Curtain_roughness.ankitex"/>
+		<input shaderVar="u_normalTex" value="assets/Sponza_Curtain_Red_normal.ankitex"/>
+		<input shaderVar="m_emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderVar="m_subsurface" value="0.100000"/>
 		
 	</inputs>
 </material>

samples/sponza/assets/fabric_c.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- This file is auto generated by ImporterMaterial.cpp -->
-<material shaderProgram="shaders/GBufferGeneric.glslp">
-	<mutators>
+<material shaderProgram="shaders/GBufferGeneric.ankiprog">
+	<mutation>
 		<mutator name="DIFFUSE_TEX" value="1"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
 		<mutator name="ROUGHNESS_TEX" value="1"/>
@@ -9,22 +9,18 @@
 		<mutator name="NORMAL_TEX" value="1"/>
 		<mutator name="PARALLAX" value="0"/>
 		<mutator name="EMISSIVE_TEX" value="0"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
 		
 
-		<input shaderInput="diffTex" value="assets/sponza_fabric_green_diff.ankitex"/>
-		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
-		<input shaderInput="roughnessTex" value="assets/Sponza_Fabric_metallic-Sponza_Curtain_roughness.ankitex"/>
-		<input shaderInput="metallicTex" value="assets/Sponza_Fabric_metallic-Sponza_Curtain_roughness.ankitex"/>
-		<input shaderInput="normalTex" value="assets/Sponza_Curtain_Red_normal.ankitex"/>
-		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
-		<input shaderInput="subsurface" value="0.250000"/>
+		<input shaderVar="u_diffTex" value="assets/sponza_fabric_green_diff.ankitex"/>
+		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderVar="u_roughnessTex" value="assets/Sponza_Fabric_metallic-Sponza_Curtain_roughness.ankitex"/>
+		<input shaderVar="u_metallicTex" value="assets/Sponza_Fabric_metallic-Sponza_Curtain_roughness.ankitex"/>
+		<input shaderVar="u_normalTex" value="assets/Sponza_Curtain_Red_normal.ankitex"/>
+		<input shaderVar="m_emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderVar="m_subsurface" value="0.250000"/>
 		
 	</inputs>
 </material>

samples/sponza/assets/fabric_d.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- This file is auto generated by ImporterMaterial.cpp -->
-<material shaderProgram="shaders/GBufferGeneric.glslp">
-	<mutators>
+<material shaderProgram="shaders/GBufferGeneric.ankiprog">
+	<mutation>
 		<mutator name="DIFFUSE_TEX" value="1"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
 		<mutator name="ROUGHNESS_TEX" value="1"/>
@@ -9,22 +9,18 @@
 		<mutator name="NORMAL_TEX" value="1"/>
 		<mutator name="PARALLAX" value="0"/>
 		<mutator name="EMISSIVE_TEX" value="0"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
 		
 
-		<input shaderInput="diffTex" value="assets/sponza_fabric_diff.ankitex"/>
-		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
-		<input shaderInput="roughnessTex" value="assets/Sponza_Fabric_metallic-Sponza_Curtain_roughness.ankitex"/>
-		<input shaderInput="metallicTex" value="assets/Sponza_Fabric_metallic-Sponza_Curtain_roughness.ankitex"/>
-		<input shaderInput="normalTex" value="assets/Sponza_Curtain_Red_normal.ankitex"/>
-		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
-		<input shaderInput="subsurface" value="0.100000"/>
+		<input shaderVar="u_diffTex" value="assets/sponza_fabric_diff.ankitex"/>
+		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderVar="u_roughnessTex" value="assets/Sponza_Fabric_metallic-Sponza_Curtain_roughness.ankitex"/>
+		<input shaderVar="u_metallicTex" value="assets/Sponza_Fabric_metallic-Sponza_Curtain_roughness.ankitex"/>
+		<input shaderVar="u_normalTex" value="assets/Sponza_Curtain_Red_normal.ankitex"/>
+		<input shaderVar="m_emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderVar="m_subsurface" value="0.100000"/>
 		
 	</inputs>
 </material>

samples/sponza/assets/fabric_e.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- This file is auto generated by ImporterMaterial.cpp -->
-<material shaderProgram="shaders/GBufferGeneric.glslp">
-	<mutators>
+<material shaderProgram="shaders/GBufferGeneric.ankiprog">
+	<mutation>
 		<mutator name="DIFFUSE_TEX" value="1"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
 		<mutator name="ROUGHNESS_TEX" value="1"/>
@@ -9,22 +9,18 @@
 		<mutator name="NORMAL_TEX" value="1"/>
 		<mutator name="PARALLAX" value="0"/>
 		<mutator name="EMISSIVE_TEX" value="0"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
 		
 
-		<input shaderInput="diffTex" value="assets/sponza_fabric_green_diff.ankitex"/>
-		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
-		<input shaderInput="roughnessTex" value="assets/Sponza_Fabric_metallic-Sponza_Curtain_roughness.ankitex"/>
-		<input shaderInput="metallicTex" value="assets/Sponza_Fabric_metallic-Sponza_Curtain_roughness.ankitex"/>
-		<input shaderInput="normalTex" value="assets/Sponza_Curtain_Red_normal.ankitex"/>
-		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
-		<input shaderInput="subsurface" value="0.100000"/>
+		<input shaderVar="u_diffTex" value="assets/sponza_fabric_green_diff.ankitex"/>
+		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderVar="u_roughnessTex" value="assets/Sponza_Fabric_metallic-Sponza_Curtain_roughness.ankitex"/>
+		<input shaderVar="u_metallicTex" value="assets/Sponza_Fabric_metallic-Sponza_Curtain_roughness.ankitex"/>
+		<input shaderVar="u_normalTex" value="assets/Sponza_Curtain_Red_normal.ankitex"/>
+		<input shaderVar="m_emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderVar="m_subsurface" value="0.100000"/>
 		
 	</inputs>
 </material>

samples/sponza/assets/fabric_f.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- This file is auto generated by ImporterMaterial.cpp -->
-<material shaderProgram="shaders/GBufferGeneric.glslp">
-	<mutators>
+<material shaderProgram="shaders/GBufferGeneric.ankiprog">
+	<mutation>
 		<mutator name="DIFFUSE_TEX" value="1"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
 		<mutator name="ROUGHNESS_TEX" value="1"/>
@@ -9,22 +9,18 @@
 		<mutator name="NORMAL_TEX" value="1"/>
 		<mutator name="PARALLAX" value="0"/>
 		<mutator name="EMISSIVE_TEX" value="0"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
 		
 
-		<input shaderInput="diffTex" value="assets/sponza_curtain_green_diff_tga.ankitex"/>
-		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
-		<input shaderInput="roughnessTex" value="assets/Sponza_Curtain_roughness_tga_001.ankitex"/>
-		<input shaderInput="metallic" value="0.000000"/>
-		<input shaderInput="normalTex" value="assets/Sponza_Curtain_Red_normal_tga_001.ankitex"/>
-		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
-		<input shaderInput="subsurface" value="0.250000"/>
+		<input shaderVar="u_diffTex" value="assets/sponza_curtain_green_diff_tga.ankitex"/>
+		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderVar="u_roughnessTex" value="assets/Sponza_Curtain_roughness_tga_001.ankitex"/>
+		<input shaderVar="m_metallic" value="0.000000"/>
+		<input shaderVar="u_normalTex" value="assets/Sponza_Curtain_Red_normal_tga_001.ankitex"/>
+		<input shaderVar="m_emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderVar="m_subsurface" value="0.250000"/>
 		
 	</inputs>
 </material>

samples/sponza/assets/fire.ankimtl

@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<material shaderProgram="shaders/ForwardShadingParticles.glslp" forwardShading="1" shadow="0">
-	<mutators>
+<material shaderProgram="shaders/ForwardShadingParticles.ankiprog" forwardShading="1" shadow="0">
+	<mutation>
 		<mutator name="ANIMATED_TEXTURE" value="0"/>
 		<mutator name="LIGHT" value="0"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="cameraRotMat" builtin="CAMERA_ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
-
-		<input shaderInput="diffuseMap" value="assets/ember_mid.ankitex"/>
-		<input shaderInput="colorScale" value="3 3 3 1.0"/>
-		<input shaderInput="colorBias" value="0 0 0 0"/>
+		<input shaderVar="u_diffuseMap" value="assets/ember_mid.ankitex"/>
+		<input shaderVar="m_colorScale" value="3 3 3 1.0"/>
+		<input shaderVar="m_colorBias" value="0 0 0 0"/>
 	</inputs>
 </material>
 

samples/sponza/assets/flagpole.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- This file is auto generated by ImporterMaterial.cpp -->
-<material shaderProgram="shaders/GBufferGeneric.glslp">
-	<mutators>
+<material shaderProgram="shaders/GBufferGeneric.ankiprog">
+	<mutation>
 		<mutator name="DIFFUSE_TEX" value="1"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
 		<mutator name="ROUGHNESS_TEX" value="1"/>
@@ -9,22 +9,18 @@
 		<mutator name="NORMAL_TEX" value="1"/>
 		<mutator name="PARALLAX" value="0"/>
 		<mutator name="EMISSIVE_TEX" value="0"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
 		
 
-		<input shaderInput="diffTex" value="assets/sponza_flagpole_diff.ankitex"/>
-		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
-		<input shaderInput="roughnessTex" value="assets/Sponza_FlagPole_roughness.ankitex"/>
-		<input shaderInput="metallic" value="0.000000"/>
-		<input shaderInput="normalTex" value="assets/Sponza_FlagPole_normal.ankitex"/>
-		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
-		<input shaderInput="subsurface" value="0.000000"/>
+		<input shaderVar="u_diffTex" value="assets/sponza_flagpole_diff.ankitex"/>
+		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderVar="u_roughnessTex" value="assets/Sponza_FlagPole_roughness.ankitex"/>
+		<input shaderVar="m_metallic" value="0.000000"/>
+		<input shaderVar="u_normalTex" value="assets/Sponza_FlagPole_normal.ankitex"/>
+		<input shaderVar="m_emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderVar="m_subsurface" value="0.000000"/>
 		
 	</inputs>
 </material>

samples/sponza/assets/floor.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- This file is auto generated by ImporterMaterial.cpp -->
-<material shaderProgram="shaders/GBufferGeneric.glslp">
-	<mutators>
+<material shaderProgram="shaders/GBufferGeneric.ankiprog">
+	<mutation>
 		<mutator name="DIFFUSE_TEX" value="1"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
 		<mutator name="ROUGHNESS_TEX" value="1"/>
@@ -9,22 +9,18 @@
 		<mutator name="NORMAL_TEX" value="1"/>
 		<mutator name="PARALLAX" value="0"/>
 		<mutator name="EMISSIVE_TEX" value="0"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
 		
 
-		<input shaderInput="diffTex" value="assets/sponza_floor_a_diff.ankitex"/>
-		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
-		<input shaderInput="roughnessTex" value="assets/Sponza_Floor_roughness.ankitex"/>
-		<input shaderInput="metallic" value="0.000000"/>
-		<input shaderInput="normalTex" value="assets/Sponza_Floor_normal.ankitex"/>
-		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
-		<input shaderInput="subsurface" value="0.000000"/>
+		<input shaderVar="u_diffTex" value="assets/sponza_floor_a_diff.ankitex"/>
+		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderVar="u_roughnessTex" value="assets/Sponza_Floor_roughness.ankitex"/>
+		<input shaderVar="m_metallic" value="0.000000"/>
+		<input shaderVar="u_normalTex" value="assets/Sponza_Floor_normal.ankitex"/>
+		<input shaderVar="m_emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderVar="m_subsurface" value="0.000000"/>
 		
 	</inputs>
 </material>

samples/sponza/assets/leaf.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- This file is auto generated by ImporterMaterial.cpp -->
-<material shaderProgram="shaders/GBufferGeneric.glslp">
-	<mutators>
+<material shaderProgram="shaders/GBufferGeneric.ankiprog">
+	<mutation>
 		<mutator name="DIFFUSE_TEX" value="1"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
 		<mutator name="ROUGHNESS_TEX" value="1"/>
@@ -9,22 +9,18 @@
 		<mutator name="NORMAL_TEX" value="1"/>
 		<mutator name="PARALLAX" value="0"/>
 		<mutator name="EMISSIVE_TEX" value="0"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
 		
 
-		<input shaderInput="diffTex" value="assets/sponza_thorn_diff.ankitex"/>
-		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
-		<input shaderInput="roughnessTex" value="assets/Sponza_Thorn_roughness.ankitex"/>
-		<input shaderInput="metallic" value="0.000000"/>
-		<input shaderInput="normalTex" value="assets/sponza_thorn_ddn.ankitex"/>
-		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
-		<input shaderInput="subsurface" value="0.100000"/>
+		<input shaderVar="u_diffTex" value="assets/sponza_thorn_diff.ankitex"/>
+		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderVar="u_roughnessTex" value="assets/Sponza_Thorn_roughness.ankitex"/>
+		<input shaderVar="m_metallic" value="0.000000"/>
+		<input shaderVar="u_normalTex" value="assets/sponza_thorn_ddn.ankitex"/>
+		<input shaderVar="m_emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderVar="m_subsurface" value="0.100000"/>
 		
 	</inputs>
 </material>

samples/sponza/assets/lion.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- This file is auto generated by ImporterMaterial.cpp -->
-<material shaderProgram="shaders/GBufferGeneric.glslp">
-	<mutators>
+<material shaderProgram="shaders/GBufferGeneric.ankiprog">
+	<mutation>
 		<mutator name="DIFFUSE_TEX" value="1"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
 		<mutator name="ROUGHNESS_TEX" value="1"/>
@@ -9,22 +9,18 @@
 		<mutator name="NORMAL_TEX" value="1"/>
 		<mutator name="PARALLAX" value="0"/>
 		<mutator name="EMISSIVE_TEX" value="0"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
 		
 
-		<input shaderInput="diffTex" value="assets/lion.ankitex"/>
-		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
-		<input shaderInput="roughnessTex" value="assets/Lion_Roughness.ankitex"/>
-		<input shaderInput="metallic" value="0.000000"/>
-		<input shaderInput="normalTex" value="assets/lion_ddn.ankitex"/>
-		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
-		<input shaderInput="subsurface" value="0.000000"/>
+		<input shaderVar="u_diffTex" value="assets/lion.ankitex"/>
+		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderVar="u_roughnessTex" value="assets/Lion_Roughness.ankitex"/>
+		<input shaderVar="m_metallic" value="0.000000"/>
+		<input shaderVar="u_normalTex" value="assets/lion_ddn.ankitex"/>
+		<input shaderVar="m_emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderVar="m_subsurface" value="0.000000"/>
 		
 	</inputs>
 </material>

samples/sponza/assets/lion_stand.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- This file is auto generated by ImporterMaterial.cpp -->
-<material shaderProgram="shaders/GBufferGeneric.glslp">
-	<mutators>
+<material shaderProgram="shaders/GBufferGeneric.ankiprog">
+	<mutation>
 		<mutator name="DIFFUSE_TEX" value="1"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
 		<mutator name="ROUGHNESS_TEX" value="1"/>
@@ -9,22 +9,18 @@
 		<mutator name="NORMAL_TEX" value="1"/>
 		<mutator name="PARALLAX" value="0"/>
 		<mutator name="EMISSIVE_TEX" value="0"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
 		
 
-		<input shaderInput="diffTex" value="assets/background.ankitex"/>
-		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
-		<input shaderInput="roughnessTex" value="assets/Background_Roughness.ankitex"/>
-		<input shaderInput="metallic" value="0.000000"/>
-		<input shaderInput="normalTex" value="assets/background_ddn.ankitex"/>
-		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
-		<input shaderInput="subsurface" value="0.000000"/>
+		<input shaderVar="u_diffTex" value="assets/background.ankitex"/>
+		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderVar="u_roughnessTex" value="assets/Background_Roughness.ankitex"/>
+		<input shaderVar="m_metallic" value="0.000000"/>
+		<input shaderVar="u_normalTex" value="assets/background_ddn.ankitex"/>
+		<input shaderVar="m_emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderVar="m_subsurface" value="0.000000"/>
 		
 	</inputs>
 </material>

samples/sponza/assets/roof.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- This file is auto generated by ImporterMaterial.cpp -->
-<material shaderProgram="shaders/GBufferGeneric.glslp">
-	<mutators>
+<material shaderProgram="shaders/GBufferGeneric.ankiprog">
+	<mutation>
 		<mutator name="DIFFUSE_TEX" value="1"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
 		<mutator name="ROUGHNESS_TEX" value="1"/>
@@ -9,22 +9,18 @@
 		<mutator name="NORMAL_TEX" value="1"/>
 		<mutator name="PARALLAX" value="0"/>
 		<mutator name="EMISSIVE_TEX" value="0"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
 		
 
-		<input shaderInput="diffTex" value="assets/sponza_roof_diff.ankitex"/>
-		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
-		<input shaderInput="roughnessTex" value="assets/Sponza_Roof_roughness.ankitex"/>
-		<input shaderInput="metallic" value="0.000000"/>
-		<input shaderInput="normalTex" value="assets/Sponza_Roof_normal.ankitex"/>
-		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
-		<input shaderInput="subsurface" value="0.000000"/>
+		<input shaderVar="u_diffTex" value="assets/sponza_roof_diff.ankitex"/>
+		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderVar="u_roughnessTex" value="assets/Sponza_Roof_roughness.ankitex"/>
+		<input shaderVar="m_metallic" value="0.000000"/>
+		<input shaderVar="u_normalTex" value="assets/Sponza_Roof_normal.ankitex"/>
+		<input shaderVar="m_emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderVar="m_subsurface" value="0.000000"/>
 		
 	</inputs>
 </material>

samples/sponza/assets/scene.lua

@@ -173,6 +173,9 @@ lcomp = node:getSceneNodeBase():getLightComponent()
 lcomp:setDiffuseColor(Vec4.new(20.007532, 8.208058, 5.410148, 1))
 lcomp:setShadowEnabled(1)
 lcomp:setRadius(3.000000)
+event = events:newLightEvent(0.0, -1.0, node:getSceneNodeBase())
+event:setIntensityMultiplier(Vec4.new(1.200000, 1.300000, 1.300000, 0.000000))
+event:setFrequency(2.000000, 0.020000)
 trf = Transform.new()
 trf:setOrigin(Vec4.new(-10.783357, 2.494228, -3.841534, 0))
 rot = Mat3x4.new()
@@ -186,6 +189,9 @@ lcomp = node:getSceneNodeBase():getLightComponent()
 lcomp:setDiffuseColor(Vec4.new(20.007532, 8.208058, 5.410148, 1))
 lcomp:setShadowEnabled(1)
 lcomp:setRadius(3.000000)
+event = events:newLightEvent(0.0, -1.0, node:getSceneNodeBase())
+event:setIntensityMultiplier(Vec4.new(1.200000, 1.300000, 1.300000, 0.000000))
+event:setFrequency(2.000000, 0.020000)
 trf = Transform.new()
 trf:setOrigin(Vec4.new(-10.783357, 2.494228, 2.518101, 0))
 rot = Mat3x4.new()
@@ -199,6 +205,9 @@ lcomp = node:getSceneNodeBase():getLightComponent()
 lcomp:setDiffuseColor(Vec4.new(20.007532, 8.208058, 5.410148, 1))
 lcomp:setShadowEnabled(1)
 lcomp:setRadius(3.000000)
+event = events:newLightEvent(0.0, -1.0, node:getSceneNodeBase())
+event:setIntensityMultiplier(Vec4.new(1.200000, 1.300000, 1.300000, 0.000000))
+event:setFrequency(2.000000, 0.020000)
 trf = Transform.new()
 trf:setOrigin(Vec4.new(8.546165, 2.494228, 2.518101, 0))
 rot = Mat3x4.new()
@@ -212,6 +221,9 @@ lcomp = node:getSceneNodeBase():getLightComponent()
 lcomp:setDiffuseColor(Vec4.new(20.007532, 8.208058, 5.410148, 1))
 lcomp:setShadowEnabled(1)
 lcomp:setRadius(3.000000)
+event = events:newLightEvent(0.0, -1.0, node:getSceneNodeBase())
+event:setIntensityMultiplier(Vec4.new(1.200000, 1.300000, 1.300000, 0.000000))
+event:setFrequency(2.000000, 0.020000)
 trf = Transform.new()
 trf:setOrigin(Vec4.new(8.546165, 2.494228, -3.830497, 0))
 rot = Mat3x4.new()

samples/sponza/assets/sky.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- This file is auto generated by ImporterMaterial.cpp -->
-<material shaderProgram="shaders/GBufferGeneric.glslp">
-	<mutators>
+<material shaderProgram="shaders/GBufferGeneric.ankiprog">
+	<mutation>
 		<mutator name="DIFFUSE_TEX" value="0"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
 		<mutator name="ROUGHNESS_TEX" value="0"/>
@@ -9,22 +9,18 @@
 		<mutator name="NORMAL_TEX" value="0"/>
 		<mutator name="PARALLAX" value="0"/>
 		<mutator name="EMISSIVE_TEX" value="0"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
 		
 
-		<input shaderInput="diffColor" value="0.352369 0.517735 0.800000"/>
-		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
-		<input shaderInput="roughness" value="0.500000"/>
-		<input shaderInput="metallic" value="0.000000"/>
+		<input shaderVar="m_diffColor" value="0.352369 0.517735 0.800000"/>
+		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderVar="m_roughness" value="0.500000"/>
+		<input shaderVar="m_metallic" value="0.000000"/>
 		
-		<input shaderInput="emission" value="10.000000 10.000000 10.000000"/>
-		<input shaderInput="subsurface" value="0.000000"/>
+		<input shaderVar="m_emission" value="1.000000 1.000000 1.000000"/>
+		<input shaderVar="m_subsurface" value="0.000000"/>
 		
 	</inputs>
 </material>

samples/sponza/assets/smoke.ankimtl

@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<material shaderProgram="shaders/ForwardShadingParticles.glslp" forwardShading="1" shadow="0">
-	<mutators>
+<material shaderProgram="shaders/ForwardShadingParticles.ankiprog" forwardShading="1" shadow="0">
+	<mutation>
 		<mutator name="ANIMATED_TEXTURE" value="0"/>
 		<mutator name="LIGHT" value="1"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="cameraRotMat" builtin="CAMERA_ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
-
-		<input shaderInput="diffuseMap" value="assets/smoke.ankitex"/>
-		<input shaderInput="colorScale" value="1.0 1.0 1.0 1.0"/>
-		<input shaderInput="colorBias" value="0 0 0 0"/>
+		<input shaderVar="u_diffuseMap" value="assets/smoke.ankitex"/>
+		<input shaderVar="m_colorScale" value="1.0 1.0 1.0 1.0"/>
+		<input shaderVar="m_colorBias" value="0 0 0 0"/>
 	</inputs>
 </material>
 

samples/sponza/assets/vase.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- This file is auto generated by ImporterMaterial.cpp -->
-<material shaderProgram="shaders/GBufferGeneric.glslp">
-	<mutators>
+<material shaderProgram="shaders/GBufferGeneric.ankiprog">
+	<mutation>
 		<mutator name="DIFFUSE_TEX" value="1"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
 		<mutator name="ROUGHNESS_TEX" value="1"/>
@@ -9,22 +9,18 @@
 		<mutator name="NORMAL_TEX" value="1"/>
 		<mutator name="PARALLAX" value="0"/>
 		<mutator name="EMISSIVE_TEX" value="0"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
 		
 
-		<input shaderInput="diffTex" value="assets/vase_dif.ankitex"/>
-		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
-		<input shaderInput="roughnessTex" value="assets/Vase_roughness.ankitex"/>
-		<input shaderInput="metallic" value="0.000000"/>
-		<input shaderInput="normalTex" value="assets/vase_ddn.ankitex"/>
-		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
-		<input shaderInput="subsurface" value="0.000000"/>
+		<input shaderVar="u_diffTex" value="assets/vase_dif.ankitex"/>
+		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderVar="u_roughnessTex" value="assets/Vase_roughness.ankitex"/>
+		<input shaderVar="m_metallic" value="0.000000"/>
+		<input shaderVar="u_normalTex" value="assets/vase_ddn.ankitex"/>
+		<input shaderVar="m_emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderVar="m_subsurface" value="0.000000"/>
 		
 	</inputs>
 </material>

samples/sponza/assets/vase_fl.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- This file is auto generated by ImporterMaterial.cpp -->
-<material shaderProgram="shaders/GBufferGeneric.glslp">
-	<mutators>
+<material shaderProgram="shaders/GBufferGeneric.ankiprog">
+	<mutation>
 		<mutator name="DIFFUSE_TEX" value="1"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
 		<mutator name="ROUGHNESS_TEX" value="1"/>
@@ -9,22 +9,18 @@
 		<mutator name="NORMAL_TEX" value="1"/>
 		<mutator name="PARALLAX" value="0"/>
 		<mutator name="EMISSIVE_TEX" value="0"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
 		
 
-		<input shaderInput="diffTex" value="assets/vase_plant_tga.ankitex"/>
-		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
-		<input shaderInput="roughnessTex" value="assets/VaseRound_roughness.ankitex"/>
-		<input shaderInput="metallic" value="0.000000"/>
-		<input shaderInput="normalTex" value="assets/VasePlant_normal.ankitex"/>
-		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
-		<input shaderInput="subsurface" value="0.250000"/>
+		<input shaderVar="u_diffTex" value="assets/vase_plant_tga.ankitex"/>
+		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderVar="u_roughnessTex" value="assets/VaseRound_roughness.ankitex"/>
+		<input shaderVar="m_metallic" value="0.000000"/>
+		<input shaderVar="u_normalTex" value="assets/VasePlant_normal.ankitex"/>
+		<input shaderVar="m_emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderVar="m_subsurface" value="0.250000"/>
 		
 	</inputs>
 </material>

samples/sponza/assets/vase_hanging.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- This file is auto generated by ImporterMaterial.cpp -->
-<material shaderProgram="shaders/GBufferGeneric.glslp">
-	<mutators>
+<material shaderProgram="shaders/GBufferGeneric.ankiprog">
+	<mutation>
 		<mutator name="DIFFUSE_TEX" value="1"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
 		<mutator name="ROUGHNESS_TEX" value="1"/>
@@ -9,22 +9,18 @@
 		<mutator name="NORMAL_TEX" value="1"/>
 		<mutator name="PARALLAX" value="0"/>
 		<mutator name="EMISSIVE_TEX" value="0"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
 		
 
-		<input shaderInput="diffTex" value="assets/vase_hanging_tga.ankitex"/>
-		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
-		<input shaderInput="roughnessTex" value="assets/VaseHanging_roughness_tga.ankitex"/>
-		<input shaderInput="metallic" value="0.000000"/>
-		<input shaderInput="normalTex" value="assets/VaseHanging_normal_tga.ankitex"/>
-		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
-		<input shaderInput="subsurface" value="0.000000"/>
+		<input shaderVar="u_diffTex" value="assets/vase_hanging_tga.ankitex"/>
+		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderVar="u_roughnessTex" value="assets/VaseHanging_roughness_tga.ankitex"/>
+		<input shaderVar="m_metallic" value="0.000000"/>
+		<input shaderVar="u_normalTex" value="assets/VaseHanging_normal_tga.ankitex"/>
+		<input shaderVar="m_emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderVar="m_subsurface" value="0.000000"/>
 		
 	</inputs>
 </material>

samples/sponza/assets/vase_round.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- This file is auto generated by ImporterMaterial.cpp -->
-<material shaderProgram="shaders/GBufferGeneric.glslp">
-	<mutators>
+<material shaderProgram="shaders/GBufferGeneric.ankiprog">
+	<mutation>
 		<mutator name="DIFFUSE_TEX" value="1"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
 		<mutator name="ROUGHNESS_TEX" value="1"/>
@@ -9,22 +9,18 @@
 		<mutator name="NORMAL_TEX" value="1"/>
 		<mutator name="PARALLAX" value="0"/>
 		<mutator name="EMISSIVE_TEX" value="0"/>
-	</mutators>
+	</mutation>
 
 	<inputs>
-		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
-		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
-		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
 		
 
-		<input shaderInput="diffTex" value="assets/vase_round_tga.ankitex"/>
-		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
-		<input shaderInput="roughnessTex" value="assets/VaseRound_roughness.ankitex"/>
-		<input shaderInput="metallic" value="0.000000"/>
-		<input shaderInput="normalTex" value="assets/VaseRound_normal.ankitex"/>
-		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
-		<input shaderInput="subsurface" value="0.000000"/>
+		<input shaderVar="u_diffTex" value="assets/vase_round_tga.ankitex"/>
+		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderVar="u_roughnessTex" value="assets/VaseRound_roughness.ankitex"/>
+		<input shaderVar="m_metallic" value="0.000000"/>
+		<input shaderVar="u_normalTex" value="assets/VaseRound_normal.ankitex"/>
+		<input shaderVar="m_emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderVar="m_subsurface" value="0.000000"/>
 		
 	</inputs>
 </material>

shaders/ForwardShadingFog.ankiprog

@@ -12,7 +12,7 @@ struct PerDraw
 	F32 m_fogDistanceOfMaxThikness;
 };
 
-layout(set = 1, binding = 0) uniform b_ankiMaterial
+layout(set = 1, binding = 0, row_major) uniform b_ankiMaterial
 {
 	PerDraw u_ankiPerDraw;
 };

shaders/ForwardShadingParticles.ankiprog

@@ -17,7 +17,7 @@ struct PerDraw
 	Vec4 m_colorBias;
 };
 
-layout(set = 1, binding = 0) uniform b_ankiMaterial
+layout(set = 1, binding = 0, row_major) uniform b_ankiMaterial
 {
 	PerDraw u_ankiPerDraw;
 };

src/anki/importer/GltfImporter.cpp

@@ -154,8 +154,14 @@ GltfImporter::~GltfImporter()
 	m_alloc.deleteInstance(m_hive);
 }
 
-Error GltfImporter::init(
-	CString inputFname, CString outDir, CString rpath, CString texrpath, Bool optimizeMeshes, U32 threadCount)
+Error GltfImporter::init(CString inputFname,
+	CString outDir,
+	CString rpath,
+	CString texrpath,
+	Bool optimizeMeshes,
+	F32 lodFactor,
+	U32 lodCount,
+	U32 threadCount)
 {
 	m_inputFname.create(inputFname);
 	m_outDir.create(outDir);
@@ -163,18 +169,34 @@ Error GltfImporter::init(
 	m_texrpath.create(texrpath);
 	m_optimizeMeshes = optimizeMeshes;
 
+	m_lodCount = clamp(lodCount, 1u, 3u);
+	m_lodFactor = clamp(lodFactor, 0.0f, 1.0f);
+	if(m_lodFactor * F32(m_lodCount - 1) > 0.7f)
+	{
+		ANKI_GLTF_LOGE("LOD factor is too high %f", m_lodFactor);
+		return Error::USER_DATA;
+	}
+
+	if(m_lodFactor < EPSILON || lodCount == 1)
+	{
+		m_lodCount = 1;
+		m_lodFactor = 0.0f;
+	}
+
+	ANKI_GLTF_LOGI("Having %u LODs with LOD factor %f", m_lodCount, m_lodFactor);
+
 	cgltf_options options = {};
 	cgltf_result res = cgltf_parse_file(&options, inputFname.cstr(), &m_gltf);
 	if(res != cgltf_result_success)
 	{
-		ANKI_LOGE("Failed to open the GLTF file. Code: %d", res);
+		ANKI_GLTF_LOGE("Failed to open the GLTF file. Code: %d", res);
 		return Error::FUNCTION_FAILED;
 	}
 
 	res = cgltf_load_buffers(&options, m_gltf, inputFname.cstr());
 	if(res != cgltf_result_success)
 	{
-		ANKI_LOGE("Failed to load GLTF data. Code: %d", res);
+		ANKI_GLTF_LOGE("Failed to load GLTF data. Code: %d", res);
 		return Error::FUNCTION_FAILED;
 	}
 
@@ -603,12 +625,16 @@ Error GltfImporter::visitNode(
 				cgltf_material* m_mtl;
 				cgltf_skin* m_skin;
 				Bool m_selfCollision;
+				U32 m_lodCount;
+				F32 m_lodFactor;
 			};
 			Ctx* ctx = m_alloc.newInstance<Ctx>();
 			ctx->m_importer = this;
 			ctx->m_mesh = node.mesh;
 			ctx->m_mtl = node.mesh->primitives[0].material;
 			ctx->m_skin = node.skin;
+			ctx->m_lodCount = m_lodCount;
+			ctx->m_lodFactor = m_lodFactor;
 
 			HashMapAuto<CString, StringAuto>::Iterator it2;
 			const Bool selfCollision = (it2 = extras.find("collision_mesh")) != extras.getEnd() && *it2 == "self";
@@ -618,22 +644,23 @@ Error GltfImporter::visitNode(
 			auto callback = [](void* userData, U32 threadId, ThreadHive& hive, ThreadHiveSemaphore* signalSemaphore) {
 				Ctx& self = *static_cast<Ctx*>(userData);
 
+				// LOD 0
 				Error err = self.m_importer->writeMesh(*self.m_mesh, CString(), 1.0f);
 
 				// LOD 1
-				if(!err)
+				if(!err && self.m_lodCount > 1)
 				{
 					StringAuto name(self.m_importer->m_alloc);
 					name.sprintf("%s_lod1", self.m_mesh->name);
-					err = self.m_importer->writeMesh(*self.m_mesh, name, 0.66f);
+					err = self.m_importer->writeMesh(*self.m_mesh, name, 1.0f - self.m_lodFactor);
 				}
 
 				// LOD 2
-				if(!err)
+				if(!err && self.m_lodCount > 2)
 				{
 					StringAuto name(self.m_importer->m_alloc);
 					name.sprintf("%s_lod2", self.m_mesh->name);
-					err = self.m_importer->writeMesh(*self.m_mesh, name, 0.33f);
+					err = self.m_importer->writeMesh(*self.m_mesh, name, 1.0f - self.m_lodFactor * 2.0f);
 				}
 
 				if(!err)
@@ -758,12 +785,14 @@ Error GltfImporter::writeModel(const cgltf_mesh& mesh, CString skinName)
 
 	ANKI_CHECK(file.writeText("\t\t\t<mesh>%s%s.ankimesh</mesh>\n", m_rpath.cstr(), mesh.name));
 
+	if(m_lodCount > 1)
 	{
 		StringAuto name(m_alloc);
 		name.sprintf("%s_lod1", mesh.name);
 		ANKI_CHECK(file.writeText("\t\t\t<mesh1>%s%s.ankimesh</mesh1>\n", m_rpath.cstr(), name.cstr()));
 	}
 
+	if(m_lodCount > 2)
 	{
 		StringAuto name(m_alloc);
 		name.sprintf("%s_lod2", mesh.name);

src/anki/importer/GltfImporter.h

@@ -35,6 +35,8 @@ public:
 		CString rpath,
 		CString texrpath,
 		Bool optimizeMeshes,
+		F32 lodFactor,
+		U32 lodCount,
 		U32 threadCount = MAX_U32);
 
 	ANKI_USE_RESULT Error writeAll();
@@ -71,6 +73,8 @@ private:
 
 	HashMapAuto<const void*, U32, PtrHasher> m_nodePtrToIdx{m_alloc}; ///< Need an index for the unnamed nodes.
 
+	F32 m_lodFactor = 1.0f;
+	U32 m_lodCount = 1;
 	Bool m_optimizeMeshes = false;
 
 	// Misc

src/anki/importer/GltfImporterMesh.cpp

@@ -269,7 +269,10 @@ Error GltfImporter::writeMesh(const cgltf_mesh& mesh, CString nameOverride, F32
 {
 	StringAuto fname(m_alloc);
 	fname.sprintf("%s%s.ankimesh", m_outDir.cstr(), (nameOverride.isEmpty()) ? mesh.name : nameOverride.cstr());
-	ANKI_GLTF_LOGI("Importing mesh%s%s", (m_optimizeMeshes) ? " (will also optimize) " : " ", fname.cstr());
+	ANKI_GLTF_LOGI("Importing mesh (%s, decimate factor %f): %s",
+		(m_optimizeMeshes) ? "optimze" : "WON'T optimize",
+		decimateFactor,
+		fname.cstr());
 
 	ListAuto<SubMesh> submeshes(m_alloc);
 	U32 totalIndexCount = 0;
@@ -509,7 +512,14 @@ Error GltfImporter::writeMesh(const cgltf_mesh& mesh, CString nameOverride, F32
 				const Vec3& n = submesh.m_verts[i].m_normal;
 				Vec3& b = bitangents[i];
 
-				t.normalize();
+				if(t.getLengthSquared() < EPSILON)
+				{
+					t = Vec3(1.0f, 0.0f, 0.0f); // Something random
+				}
+				else
+				{
+					t.normalize();
+				}
 
 				if(b.getLengthSquared() < EPSILON)
 				{

src/anki/resource/MaterialResource2.cpp

@@ -59,7 +59,7 @@ static ANKI_USE_RESULT Error checkBuiltin(
 				return Error::USER_DATA;
 			}
 
-			if(BUILTIN_INFOS[id].m_instanced != instanced)
+			if(instanced && !BUILTIN_INFOS[id].m_instanced)
 			{
 				ANKI_RESOURCE_LOGE("Variable %s be instanced: %s",
 					(BUILTIN_INFOS[id].m_instanced) ? "should" : "shouldn't",

tools/gltf_importer/Main.cpp

@@ -13,6 +13,8 @@ Options:
 -texrpath <string>     : Same as rpath but for textures
 -optimize-meshes <0|1> : Optimize meshes. Default is 1
 -j <thread_count>      : Number of threads. Defaults to system's max
+-lod-count <1|2|3>     : The number of geometry LODs to generate. Default: 1
+-lod-factor            : The decimate factor for each LOD. Default 0.25
 )";
 
 class CmdLineArgs
@@ -25,6 +27,8 @@ public:
 	StringAuto m_texRpath = {m_alloc};
 	Bool m_optimizeMeshes = true;
 	U32 m_threadCount = MAX_U32;
+	U32 m_lodCount = 1;
+	F32 m_lodFactor = 0.25f;
 };
 
 static Error parseCommandLineArgs(int argc, char** argv, CmdLineArgs& info)
@@ -115,6 +119,32 @@ static Error parseCommandLineArgs(int argc, char** argv, CmdLineArgs& info)
 				return Error::USER_DATA;
 			}
 		}
+		else if(strcmp(argv[i], "-lod-count") == 0)
+		{
+			++i;
+
+			if(i < argc)
+			{
+				ANKI_CHECK(CString(argv[i]).toNumber(info.m_lodCount));
+			}
+			else
+			{
+				return Error::USER_DATA;
+			}
+		}
+		else if(strcmp(argv[i], "-lod-factor") == 0)
+		{
+			++i;
+
+			if(i < argc)
+			{
+				ANKI_CHECK(CString(argv[i]).toNumber(info.m_lodFactor));
+			}
+			else
+			{
+				return Error::USER_DATA;
+			}
+		}
 		else
 		{
 			return Error::USER_DATA;
@@ -150,6 +180,8 @@ int main(int argc, char** argv)
 		   info.m_rpath.toCString(),
 		   info.m_texRpath.toCString(),
 		   info.m_optimizeMeshes,
+		   info.m_lodFactor,
+		   info.m_lodCount,
 		   info.m_threadCount))
 	{
 		return 1;