Skip to content

Commit 0771f93

Browse files
kunitokikunitoki
committed
Bump rive to latest
1 parent 362ccfe commit 0771f93

2,098 files changed

Lines changed: 412983 additions & 155477 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ cmake-build*
4040
out/*
4141

4242
# Ides/Agents
43+
.gitnexus/
4344
.vscode/
4445
.idea/
4546
.vs/

‎justfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,5 @@ python_uninstall:
9898
python_test *TEST_OPTS:
9999
python -m pytest -s {{TEST_OPTS}}
100100

101-
bump_rive:
102-
uv run python tools/bump_rive.py --rive-ref runtime-v0.1.62 --allow-dirty
103-
101+
rive_update REF="runtime-v0.1.62":
102+
uv run python tools/rive_update.py --rive-ref {{REF}} --allow-dirty --keep-work-dir

‎modules/yup_graphics/imaging/yup_Image.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ bool Image::createTextureIfNotPresent (GraphicsContext& context) const
173173
width,
174174
height,
175175
rive::math::msb (width | height),
176+
rive::GPUTextureFormat::rgba32,
176177
getRawData().data());
177178

178179
return true;

‎modules/yup_graphics/native/yup_GraphicsContext_headless.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class NoOpRenderPath : public rive::RenderPath
7979

8080
void addPath (rive::CommandPath*, const rive::Mat2D&) override {}
8181

82-
void addRenderPath (rive::RenderPath*, const rive::Mat2D&) override {}
82+
void addRenderPath (const rive::RenderPath*, const rive::Mat2D&) override {}
8383

8484
void moveTo (float, float) override {}
8585

@@ -179,6 +179,8 @@ class NoOpRenderer : public rive::Renderer
179179
uint32_t indexCount,
180180
rive::BlendMode,
181181
float) override {}
182+
183+
void modulateOpacity (float) override {}
182184
};
183185

184186
//==============================================================================

‎modules/yup_graphics/native/yup_GraphicsContext_metal.cpp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class LowLevelRenderContextMetal : public GraphicsContext
8282
rive::gpu::RenderContextMetalImpl::ContextOptions metalOptions;
8383

8484
if (m_fiddleOptions.synchronousShaderCompilations)
85-
metalOptions.synchronousShaderCompilations = true;
85+
metalOptions.shaderCompilationMode = rive::gpu::ShaderCompilationMode::alwaysSynchronous;
8686

8787
if (m_fiddleOptions.disableRasterOrdering)
8888
metalOptions.disableFramebufferReads = true;
@@ -192,8 +192,12 @@ class LowLevelRenderContextMetal : public GraphicsContext
192192
if (m_currentTexture != nil)
193193
{
194194
[m_currentTexture setPurgeableState:MTLPurgeableStateEmpty];
195+
#if defined(__has_feature) && __has_feature(objc_arc)
196+
m_currentTexture = nil;
197+
#else
195198
[m_currentTexture release];
196199
m_currentTexture = nil;
200+
#endif
197201
}
198202

199203
MTLTextureDescriptor* descriptor = [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:(MTLPixelFormatBGRA8Unorm)

‎modules/yup_gui/artboard/yup_ArtboardFile.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class LambdaAssetLoader : public rive::FileAssetLoader
5757

5858
//==============================================================================
5959

60-
ArtboardFile::ArtboardFile (std::unique_ptr<rive::File> rivFile)
60+
ArtboardFile::ArtboardFile (rive::rcp<rive::File> rivFile)
6161
: rivFile (std::move (rivFile))
6262
{
6363
}
@@ -106,7 +106,7 @@ ArtboardFile::LoadResult ArtboardFile::load (InputStream& is, rive::Factory& fac
106106
is.readIntoMemoryBlock (mb);
107107

108108
rive::ImportResult result;
109-
std::unique_ptr<rive::File> rivFile;
109+
rive::rcp<rive::File> rivFile;
110110

111111
if (assetCallback != nullptr)
112112
{

‎modules/yup_gui/artboard/yup_ArtboardFile.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ class YUP_API ArtboardFile
9494

9595
private:
9696
ArtboardFile() = default;
97-
ArtboardFile (std::unique_ptr<rive::File> rivFile);
97+
ArtboardFile (rive::rcp<rive::File> rivFile);
9898

99-
std::unique_ptr<rive::File> rivFile;
99+
rive::rcp<rive::File> rivFile;
100100
};
101101

102102
} // namespace yup

‎thirdparty/harfbuzz/harfbuzz.cpp‎

Lines changed: 22 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#pragma clang diagnostic push
2424
#pragma clang diagnostic ignored "-Wempty-body"
2525
#pragma clang diagnostic ignored "-Wunused-function"
26+
#pragma clang diagnostic ignored "-Wunused-member-function"
2627
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
2728
#pragma clang diagnostic ignored "-Wformat"
2829
#elif __GNUC__
@@ -39,83 +40,27 @@
3940

4041
#include "harfbuzz.h"
4142

42-
#include "upstream/graph/gsubgpos-context.cc"
43-
#include "upstream/hb-aat-layout.cc"
44-
#include "upstream/hb-aat-map.cc"
45-
#include "upstream/hb-blob.cc"
46-
#include "upstream/hb-buffer-serialize.cc"
47-
#include "upstream/hb-buffer-verify.cc"
48-
#include "upstream/hb-buffer.cc"
49-
#include "upstream/hb-cairo-utils.cc"
50-
#include "upstream/hb-cairo.cc"
51-
#include "upstream/hb-common.cc"
52-
#include "upstream/hb-coretext-font.cc"
53-
#include "upstream/hb-coretext-shape.cc"
54-
#include "upstream/hb-directwrite.cc"
55-
#include "upstream/hb-draw.cc"
56-
#include "upstream/hb-face-builder.cc"
57-
#include "upstream/hb-face.cc"
58-
#include "upstream/hb-fallback-shape.cc"
59-
#include "upstream/hb-font.cc"
60-
#include "upstream/hb-ft.cc"
61-
#include "upstream/hb-gdi.cc"
62-
#include "upstream/hb-glib.cc"
63-
#include "upstream/hb-gobject-structs.cc"
64-
#include "upstream/hb-graphite2.cc"
65-
#include "upstream/hb-icu.cc"
66-
#include "upstream/hb-map.cc"
67-
#include "upstream/hb-number.cc"
68-
#include "upstream/hb-ot-cff1-table.cc"
69-
#include "upstream/hb-ot-cff2-table.cc"
70-
#include "upstream/hb-ot-color.cc"
71-
#include "upstream/hb-ot-face.cc"
72-
#include "upstream/hb-ot-font.cc"
73-
#include "upstream/hb-ot-layout.cc"
74-
#include "upstream/hb-ot-map.cc"
75-
#include "upstream/hb-ot-math.cc"
76-
#include "upstream/hb-ot-meta.cc"
77-
#include "upstream/hb-ot-metrics.cc"
78-
#include "upstream/hb-ot-name.cc"
79-
#include "upstream/hb-ot-shape-fallback.cc"
80-
#include "upstream/hb-ot-shape-normalize.cc"
81-
#include "upstream/hb-ot-shape.cc"
82-
#include "upstream/hb-ot-shaper-arabic.cc"
83-
#include "upstream/hb-ot-shaper-default.cc"
84-
#include "upstream/hb-ot-shaper-hangul.cc"
85-
#include "upstream/hb-ot-shaper-hebrew.cc"
86-
#include "upstream/hb-ot-shaper-indic-table.cc"
87-
#include "upstream/hb-ot-shaper-indic.cc"
88-
#include "upstream/hb-ot-shaper-khmer.cc"
89-
#include "upstream/hb-ot-shaper-myanmar.cc"
90-
#include "upstream/hb-ot-shaper-syllabic.cc"
91-
#include "upstream/hb-ot-shaper-thai.cc"
92-
#include "upstream/hb-ot-shaper-use.cc"
93-
#include "upstream/hb-ot-shaper-vowel-constraints.cc"
94-
#include "upstream/hb-ot-tag.cc"
95-
#include "upstream/hb-ot-var.cc"
96-
#include "upstream/hb-outline.cc"
97-
#include "upstream/hb-paint-extents.cc"
98-
#include "upstream/hb-paint.cc"
99-
#include "upstream/hb-set.cc"
100-
#include "upstream/hb-shape-plan.cc"
101-
#include "upstream/hb-shape.cc"
102-
#include "upstream/hb-shaper.cc"
103-
#include "upstream/hb-static.cc"
104-
#include "upstream/hb-style.cc"
105-
#include "upstream/hb-subset-cff-common.cc"
106-
#include "upstream/hb-subset-cff1.cc"
107-
#include "upstream/hb-subset-cff2.cc"
108-
#include "upstream/hb-subset-input.cc"
109-
#include "upstream/hb-subset-instancer-iup.cc"
110-
#include "upstream/hb-subset-instancer-solver.cc"
111-
#include "upstream/hb-subset-plan.cc"
112-
#include "upstream/hb-subset-repacker.cc"
113-
#include "upstream/hb-subset.cc"
114-
#include "upstream/hb-ucd.cc"
115-
#include "upstream/hb-unicode.cc"
116-
#include "upstream/hb-uniscribe.cc"
117-
#include "upstream/hb-wasm-api.cc"
118-
#include "upstream/hb-wasm-shape.cc"
43+
#if !defined(HB_NO_PRAGMA_GCC_DIAGNOSTIC_ERROR)
44+
#define YUP_HARFBUZZ_DEFINED_HB_NO_PRAGMA_GCC_DIAGNOSTIC_ERROR 1
45+
#define HB_NO_PRAGMA_GCC_DIAGNOSTIC_ERROR 1
46+
#endif
47+
48+
#if !defined(HB_NO_PRAGMA_GCC_DIAGNOSTIC_WARNING)
49+
#define YUP_HARFBUZZ_DEFINED_HB_NO_PRAGMA_GCC_DIAGNOSTIC_WARNING 1
50+
#define HB_NO_PRAGMA_GCC_DIAGNOSTIC_WARNING 1
51+
#endif
52+
53+
#include "upstream/harfbuzz.cc"
54+
55+
#if defined(YUP_HARFBUZZ_DEFINED_HB_NO_PRAGMA_GCC_DIAGNOSTIC_WARNING)
56+
#undef HB_NO_PRAGMA_GCC_DIAGNOSTIC_WARNING
57+
#undef YUP_HARFBUZZ_DEFINED_HB_NO_PRAGMA_GCC_DIAGNOSTIC_WARNING
58+
#endif
59+
60+
#if defined(YUP_HARFBUZZ_DEFINED_HB_NO_PRAGMA_GCC_DIAGNOSTIC_ERROR)
61+
#undef HB_NO_PRAGMA_GCC_DIAGNOSTIC_ERROR
62+
#undef YUP_HARFBUZZ_DEFINED_HB_NO_PRAGMA_GCC_DIAGNOSTIC_ERROR
63+
#endif
11964

12065
#if __clang__
12166
#pragma clang diagnostic pop

‎thirdparty/harfbuzz/harfbuzz.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
website: https://github.com/harfbuzz/harfbuzz
3333
license: MIT
3434
35-
defines: HAVE_ATEXIT=1 HB_ONLY_ONE_SHAPER HAVE_OT HB_NO_FALLBACK_SHAPE HB_NO_WIN1256 HB_NO_WIN1256 HB_NO_EXTERN_HELPERS HB_DISABLE_DEPRECATED HB_NO_COLOR HB_NO_BITMAP HB_NO_BUFFER_SERIALIZE HB_NO_BUFFER_VERIFY HB_NO_BUFFER_MESSAGE HB_NO_SETLOCALE HB_NO_VERTICAL HB_NO_LAYOUT_COLLECT_GLYPHS HB_NO_LAYOUT_RARELY_USED HB_NO_LAYOUT_UNUSED HB_NO_OT_FONT_GLYPH_NAMES HB_NO_PAINT HB_NO_MMAP HB_NO_META
35+
defines: HAVE_ATEXIT=1 HB_ONLY_ONE_SHAPER HAVE_OT HB_NO_FALLBACK_SHAPE HB_NO_WIN1256 HB_NO_WIN1256 HB_NO_EXTERN_HELPERS HB_DISABLE_DEPRECATED HB_NO_BUFFER_SERIALIZE HB_NO_BUFFER_VERIFY HB_NO_BUFFER_MESSAGE HB_NO_SETLOCALE HB_NO_VERTICAL HB_NO_LAYOUT_COLLECT_GLYPHS HB_NO_LAYOUT_RARELY_USED HB_NO_LAYOUT_UNUSED HB_NO_OT_FONT_GLYPH_NAMES HB_NO_MMAP HB_NO_META
3636
appleDefines: HAVE_CORETEXT
3737
appleFrameworks: CoreText
3838
searchpaths: upstream

0 commit comments

Comments
 (0)