AcademySoftwareFoundation
diff --git a/‎CMakeLists.txt‎
Lines changed: 12 additions & 5 deletions b/‎CMakeLists.txt‎
Lines changed: 12 additions & 5 deletions
diff --git a/‎share/cmake/modules/FindExtPackages.cmake‎
Lines changed: 1 addition & 1 deletion b/‎share/cmake/modules/FindExtPackages.cmake‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎share/cmake/modules/install/Installsse2neon.cmake‎
Lines changed: 5 additions & 3 deletions b/‎share/cmake/modules/install/Installsse2neon.cmake‎
Lines changed: 5 additions & 3 deletions
diff --git a/‎share/cmake/utils/CheckSupportSSEUsingSSE2NEON.cmake‎
Lines changed: 8 additions & 2 deletions b/‎share/cmake/utils/CheckSupportSSEUsingSSE2NEON.cmake‎
Lines changed: 8 additions & 2 deletions
diff --git a/‎share/cmake/utils/CompilerFlags.cmake‎
Lines changed: 6 additions & 1 deletion b/‎share/cmake/utils/CompilerFlags.cmake‎
Lines changed: 6 additions & 1 deletion
diff --git a/‎share/dev/windows/ocio.bat‎
Lines changed: 1 addition & 1 deletion b/‎share/dev/windows/ocio.bat‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎share/dev/windows/ocio_deps.bat‎
Lines changed: 1 addition & 1 deletion b/‎share/dev/windows/ocio_deps.bat‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/OpenColorIO/CPUInfo.cpp‎
Lines changed: 1 addition & 1 deletion b/‎src/OpenColorIO/CPUInfo.cpp‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/OpenColorIO/CPUInfoConfig.h.in‎
Lines changed: 2 additions & 2 deletions b/‎src/OpenColorIO/CPUInfoConfig.h.in‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/OpenColorIO/GpuShaderClassWrapper.cpp‎
Lines changed: 1 addition & 4 deletions b/‎src/OpenColorIO/GpuShaderClassWrapper.cpp‎
Lines changed: 1 addition & 4 deletions
@@ -29,7 +29,7 @@ endif()
 # Project definition.
 
 project(OpenColorIO 
-    VERSION 2.4.1
+    VERSION 2.4.2
     DESCRIPTION "OpenColorIO (OCIO) is a complete color management solution"
     HOMEPAGE_URL https://github.com/AcademySoftwareFoundation/OpenColorIO
     LANGUAGES CXX C)
