Adjust tinyUSD patch to enable compilation of library #6071
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Michał Pełka <[email protected]>
|
tellypresence
suggested changes
Mar 27, 2025
Comment on lines
-1
to
+5
| diff -rupN -x .git autoclone/tinyusdz_repo-src/src/external/stb_image_resize2.h tinyusdz_repo_patch/src/external/stb_image_resize2.h | ||
| --- autoclone/tinyusdz_repo-src/src/external/stb_image_resize2.h 2024-07-09 21:29:48.556969900 -0700 | ||
| +++ tinyusdz_repo_patch/src/external/stb_image_resize2.h 2024-07-09 23:03:47.379316700 -0700 | ||
| @@ -2404,6 +2404,38 @@ static stbir__inline stbir_uint8 stbir__ | ||
| diff --git a/src/external/stb_image_resize2.h b/src/external/stb_image_resize2.h | ||
| index 1cd379a7..c2f767a3 100644 | ||
| --- a/src/external/stb_image_resize2.h | ||
| +++ b/src/external/stb_image_resize2.h | ||
| @@ -2404,6 +2404,38 @@ static stbir__inline stbir_uint8 stbir__linear_to_srgb_uchar(float in) |
There was a problem hiding this comment.
Please delete these changes, it is likely to break the patch for other users
| @@ -40,3 +41,16 @@ diff -rupN -x .git autoclone/tinyusdz_repo-src/src/external/stb_image_resize2.h | |||
| #elif defined(STBIR_NEON) && defined(_MSC_VER) && defined(_M_ARM64) && !defined(__clang__) // 64-bit ARM on MSVC (not clang) | |||
|
|
|||
| static stbir__inline void stbir__half_to_float_SIMD(float * output, stbir__FP16 const * input) | |||
| diff --git a/src/lz4-compression.cc b/src/lz4-compression.cc | |||
There was a problem hiding this comment.
Please change to
diff -rupN -x .git autoclone/tinyusdz_repo-src/src/lz4-compression.cc tinyusdz_repo_patch/src/lz4-compression.cc
Comment on lines
+46
to
+47
| --- a/src/lz4-compression.cc | ||
| +++ b/src/lz4-compression.cc |
There was a problem hiding this comment.
Please change to
--- autoclone/tinyusdz_repo-src/src/lz4-compression.cc 2024-07-09 21:29:48.556969900 -0700
+++ tinyusdz_repo_patch/src/lz4-compression.cc 2024-07-09 23:03:47.379316700 -0700
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was signing comparison warning that stopped build