浏览代码

Update materials again

Panagiotis Christopoulos Charitos 3 年之前
父节点
当前提交
299b70038a
共有 47 个文件被更改,包括 95 次插入92 次删除
  1. 2 2
      AnKi/Importer/GltfImporterMaterial.cpp
  2. 7 4
      AnKi/Resource/MaterialResource.cpp
  3. 1 1
      AnKi/Resource/MaterialResource.h
  4. 1 1
      Samples/PhysicsPlayground/Assets/GpuSparks.ankimtl
  5. 2 2
      Samples/PhysicsPlayground/Assets/dynamic_f238b379a41079ff.ankimtl
  6. 2 2
      Samples/PhysicsPlayground/Assets/walls.001_2469a4d42c8d129c.ankimtl
  7. 2 2
      Samples/PhysicsPlayground/Assets/walls_9619132fa258d22d.ankimtl
  8. 2 2
      Samples/SimpleScene/Assets/backWall_361f28d87a6738d3.ankimtl
  9. 2 2
      Samples/SimpleScene/Assets/ceiling_3fd94cde277a48e1.ankimtl
  10. 2 2
      Samples/SimpleScene/Assets/floor_71cbd2644e53ab8c.ankimtl
  11. 2 2
      Samples/SimpleScene/Assets/leftWall_fe97b196ed148fca.ankimtl
  12. 2 2
      Samples/SimpleScene/Assets/light_1544a10dffc35038.ankimtl
  13. 2 2
      Samples/SimpleScene/Assets/rightWall_d627c19b8205864.ankimtl
  14. 2 2
      Samples/SimpleScene/Assets/shortBox_122467965d493dab.ankimtl
  15. 2 2
      Samples/SimpleScene/Assets/tallBox_15316a0c94bdf7f6.ankimtl
  16. 2 2
      Samples/SkeletalAnimation/Assets/Robot.001_851820527fac54db.ankimtl
  17. 2 2
      Samples/SkeletalAnimation/Assets/Robot_a9af3c46eb28a7d4.ankimtl
  18. 2 2
      Samples/SkeletalAnimation/Assets/room.blue_21e71ba855d95ca2.ankimtl
  19. 2 2
      Samples/SkeletalAnimation/Assets/room.green_c7dc339831ac73a2.ankimtl
  20. 2 2
      Samples/SkeletalAnimation/Assets/room.red_4176c8682cee36ac.ankimtl
  21. 2 2
      Samples/SkeletalAnimation/Assets/room_bb0180d3054a4db3.ankimtl
  22. 1 1
      Samples/Sponza/Assets/Fire.ankimtl
  23. 1 1
      Samples/Sponza/Assets/Smoke.ankimtl
  24. 2 2
      Samples/Sponza/Assets/arch.001_efebbb2a6f84fff0.ankimtl
  25. 2 2
      Samples/Sponza/Assets/arch_e0c8c7e29c806284.ankimtl
  26. 2 2
      Samples/Sponza/Assets/bricks_8bd6f24aa0ad3654.ankimtl
  27. 2 2
      Samples/Sponza/Assets/ceiling_3fd94cde277a48e1.ankimtl
  28. 2 2
      Samples/Sponza/Assets/chain_33ef478b87fe7c15.ankimtl
  29. 2 2
      Samples/Sponza/Assets/column_a_1e1bacae3460b88.ankimtl
  30. 2 2
      Samples/Sponza/Assets/column_b_c9391d56bff59fc3.ankimtl
  31. 2 2
      Samples/Sponza/Assets/column_c_43f866fc7b9f0169.ankimtl
  32. 2 2
      Samples/Sponza/Assets/details_4242afc5fc479920.ankimtl
  33. 2 2
      Samples/Sponza/Assets/fabric_a_945c29fc221550fb.ankimtl
  34. 2 2
      Samples/Sponza/Assets/fabric_c_c8bf70dee411d1bd.ankimtl
  35. 2 2
      Samples/Sponza/Assets/fabric_d_8ff4aebb25bf20b0.ankimtl
  36. 2 2
      Samples/Sponza/Assets/fabric_e_d1c5a44841c48230.ankimtl
  37. 2 2
      Samples/Sponza/Assets/fabric_f_d54bbaca38ed4391.ankimtl
  38. 2 2
      Samples/Sponza/Assets/flagpole_6c7e0eb8dd33b39e.ankimtl
  39. 2 2
      Samples/Sponza/Assets/floor_71cbd2644e53ab8c.ankimtl
  40. 2 2
      Samples/Sponza/Assets/leaf_3a245efd17475037.ankimtl
  41. 2 2
      Samples/Sponza/Assets/lion_c45d3035db3bc17b.ankimtl
  42. 2 2
      Samples/Sponza/Assets/lion_stand_ab5e3642131ad971.ankimtl
  43. 2 2
      Samples/Sponza/Assets/roof_4359bd4e3b26845.ankimtl
  44. 2 2
      Samples/Sponza/Assets/vase_45c3983f6cc9c489.ankimtl
  45. 2 2
      Samples/Sponza/Assets/vase_fl_580cea687de3d758.ankimtl
  46. 2 2
      Samples/Sponza/Assets/vase_hanging_c2d2b40b27cacd7d.ankimtl
  47. 2 2
      Samples/Sponza/Assets/vase_round_71af81a1ac0a7c3e.ankimtl