@@ -180,7 +180,12 @@ option(OCIO_USE_OIIO_FOR_APPS "Request OIIO to build apps (ociolutimage, ociocon
 
 
 if (NOT APPLE)
-    if ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(AMD64|IA64|EM64T|x86_64|X86|i386|i686)")
+    if("${CMAKE_GENERATOR_PLATFORM}" MATCHES "(ARM64|arm64)" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")
+        set(OCIO_ARCH_X86 0)
+        set(OCIO_BUILD_ENABLE_OPTIMIZATIONS_SSE ON)
+        set(OCIO_BUILD_ENABLE_OPTIMIZATIONS_AVX OFF)
+        set(OCIO_BUILD_ENABLE_OPTIMIZATIONS_F16C OFF)
+    elseif ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(AMD64|IA64|EM64T|x86_64|X86|i386|i686)")
         # Intel-based architecture (not APPLE)
         if ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(X86|i386|i686)")
             set(OCIO_ARCH_X86_32 1)
@@ -270,7 +275,7 @@ option(OCIO_USE_AVX2 "Specify whether to enable AVX2 CPU performance optimizatio
 option(OCIO_USE_AVX512 "Specify whether to enable AVX512 CPU performance optimizations" ${OCIO_BUILD_ENABLE_OPTIMIZATIONS_AVX})
 option(OCIO_USE_F16C  "Specify whether to enable F16C CPU performance optimizations" ${OCIO_BUILD_ENABLE_OPTIMIZATIONS_F16C})
 
-if (APPLE)
+if (APPLE OR WIN32)
    # TODO: Revisit whether that option is necessary.
    option(OCIO_USE_SSE2NEON "Specify whether to enable SSE CPU performance optimizations using SSE2NEON for Apple ARM architecture" ON)
    mark_as_advanced(OCIO_USE_SSE2NEON)
@@ -332,8 +337,10 @@ if(OCIO_USE_SIMD AND OCIO_USE_SSE2NEON AND COMPILER_SUPPORTS_ARM_NEON)
         add_library(sse2neon INTERFACE)
         # Add the include directories to the target.
         target_include_directories(sse2neon INTERFACE "${sse2neon_INCLUDE_DIR}")
-        # Ignore the warnings coming from sse2neon.h as they are false positives.
-        target_compile_options(sse2neon INTERFACE -Wno-unused-parameter)
+        if(NOT MSVC)
+            # Ignore the warnings coming from sse2neon.h as they are false positives.
+            target_compile_options(sse2neon INTERFACE -Wno-unused-parameter)
+        endif()
     endif()
 endif()
 
 
@@ -77,7 +77,7 @@ ocio_handle_dependency(  pystring REQUIRED ALLOW_INSTALL
 # https://github.com/AcademySoftwareFoundation/Imath
 ocio_handle_dependency(  Imath REQUIRED ALLOW_INSTALL
                          MIN_VERSION 3.1.1
-                         RECOMMENDED_VERSION 3.1.6
+                         RECOMMENDED_VERSION 3.1.12
                          RECOMMENDED_VERSION_REASON "Latest version tested with OCIO")
 
 ###############################################################################
 
@@ -16,7 +16,7 @@ include(FetchContent)
 set(FETCHCONTENT_BASE_DIR "${CMAKE_BINARY_DIR}/ext/build/sse2neon")
 FetchContent_Declare(sse2neon
   GIT_REPOSITORY https://github.com/DLTcollab/sse2neon.git
-  GIT_TAG        v1.6.0
+  GIT_TAG        227cc413fb2d50b2a10073087be96b59d5364aea
 )
 
 # FetchContent_MakeAvailable is not available until CMake 3.14+.
@@ -38,6 +38,8 @@ if(NOT sse2neon_POPULATED)
   add_library(sse2neon INTERFACE)
   # Add the include directories to the target.
   target_include_directories(sse2neon INTERFACE "${sse2neon_INCLUDE_DIR}")
-  # Ignore the warnings coming from sse2neon.h as they are false positives.
-  target_compile_options(sse2neon INTERFACE -Wno-unused-parameter)
+  if(NOT MSVC)
+      # Ignore the warnings coming from sse2neon.h as they are false positives.
+      target_compile_options(sse2neon INTERFACE -Wno-unused-parameter)
+  endif()
 endif()
@@ -6,8 +6,13 @@ include(CheckCXXSourceCompiles)
 set(_cmake_required_flags_orig "${CMAKE_REQUIRED_FLAGS}")
 set(_cmake_required_includes_orig "${CMAKE_REQUIRED_INCLUDES}")
 set(_cmake_osx_architectures_orig "${CMAKE_OSX_ARCHITECTURES}")
+set(_cmake_cxx_flags_orig "${CMAKE_CXX_FLAGS}")
 
-if(APPLE AND COMPILER_SUPPORTS_ARM_NEON)
+if(MSVC)
+    set(CMAKE_CXX_FLAGS "/Zc:preprocessor")
+endif()
+
+if((APPLE OR WIN32) AND COMPILER_SUPPORTS_ARM_NEON)
 
     if("${CMAKE_OSX_ARCHITECTURES}" MATCHES "arm64;x86_64" OR
        "${CMAKE_OSX_ARCHITECTURES}" MATCHES "x86_64;arm64")
@@ -63,8 +68,9 @@ endif()
 set(CMAKE_REQUIRED_FLAGS "${_cmake_required_flags_orig}")
 set(CMAKE_REQUIRED_INCLUDES "${_cmake_required_includes_orig}")
 set(CMAKE_OSX_ARCHITECTURES "${_cmake_osx_architectures_orig}")
+set(CMAKE_CXX_FLAGS "${_cmake_cxx_flags_orig}")
 
 unset(_cmake_required_flags_orig)
 unset(_cmake_required_includes_orig)
 unset(_cmake_osx_architectures_orig)
-
+unset(_cmake_cxx_flags_orig)
@@ -18,7 +18,12 @@ if(OCIO_USE_SIMD)
 
     if (OCIO_USE_SSE2NEON AND COMPILER_SUPPORTS_ARM_NEON)
         include(CheckSupportSSEUsingSSE2NEON)
-        if(NOT COMPILER_SUPPORTS_SSE_WITH_SSE2NEON)
+        if(COMPILER_SUPPORTS_SSE_WITH_SSE2NEON)
+            if(WIN32 AND MSVC)
+                # Enable the "new" preprocessor, to more closely match Clang/GCC, required for sse2neon
+                set(PLATFORM_COMPILE_OPTIONS "${PLATFORM_COMPILE_OPTIONS};/Zc:preprocessor")
+            endif()
+        else()
             set(OCIO_USE_SSE2NEON OFF)
         endif()
     endif()
 
@@ -77,7 +77,7 @@ if NOT "%~1"=="" (
 
 rem If not overridden by the cmd line args, find and use the latest Visual Studio
 if NOT DEFINED MSVS_PATH (
-    for /f %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -format value -property installationPath -latest') do (
+    for /f "delims=" %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -format value -property installationPath -latest') do (
         echo Found Visual Studio installation at '%%i'
         set MSVS_PATH=%%i
     )
 
@@ -105,7 +105,7 @@ if ErrorLevel 1 (
 
 echo Checking for Microsoft Visual Studio...
 set MSVS_PATH=
-for /f %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -format value -property installationPath -latest') do (
+for /f "delims=" %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -format value -property installationPath -latest') do (
     echo Found Visual Studio installation at '%%i'
     set MSVS_PATH=%%i
 )
 
@@ -183,7 +183,7 @@ CPUInfo::CPUInfo()
     }
 }
 
-#elif defined(__aarch64__) // ARM Processor or Apple ARM.
+#elif defined(__aarch64__) || defined(_M_ARM64) // ARM 64-bit processor (multiple platforms)
 
 CPUInfo::CPUInfo()
 {
 
@@ -6,7 +6,7 @@
 #cmakedefine01 OCIO_ARCH_X86_32
 
 // Relevant only for arm64 architecture.
-#if defined(__aarch64__)
+#if defined(__aarch64__) || defined(_M_ARM64)
     #cmakedefine01 OCIO_USE_SSE2NEON
 #else
     #define OCIO_USE_SSE2NEON 0
@@ -23,7 +23,7 @@
 
 // Building for x86_64 processor on a non-ARM host architecture
 // OR Building on/for an ARM architecture and using SSE2NEON.
-#if (OCIO_ARCH_X86 && !defined(__aarch64__)) || (defined(__aarch64__) && OCIO_USE_SSE2NEON)
+#if (OCIO_ARCH_X86 && !defined(__aarch64__)) || ((defined(__aarch64__) || defined(_M_ARM64)) && OCIO_USE_SSE2NEON)
     #cmakedefine01 OCIO_USE_SSE2
     #cmakedefine01 OCIO_USE_SSE3
     #cmakedefine01 OCIO_USE_SSSE3
 
@@ -66,10 +66,7 @@ std::string OSLShaderClassWrapper::getClassWrapperHeader(const std::string& orig
     st.newLine() << "vector4 __operator__mul__(matrix m, vector4 v)";
     st.newLine() << "{";
     st.indent();
-    st.newLine() << "return vector4(v.x * m[0][0] + v.y * m[0][1] + v.z * m[0][2] + v.w * m[0][3], ";
-    st.newLine() << "               v.x * m[1][0] + v.y * m[1][1] + v.z * m[1][2] + v.w * m[1][3], ";
-    st.newLine() << "               v.x * m[2][0] + v.y * m[2][1] + v.z * m[2][2] + v.w * m[2][3], ";
-    st.newLine() << "               v.x * m[3][0] + v.y * m[3][1] + v.z * m[3][2] + v.w * m[3][3]);";
+    st.newLine() << "return transform(m, v);";
     st.dedent();
     st.newLine() << "}";
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ if NOT "%~1"=="" (`
`77`	`77`
`78`	`78`	`rem If not overridden by the cmd line args, find and use the latest Visual Studio`
`79`	`79`	`if NOT DEFINED MSVS_PATH (`
`80`		`- for /f %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -format value -property installationPath -latest') do (`
	`80`	`+ for /f "delims=" %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -format value -property installationPath -latest') do (`
`81`	`81`	`echo Found Visual Studio installation at '%%i'`
`82`	`82`	`set MSVS_PATH=%%i`
`83`	`83`	`)`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ if ErrorLevel 1 (`
`105`	`105`
`106`	`106`	`echo Checking for Microsoft Visual Studio...`
`107`	`107`	`set MSVS_PATH=`
`108`		`-for /f %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -format value -property installationPath -latest') do (`
	`108`	`+for /f "delims=" %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -format value -property installationPath -latest') do (`
`109`	`109`	`echo Found Visual Studio installation at '%%i'`
`110`	`110`	`set MSVS_PATH=%%i`
`111`	`111`	`)`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ CPUInfo::CPUInfo()`
`183`	`183`	`}`
`184`	`184`	`}`
`185`	`185`
`186`		`-#elif defined(__aarch64__) // ARM Processor or Apple ARM.`
	`186`	`+#elif defined(__aarch64__) \|\| defined(_M_ARM64) // ARM 64-bit processor (multiple platforms)`
`187`	`187`
`188`	`188`	`CPUInfo::CPUInfo()`
`189`	`189`	`{`