xuanchi/XCEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tighten builtin pass metadata and remove skybox property fallbacks

Browse Source
This commit is contained in:
ssdfasd
2026-04-08 13:13:42 +08:00
parent efdd6bd68f
commit 08c3278e10
9 changed files with 186 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/Resources/Shader/test_shader_loader.cpp
View File

@@ -152,7 +152,7 @@ TEST(ShaderLoader, LoadShaderAuthoringBuildsMultiPassGenericVariants) {
Pass
{
Name "ForwardLit"
Tags { "LightMode" = "ForwardBase", "Queue" = "Geometry" }
Tags { "LightMode" = "ForwardLit", "Queue" = "Geometry" }
HLSLPROGRAM
#pragma target 4.5
#pragma vertex MainVS
@@ -228,7 +228,7 @@ TEST(ShaderLoader, LoadShaderAuthoringBuildsMultiPassGenericVariants) {
EXPECT_EQ(forwardLitPass->resources.Size(), 8u);
ASSERT_NE(FindPassTag(forwardLitPass, "LightMode"), nullptr);
ASSERT_NE(FindPassTag(forwardLitPass, "Queue"), nullptr);
EXPECT_EQ(FindPassTag(forwardLitPass, "LightMode")->value, "ForwardBase");
EXPECT_EQ(FindPassTag(forwardLitPass, "LightMode")->value, "ForwardLit");
EXPECT_EQ(FindPassTag(forwardLitPass, "Queue")->value, "Geometry");
const ShaderStageVariant* d3d12Vertex = shader->FindVariant("ForwardLit", ShaderType::Vertex, ShaderBackend::D3D12);
@@ -1631,7 +1631,7 @@ TEST(ShaderLoader, AssetDatabaseCreatesShaderArtifactFromAuthoringAndLoaderReads
Pass
{
Name "ForwardLit"
Tags { "LightMode" = "ForwardBase" }
Tags { "LightMode" = "ForwardLit" }
HLSLPROGRAM
#pragma vertex MainVS
#pragma fragment MainPS
@@ -1720,7 +1720,7 @@ TEST(ShaderLoader, AssetDatabaseReimportsLegacyShaderArtifactHeaderBeforeLoad) {
Pass
{
Name "ForwardLit"
Tags { "LightMode" = "ForwardBase" }
Tags { "LightMode" = "ForwardLit" }
HLSLPROGRAM
#pragma vertex MainVS
#pragma fragment MainPS
@@ -1888,7 +1888,7 @@ TEST(ShaderLoader, AssetDatabaseCreatesShaderArtifactFromAuthoringAndTracksInclu
Pass
{
Name "ForwardLit"
Tags { "LightMode" = "ForwardBase" }
Tags { "LightMode" = "ForwardLit" }
HLSLPROGRAM
#pragma vertex Vert
#pragma fragment Frag
@@ -2031,7 +2031,7 @@ TEST(ShaderLoader, LoadBuiltinForwardLitShaderBuildsAuthoringVariants) {
EXPECT_TRUE(pass->fixedFunctionState.depthWriteEnable);
EXPECT_EQ(pass->fixedFunctionState.depthFunc, MaterialComparisonFunc::LessEqual);
EXPECT_EQ(pass->tags[0].name, "LightMode");
EXPECT_EQ(pass->tags[0].value, "ForwardBase");
EXPECT_EQ(pass->tags[0].value, "ForwardLit");
const ShaderPropertyDesc* baseColorProperty = shader->FindProperty("_BaseColor");
ASSERT_NE(baseColorProperty, nullptr);
@@ -2601,7 +2601,7 @@ TEST(ShaderLoader, LoadBuiltinFinalColorShaderBuildsAuthoringVariants) {
EXPECT_FALSE(pass->fixedFunctionState.depthWriteEnable);
EXPECT_EQ(pass->fixedFunctionState.depthFunc, MaterialComparisonFunc::Always);
EXPECT_EQ(pass->tags[0].name, "LightMode");
EXPECT_EQ(pass->tags[0].value, "FinalOutput");
EXPECT_EQ(pass->tags[0].value, "FinalColor");
const ShaderPropertyDesc* colorScaleProperty = shader->FindProperty("_ColorScale");
ASSERT_NE(colorScaleProperty, nullptr);
@@ -2684,7 +2684,7 @@ TEST(ShaderLoader, LoadBuiltinColorScalePostProcessShaderBuildsAuthoringVariants
EXPECT_FALSE(pass->fixedFunctionState.depthWriteEnable);
EXPECT_EQ(pass->fixedFunctionState.depthFunc, MaterialComparisonFunc::Always);
EXPECT_EQ(pass->tags[0].name, "LightMode");
EXPECT_EQ(pass->tags[0].value, "PostProcess");
EXPECT_EQ(pass->tags[0].value, "ColorScale");
const ShaderPropertyDesc* colorScaleProperty = shader->FindProperty("_ColorScale");
ASSERT_NE(colorScaleProperty, nullptr);