Skip to content

Commit dd944d0

Browse files
theblackunknowntheblackunknown
committed
[usd] Bump to v24.08
1 parent 198d68d commit dd944d0

21 files changed

+1303
-77
lines changed

‎ports/usd/001-fix_rename_find_package_to_find_dependency.patch‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in
2+
index b26f1ea31..a7dd9603d 100644
3+
--- a/pxr/pxrConfig.cmake.in
4+
+++ b/pxr/pxrConfig.cmake.in
5+
@@ -41,9 +41,9 @@ if(@PXR_ENABLE_PYTHON_SUPPORT@)
6+
endif()
7+
8+
if (NOT DEFINED Python3_VERSION)
9+
- find_package(Python3 "@Python3_VERSION@" EXACT COMPONENTS Development REQUIRED)
10+
+ find_dependency(Python3 "@Python3_VERSION@" EXACT COMPONENTS Development)
11+
else()
12+
- find_package(Python3 COMPONENTS Development REQUIRED)
13+
+ find_dependency(Python3 COMPONENTS Development)
14+
endif()
15+
endif()
16+
17+
@@ -57,7 +57,7 @@ if(@PXR_ENABLE_MATERIALX_SUPPORT@)
18+
set(MaterialX_DIR [[@MaterialX_DIR@]])
19+
endif()
20+
endif()
21+
- find_package(MaterialX REQUIRED)
22+
+ find_dependency(MaterialX)
23+
endif()
24+
25+
# Similar to MaterialX above, we are using Imath's cmake package config, so set
26+
@@ -71,7 +71,7 @@ if(@Imath_FOUND@)
27+
set(Imath_DIR [[@Imath_DIR@]])
28+
endif()
29+
endif()
30+
- find_package(Imath REQUIRED)
31+
+ find_dependency(Imath)
32+
endif()
33+
34+
include("${PXR_CMAKE_DIR}/cmake/pxrTargets.cmake")

