[Bf-blender-cvs] [d729906393b] tmp_libupdate_34: Enable OpenGL, Metal and OpenImageIO in USD library

[Brecht Van Lommel]

Commit: d729906393bfa3da155be9182db49f55f6bd1c4e
Author: Brecht Van Lommel
Date:   Tue Aug 23 19:01:11 2022 +0200
Branches: tmp_libupdate_34
https://developer.blender.org/rBd729906393bfa3da155be9182db49f55f6bd1c4e

Enable OpenGL, Metal and OpenImageIO in USD library

Not tested on Windows.

===================================================================

M	build_files/build_environment/cmake/usd.cmake

===================================================================

diff --git a/build_files/build_environment/cmake/usd.cmake b/build_files/build_environment/cmake/usd.cmake
index 106aee09379..a8eb6be1231 100644
--- a/build_files/build_environment/cmake/usd.cmake
+++ b/build_files/build_environment/cmake/usd.cmake
@@ -47,6 +47,7 @@ set(USD_EXTRA_ARGS
   -DPXR_BUILD_TESTS=OFF
   -DPXR_BUILD_EXAMPLES=OFF
   -DPXR_BUILD_TUTORIALS=OFF
+  -DPXR_BUILD_USDVIEW=OFF
   -DPXR_ENABLE_HDF5_SUPPORT=OFF
   -DPXR_ENABLE_MATERIALX_SUPPORT=OFF
   -DPXR_ENABLE_OPENVDB_SUPPORT=ON
@@ -57,17 +58,13 @@ set(USD_EXTRA_ARGS
   # cube, etc.) to geometry, it's not necessary. Disabling it will make it
   # simpler to build Blender; currently only Cycles uses OSL.
   -DPXR_ENABLE_OSL_SUPPORT=OFF
-  # GL support on Linux also links to X11 libraries. Enabling it would break
-  # headless or Wayland-only builds. OpenGL support would be useful if someone
-  # wants to work on a Hydra viewport in Blender; when that's actually being
-  # worked on, we could patch in a new PXR_ENABLE_X11_SUPPORT option (to
-  # separate OpenGL from X11) and contribute it upstream.
-  -DPXR_ENABLE_GL_SUPPORT=OFF
-  # Disable Metal since USD fails to build this when OpenGL is disabled.
-  -DPXR_ENABLE_METAL_SUPPORT=OFF
-  # OIIO is used for loading image textures in Hydra Storm / Embree renderers,
-  # which we don't use.
-  -DPXR_BUILD_OPENIMAGEIO_PLUGIN=OFF
+  # Keep OpenGL and Metal enabled for Hydra support. Note that this indirectly also
+  # adds an X11 dependency on Linux, which would be good to eliminate for headless
+  # and Wayland only builds.
+  #-DPXR_ENABLE_GL_SUPPORT=OFF
+  #-DPXR_ENABLE_METAL_SUPPORT=OFF
+  # OIIO is used for loading image textures in Hydra Storm / Embree renderers.
+  -DPXR_BUILD_OPENIMAGEIO_PLUGIN=ON
   # USD 22.03 does not support OCIO 2.x
   # Tracking ticket https://github.com/PixarAnimationStudios/USD/issues/1386
   -DPXR_BUILD_OPENCOLORIO_PLUGIN=OFF