Skip to content

Align writing of generated Slang shaders with GLSL #2698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jstone-lucasfilm merged 3 commits into from
Dec 1, 2025
Merged

Align writing of generated Slang shaders with GLSL #2698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8420a7
Disabled the genslang test generating files. This matches genglsl.
tdavidovicNV Nov 26, 2025
2a8f2f4
Added ND_lightcompoundtest to slang's skipNodeDefs
tdavidovicNV Nov 27, 2025
ac7371d
Merge branch 'main' into dev/tdavidovic/disable_genslang_file_generation
jstone-lucasfilm Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/MaterialXTest/MaterialXGenSlang/GenSlang.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ TEST_CASE("GenShader: Slang Shader Generation", "[genslang]")
generator = mx::SlangShaderGenerator::create();

const mx::FilePath logPath("genslang_generate_test.txt");
SlangShaderGeneratorTester tester(generator, testRootPaths, searchPath, logPath, true);
SlangShaderGeneratorTester tester(generator, testRootPaths, searchPath, logPath, false);

// Handle resource binding layouts if requested.
const mx::GenOptions genOptions;
Expand Down
1 change: 1 addition & 0 deletions source/MaterialXTest/MaterialXGenSlang/GenSlang.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class SlangShaderGeneratorTester : public GenShaderUtil::ShaderGeneratorTester
{
_skipNodeDefs.insert("ND_displacement_float");
_skipNodeDefs.insert("ND_displacement_vector3");
_skipNodeDefs.insert("ND_lightcompoundtest");
ParentClass::addSkipNodeDefs();
}

Expand Down