Merge branch 'main' into cube-parser-opt

Author: remia

share/cmake/utils/CompilerFlags.cmake

@@ -77,6 +77,9 @@ if(USE_MSVC)
         set(PLATFORM_COMPILE_OPTIONS "${PLATFORM_COMPILE_OPTIONS};/WX")
     endif()
 
+    # Enable parallel compilation of source files
+    set(PLATFORM_COMPILE_OPTIONS "${PLATFORM_COMPILE_OPTIONS};/MP")
+
 elseif(USE_CLANG)
 
     set(PLATFORM_COMPILE_OPTIONS "${PLATFORM_COMPILE_OPTIONS};-DUSE_CLANG")

src/OpenColorIO/ops/fixedfunction/FixedFunctionOpGPU.cpp

@@ -411,7 +411,7 @@ std::string _Add_Reach_table(
     std::ostringstream resName;
     resName << shaderCreator->getResourcePrefix()
             << std::string("_")
-            << std::string("reach_m_table")
+            << std::string("reach_m_table_")
             << resourceIndex;
 
     // Note: Remove potentially problematic double underscores from GLSL resource names.
@@ -684,7 +684,7 @@ std::string _Add_Cusp_table(
     std::ostringstream resName;
     resName << shaderCreator->getResourcePrefix()
             << std::string("_")
-            << std::string("gamut_cusp_table")
+            << std::string("gamut_cusp_table_")
             << resourceIndex;
 
     // Note: Remove potentially problematic double underscores from GLSL resource names.
@@ -803,7 +803,7 @@ std::string _Add_Gamma_table(
     std::ostringstream resName;
     resName << shaderCreator->getResourcePrefix()
             << std::string("_")
-            << std::string("upper_hull_gamma_table")
+            << std::string("upper_hull_gamma_table_")
             << resourceIndex;
 
     // Note: Remove potentially problematic double underscores from GLSL resource names.