+ 2 - 2
AnKi/Importer/GltfImporterMaterial.cpp

@@ -12,7 +12,7 @@ namespace anki {
 const char* MATERIAL_TEMPLATE = R"(<!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/GBufferGeneric.ankiprogbin">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="%diffTexMutator%"/>
 				<mutator name="SPECULAR_TEX" value="%specTexMutator%"/>
@@ -42,7 +42,7 @@ const char* MATERIAL_TEMPLATE = R"(<!-- This file is auto generated by ImporterM
 )";
 
 const char* RT_MATERIAL_TEMPLATE = R"(
-		<shaderProgram filename="ShaderBinaries/RtShadowsHit.ankiprogbin">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 7 - 4
AnKi/Resource/MaterialResource.cpp

@@ -207,16 +207,19 @@ Error MaterialResource::load(const ResourceFilename& filename, Bool async)
 
 Error MaterialResource::parseShaderProgram(XmlElement shaderProgramEl, Bool async)
 {
-	// filename
-	CString fname;
-	ANKI_CHECK(shaderProgramEl.getAttributeText("filename", fname));
+	// name
+	CString shaderName;
+	ANKI_CHECK(shaderProgramEl.getAttributeText("name", shaderName));
 
-	if(fname.find("/Rt") != CString::NPOS && !getManager().getGrManager().getDeviceCapabilities().m_rayTracingEnabled)
+	if(!getManager().getGrManager().getDeviceCapabilities().m_rayTracingEnabled && shaderName.find("Rt") == 0)
 	{
 		// Skip RT programs when RT is disabled
 		return Error::NONE;
 	}
 
+	StringAuto fname(getTempAllocator());
+	fname.sprintf("ShaderBinaries/%s.ankiprogbin", shaderName.cstr());
+
 	Program& prog = *m_programs.emplaceBack(getAllocator());
 	ANKI_CHECK(getManager().loadResource(fname, prog.m_prog, async));
 

+ 1 - 1
AnKi/Resource/MaterialResource.h

@@ -197,7 +197,7 @@ private:
 /// @code
 ///	<material [shadows="0|1"]>
 /// 	<shaderPrograms>
-///			<shaderProgram filename="filename">
+///			<shaderProgram name="name of the shader">
 ///				[<mutation>
 ///					<mutator name="str" value="value"/>
 ///				</mutation>]

+ 1 - 1
Samples/PhysicsPlayground/Assets/GpuSparks.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <material shadow="0">
 	<shaderPrograms>
-		<shaderProgram filename="Anki/Shaders/GBufferGpuParticles.ankiprog"/>
+		<shaderProgram name="GBufferGpuParticles"/>
 	</shaderPrograms>
 
 	<inputs>

+ 2 - 2
Samples/PhysicsPlayground/Assets/dynamic_f238b379a41079ff.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="AnKi/Shaders/GBufferGeneric.ankiprog">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="0"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="AnKi/Shaders/RtShadowsHit.ankiprog">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/PhysicsPlayground/Assets/walls.001_2469a4d42c8d129c.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="AnKi/Shaders/GBufferGeneric.ankiprog">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="AnKi/Shaders/RtShadowsHit.ankiprog">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/PhysicsPlayground/Assets/walls_9619132fa258d22d.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="AnKi/Shaders/GBufferGeneric.ankiprog">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="AnKi/Shaders/RtShadowsHit.ankiprog">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/SimpleScene/Assets/backWall_361f28d87a6738d3.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="AnKi/Shaders/GBufferGeneric.ankiprog">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="0"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="AnKi/Shaders/RtShadowsHit.ankiprog">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/SimpleScene/Assets/ceiling_3fd94cde277a48e1.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="AnKi/Shaders/GBufferGeneric.ankiprog">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="0"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="AnKi/Shaders/RtShadowsHit.ankiprog">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/SimpleScene/Assets/floor_71cbd2644e53ab8c.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="AnKi/Shaders/GBufferGeneric.ankiprog">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="0"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="AnKi/Shaders/RtShadowsHit.ankiprog">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/SimpleScene/Assets/leftWall_fe97b196ed148fca.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="AnKi/Shaders/GBufferGeneric.ankiprog">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="0"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="AnKi/Shaders/RtShadowsHit.ankiprog">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/SimpleScene/Assets/light_1544a10dffc35038.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="AnKi/Shaders/GBufferGeneric.ankiprog">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="0"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="AnKi/Shaders/RtShadowsHit.ankiprog">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/SimpleScene/Assets/rightWall_d627c19b8205864.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="AnKi/Shaders/GBufferGeneric.ankiprog">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="0"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="AnKi/Shaders/RtShadowsHit.ankiprog">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/SimpleScene/Assets/shortBox_122467965d493dab.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="AnKi/Shaders/GBufferGeneric.ankiprog">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="0"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="AnKi/Shaders/RtShadowsHit.ankiprog">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/SimpleScene/Assets/tallBox_15316a0c94bdf7f6.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="AnKi/Shaders/GBufferGeneric.ankiprog">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="0"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="AnKi/Shaders/RtShadowsHit.ankiprog">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/SkeletalAnimation/Assets/Robot.001_851820527fac54db.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="AnKi/Shaders/GBufferGeneric.ankiprog">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="AnKi/Shaders/RtShadowsHit.ankiprog">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/SkeletalAnimation/Assets/Robot_a9af3c46eb28a7d4.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="AnKi/Shaders/GBufferGeneric.ankiprog">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="0"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="AnKi/Shaders/RtShadowsHit.ankiprog">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/SkeletalAnimation/Assets/room.blue_21e71ba855d95ca2.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="AnKi/Shaders/GBufferGeneric.ankiprog">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="0"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="AnKi/Shaders/RtShadowsHit.ankiprog">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/SkeletalAnimation/Assets/room.green_c7dc339831ac73a2.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="AnKi/Shaders/GBufferGeneric.ankiprog">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="0"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="AnKi/Shaders/RtShadowsHit.ankiprog">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/SkeletalAnimation/Assets/room.red_4176c8682cee36ac.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="AnKi/Shaders/GBufferGeneric.ankiprog">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="0"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="AnKi/Shaders/RtShadowsHit.ankiprog">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/SkeletalAnimation/Assets/room_bb0180d3054a4db3.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="AnKi/Shaders/GBufferGeneric.ankiprog">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="0"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="AnKi/Shaders/RtShadowsHit.ankiprog">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 1 - 1
Samples/Sponza/Assets/Fire.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <material shadow="0">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/ForwardShadingParticles.ankiprogbin">
+		<shaderProgram name="ForwardShadingParticles">
 			<mutation>
 				<mutator name="ANIMATED_TEXTURE" value="0"/>
 				<mutator name="LIGHT" value="0"/>

+ 1 - 1
Samples/Sponza/Assets/Smoke.ankimtl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <material shadow="0">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/ForwardShadingParticles.ankiprogbin">
+		<shaderProgram name="ForwardShadingParticles">
 			<mutation>
 				<mutator name="ANIMATED_TEXTURE" value="0"/>
 				<mutator name="LIGHT" value="1"/>

+ 2 - 2
Samples/Sponza/Assets/arch.001_efebbb2a6f84fff0.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/GBufferGeneric.ankiprogbin">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="ShaderBinaries/RtShadowsHit.ankiprogbin">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/Sponza/Assets/arch_e0c8c7e29c806284.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/GBufferGeneric.ankiprogbin">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="ShaderBinaries/RtShadowsHit.ankiprogbin">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/Sponza/Assets/bricks_8bd6f24aa0ad3654.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/GBufferGeneric.ankiprogbin">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="ShaderBinaries/RtShadowsHit.ankiprogbin">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/Sponza/Assets/ceiling_3fd94cde277a48e1.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/GBufferGeneric.ankiprogbin">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="ShaderBinaries/RtShadowsHit.ankiprogbin">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/Sponza/Assets/chain_33ef478b87fe7c15.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/GBufferGeneric.ankiprogbin">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="ShaderBinaries/RtShadowsHit.ankiprogbin">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/Sponza/Assets/column_a_1e1bacae3460b88.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/GBufferGeneric.ankiprogbin">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="ShaderBinaries/RtShadowsHit.ankiprogbin">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/Sponza/Assets/column_b_c9391d56bff59fc3.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/GBufferGeneric.ankiprogbin">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="ShaderBinaries/RtShadowsHit.ankiprogbin">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/Sponza/Assets/column_c_43f866fc7b9f0169.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/GBufferGeneric.ankiprogbin">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="ShaderBinaries/RtShadowsHit.ankiprogbin">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/Sponza/Assets/details_4242afc5fc479920.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/GBufferGeneric.ankiprogbin">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="ShaderBinaries/RtShadowsHit.ankiprogbin">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/Sponza/Assets/fabric_a_945c29fc221550fb.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/GBufferGeneric.ankiprogbin">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="ShaderBinaries/RtShadowsHit.ankiprogbin">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/Sponza/Assets/fabric_c_c8bf70dee411d1bd.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/GBufferGeneric.ankiprogbin">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="ShaderBinaries/RtShadowsHit.ankiprogbin">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/Sponza/Assets/fabric_d_8ff4aebb25bf20b0.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/GBufferGeneric.ankiprogbin">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="ShaderBinaries/RtShadowsHit.ankiprogbin">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/Sponza/Assets/fabric_e_d1c5a44841c48230.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/GBufferGeneric.ankiprogbin">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="ShaderBinaries/RtShadowsHit.ankiprogbin">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/Sponza/Assets/fabric_f_d54bbaca38ed4391.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/GBufferGeneric.ankiprogbin">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="ShaderBinaries/RtShadowsHit.ankiprogbin">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/Sponza/Assets/flagpole_6c7e0eb8dd33b39e.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/GBufferGeneric.ankiprogbin">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="ShaderBinaries/RtShadowsHit.ankiprogbin">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/Sponza/Assets/floor_71cbd2644e53ab8c.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/GBufferGeneric.ankiprogbin">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="ShaderBinaries/RtShadowsHit.ankiprogbin">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/Sponza/Assets/leaf_3a245efd17475037.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/GBufferGeneric.ankiprogbin">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="ShaderBinaries/RtShadowsHit.ankiprogbin">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/Sponza/Assets/lion_c45d3035db3bc17b.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/GBufferGeneric.ankiprogbin">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="ShaderBinaries/RtShadowsHit.ankiprogbin">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/Sponza/Assets/lion_stand_ab5e3642131ad971.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/GBufferGeneric.ankiprogbin">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="ShaderBinaries/RtShadowsHit.ankiprogbin">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/Sponza/Assets/roof_4359bd4e3b26845.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/GBufferGeneric.ankiprogbin">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="ShaderBinaries/RtShadowsHit.ankiprogbin">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/Sponza/Assets/vase_45c3983f6cc9c489.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/GBufferGeneric.ankiprogbin">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="ShaderBinaries/RtShadowsHit.ankiprogbin">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/Sponza/Assets/vase_fl_580cea687de3d758.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/GBufferGeneric.ankiprogbin">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="ShaderBinaries/RtShadowsHit.ankiprogbin">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/Sponza/Assets/vase_hanging_c2d2b40b27cacd7d.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/GBufferGeneric.ankiprogbin">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="ShaderBinaries/RtShadowsHit.ankiprogbin">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>

+ 2 - 2
Samples/Sponza/Assets/vase_round_71af81a1ac0a7c3e.ankimtl

@@ -2,7 +2,7 @@
 <!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shadows="1">
 	<shaderPrograms>
-		<shaderProgram filename="ShaderBinaries/GBufferGeneric.ankiprogbin">
+		<shaderProgram name="GBufferGeneric">
 			<mutation>
 				<mutator name="DIFFUSE_TEX" value="1"/>
 				<mutator name="SPECULAR_TEX" value="0"/>
@@ -15,7 +15,7 @@
 			</mutation>
 		</shaderProgram>
 		
-		<shaderProgram filename="ShaderBinaries/RtShadowsHit.ankiprogbin">
+		<shaderProgram name="RtShadowsHit">
 			<mutation>
 				<mutator name="ALPHA_TEXTURE" value="0"/>
 			</mutation>