diff --git a/src/Common/Game/T6/T6_Assets.h b/src/Common/Game/T6/T6_Assets.h index 4bab9c89..2ee51b42 100644 --- a/src/Common/Game/T6/T6_Assets.h +++ b/src/Common/Game/T6/T6_Assets.h @@ -5760,9 +5760,13 @@ namespace T6 STREAM_SRC_TEXCOORD_0 = 0x2, STREAM_SRC_NORMAL = 0x3, STREAM_SRC_TANGENT = 0x4, - STREAM_SRC_TEXCOORD_1 = 0x5, - STREAM_SRC_OPTIONAL_BEGIN = 0x6, + STREAM_SRC_PRE_OPTIONAL_BEGIN = 0x5, + + STREAM_SRC_TEXCOORD_1 = 0x5, + + STREAM_SRC_OPTIONAL_BEGIN = 0x6, + STREAM_SRC_TEXCOORD_2 = 0x6, STREAM_SRC_TEXCOORD_3 = 0x7, STREAM_SRC_NORMAL_TRANSFORM_0 = 0x8, diff --git a/src/ObjWriting/Game/T6/Material/MaterialConstantZoneStateT6.cpp b/src/ObjWriting/Game/T6/Material/MaterialConstantZoneStateT6.cpp index caf9d8b3..cc140b4a 100644 --- a/src/ObjWriting/Game/T6/Material/MaterialConstantZoneStateT6.cpp +++ b/src/ObjWriting/Game/T6/Material/MaterialConstantZoneStateT6.cpp @@ -409,6 +409,7 @@ namespace "colorMap", "colorMap1", "colorMap2", + "colorMap3", "colorMap2D", "colorMapPostSun", "colorMapPostSunSampler", diff --git a/test/ObjCompilingTests/Game/T6/Techset/TechniqueCompilerT6Test.cpp b/test/ObjCompilingTests/Game/T6/Techset/TechniqueCompilerT6Test.cpp new file mode 100644 index 00000000..64459b88 --- /dev/null +++ b/test/ObjCompilingTests/Game/T6/Techset/TechniqueCompilerT6Test.cpp @@ -0,0 +1,328 @@ +#include "Game/T6/Techset/TechniqueCompilerT6.h" + +#include "Game/T6/T6.h" +#include "Game/T6/Techset/PixelShaderLoaderT6.h" +#include "Game/T6/Techset/VertexDeclCompilerT6.h" +#include "Game/T6/Techset/VertexShaderLoaderT6.h" +#include "OatTestPaths.h" +#include "SearchPath/MockSearchPath.h" +#include "Shader/ShaderCommon.h" +#include "Utils/MemoryManager.h" + +#include +#include +#include +#include + +using namespace T6; +using namespace Catch; +using namespace std::literals; +namespace fs = std::filesystem; + +namespace +{ + void GivenVertexShaderFile(const std::string& name, MockSearchPath& searchPath) + { + const auto filePath = oat::paths::GetTestDirectory() / "ObjCompilingTests/Game/T6/Techset" / std::format("vs_{}.cso", name); + const auto fileSize = static_cast(fs::file_size(filePath)); + + std::ifstream file(filePath, std::ios::binary); + REQUIRE(file.is_open()); + + std::string data(fileSize, '\0'); + file.read(data.data(), fileSize); + REQUIRE(file.gcount() == static_cast(fileSize)); + + searchPath.AddFileData(shader::GetFileNameForVertexShaderAssetName(name), std::move(data)); + } + + void GivenPixelShaderFile(const std::string& name, MockSearchPath& searchPath) + { + const auto filePath = oat::paths::GetTestDirectory() / "ObjCompilingTests/Game/T6/Techset" / std::format("ps_{}.cso", name); + const auto fileSize = static_cast(fs::file_size(filePath)); + + std::ifstream file(filePath, std::ios::binary); + REQUIRE(file.is_open()); + + std::string data(fileSize, '\0'); + file.read(data.data(), fileSize); + REQUIRE(file.gcount() == static_cast(fileSize)); + + searchPath.AddFileData(shader::GetFileNameForPixelShaderAssetName(name), std::move(data)); + } +} // namespace + +TEST_CASE("TechniqueCompilerT6", "[t6][techset][compiler]") +{ + + Zone zone("MockZone", 0, GameId::T6, GamePlatform::PC); + zone.Register(); + + MemoryManager memory; + AssetCreatorCollection creatorCollection(zone); + IgnoredAssetLookup ignoredAssetLookup; + AssetCreationContext context(zone, &creatorCollection, &ignoredAssetLookup); + MockSearchPath searchPath; + + creatorCollection.AddSubAssetCreator(techset::CreateVertexDeclCompilerT6(memory)); + creatorCollection.AddSubAssetCreator(techset::CreateVertexShaderLoaderT6(memory, searchPath)); + creatorCollection.AddSubAssetCreator(techset::CreatePixelShaderLoaderT6(memory, searchPath)); + + auto loader = techset::CreateTechniqueCompilerT6(memory, searchPath); + + SECTION("Can compile simple technique") + { + searchPath.AddFileData("techniques/example_zprepass.tech", R"TECHNIQUE( +{ + stateMap "passthrough"; + + vertexShader 4.0 "simple.hlsl" + { + } + + pixelShader 4.0 "simple.hlsl" + { + } + + vertex.position = code.position; +} +)TECHNIQUE"); + + GivenVertexShaderFile("simple.hlsl", searchPath); + GivenPixelShaderFile("simple.hlsl", searchPath); + + auto result = loader->CreateSubAsset("example_zprepass", context); + REQUIRE(result.HasBeenSuccessful()); + + const auto* assetInfo = reinterpret_cast*>(result.GetAssetInfo()); + const auto* technique = assetInfo->Asset(); + + CHECK(technique->name == "example_zprepass"s); + CHECK(technique->flags == 0x84); + + REQUIRE(technique->passCount == 1); + auto& pass = technique->passArray[0]; + CHECK(pass.customSamplerFlags == 0); + + // idk + // CHECK(pass.precompiledIndex == VERTEX_SHADER_MODEL_UNLIT); + + // Set from techset + // CHECK(pass.materialType == MTL_TYPE_MODEL_VERTCOL); + + REQUIRE(pass.vertexShader); + CHECK(pass.vertexShader->name == "simple.hlsl"s); + REQUIRE(pass.pixelShader); + CHECK(pass.pixelShader->name == "simple.hlsl"s); + + REQUIRE(pass.vertexDecl); + auto& vertexDecl = *pass.vertexDecl; + CHECK(vertexDecl.hasOptionalSource == false); + CHECK(vertexDecl.isLoaded == false); + REQUIRE(vertexDecl.streamCount == 1); + CHECK(vertexDecl.routing.data[0].source == STREAM_SRC_POSITION); + CHECK(vertexDecl.routing.data[0].dest == STREAM_DST_POSITION); + + REQUIRE(pass.perPrimArgCount == 1); + REQUIRE(pass.perObjArgCount == 1); + REQUIRE(pass.stableArgCount == 0); + CHECK(pass.args[0].type == MTL_ARG_CODE_VERTEX_CONST); + CHECK(pass.args[0].location.offset == 0); + CHECK(pass.args[0].size == 0x40); + CHECK(pass.args[0].buffer == 3); + CHECK(pass.args[0].u.codeConst.index == CONST_SRC_CODE_TRANSPOSE_WORLD_MATRIX); + CHECK(pass.args[0].u.codeConst.firstRow == 0); + CHECK(pass.args[0].u.codeConst.rowCount == 4); + + CHECK(pass.args[1].type == MTL_ARG_CODE_VERTEX_CONST); + CHECK(pass.args[1].location.offset == 0x240); + CHECK(pass.args[1].size == 0x40); + CHECK(pass.args[1].buffer == 0); + CHECK(pass.args[1].u.codeConst.index == CONST_SRC_CODE_TRANSPOSE_VIEW_PROJECTION_MATRIX); + CHECK(pass.args[1].u.codeConst.firstRow == 0); + CHECK(pass.args[1].u.codeConst.rowCount == 4); + } + + SECTION("Can compile advanced technique") + { + searchPath.AddFileData("techniques/example_lit_sun_shadow.tech", R"TECHNIQUE( +{ + stateMap "passthrough"; + + vertexShader 4.0 "advanced.hlsl" + { + } + + pixelShader 4.0 "advanced.hlsl" + { + normalMapSampler = material.normalMap; + normalMapSampler1 = material.normalMap1; + colorMapSampler = material.colorMap; + colorMapSampler1 = material.colorMap1; + colorMapSampler3 = material.colorMap3; + colorMapSampler2 = material.colorMap2; + alphaRevealParms1 = material.alphaRevealParms1; + } + + vertex.position = code.position; + vertex.color[0] = code.color; + vertex.texcoord[0] = code.texcoord[0]; + vertex.normal = code.normal; + vertex.texcoord[2] = code.tangent; + vertex.texcoord[1] = code.texcoord[1]; + vertex.texcoord[3] = code.texcoord[2]; + vertex.texcoord[4] = code.texcoord[3]; + vertex.texcoord[5] = code.normalTransform[0]; +} +)TECHNIQUE"); + + GivenVertexShaderFile("advanced.hlsl", searchPath); + GivenPixelShaderFile("advanced.hlsl", searchPath); + + auto result = loader->CreateSubAsset("example_lit_sun_shadow", context); + REQUIRE(result.HasBeenSuccessful()); + + const auto* assetInfo = reinterpret_cast*>(result.GetAssetInfo()); + const auto* technique = assetInfo->Asset(); + + CHECK(technique->name == "example_lit_sun_shadow"s); + CHECK(technique->flags == 0x88); + + REQUIRE(technique->passCount == 1); + auto& pass = technique->passArray[0]; + CHECK(pass.customSamplerFlags == 3); + + // idk + // CHECK(pass.precompiledIndex == VERTEX_SHADER_NONE); + + // Set from techset + // CHECK(pass.materialType == MTL_TYPE_DEFAULT); + + REQUIRE(pass.vertexShader); + CHECK(pass.vertexShader->name == "advanced.hlsl"s); + REQUIRE(pass.pixelShader); + CHECK(pass.pixelShader->name == "advanced.hlsl"s); + + REQUIRE(pass.vertexDecl); + auto& vertexDecl = *pass.vertexDecl; + CHECK(vertexDecl.hasOptionalSource == true); + CHECK(vertexDecl.isLoaded == false); + REQUIRE(vertexDecl.streamCount == 9); + CHECK(vertexDecl.routing.data[0].source == STREAM_SRC_POSITION); + CHECK(vertexDecl.routing.data[0].dest == STREAM_DST_POSITION); + CHECK(vertexDecl.routing.data[1].source == STREAM_SRC_COLOR); + CHECK(vertexDecl.routing.data[1].dest == STREAM_DST_COLOR_0); + CHECK(vertexDecl.routing.data[2].source == STREAM_SRC_TEXCOORD_0); + CHECK(vertexDecl.routing.data[2].dest == STREAM_DST_TEXCOORD_0); + CHECK(vertexDecl.routing.data[3].source == STREAM_SRC_NORMAL); + CHECK(vertexDecl.routing.data[3].dest == STREAM_DST_NORMAL); + CHECK(vertexDecl.routing.data[4].source == STREAM_SRC_TANGENT); + CHECK(vertexDecl.routing.data[4].dest == STREAM_DST_TEXCOORD_2); + CHECK(vertexDecl.routing.data[5].source == STREAM_SRC_TEXCOORD_1); + CHECK(vertexDecl.routing.data[5].dest == STREAM_DST_TEXCOORD_1); + CHECK(vertexDecl.routing.data[6].source == STREAM_SRC_TEXCOORD_2); + CHECK(vertexDecl.routing.data[6].dest == STREAM_DST_TEXCOORD_3); + CHECK(vertexDecl.routing.data[7].source == STREAM_SRC_TEXCOORD_3); + CHECK(vertexDecl.routing.data[7].dest == STREAM_DST_TEXCOORD_4); + CHECK(vertexDecl.routing.data[8].source == STREAM_SRC_NORMAL_TRANSFORM_0); + CHECK(vertexDecl.routing.data[8].dest == STREAM_DST_TEXCOORD_5); + + REQUIRE(pass.perPrimArgCount == 1); + REQUIRE(pass.perObjArgCount == 1); + REQUIRE(pass.stableArgCount == 11); + CHECK(pass.args[0].type == MTL_ARG_CODE_VERTEX_CONST); + CHECK(pass.args[0].location.offset == 0); + CHECK(pass.args[0].size == 0x40); + CHECK(pass.args[0].buffer == 3); + CHECK(pass.args[0].u.codeConst.index == CONST_SRC_CODE_TRANSPOSE_WORLD_MATRIX); + CHECK(pass.args[0].u.codeConst.firstRow == 0); + CHECK(pass.args[0].u.codeConst.rowCount == 4); + + CHECK(pass.args[1].type == MTL_ARG_CODE_VERTEX_CONST); + CHECK(pass.args[1].location.offset == 0x240); + CHECK(pass.args[1].size == 0x40); + CHECK(pass.args[1].buffer == 0); + CHECK(pass.args[1].u.codeConst.index == CONST_SRC_CODE_TRANSPOSE_VIEW_PROJECTION_MATRIX); + CHECK(pass.args[1].u.codeConst.firstRow == 0); + CHECK(pass.args[1].u.codeConst.rowCount == 4); + + CHECK(pass.args[2].type == MTL_ARG_MATERIAL_PIXEL_SAMPLER); + CHECK(pass.args[2].location.textureIndex == 1); + CHECK(pass.args[2].location.samplerIndex == 1); + CHECK(pass.args[2].size == 1); + CHECK(pass.args[2].buffer == 0); + CHECK(pass.args[2].u.nameHash == 0x59d30d0f); + + CHECK(pass.args[3].type == MTL_ARG_MATERIAL_PIXEL_SAMPLER); + CHECK(pass.args[3].location.textureIndex == 3); + CHECK(pass.args[3].location.samplerIndex == 5); + CHECK(pass.args[3].size == 1); + CHECK(pass.args[3].buffer == 0); + CHECK(pass.args[3].u.nameHash == 0x9434aede); + + CHECK(pass.args[4].type == MTL_ARG_MATERIAL_PIXEL_SAMPLER); + CHECK(pass.args[4].location.textureIndex == 0); + CHECK(pass.args[4].location.samplerIndex == 0); + CHECK(pass.args[4].size == 1); + CHECK(pass.args[4].buffer == 0); + CHECK(pass.args[4].u.nameHash == 0xa0ab1041); + + CHECK(pass.args[5].type == MTL_ARG_MATERIAL_PIXEL_SAMPLER); + CHECK(pass.args[5].location.textureIndex == 2); + CHECK(pass.args[5].location.samplerIndex == 2); + CHECK(pass.args[5].size == 1); + CHECK(pass.args[5].buffer == 0); + CHECK(pass.args[5].u.nameHash == 0xb60d1850); + + CHECK(pass.args[6].type == MTL_ARG_MATERIAL_PIXEL_SAMPLER); + CHECK(pass.args[6].location.textureIndex == 5); + CHECK(pass.args[6].location.samplerIndex == 4); + CHECK(pass.args[6].size == 1); + CHECK(pass.args[6].buffer == 0); + CHECK(pass.args[6].u.nameHash == 0xb60d1852); + + CHECK(pass.args[7].type == MTL_ARG_MATERIAL_PIXEL_SAMPLER); + CHECK(pass.args[7].location.textureIndex == 4); + CHECK(pass.args[7].location.samplerIndex == 3); + CHECK(pass.args[7].size == 1); + CHECK(pass.args[7].buffer == 0); + CHECK(pass.args[7].u.nameHash == 0xb60d1853); + + CHECK(pass.args[8].type == MTL_ARG_CODE_VERTEX_CONST); + CHECK(pass.args[8].location.offset == 0x300); + CHECK(pass.args[8].size == 0x40); + CHECK(pass.args[8].buffer == 0); + CHECK(pass.args[8].u.codeConst.index == CONST_SRC_CODE_TRANSPOSE_SHADOW_LOOKUP_MATRIX); + CHECK(pass.args[8].u.codeConst.firstRow == 0); + CHECK(pass.args[8].u.codeConst.rowCount == 4); + + CHECK(pass.args[9].type == MTL_ARG_CODE_PIXEL_SAMPLER); + CHECK(pass.args[9].location.textureIndex == 9); + CHECK(pass.args[9].location.samplerIndex == 9); + CHECK(pass.args[9].size == 1); + CHECK(pass.args[9].buffer == 0); + CHECK(pass.args[9].u.codeSampler == TEXTURE_SRC_CODE_SHADOWMAP_SUN); + + CHECK(pass.args[10].type == MTL_ARG_CODE_PIXEL_CONST); + CHECK(pass.args[10].location.offset == 0x610); + CHECK(pass.args[10].size == 0x10); + CHECK(pass.args[10].buffer == 0); + CHECK(pass.args[10].u.codeConst.index == CONST_SRC_CODE_SHADOWMAP_SWITCH_PARTITION); + CHECK(pass.args[10].u.codeConst.firstRow == 0); + CHECK(pass.args[10].u.codeConst.rowCount == 1); + + CHECK(pass.args[11].type == MTL_ARG_CODE_PIXEL_CONST); + CHECK(pass.args[11].location.offset == 0x630); + CHECK(pass.args[11].size == 0x10); + CHECK(pass.args[11].buffer == 0); + CHECK(pass.args[11].u.codeConst.index == CONST_SRC_CODE_SUNSHADOWMAP_PIXEL_SIZE); + CHECK(pass.args[11].u.codeConst.firstRow == 0); + CHECK(pass.args[11].u.codeConst.rowCount == 1); + + CHECK(pass.args[12].type == MTL_ARG_MATERIAL_PIXEL_CONST); + CHECK(pass.args[12].location.offset == 0x3b0); + CHECK(pass.args[12].size == 0x10); + CHECK(pass.args[12].buffer == 1); + CHECK(pass.args[12].u.nameHash == 0x88befc31); + } +} diff --git a/test/ObjCompilingTests/Game/T6/Techset/TechsetCompilerT6Test.cpp b/test/ObjCompilingTests/Game/T6/Techset/TechsetCompilerT6Test.cpp index 1bfdce31..4eb3a709 100644 --- a/test/ObjCompilingTests/Game/T6/Techset/TechsetCompilerT6Test.cpp +++ b/test/ObjCompilingTests/Game/T6/Techset/TechsetCompilerT6Test.cpp @@ -2,6 +2,7 @@ #include "Game/T6/T6.h" #include "SearchPath/MockSearchPath.h" +#include "Techset/TechsetCommon.h" #include "Utils/TestMemoryManager.h" #include @@ -12,7 +13,20 @@ using namespace T6; using namespace std::string_literals; -TEST_CASE("Game::T6::Techset::TechsetCompilerT6", "[techset][t6]") +namespace +{ + MaterialTechnique* GivenTechnique(const std::string& name, AssetCreationContext& context, MemoryManager& memory) + { + auto* technique = memory.Alloc(); + technique->name = memory.Dup(name.c_str()); + + context.AddSubAsset(name, technique); + + return technique; + } +} // namespace + +TEST_CASE("TechsetCompilerT6", "[techset][t6][compiler]") { Zone zone("test", 0, GameId::T6, GamePlatform::PC); AssetCreatorCollection creators(zone); @@ -20,7 +34,7 @@ TEST_CASE("Game::T6::Techset::TechsetCompilerT6", "[techset][t6]") AssetCreationContext context(zone, &creators, &ignoredAssets); MockSearchPath searchPath; TestMemoryManager memory; - const auto sut = ::techset::CreateCompilerT6(memory, searchPath); + const auto sut = techset::CreateCompilerT6(memory, searchPath); SECTION("Sets correct worldVertFormat") { @@ -54,7 +68,7 @@ TEST_CASE("Game::T6::Techset::TechsetCompilerT6", "[techset][t6]") })); CAPTURE(techsetName); - searchPath.AddFileData(std::format("techsets/{}.techset", techsetName), ""); + searchPath.AddFileData(techset::GetFileNameForTechsetName(techsetName), ""); const auto result = sut->CreateAsset(techsetName, context); REQUIRE(result.HasBeenSuccessful()); @@ -62,4 +76,74 @@ TEST_CASE("Game::T6::Techset::TechsetCompilerT6", "[techset][t6]") const auto* techset = static_cast(result.GetAssetInfo()->m_ptr); CHECK(techset->worldVertFormat == expectedWorldVertFormat); } + + SECTION("Can parse simple techset") + { + searchPath.AddFileData(techset::GetFileNameForTechsetName("simple"), R"TECHSET( +"depth prepass": + example_zprepass; + +"lit sun shadow": + example_lit_sun_shadow; +)TECHSET"); + + auto* exampleZPrepass = GivenTechnique("example_zprepass", context, memory); + auto* exampleLitSunShadow = GivenTechnique("example_lit_sun_shadow", context, memory); + + const auto result = sut->CreateAsset("simple", context); + REQUIRE(result.HasBeenSuccessful()); + + const auto* techset = static_cast(result.GetAssetInfo()->m_ptr); + CHECK(techset->name == "simple"s); + CHECK(techset->worldVertFormat == MTL_WORLDVERT_TEX_1_NRM_1); + + size_t techniqueCount = 0; + for (auto* technique : techset->techniques) + { + if (technique) + techniqueCount++; + } + + CHECK(techniqueCount == 2); + CHECK(techset->techniques[TECHNIQUE_DEPTH_PREPASS] == exampleZPrepass); + CHECK(techset->techniques[TECHNIQUE_LIT_SUN_SHADOW] == exampleLitSunShadow); + } + + SECTION("Can parse techset with same technique used multiple times") + { + searchPath.AddFileData(techset::GetFileNameForTechsetName("simple"), R"TECHSET( +"depth prepass": +"build shadowmap depth": + example_zprepass; + +"lit": +"lit sun": +"lit sun shadow": + example_lit_sun_shadow; +)TECHSET"); + + auto* exampleZPrepass = GivenTechnique("example_zprepass", context, memory); + auto* exampleLitSunShadow = GivenTechnique("example_lit_sun_shadow", context, memory); + + const auto result = sut->CreateAsset("simple", context); + REQUIRE(result.HasBeenSuccessful()); + + const auto* techset = static_cast(result.GetAssetInfo()->m_ptr); + CHECK(techset->name == "simple"s); + CHECK(techset->worldVertFormat == MTL_WORLDVERT_TEX_1_NRM_1); + + size_t techniqueCount = 0; + for (auto* technique : techset->techniques) + { + if (technique) + techniqueCount++; + } + + CHECK(techniqueCount == 5); + CHECK(techset->techniques[TECHNIQUE_DEPTH_PREPASS] == exampleZPrepass); + CHECK(techset->techniques[TECHNIQUE_BUILD_SHADOWMAP_DEPTH] == exampleZPrepass); + CHECK(techset->techniques[TECHNIQUE_LIT] == exampleLitSunShadow); + CHECK(techset->techniques[TECHNIQUE_LIT_SUN] == exampleLitSunShadow); + CHECK(techset->techniques[TECHNIQUE_LIT_SUN_SHADOW] == exampleLitSunShadow); + } } diff --git a/test/ObjCompilingTests/Game/T6/Techset/VertexDeclCompilerT6Test.cpp b/test/ObjCompilingTests/Game/T6/Techset/VertexDeclCompilerT6Test.cpp new file mode 100644 index 00000000..34734029 --- /dev/null +++ b/test/ObjCompilingTests/Game/T6/Techset/VertexDeclCompilerT6Test.cpp @@ -0,0 +1,63 @@ +#include "Game/T6/Techset/VertexDeclCompilerT6.h" + +#include "Game/T6/T6.h" +#include "Utils/MemoryManager.h" + +#include + +using namespace T6; +using namespace Catch; +using namespace std::literals; + +TEST_CASE("VertexDeclCompilerT6", "[t6][techset][compiler]") +{ + Zone zone("MockZone", 0, GameId::T6, GamePlatform::PC); + zone.Register(); + + MemoryManager memory; + AssetCreatorCollection creatorCollection(zone); + IgnoredAssetLookup ignoredAssetLookup; + AssetCreationContext context(zone, &creatorCollection, &ignoredAssetLookup); + + auto loader = techset::CreateVertexDeclCompilerT6(memory); + + SECTION("Can create simple vertex decl") + { + auto result = loader->CreateSubAsset("pp", context); + REQUIRE(result.HasBeenSuccessful()); + + const auto* assetInfo = reinterpret_cast*>(result.GetAssetInfo()); + const auto* decl = assetInfo->Asset(); + + CHECK(decl->hasOptionalSource == false); + CHECK(decl->isLoaded == false); + + REQUIRE(decl->streamCount == 1); + CHECK(decl->routing.data[0].source == STREAM_SRC_POSITION); + CHECK(decl->routing.data[0].dest == STREAM_DST_POSITION); + } + + SECTION("Can create advanced vertex decl") + { + auto result = loader->CreateSubAsset("pbcc1tt10t1t1n1n", context); + REQUIRE(result.HasBeenSuccessful()); + + const auto* assetInfo = reinterpret_cast*>(result.GetAssetInfo()); + const auto* decl = assetInfo->Asset(); + + CHECK(decl->hasOptionalSource == true); + CHECK(decl->isLoaded == false); + + REQUIRE(decl->streamCount == 5); + CHECK(decl->routing.data[0].source == STREAM_SRC_POSITION); + CHECK(decl->routing.data[0].dest == STREAM_DST_BLENDWEIGHT); + CHECK(decl->routing.data[1].source == STREAM_SRC_COLOR); + CHECK(decl->routing.data[1].dest == STREAM_DST_COLOR_1); + CHECK(decl->routing.data[2].source == STREAM_SRC_TANGENT); + CHECK(decl->routing.data[2].dest == STREAM_DST_TEXCOORD_10); + CHECK(decl->routing.data[3].source == STREAM_SRC_TEXCOORD_1); + CHECK(decl->routing.data[3].dest == STREAM_DST_TEXCOORD_1); + CHECK(decl->routing.data[4].source == STREAM_SRC_NORMAL_TRANSFORM_1); + CHECK(decl->routing.data[4].dest == STREAM_DST_NORMAL); + } +} diff --git a/test/ObjCompilingTests/Game/T6/Techset/ps_advanced.hlsl.cso b/test/ObjCompilingTests/Game/T6/Techset/ps_advanced.hlsl.cso new file mode 100644 index 00000000..b0185432 Binary files /dev/null and b/test/ObjCompilingTests/Game/T6/Techset/ps_advanced.hlsl.cso differ diff --git a/test/ObjCompilingTests/Game/T6/Techset/ps_simple.hlsl.cso b/test/ObjCompilingTests/Game/T6/Techset/ps_simple.hlsl.cso new file mode 100644 index 00000000..cfe8445a Binary files /dev/null and b/test/ObjCompilingTests/Game/T6/Techset/ps_simple.hlsl.cso differ diff --git a/test/ObjCompilingTests/Game/T6/Techset/vs_advanced.hlsl.cso b/test/ObjCompilingTests/Game/T6/Techset/vs_advanced.hlsl.cso new file mode 100644 index 00000000..35725a0e Binary files /dev/null and b/test/ObjCompilingTests/Game/T6/Techset/vs_advanced.hlsl.cso differ diff --git a/test/ObjCompilingTests/Game/T6/Techset/vs_simple.hlsl.cso b/test/ObjCompilingTests/Game/T6/Techset/vs_simple.hlsl.cso new file mode 100644 index 00000000..50c95fc2 Binary files /dev/null and b/test/ObjCompilingTests/Game/T6/Techset/vs_simple.hlsl.cso differ diff --git a/test/ObjWritingTests/Game/T6/Techset/TechsetDumperT6Test.cpp b/test/ObjWritingTests/Game/T6/Techset/TechsetDumperT6Test.cpp new file mode 100644 index 00000000..972896c2 --- /dev/null +++ b/test/ObjWritingTests/Game/T6/Techset/TechsetDumperT6Test.cpp @@ -0,0 +1,382 @@ +#include "Game/T6/Techset/TechsetDumperT6.h" + +#include "Asset/AssetRegistration.h" +#include "Game/T6/GameT6.h" +#include "OatTestPaths.h" +#include "SearchPath/MockOutputPath.h" +#include "SearchPath/MockSearchPath.h" +#include "Utils/MemoryManager.h" + +#include +#include +#include +#include +#include + +using namespace T6; +using namespace Catch; +using namespace std::literals; +namespace fs = std::filesystem; + +namespace +{ + std::string Trimmed(const std::string& input) + { + auto start = input.find_first_not_of(" \r\n"); + if (start == std::string::npos) + start = 0; + + auto end = input.find_last_not_of(" \r\n"); + if (end == std::string::npos) + end = input.length(); + else + end = end + 1; + + return input.substr(start, end - start); + } + + MaterialVertexShader* GivenVertexShader(const std::string& name, MemoryManager& memory) + { + const auto filePath = oat::paths::GetTestDirectory() / "ObjWritingTests/Game/T6/Techset" / std::format("vs_{}.cso", name); + const auto fileSize = static_cast(fs::file_size(filePath)); + + std::ifstream file(filePath, std::ios::binary); + REQUIRE(file.is_open()); + + auto* shader = memory.Alloc(); + shader->name = memory.Dup(name.c_str()); + shader->prog.loadDef.program = memory.Alloc(fileSize); + shader->prog.loadDef.programSize = static_cast(fileSize); + file.read(shader->prog.loadDef.program, fileSize); + REQUIRE(file.gcount() == static_cast(fileSize)); + + return shader; + } + + MaterialPixelShader* GivenPixelShader(const std::string& name, MemoryManager& memory) + { + const auto filePath = oat::paths::GetTestDirectory() / "ObjWritingTests/Game/T6/Techset" / std::format("ps_{}.cso", name); + const auto fileSize = static_cast(fs::file_size(filePath)); + + std::ifstream file(filePath, std::ios::binary); + REQUIRE(file.is_open()); + + auto* shader = memory.Alloc(); + shader->name = memory.Dup(name.c_str()); + shader->prog.loadDef.program = memory.Alloc(fileSize); + shader->prog.loadDef.programSize = static_cast(fileSize); + file.read(shader->prog.loadDef.program, fileSize); + REQUIRE(file.gcount() == static_cast(fileSize)); + + return shader; + } + + MaterialTechnique* GivenDepthPrepassTechnique(MemoryManager& memory) + { + auto* technique = memory.Alloc(); + technique->name = "example_zprepass"; + technique->flags = 0x84; + technique->passCount = 1; + + auto& pass = technique->passArray[0]; + pass.perPrimArgCount = 1; + pass.perObjArgCount = 1; + pass.stableArgCount = 0; + pass.customSamplerFlags = 0; + pass.precompiledIndex = VERTEX_SHADER_MODEL_UNLIT; + pass.materialType = MTL_TYPE_MODEL_VERTCOL; + + pass.vertexShader = GivenVertexShader("simple.hlsl", memory); + pass.pixelShader = GivenPixelShader("simple.hlsl", memory); + + pass.vertexDecl = memory.Alloc(); + auto& vertexDecl = *pass.vertexDecl; + vertexDecl.streamCount = 1; + vertexDecl.hasOptionalSource = false; + vertexDecl.isLoaded = false; + vertexDecl.routing.data[0].source = STREAM_SRC_POSITION; + vertexDecl.routing.data[0].dest = STREAM_DST_POSITION; + + pass.args = memory.Alloc(2); + pass.args[0].type = MTL_ARG_CODE_VERTEX_CONST; + pass.args[0].location.offset = 0; + pass.args[0].size = 0x40; + pass.args[0].buffer = 3; + pass.args[0].u.codeConst.index = CONST_SRC_CODE_TRANSPOSE_WORLD_MATRIX; + pass.args[0].u.codeConst.firstRow = 0; + pass.args[0].u.codeConst.rowCount = 4; + + pass.args[1].type = MTL_ARG_CODE_VERTEX_CONST; + pass.args[1].location.offset = 0x240; + pass.args[1].size = 0x40; + pass.args[1].buffer = 0; + pass.args[1].u.codeConst.index = CONST_SRC_CODE_TRANSPOSE_VIEW_PROJECTION_MATRIX; + pass.args[1].u.codeConst.firstRow = 0; + pass.args[1].u.codeConst.rowCount = 4; + + return technique; + } + + MaterialTechnique* GivenLitSunShadowTechnique(MemoryManager& memory) + { + auto* technique = memory.Alloc(); + technique->name = "example_lit_sun_shadow"; + technique->flags = 0x88; + technique->passCount = 1; + + auto& pass = technique->passArray[0]; + pass.perPrimArgCount = 1; + pass.perObjArgCount = 1; + pass.stableArgCount = 11; + pass.customSamplerFlags = 3; + pass.precompiledIndex = VERTEX_SHADER_NONE; + pass.materialType = MTL_TYPE_DEFAULT; + + pass.vertexShader = GivenVertexShader("advanced.hlsl", memory); + pass.pixelShader = GivenPixelShader("advanced.hlsl", memory); + + pass.vertexDecl = memory.Alloc(); + auto& vertexDecl = *pass.vertexDecl; + vertexDecl.streamCount = 9; + vertexDecl.hasOptionalSource = true; + vertexDecl.isLoaded = false; + vertexDecl.routing.data[0].source = STREAM_SRC_POSITION; + vertexDecl.routing.data[0].dest = STREAM_DST_POSITION; + vertexDecl.routing.data[1].source = STREAM_SRC_COLOR; + vertexDecl.routing.data[1].dest = STREAM_DST_COLOR_0; + vertexDecl.routing.data[2].source = STREAM_SRC_TEXCOORD_0; + vertexDecl.routing.data[2].dest = STREAM_DST_TEXCOORD_0; + vertexDecl.routing.data[3].source = STREAM_SRC_NORMAL; + vertexDecl.routing.data[3].dest = STREAM_DST_NORMAL; + vertexDecl.routing.data[4].source = STREAM_SRC_TANGENT; + vertexDecl.routing.data[4].dest = STREAM_DST_TEXCOORD_2; + vertexDecl.routing.data[5].source = STREAM_SRC_TEXCOORD_1; + vertexDecl.routing.data[5].dest = STREAM_DST_TEXCOORD_1; + vertexDecl.routing.data[6].source = STREAM_SRC_TEXCOORD_2; + vertexDecl.routing.data[6].dest = STREAM_DST_TEXCOORD_3; + vertexDecl.routing.data[7].source = STREAM_SRC_TEXCOORD_3; + vertexDecl.routing.data[7].dest = STREAM_DST_TEXCOORD_4; + vertexDecl.routing.data[8].source = STREAM_SRC_NORMAL_TRANSFORM_0; + vertexDecl.routing.data[8].dest = STREAM_DST_TEXCOORD_5; + + pass.args = memory.Alloc(13); + pass.args[0].type = MTL_ARG_CODE_VERTEX_CONST; + pass.args[0].location.offset = 0; + pass.args[0].size = 0x40; + pass.args[0].buffer = 3; + pass.args[0].u.codeConst.index = CONST_SRC_CODE_TRANSPOSE_WORLD_MATRIX; + pass.args[0].u.codeConst.firstRow = 0; + pass.args[0].u.codeConst.rowCount = 4; + + pass.args[1].type = MTL_ARG_CODE_VERTEX_CONST; + pass.args[1].location.offset = 0x240; + pass.args[1].size = 0x40; + pass.args[1].buffer = 0; + pass.args[1].u.codeConst.index = CONST_SRC_CODE_TRANSPOSE_VIEW_PROJECTION_MATRIX; + pass.args[1].u.codeConst.firstRow = 0; + pass.args[1].u.codeConst.rowCount = 4; + + pass.args[2].type = MTL_ARG_MATERIAL_PIXEL_SAMPLER; + pass.args[2].location.textureIndex = 1; + pass.args[2].location.samplerIndex = 1; + pass.args[2].size = 1; + pass.args[2].buffer = 0; + pass.args[2].u.nameHash = 0x59d30d0f; + + pass.args[3].type = MTL_ARG_MATERIAL_PIXEL_SAMPLER; + pass.args[3].location.textureIndex = 3; + pass.args[3].location.samplerIndex = 5; + pass.args[3].size = 1; + pass.args[3].buffer = 0; + pass.args[3].u.nameHash = 0x9434aede; + + pass.args[4].type = MTL_ARG_MATERIAL_PIXEL_SAMPLER; + pass.args[4].location.textureIndex = 0; + pass.args[4].location.samplerIndex = 0; + pass.args[4].size = 1; + pass.args[4].buffer = 0; + pass.args[4].u.nameHash = 0xa0ab1041; + + pass.args[5].type = MTL_ARG_MATERIAL_PIXEL_SAMPLER; + pass.args[5].location.textureIndex = 2; + pass.args[5].location.samplerIndex = 2; + pass.args[5].size = 1; + pass.args[5].buffer = 0; + pass.args[5].u.nameHash = 0xb60d1850; + + pass.args[6].type = MTL_ARG_MATERIAL_PIXEL_SAMPLER; + pass.args[6].location.textureIndex = 5; + pass.args[6].location.samplerIndex = 4; + pass.args[6].size = 1; + pass.args[6].buffer = 0; + pass.args[6].u.nameHash = 0xb60d1852; + + pass.args[7].type = MTL_ARG_MATERIAL_PIXEL_SAMPLER; + pass.args[7].location.textureIndex = 4; + pass.args[7].location.samplerIndex = 3; + pass.args[7].size = 1; + pass.args[7].buffer = 0; + pass.args[7].u.nameHash = 0xb60d1853; + + pass.args[8].type = MTL_ARG_CODE_VERTEX_CONST; + pass.args[8].location.offset = 0x300; + pass.args[8].size = 0x40; + pass.args[8].buffer = 0; + pass.args[8].u.codeConst.index = CONST_SRC_CODE_TRANSPOSE_SHADOW_LOOKUP_MATRIX; + pass.args[8].u.codeConst.firstRow = 0; + pass.args[8].u.codeConst.rowCount = 4; + + pass.args[9].type = MTL_ARG_CODE_PIXEL_SAMPLER; + pass.args[9].location.textureIndex = 9; + pass.args[9].location.samplerIndex = 9; + pass.args[9].size = 1; + pass.args[9].buffer = 0; + pass.args[9].u.codeSampler = TEXTURE_SRC_CODE_SHADOWMAP_SUN; + + pass.args[10].type = MTL_ARG_CODE_PIXEL_CONST; + pass.args[10].location.offset = 0x610; + pass.args[10].size = 0x10; + pass.args[10].buffer = 0; + pass.args[10].u.codeConst.index = CONST_SRC_CODE_SHADOWMAP_SWITCH_PARTITION; + pass.args[10].u.codeConst.firstRow = 0; + pass.args[10].u.codeConst.rowCount = 1; + + pass.args[11].type = MTL_ARG_CODE_PIXEL_CONST; + pass.args[11].location.offset = 0x630; + pass.args[11].size = 0x10; + pass.args[11].buffer = 0; + pass.args[11].u.codeConst.index = CONST_SRC_CODE_SUNSHADOWMAP_PIXEL_SIZE; + pass.args[11].u.codeConst.firstRow = 0; + pass.args[11].u.codeConst.rowCount = 1; + + pass.args[12].type = MTL_ARG_MATERIAL_PIXEL_CONST; + pass.args[12].location.offset = 0x3b0; + pass.args[12].size = 0x10; + pass.args[12].buffer = 1; + pass.args[12].u.nameHash = 0x88befc31; + + return technique; + } + + MaterialTechniqueSet* GivenTechset(Zone& zone, MemoryManager& memory) + { + auto* techset = memory.Alloc(); + techset->name = "example_techset"; + techset->worldVertFormat = MTL_WORLDVERT_TEX_4_NRM_2; + + techset->techniques[TECHNIQUE_DEPTH_PREPASS] = GivenDepthPrepassTechnique(memory); + techset->techniques[TECHNIQUE_LIT_SUN_SHADOW] = GivenLitSunShadowTechnique(memory); + + zone.m_pools.AddAsset(std::make_unique>(ASSET_TYPE_TECHNIQUE_SET, techset->name, techset)); + return techset; + } +} // namespace + +TEST_CASE("TechsetDumperT6", "[t6][techset][dumper]") +{ + Zone zone("MockZone", 0, GameId::T6, GamePlatform::PC); + zone.Register(); + + MemoryManager memory; + MockSearchPath mockObjPath; + MockOutputPath mockOutput; + AssetDumpingContext context(zone, "", mockOutput, mockObjPath, std::nullopt); + + GivenTechset(zone, memory); + + techset::DumperT6 dumper(true); + + SECTION("Can dump techset") + { + std::string expected(R"TECHSET( +"depth prepass": + example_zprepass; + +"lit sun shadow": + example_lit_sun_shadow; +)TECHSET"); + + dumper.Dump(context); + + const auto* file = mockOutput.GetMockedFile("techsets/example_techset.techset"); + REQUIRE(file); + REQUIRE(Trimmed(file->AsString()) == Trimmed(expected)); + } + + SECTION("Can dump simple technique") + { + std::string expected(R"TECHNIQUE( +// TECHNIQUE FLAGS: 0x4 +// TECHNIQUE FLAGS: 0x80 +{ + stateMap "passthrough"; // TODO + + vertexShader 4.0 "simple.hlsl" + { + // Omitted due to matching accessors: worldMatrix = constant.worldMatrix; + // Omitted due to matching accessors: viewProjectionMatrix = constant.viewProjectionMatrix; + } + + pixelShader 4.0 "simple.hlsl" + { + } + + vertex.position = code.position; +} +)TECHNIQUE"); + dumper.Dump(context); + + const auto* file = mockOutput.GetMockedFile("techniques/example_zprepass.tech"); + REQUIRE(file); + REQUIRE(Trimmed(file->AsString()) == Trimmed(expected)); + } + + SECTION("Can dump advanced technique") + { + std::string expected(R"TECHNIQUE( +// TECHNIQUE FLAGS: 0x8 +// TECHNIQUE FLAGS: 0x80 +{ + // CUSTOM SAMPLER FLAGS: 0x1 + // CUSTOM SAMPLER FLAGS: 0x2 + stateMap "passthrough"; // TODO + + vertexShader 4.0 "advanced.hlsl" + { + // Omitted due to matching accessors: worldMatrix = constant.worldMatrix; + // Omitted due to matching accessors: viewProjectionMatrix = constant.viewProjectionMatrix; + // Omitted due to matching accessors: shadowLookupMatrix = constant.shadowLookupMatrix; + } + + pixelShader 4.0 "advanced.hlsl" + { + normalMapSampler = material.normalMap; + normalMapSampler1 = material.normalMap1; + colorMapSampler = material.colorMap; + colorMapSampler1 = material.colorMap1; + colorMapSampler3 = material.colorMap3; + colorMapSampler2 = material.colorMap2; + // Omitted due to matching accessors: shadowmapSamplerSun = sampler.shadowmapSamplerSun; + // Omitted due to matching accessors: shadowmapSwitchPartition = constant.shadowmapSwitchPartition; + // Omitted due to matching accessors: sunShadowmapPixelSize = constant.sunShadowmapPixelSize; + alphaRevealParms1 = material.alphaRevealParms1; + } + + vertex.position = code.position; + vertex.color[0] = code.color; + vertex.texcoord[0] = code.texcoord[0]; + vertex.normal = code.normal; + vertex.texcoord[2] = code.tangent; + vertex.texcoord[1] = code.texcoord[1]; + vertex.texcoord[3] = code.texcoord[2]; + vertex.texcoord[4] = code.texcoord[3]; + vertex.texcoord[5] = code.normalTransform[0]; +} +)TECHNIQUE"); + dumper.Dump(context); + + const auto* file = mockOutput.GetMockedFile("techniques/example_lit_sun_shadow.tech"); + REQUIRE(file); + REQUIRE(Trimmed(file->AsString()) == Trimmed(expected)); + } +} diff --git a/test/ObjWritingTests/Game/T6/Techset/ps_advanced.hlsl.cso b/test/ObjWritingTests/Game/T6/Techset/ps_advanced.hlsl.cso new file mode 100644 index 00000000..b0185432 Binary files /dev/null and b/test/ObjWritingTests/Game/T6/Techset/ps_advanced.hlsl.cso differ diff --git a/test/ObjWritingTests/Game/T6/Techset/ps_simple.hlsl.cso b/test/ObjWritingTests/Game/T6/Techset/ps_simple.hlsl.cso new file mode 100644 index 00000000..cfe8445a Binary files /dev/null and b/test/ObjWritingTests/Game/T6/Techset/ps_simple.hlsl.cso differ diff --git a/test/ObjWritingTests/Game/T6/Techset/vs_advanced.hlsl.cso b/test/ObjWritingTests/Game/T6/Techset/vs_advanced.hlsl.cso new file mode 100644 index 00000000..35725a0e Binary files /dev/null and b/test/ObjWritingTests/Game/T6/Techset/vs_advanced.hlsl.cso differ diff --git a/test/ObjWritingTests/Game/T6/Techset/vs_simple.hlsl.cso b/test/ObjWritingTests/Game/T6/Techset/vs_simple.hlsl.cso new file mode 100644 index 00000000..50c95fc2 Binary files /dev/null and b/test/ObjWritingTests/Game/T6/Techset/vs_simple.hlsl.cso differ