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.

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 Apple ARM64/Universal build #552

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ if (LOTTIE_ASAN)
endif()

if (NOT LIB_INSTALL_DIR)
set (LIB_INSTALL_DIR "/usr/lib")
set (LIB_INSTALL_DIR "/usr/local/lib")
endif (NOT LIB_INSTALL_DIR)

#declare source and include files
Expand Down
16 changes: 4 additions & 12 deletions src/vector/vdrawhelper_neon.cpp
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)
{
int ialpha, i;
if (const_alpha != 255) color = BYTE_MUL(color, const_alpha);

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

void RenderFuncTable::neon()
Expand Down