Skip to content

Commit a7bcf78

Browse files
aliasbinmanCopilotaliasbinmanblakdragan7
committed
Runtime compressed texture support (#12026) 7009e7fdec
* Bitmap Decoder Stuff * Format stuff * archive * Updates * Delete texture_archive.hpp * Format * Tests * Clang format * Apple * Update render_context.hpp * Update render_context.hpp * Update render_context_null.hpp * Update rive_renderer_gl.cpp * Update render_context.hpp * Update render_context.hpp * Update android_factories.cpp * Update render_context_webgpu_impl.cpp * clang format * Update d3d_utils.hpp * Update D3d * Update RenderContextRHIImpl.cpp * clang format * RHI * Update RenderContextRHIImpl.hpp * build break * Change align up * Update render_context_d3d_impl.cpp * clang * Update RenderContextRHIImpl.hpp * Update RenderContextRHIImpl.cpp * Update packages/runtime/renderer/src/d3d/d3d_utils.cpp * Update due to container types * formatting * Update render_context.cpp * Update bitmap decoder * clang format * Update render_context_d3d12_impl.cpp * clang format * clang * started rhi support * typo * Create texture_archive_test.cpp * clang * Address comments * Update enum * Clang format * Update texture_archive.hpp * Update decode_jpeg.cpp * Clang format * Update texture_archive_test.cpp * Update texture_archive.cpp * Update texture_archive.cpp * Update texture_archive_test.cpp * Fix bugs * Update image_decoders_test.cpp * Update texture_archive_test.cpp * Update texture_archive_test.cpp * Update texture_archive_test.cpp * Update texture_archive_test.cpp * Update texture_archive.hpp * Address Chris' comments * Update render_context_d3d12_impl.cpp * Update render_context_d3d12_impl.cpp * Update render_context_webgpu_impl.cpp * Update render_context_metal_impl.mm * Update render_context_d3d_impl.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: John White <aliasbinman@gmail.com> Co-authored-by: blakdragan7 <jcopela4@gmail.com>
1 parent d9b41e5 commit a7bcf78

4 files changed

Lines changed: 15 additions & 11 deletions

File tree

.rive_head

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
68e0e5ef0d546d0e799284801ae865e263a7efde
1+
7009e7fdec8306e566e631ea916f0318e05dc97c

kotlin/src/main/cpp/include/models/render_context.hpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "rive/renderer/gl/render_context_gl_impl.hpp"
1010
#include "rive/renderer/render_context.hpp"
1111
#include "rive/renderer/rive_render_image.hpp"
12+
#include "rive/texture_archive.hpp"
1213

1314
namespace rive_android
1415
{
@@ -208,11 +209,12 @@ struct RenderContextGL : RenderContext
208209
{
209210
auto mipLevelCount = rive::math::msb(height | width);
210211
RiveLogD(TAG_RC, "Creating RiveRenderImage");
211-
auto texture =
212-
riveContext->impl()->makeImageTexture(width,
213-
height,
214-
mipLevelCount,
215-
imageDataRGBA.get());
212+
auto texture = riveContext->impl()->makeImageTexture(
213+
width,
214+
height,
215+
mipLevelCount,
216+
rive::GPUTextureFormat::rgba32,
217+
imageDataRGBA.get());
216218
return rive::make_rcp<rive::RiveRenderImage>(texture);
217219
}
218220

kotlin/src/main/cpp/src/helpers/android_factories.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,12 @@ AndroidImage::AndroidImage(int width,
176176
auto* renderContextImpl =
177177
plsState->renderContext()
178178
->static_impl_cast<RenderContextGLImpl>();
179-
resetTexture(renderContextImpl->makeImageTexture(m_Width,
180-
m_Height,
181-
mipLevelCount,
182-
imageDataRGBA));
179+
resetTexture(renderContextImpl->makeImageTexture(
180+
m_Width,
181+
m_Height,
182+
mipLevelCount,
183+
rive::GPUTextureFormat::rgba32,
184+
imageDataRGBA));
183185
delete[] imageDataRGBA;
184186
});
185187
}

0 commit comments

Comments
 (0)