Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use LD Version Script only if BUILD_SHARED_LIBS #534

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: use LD Version Script only if BUILD_SHARED_LIBS #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fe6b1a
fix: use LD Version Script only if BUILD_SHARED_LIBS
zyzniewski Dec 30, 2022
c84298a
fix: Apple Silicon
zyzniewski Jan 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ target_link_libraries(rlottie
"${CMAKE_THREAD_LIBS_INIT}"
)

if (NOT APPLE AND NOT WIN32)
if (NOT APPLE AND NOT WIN32 AND BUILD_SHARED_LIBS)
target_link_libraries(rlottie
PRIVATE
"-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/rlottie.expmap"
Expand Down
20 changes: 6 additions & 14 deletions src/vector/vdrawhelper_neon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,20 @@

#include "vdrawhelper.h"

extern "C" void pixman_composite_src_n_8888_asm_neon(int32_t w, int32_t h,
uint32_t *dst,
int32_t dst_stride,
uint32_t src);

extern "C" void pixman_composite_over_n_8888_asm_neon(int32_t w, int32_t h,
uint32_t *dst,
int32_t dst_stride,
uint32_t src);

void memfill32(uint32_t *dest, uint32_t value, int length)
{
pixman_composite_src_n_8888_asm_neon(length, 1, dest, length, value);
memset(dest, value, length);
}

static void color_SourceOver(uint32_t *dest, int length,
uint32_t color,
uint32_t const_alpha)
uint32_t alpha)
{
if (const_alpha != 255) color = BYTE_MUL(color, const_alpha);
int ialpha, i;

pixman_composite_over_n_8888_asm_neon(length, 1, dest, length, color);
if (alpha != 255) color = BYTE_MUL(color, alpha);
ialpha = 255 - vAlpha(color);
for (i = 0; i < length; ++i) dest[i] = color + BYTE_MUL(dest[i], ialpha);
}

void RenderFuncTable::neon()
Expand Down