Add MATERIALXX_BUILD_OSO option for .oso generation control

Author: chellmuth

CMakeLists.txt

@@ -39,8 +39,7 @@ option(MATERIALX_BUILD_GRAPH_EDITOR "Build the MaterialX Graph Editor." OFF)
 option(MATERIALX_BUILD_DOCS "Create HTML documentation using Doxygen. Requires that Doxygen be installed." OFF)
 
 option(MATERIALX_BUILD_GEN_GLSL "Build the GLSL shader generator back-end." ON)
-option(MATERIALX_BUILD_GEN_OSL "Build the OSL shader generator back-end." ON)
-option(MATERIALX_BUILD_GEN_OSL_NETWORK "Build the OSL network shader generator back-end." OFF)
+option(MATERIALX_BUILD_GEN_OSL "Build the OSL shader generator back-ends." ON)
 option(MATERIALX_BUILD_GEN_MDL "Build the MDL shader generator back-end." ON)
 option(MATERIALX_BUILD_GEN_MSL "Build the MSL shader generator back-end." ON)
 option(MATERIALX_BUILD_RENDER "Build the MaterialX Render modules." ON)
@@ -49,6 +48,7 @@ option(MATERIALX_BUILD_OIIO "Build OpenImageIO support for MaterialXRender." OFF
 option(MATERIALX_BUILD_OCIO "Build OpenColorIO support for shader generators." OFF)
 option(MATERIALX_BUILD_TESTS "Build unit tests." OFF)
 option(MATERIALX_BUILD_BENCHMARK_TESTS "Build benchmark tests." OFF)
+option(MATERIALX_BUILD_OSOS "Build OSL .oso's of standard library shaders for the OSL Network generator" OFF)
 
 option(MATERIALX_BUILD_SHARED_LIBS "Build MaterialX libraries as shared rather than static." OFF)
 option(MATERIALX_BUILD_DATA_LIBRARY "Build generated products from the MaterialX data library." OFF)
@@ -85,8 +85,8 @@ if (CMAKE_SYSTEM_NAME MATCHES "iOS" OR CMAKE_SYSTEM_NAME MATCHES "tvOS" OR CMAKE
     set(MATERIALX_BUILD_GRAPH_EDITOR OFF)
     set(MATERIALX_BUILD_GEN_GLSL OFF)
     set(MATERIALX_BUILD_GEN_OSL OFF)
-    set(MATERIALX_BUILD_GEN_OSL_NETWORK OFF)
     set(MATERIALX_BUILD_GEN_MDL OFF)
+    set(MATERIALX_BUILD_OSOS OFF)
     set(MATERIALX_BUILD_TESTS OFF)
 endif()
 
@@ -105,7 +105,7 @@ if (MATERIALX_BUILD_APPLE_FRAMEWORK)
 endif()
 
 if (MATERIALX_BUILD_JS)
-    set(MATERIALX_BUILD_GEN_OSL_NETWORK OFF)
+    set(MATERIALX_BUILD_OSOS OFF)
     set(MATERIALX_BUILD_RENDER OFF)
     set(MATERIALX_BUILD_TESTS OFF)
 endif()
@@ -139,7 +139,7 @@ if(SKBUILD)
     set(MATERIALX_PYTHON_FOLDER_NAME "MaterialX")
 endif()
 
-if (MATERIALX_BUILD_GEN_OSL_NETWORK)
+if (MATERIALX_BUILD_OSOS)
     set(MATERIALX_BUILD_DATA_LIBRARY ON)
     set(MATERIALX_BUILD_GEN_OSL ON)
     set(MATERIALX_BUILD_RENDER ON)
@@ -172,9 +172,9 @@ set(MATERIALX_LIBNAME_SUFFIX "" CACHE STRING "Specify a suffix to all libraries
 mark_as_advanced(MATERIALX_BUILD_DOCS)
 mark_as_advanced(MATERIALX_BUILD_GEN_GLSL)
 mark_as_advanced(MATERIALX_BUILD_GEN_OSL)
-mark_as_advanced(MATERIALX_BUILD_GEN_OSL_NETWORK)
 mark_as_advanced(MATERIALX_BUILD_GEN_MDL)
 mark_as_advanced(MATERIALX_BUILD_GEN_MSL)
+mark_as_advanced(MATERIALX_BUILD_OSOS)
 mark_as_advanced(MATERIALX_BUILD_RENDER)
 mark_as_advanced(MATERIALX_BUILD_RENDER_PLATFORMS)
 mark_as_advanced(MATERIALX_BUILD_OIIO)
@@ -226,7 +226,7 @@ endif()
 
 # Allow the OSL CMake package to provide binary locations for render tests.
 # This will not override explicitly provided oslc, testrender, and include paths.
-if((MATERIALX_BUILD_RENDER AND MATERIALX_BUILD_GEN_OSL AND MATERIALX_BUILD_TESTS) OR MATERIALX_BUILD_GEN_OSL_NETWORK)
+if((MATERIALX_BUILD_RENDER AND MATERIALX_BUILD_GEN_OSL AND MATERIALX_BUILD_TESTS) OR MATERIALX_BUILD_OSOS)
     find_package(OSL QUIET)
     if(OSL_FOUND)
         if(NOT MATERIALX_OSL_BINARY_OSLC)
@@ -469,7 +469,7 @@ add_subdirectory(source/MaterialXFormat)
 
 # Add shader generation subdirectories
 add_subdirectory(source/MaterialXGenShader)
-if(MATERIALX_BUILD_GEN_GLSL OR MATERIALX_BUILD_GEN_OSL OR MATERIALX_BUILD_GEN_OSL_NETWORK OR MATERIALX_BUILD_GEN_MDL OR MATERIALX_BUILD_GEN_MSL)
+if(MATERIALX_BUILD_GEN_GLSL OR MATERIALX_BUILD_GEN_OSL OR MATERIALX_BUILD_GEN_MDL OR MATERIALX_BUILD_GEN_MSL)
     if(MATERIALX_BUILD_GEN_GLSL OR MATERIALX_BUILD_GEN_MSL)
         add_subdirectory(source/MaterialXGenHw)
     endif()
@@ -482,8 +482,8 @@ if(MATERIALX_BUILD_GEN_GLSL OR MATERIALX_BUILD_GEN_OSL OR MATERIALX_BUILD_GEN_OS
         add_definitions(-DMATERIALX_BUILD_GEN_OSL)
         add_subdirectory(source/MaterialXGenOsl)
     endif()
-    if (MATERIALX_BUILD_GEN_OSL_NETWORK)
-        add_definitions(-DMATERIALX_BUILD_GEN_OSL_NETWORK)
+    if (MATERIALX_BUILD_OSOS)
+        add_definitions(-DMATERIALX_BUILD_OSOS)
     endif()
     if (MATERIALX_BUILD_GEN_MDL)
         add_definitions(-DMATERIALX_BUILD_GEN_MDL)

libraries/CMakeLists.txt

@@ -28,7 +28,7 @@ if(MATERIALX_BUILD_DATA_LIBRARY)
     add_custom_target(MaterialXBuildData ALL
         DEPENDS ${MATERIALX_DATA_LIBRARY_BUILD_FILES})
 
-    if (MATERIALX_BUILD_GEN_OSL_NETWORK AND MATERIALX_OSL_BINARY_OSLC)
+    if (MATERIALX_BUILD_OSOS AND MATERIALX_OSL_BINARY_OSLC)
         set(OSO_BUILD_PATH ${CMAKE_CURRENT_BINARY_DIR}/DataLibraryBuild/targets/genoslnetwork/osos)
         set(MTLX_BUILD_PATH ${CMAKE_CURRENT_BINARY_DIR}/DataLibraryBuild/targets/genoslnetwork)
 

source/MaterialXGenOsl/OslShaderGenerator.cpp

@@ -37,7 +37,7 @@ ShaderPtr OslShaderGenerator::generate(const string& name, ElementPtr element, G
     ShaderGraph& graph = shader->getGraph();
     ShaderStage& stage = shader->getStage(Stage::PIXEL);
 
-    emitLibraryIncludes(stage, context);;
+    emitLibraryIncludes(stage, context);
 
     // Add global constants and type definitions
     emitTypeDefinitions(context, stage);

source/MaterialXTest/MaterialXRenderOsl/RenderOsl.cpp

@@ -14,10 +14,7 @@
 #endif
 
 #include <MaterialXGenOsl/OslShaderGenerator.h>
-
-#ifdef MATERIALX_BUILD_GEN_OSL_NETWORK
 #include <MaterialXGenOsl/OslNetworkShaderGenerator.h>
-#endif
 
 #include <MaterialXFormat/Util.h>
 
@@ -394,7 +391,7 @@ TEST_CASE("Render: OSL TestSuite", "[renderosl]")
     renderTester.validate(optionsFilePath);
 }
 
-#ifdef MATERIALX_BUILD_GEN_OSL_NETWORK
+#ifdef MATERIALX_BUILD_OSOS
 TEST_CASE("Render: OSL Network TestSuite", "[renderoslnetwork]")
 {
     if (std::string(MATERIALX_OSL_BINARY_OSLC).empty() &&