Merge branch 'dev_1.39' into bhata/addEnvLightIntensity

autodesk-forks · Mar 18, 2024 · 7ee026a · 7ee026a
2 parents d4fc9fa + 0067b57
commit 7ee026a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/source/MaterialXGenShader/Syntax.cpp b/source/MaterialXGenShader/Syntax.cpp
@@ -151,7 +151,7 @@ string Syntax::getSwizzledVariable(const string& srcName, TypeDesc srcType, cons
         else
         {
             const size_t channelIndex = it->second;
-            if (channelIndex < 0 || channelIndex >= srcMembers.size())
+            if (channelIndex >= srcMembers.size())
             {
                 throw ExceptionShaderGenError("Given channel index: '" + string(1, ch) + "' in channels pattern is incorrect for type '" + srcType.getName() + "'.");
             }
@@ -197,7 +197,7 @@ ValuePtr Syntax::getSwizzledValue(ValuePtr value, TypeDesc srcType, const string
         else
         {
             const size_t channelIndex = it->second;
-            if (channelIndex < 0 || channelIndex >= srcMembers.size())
+            if (channelIndex >= srcMembers.size())
             {
                 throw ExceptionShaderGenError("Given channel index: '" + string(1, ch) + "' in channels pattern is incorrect for type '" + srcType.getName() + "'.");
             }

diff --git a/source/MaterialXRender/GeometryHandler.cpp b/source/MaterialXRender/GeometryHandler.cpp
@@ -12,6 +12,13 @@
 
 MATERIALX_NAMESPACE_BEGIN
 
+namespace
+{
+
+const float MAX_FLOAT = std::numeric_limits<float>::max();
+
+} // anonymous namespace
+
 void GeometryHandler::addLoader(GeometryLoaderPtr loader)
 {
     const StringSet& extensions = loader->supportedExtensions();
@@ -63,7 +70,6 @@ void GeometryHandler::getGeometry(MeshList& meshes, const string& location)
 
 void GeometryHandler::computeBounds()
 {
-    const float MAX_FLOAT = std::numeric_limits<float>::max();
     _minimumBounds = { MAX_FLOAT, MAX_FLOAT, MAX_FLOAT };
     _maximumBounds = { -MAX_FLOAT, -MAX_FLOAT, -MAX_FLOAT };
     for (const auto& mesh : _meshes)

diff --git a/source/MaterialXRenderGlsl/CMakeLists.txt b/source/MaterialXRenderGlsl/CMakeLists.txt
@@ -70,7 +70,7 @@ if(WIN32)
 elseif(APPLE)
     target_link_libraries(
         ${MATERIALX_MODULE_NAME}
-        OpenGL::GL
+        "-framework OpenGL"
         "-framework Foundation"
         "-framework Cocoa"
         "-framework Metal")

diff --git a/source/MaterialXRenderHw/SimpleWindowWindows.cpp b/source/MaterialXRenderHw/SimpleWindowWindows.cpp
@@ -111,9 +111,9 @@ SimpleWindow::~SimpleWindow()
     if (hWnd)
     {
         _windowWrapper->release();
+        DestroyWindow(hWnd);
     }
 
-    DestroyWindow(hWnd);
     UnregisterClass(_windowClassName, GetModuleHandle(NULL));
 }
 

diff --git a/source/MaterialXRenderMsl/CMakeLists.txt b/source/MaterialXRenderMsl/CMakeLists.txt
@@ -57,7 +57,7 @@ elseif(APPLE)
         target_link_libraries(
             ${MATERIALX_MODULE_NAME}
             "-framework Cocoa"
-            OpenGL::GL)
+            "-framework OpenGL")
     endif()
     target_link_libraries(
         ${MATERIALX_MODULE_NAME}