-
Notifications
You must be signed in to change notification settings - Fork 12
HYDRA-2013 - fix build errors for usd 25.11 #361
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.
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
HYDRA-2013 - fix build errors for usd 25.11 #361
Conversation
| currentPass->params().backgroundColor = GfVec4f(0.0f, 0.0f, 0.0f, 0.0f);//For clearing | ||
| currentPass->params().backgroundDepth = 1.0f;//For clearing | ||
| currentPass->params().renderParams.enableLighting = true; | ||
| #if PXR_VERSION <= 2508 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
enableSceneMaterials is deprecated in 25.11
| #include <windows.h> | ||
| // interface was used as variable name in materialNetworkSchema.h | ||
| // but defined as struct in basetyps.h included by windows.h, undefine it here to avoid conflicts | ||
| #undef interface |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ideally, Hydra code should avoid to use interface as variable name, not sure is there any better way to fix.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I remember seeing this before, and had the same fix. Can't find the code any more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
anyway, tried Cursor, no better way
| #if defined(_WIN32) | ||
| #include <windows.h> | ||
| // interface was used as variable name in materialNetworkSchema.h | ||
| // but defined as struct in basetyps.h included by windows.h, undefine it here to avoid conflicts |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
basetyps.h looks like a typo...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, looks like, but not.
https://github.com/tpn/winsdk-10/blob/master/Include/10.0.10240.0/shared/basetyps.h#L179
| #include <windows.h> | ||
| // interface was used as variable name in materialNetworkSchema.h | ||
| // but defined as struct in basetyps.h included by windows.h, undefine it here to avoid conflicts | ||
| #undef interface |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I remember seeing this before, and had the same fix. Can't find the code any more.
Fix build errors for usd 25.11