Dev 1.39 (#54)

* Fix OpenGL issue in Python virtual environment (AcademySoftwareFoundation#1766) See issue AcademySoftwareFoundation#1755 * Finalize changelog for 1.38.10 * Improvements to GitHub CI - Upgrade the MacOS_Xcode_14_Python311 build to the MacOS 14 environment. - Remove unneeded steps in virtual framebuffer setup and JavaScript uploads. * Remove unused classes This changelist removes two unused classes, SurfaceShaderNodeGlsl and SurfaceShaderNodeMsl, which are not leveraged in any active code path for MaterialX shader generation. * Add ESSL unit tests This changelist adds initial unit tests for ESSL shader generation, bringing the measured code coverage of MaterialX unit tests to 88.7%. --------- Co-authored-by: howetuft <[email protected]> Co-authored-by: Jonathan Stone <[email protected]>
kwokcb · Apr 19, 2024 · 20729ed · 20729ed
1 parent d58302b
commit 20729ed
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 240 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -71,7 +71,7 @@ jobs:
           python: 3.7
 
         - name: MacOS_Xcode_14_Python311
-          os: macos-13
+          os: macos-14
           compiler: xcode
           compiler_version: "14.3"
           python: 3.11
@@ -128,7 +128,7 @@ jobs:
       if: runner.os == 'Linux'
       run: |
         sudo apt-get update
-        sudo apt-get install xorg-dev mesa-utils
+        sudo apt-get install xorg-dev
         if [ "${{ matrix.compiler_version }}" != 'None' ]; then
           if [ "${{ matrix.compiler }}" = "gcc" ]; then
             sudo apt-get install -y g++-${{ matrix.compiler_version }} g++-${{ matrix.compiler_version }}-multilib
@@ -255,7 +255,6 @@ jobs:
         Xvfb :1 -screen 0 1280x960x24 &
         echo "DISPLAY=:1" >> $GITHUB_ENV
         echo "LIBGL_ALWAYS_SOFTWARE=1" >> $GITHUB_ENV
-        echo "GALLIUM_DRIVER=llvmpipe" >> $GITHUB_ENV
 
     - name: Render Script Tests
       if: matrix.test_render == 'ON'
@@ -344,7 +343,6 @@ jobs:
       with:
         name: MaterialX_JavaScript
         path: javascript/build/installed/JavaScript/MaterialX        
-        if-no-files-found: ignore   
 
   sdist:
     name: Python SDist

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## [1.39.0] - Development
 
-## [1.38.10] - Development
+## [1.38.10] - 2024-04-12
 
 ### Added
 
@@ -14,10 +14,11 @@
 
 ### Fixed
 
-- Move environment prefilter functions to their [referencing GLSL files](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1748), addressing shader compilation errors in USD.
-- Enable color and unit transforms on [root nodes](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1757) in shader generation, addressing missing color transforms in USD.
-- Store [document caches](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1753) in declaration order, addressing compiler-dependent behavior in nodedef lookups.
-- Use [framework linkage](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1752) for OpenGL in MacOS builds, addressing build issues in downstream projects.
+- Moved environment prefilter functions to their [referencing GLSL files](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1748), addressing shader compilation errors in USD.
+- Enabled color and unit transforms on [root nodes](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1757) in shader generation, addressing missing color transforms in USD.
+- Updated [document caches](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1753) to store elements in declaration order, addressing compiler-dependent behavior in nodedef lookups.
+- Switched to [framework linkage](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1752) for OpenGL libraries on MacOS, addressing build issues in downstream projects.
+- Switched to [legacy OpenGL libraries](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1766) for Python wheels on Linux, addressing missing OpenGL functionality in Python wheels.
 - Added a [missing vertex data prefix](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1762) in Vulkan GLSL shader generation.
 
 ## [1.38.9] - 2024-02-26

diff --git a/resources/Materials/TestSuite/_options.mtlx b/resources/Materials/TestSuite/_options.mtlx
@@ -21,7 +21,7 @@
 
     <!-- Comma separated list of target" specifiers to indicate which
          code generators to use. -->
-    <input name="targets" type="string" value="genglsl,genosl,genmdl,genmsl" />
+    <input name="targets" type="string" value="genglsl,genosl,genmdl,genessl,genmsl" />
 
     <!-- Check the count of number of implementations used for a given generator -->
     <input name="checkImplCount" type="boolean" value="true" />

diff --git a/source/MaterialXGenGlsl/Nodes/SurfaceShaderNodeGlsl.cpp b/source/MaterialXGenGlsl/Nodes/SurfaceShaderNodeGlsl.cpp
diff --git a/source/MaterialXGenGlsl/Nodes/SurfaceShaderNodeGlsl.h b/source/MaterialXGenGlsl/Nodes/SurfaceShaderNodeGlsl.h
diff --git a/source/MaterialXGenMsl/Nodes/SurfaceShaderNodeMsl.cpp b/source/MaterialXGenMsl/Nodes/SurfaceShaderNodeMsl.cpp
diff --git a/source/MaterialXGenMsl/Nodes/SurfaceShaderNodeMsl.h b/source/MaterialXGenMsl/Nodes/SurfaceShaderNodeMsl.h
diff --git a/source/MaterialXRenderGlsl/CMakeLists.txt b/source/MaterialXRenderGlsl/CMakeLists.txt
@@ -27,6 +27,10 @@ elseif(UNIX)
         message(FATAL_ERROR "Error in building MaterialXRenderGlsl: Xt was not found")
     endif()
 
+    if(SKBUILD)
+      set(OpenGL_GL_PREFERENCE LEGACY)
+    endif()
+
     find_package(OpenGL REQUIRED)
     include_directories(${X11_INCLUDE_DIR})
 endif()