‎ports/usd/002-vcpkg_find_tbb.patch‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake
2+
index fe60570b3..ef8cfdaba 100644
3+
--- a/cmake/defaults/Packages.cmake
4+
+++ b/cmake/defaults/Packages.cmake
5+
@@ -137,7 +137,7 @@ endif()
6+
7+
8+
# --TBB
9+
-find_package(TBB REQUIRED COMPONENTS tbb)
10+
+find_package(TBB CONFIG REQUIRED)
11+
add_definitions(${TBB_DEFINITIONS})
12+
13+
# --math
14+
diff --git a/pxr/base/tf/CMakeLists.txt b/pxr/base/tf/CMakeLists.txt
15+
index b236184c4..342296512 100644
16+
--- a/pxr/base/tf/CMakeLists.txt
17+
+++ b/pxr/base/tf/CMakeLists.txt
18+
@@ -116,12 +116,11 @@ pxr_library(tf
19+
${WINLIBS}
20+
${PYTHON_LIBRARIES}
21+
${Boost_PYTHON_LIBRARY}
22+
- ${TBB_tbb_LIBRARY}
23+
+ TBB::tbb
24+
25+
INCLUDE_DIRS
26+
${PYTHON_INCLUDE_DIRS}
27+
${Boost_INCLUDE_DIRS}
28+
- ${TBB_INCLUDE_DIRS}
29+
30+
PUBLIC_CLASSES
31+
anyUniquePtr
32+
diff --git a/pxr/imaging/plugin/hdEmbree/CMakeLists.txt b/pxr/imaging/plugin/hdEmbree/CMakeLists.txt
33+
index 43aa0826e..a1f443b9c 100644
34+
--- a/pxr/imaging/plugin/hdEmbree/CMakeLists.txt
35+
+++ b/pxr/imaging/plugin/hdEmbree/CMakeLists.txt
36+
@@ -21,11 +21,10 @@ pxr_plugin(hdEmbree
37+
hf
38+
hd
39+
hdx
40+
- ${TBB_tbb_LIBRARY}
41+
+ TBB::tbb
42+
${EMBREE_LIBRARY}
43+
44+
INCLUDE_DIRS
45+
- ${TBB_INCLUDE_DIRS}
46+
${EMBREE_INCLUDE_DIR}
47+
48+
PUBLIC_CLASSES
49+
diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in
50+
index a7dd9603d..cdd5d07f3 100644
51+
--- a/pxr/pxrConfig.cmake.in
52+
+++ b/pxr/pxrConfig.cmake.in
53+
@@ -16,6 +16,10 @@ set(PXR_MINOR_VERSION "@PXR_MINOR_VERSION@")
54+
set(PXR_PATCH_VERSION "@PXR_PATCH_VERSION@")
55+
set(PXR_VERSION "@PXR_VERSION@")
56+
57+
+include(CMakeFindDependencyMacro)
58+
+
59+
+find_dependency(TBB)
60+
+
61+
# If Python support was enabled for this USD build, find the import
62+
# targets by invoking the appropriate FindPython module. Use the same
63+
# LIBRARY and INCLUDE_DIR settings from the original build if they
64+
diff --git a/pxr/usd/usd/CMakeLists.txt b/pxr/usd/usd/CMakeLists.txt
65+
index fd86e9085..de087ea5f 100644
66+
--- a/pxr/usd/usd/CMakeLists.txt
67+
+++ b/pxr/usd/usd/CMakeLists.txt
68+
@@ -13,12 +13,11 @@ pxr_library(usd
69+
trace
70+
vt
71+
work
72+
+ TBB::tbb
73+
${Boost_PYTHON_LIBRARY}
74+
- ${TBB_tbb_LIBRARY}
75+
76+
INCLUDE_DIRS
77+
${Boost_INCLUDE_DIRS}
78+
- ${TBB_INCLUDE_DIRS}
79+
80+
PUBLIC_CLASSES
81+
apiSchemaBase

‎ports/usd/003-vcpkg_find_opensubdiv.patch‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake
2+
index ef8cfdaba..4e06391d3 100644
3+
--- a/cmake/defaults/Packages.cmake
4+
+++ b/cmake/defaults/Packages.cmake
5+
@@ -259,8 +259,12 @@ if (PXR_BUILD_IMAGING)
6+
endif()
7+
endif()
8+
# --Opensubdiv
9+
- set(OPENSUBDIV_USE_GPU ${PXR_ENABLE_GL_SUPPORT})
10+
- find_package(OpenSubdiv 3 REQUIRED)
11+
+ find_package(OpenSubdiv 3 CONFIG REQUIRED)
12+
+ set(OPENSUBDIV_LIBRARIES OpenSubdiv::osdCPU_static)
13+
+ set(OPENSUBDIV_INCLUDE_DIRS ${OPENSUBDIV_INCLUDE_DIR})
14+
+ if(PXR_ENABLE_GL_SUPPORT)
15+
+ list(APPEND OPENSUBDIV_LIBRARIES OpenSubdiv::osdGPU_static)
16+
+ endif()
17+
# --Ptex
18+
if (PXR_ENABLE_PTEX_SUPPORT)
19+
find_package(PTex REQUIRED)
20+
diff --git a/pxr/imaging/pxOsd/CMakeLists.txt b/pxr/imaging/pxOsd/CMakeLists.txt
21+
index 46f02889a..e3435372b 100644
22+
--- a/pxr/imaging/pxOsd/CMakeLists.txt
23+
+++ b/pxr/imaging/pxOsd/CMakeLists.txt
24+
@@ -6,12 +6,9 @@ pxr_library(pxOsd
25+
tf
26+
gf
27+
vt
28+
- ${OPENSUBDIV_OSDCPU_LIBRARY}
29+
+ OpenSubdiv::osdCPU_static
30+
${Boost_PYTHON_LIBRARY}
31+
32+
- INCLUDE_DIRS
33+
- ${OPENSUBDIV_INCLUDE_DIR}
34+
-
35+
PUBLIC_HEADERS
36+
api.h
37+
38+
diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in
39+
index cdd5d07f3..1835799cc 100644
40+
--- a/pxr/pxrConfig.cmake.in
41+
+++ b/pxr/pxrConfig.cmake.in
42+
@@ -20,6 +20,10 @@ include(CMakeFindDependencyMacro)
43+
44+
find_dependency(TBB)
45+
46+
+if(@PXR_BUILD_IMAGING@)
47+
+ find_dependency(OpenSubdiv 3)
48+
+endif()
49+
+
50+
# If Python support was enabled for this USD build, find the import
51+
# targets by invoking the appropriate FindPython module. Use the same
52+
# LIBRARY and INCLUDE_DIR settings from the original build if they

‎ports/usd/004-vcpkg_find_openimageio.patch‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake
2+
index 4e06391d3..88212a2fa 100644
3+
--- a/cmake/defaults/Packages.cmake
4+
+++ b/cmake/defaults/Packages.cmake
5+
@@ -195,7 +195,7 @@ if (PXR_BUILD_IMAGING)
6+
# --OpenImageIO
7+
if (PXR_BUILD_OPENIMAGEIO_PLUGIN)
8+
set(REQUIRES_Imath TRUE)
9+
- find_package(OpenImageIO REQUIRED)
10+
+ find_package(OpenImageIO CONFIG REQUIRED)
11+
add_definitions(-DPXR_OIIO_PLUGIN_ENABLED)
12+
if (OIIO_idiff_BINARY)
13+
set(IMAGE_DIFF_TOOL ${OIIO_idiff_BINARY} CACHE STRING "Uses idiff for image diffing")
14+
diff --git a/pxr/imaging/plugin/hioOiio/CMakeLists.txt b/pxr/imaging/plugin/hioOiio/CMakeLists.txt
15+
index 0a055b711..637420062 100644
16+
--- a/pxr/imaging/plugin/hioOiio/CMakeLists.txt
17+
+++ b/pxr/imaging/plugin/hioOiio/CMakeLists.txt
18+
@@ -7,14 +7,6 @@ if (NOT ${PXR_BUILD_GPU_SUPPORT})
19+
return()
20+
endif()
21+
22+
-# Use the import targets set by Imath's package config
23+
-if (Imath_FOUND)
24+
- set(__OIIO_IMATH_LIBS "Imath::Imath")
25+
-else()
26+
- set(__OIIO_IMATH_INCLUDE ${OPENEXR_INCLUDE_DIRS})
27+
- set(__OIIO_IMATH_LIBS ${OPENEXR_LIBRARIES})
28+
-endif()
29+
-
30+
pxr_plugin(hioOiio
31+
LIBRARIES
32+
ar
33+
@@ -22,12 +14,7 @@ pxr_plugin(hioOiio
34+
gf
35+
hio
36+
tf
37+
- ${OIIO_LIBRARIES}
38+
- ${__OIIO_IMATH_LIBS}
39+
-
40+
- INCLUDE_DIRS
41+
- ${OIIO_INCLUDE_DIRS}
42+
- ${__OIIO_IMATH_INCLUDE}
43+
+ OpenImageIO::OpenImageIO
44+
45+
CPPFILES
46+
oiioImage.cpp
47+
diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in
48+
index 1835799cc..ab4df71b6 100644
49+
--- a/pxr/pxrConfig.cmake.in
50+
+++ b/pxr/pxrConfig.cmake.in
51+
@@ -22,6 +22,9 @@ find_dependency(TBB)
52+
53+
if(@PXR_BUILD_IMAGING@)
54+
find_dependency(OpenSubdiv 3)
55+
+ if(@PXR_BUILD_OPENIMAGEIO_PLUGIN@)
56+
+ find_dependency(OpenImageIO)
57+
+ endif()
58+
endif()
59+
60+
# If Python support was enabled for this USD build, find the import

‎ports/usd/005-vcpkg_find_shaderc.patch‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake
2+
index 88212a2fa..953dfbeaa 100644
3+
--- a/cmake/defaults/Packages.cmake
4+
+++ b/cmake/defaults/Packages.cmake
5+
@@ -232,6 +232,7 @@ if (PXR_BUILD_IMAGING)
6+
find_package(Vulkan REQUIRED)
7+
list(APPEND VULKAN_LIBS Vulkan::Vulkan)
8+
9+
+ if(0)
10+
# Find the extra vulkan libraries we need
11+
set(EXTRA_VULKAN_LIBS shaderc_combined)
12+
if (WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
13+
@@ -241,6 +242,7 @@ if (PXR_BUILD_IMAGING)
14+
find_library("${EXTRA_LIBRARY}_PATH" NAMES "${EXTRA_LIBRARY}" PATHS $ENV{VULKAN_SDK}/lib)
15+
list(APPEND VULKAN_LIBS "${${EXTRA_LIBRARY}_PATH}")
16+
endforeach()
17+
+ endif()
18+
19+
# Find the OS specific libs we need
20+
if (APPLE)
21+
@@ -257,6 +259,7 @@ if (PXR_BUILD_IMAGING)
22+
else()
23+
message(FATAL_ERROR "VULKAN_SDK not valid")
24+
endif()
25+
+ find_package(unofficial-shaderc CONFIG REQUIRED)
26+
endif()
27+
# --Opensubdiv
28+
find_package(OpenSubdiv 3 CONFIG REQUIRED)
29+
diff --git a/pxr/imaging/hgiVulkan/CMakeLists.txt b/pxr/imaging/hgiVulkan/CMakeLists.txt
30+
index 97e422894..aaac93ee6 100644
31+
--- a/pxr/imaging/hgiVulkan/CMakeLists.txt
32+
+++ b/pxr/imaging/hgiVulkan/CMakeLists.txt
33+
@@ -14,6 +14,7 @@ pxr_library(hgiVulkan
34+
tf
35+
trace
36+
${VULKAN_LIBS}
37+
+ unofficial::shaderc::shaderc
38+
39+
PUBLIC_CLASSES
40+
blitCmds
41+
diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in
42+
index ab4df71b6..5da5543c4 100644
43+
--- a/pxr/pxrConfig.cmake.in
44+
+++ b/pxr/pxrConfig.cmake.in
45+
@@ -25,6 +25,9 @@ if(@PXR_BUILD_IMAGING@)
46+
if(@PXR_BUILD_OPENIMAGEIO_PLUGIN@)
47+
find_dependency(OpenImageIO)
48+
endif()
49+
+ if(@PXR_ENABLE_VULKAN_SUPPORT@)
50+
+ find_dependency(unofficial-shaderc)
51+
+ endif()
52+
endif()
53+
54+
# If Python support was enabled for this USD build, find the import

‎ports/usd/006-vcpkg_find_spirv-reflect.patch‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake
2+
index 953dfbeaa..ec4ab0c43 100644
3+
--- a/cmake/defaults/Packages.cmake
4+
+++ b/cmake/defaults/Packages.cmake
5+
@@ -260,6 +260,7 @@ if (PXR_BUILD_IMAGING)
6+
message(FATAL_ERROR "VULKAN_SDK not valid")
7+
endif()
8+
find_package(unofficial-shaderc CONFIG REQUIRED)
9+
+ find_package(unofficial-spirv-reflect CONFIG REQUIRED)
10+
endif()
11+
# --Opensubdiv
12+
find_package(OpenSubdiv 3 CONFIG REQUIRED)
13+
diff --git a/pxr/imaging/hgiVulkan/CMakeLists.txt b/pxr/imaging/hgiVulkan/CMakeLists.txt
14+
index aaac93ee6..7dadea311 100644
15+
--- a/pxr/imaging/hgiVulkan/CMakeLists.txt
16+
+++ b/pxr/imaging/hgiVulkan/CMakeLists.txt
17+
@@ -15,6 +15,7 @@ pxr_library(hgiVulkan
18+
trace
19+
${VULKAN_LIBS}
20+
unofficial::shaderc::shaderc
21+
+ unofficial::SPIRV-Reflect::SPIRV-Reflect
22+
23+
PUBLIC_CLASSES
24+
blitCmds
25+
@@ -47,9 +48,6 @@ pxr_library(hgiVulkan
26+
api.h
27+
vulkan.h
28+
29+
- PRIVATE_CLASSES
30+
- spirv_reflect
31+
-
32+
RESOURCE_FILES
33+
plugInfo.json
34+
)
35+
diff --git a/pxr/imaging/hgiVulkan/shaderCompiler.cpp b/pxr/imaging/hgiVulkan/shaderCompiler.cpp
36+
index 7f285e7a6..bf934e071 100644
37+
--- a/pxr/imaging/hgiVulkan/shaderCompiler.cpp
38+
+++ b/pxr/imaging/hgiVulkan/shaderCompiler.cpp
39+
@@ -10,8 +10,8 @@
40+
#include "pxr/imaging/hgiVulkan/device.h"
41+
#include "pxr/imaging/hgiVulkan/diagnostic.h"
42+
#include "pxr/imaging/hgiVulkan/shaderCompiler.h"
43+
-#include "pxr/imaging/hgiVulkan/spirv_reflect.h"
44+
45+
+#include <spirv_reflect.h>
46+
#include <shaderc/shaderc.hpp>
47+
48+
#include <unordered_map>
49+
diff --git a/pxr/imaging/hgiVulkan/spirv_reflect.cpp b/pxr/imaging/hgiVulkan/spirv_reflect.cpp
50+
deleted file mode 100644
51+
index b2862df17..000000000
52+
--- a/pxr/imaging/hgiVulkan/spirv_reflect.cpp
53+
+++ /dev/null
54+
@@ -1,9 +0,0 @@
55+
-//
56+
-// Copyright 2023 Pixar
57+
-//
58+
-// Licensed under the terms set forth in the LICENSE.txt file available at
59+
-// https://openusd.org/license.
60+
-//
61+
-#include "pxr/imaging/hgiVulkan/spirv_reflect.h"
62+
-
63+
-#include <SPIRV-Reflect/spirv_reflect.c>
64+
diff --git a/pxr/imaging/hgiVulkan/spirv_reflect.h b/pxr/imaging/hgiVulkan/spirv_reflect.h
65+
deleted file mode 100644
66+
index b2779079a..000000000
67+
--- a/pxr/imaging/hgiVulkan/spirv_reflect.h
68+
+++ /dev/null
69+
@@ -1,15 +0,0 @@
70+
-//
71+
-// Copyright 2023 Pixar
72+
-//
73+
-// Licensed under the terms set forth in the LICENSE.txt file available at
74+
-// https://openusd.org/license.
75+
-//
76+
-#ifndef PXR_IMAGING_HGIVULKAN_SPIRV_REFLECT_H
77+
-#define PXR_IMAGING_HGIVULKAN_SPIRV_REFLECT_H
78+
-
79+
-// This is an implementation of SPIRV-Reflect included
80+
-// from the Vulkan SDK.
81+
-
82+
-#include <SPIRV-Reflect/spirv_reflect.h>
83+
-
84+
-#endif
85+
diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in
86+
index 5da5543c4..8facdffbd 100644
87+
--- a/pxr/pxrConfig.cmake.in
88+
+++ b/pxr/pxrConfig.cmake.in
89+
@@ -27,6 +27,7 @@ if(@PXR_BUILD_IMAGING@)
90+
endif()
91+
if(@PXR_ENABLE_VULKAN_SUPPORT@)
92+
find_dependency(unofficial-shaderc)
93+
+ find_dependency(unofficial-spirv-reflect)
94+
endif()
95+
endif()
96+

0 commit comments

Comments
 (0)