Skip to content

Autodesk: [hdSt] Refactor MaterialXShaderGen with generics #3898

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

Open
kohakukun wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Autodesk: [hdSt] Refactor MaterialXShaderGen with generics #3898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 build_scripts/build_usd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1605,7 +1605,7 @@ def InstallDraco(context, force, buildArgs):
############################################################
# MaterialX

MATERIALX_URL = "https://github.com/AcademySoftwareFoundation/MaterialX/archive/v1.39.3.zip"
MATERIALX_URL = "https://github.com/AcademySoftwareFoundation/MaterialX/archive/v1.39.4.zip"

def InstallMaterialX(context, force, buildArgs):
with CurrentWorkingDirectory(DownloadURL(MATERIALX_URL, context, force)):
Expand Down
6 changes: 5 additions & 1 deletion pxr/imaging/hdSt/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,13 @@ if (${PXR_ENABLE_MATERIALX_SUPPORT})
MaterialXCore
MaterialXFormat
MaterialXGenGlsl
MaterialXGenMsl
hdMtlx
)
if (PXR_ENABLE_METAL_SUPPORT)
list(APPEND optionalLibs
MaterialXGenMsl
)
endif()
list(APPEND optionalPrivateClasses
materialXFilter
materialXShaderGen
Expand Down
2 changes: 2 additions & 0 deletions pxr/imaging/hdSt/materialXFilter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,11 @@ _InitHdStMaterialXContext(
HdSt_MxShaderGenInfo const& mxHdInfo,
TfToken const& apiName)
{
#ifdef PXR_METAL_SUPPORT_ENABLED
if (apiName == HgiTokens->Metal) {
return HdStMaterialXShaderGenMsl::create(mxHdInfo);
}
#endif // PXR_METAL_SUPPORT_ENABLED
if (apiName == HgiTokens->Vulkan) {
return HdStMaterialXShaderGenVkGlsl::create(mxHdInfo);
}
Expand Down
Loading
Loading