Skip to content

port: Make the project more portable #7

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

port: Make the project more portable #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# SPDX-License-Identifier: MIT

CC = gcc
CC ?= gcc

LIBMUI =
MUI_SRC := $(wildcard $(LIBMUI)src/*.c)
Expand Down
4 changes: 3 additions & 1 deletion Makefile.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ MUI_VERSION := ${shell \
CPPFLAGS += -DMUI_VERSION="\"$(MUI_VERSION)\""

OPTIMIZE ?= -O0 -g
CFLAGS += --std=gnu99 -Wall -Wextra
# "--std=gnu99" works only with gcc/clang
#CFLAGS += --std=gnu99
CFLAGS += -Wall -Wextra
CFLAGS += $(OPTIMIZE)
CFLAGS += -Wno-unused-parameter -Wno-unused-function
# PIC is necessary for the shared library/plugin to work
Expand Down
22 changes: 22 additions & 0 deletions src/cg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@
#if defined(__APPLE__) && defined(__MACH__)
#define CG_WEAK_LINKING 0
#else
#ifdef __GNUC__
#define CG_WEAK_LINKING 1
#else
#define CG_WEAK_LINKING 0
#endif
#endif

#if CG_WEAK_LINKING
Expand All @@ -41,6 +45,16 @@
extern __typeof(__##_name) _name __attribute__((weak, alias(_cg_und(_name))))
#else
#define cg_weak_alias(_name)
/* avoid build fails, when __attribute__((weak, alias(newname))) is not supported */
#define cg_memfill32 __cg_memfill32
#define cg_comp_solid_source __cg_comp_solid_source
#define cg_comp_solid_source_over __cg_comp_solid_source_over
#define cg_comp_solid_destination_in __cg_comp_solid_destination_in
#define cg_comp_solid_destination_out __cg_comp_solid_destination_out
#define cg_comp_source __cg_comp_source
#define cg_comp_source_over __cg_comp_source_over
#define cg_comp_destination_in __cg_comp_destination_in
#define cg_comp_destination_out __cg_comp_destination_out
#endif

#define cg_array_init(array) \
Expand Down Expand Up @@ -1447,12 +1461,18 @@ static inline uint32_t interpolate_pixel(uint32_t x, uint32_t a, uint32_t y, uin
return x;
}


#ifdef __GNUC__
#if defined(__AVX2__)
typedef uint32_t u32_v __attribute__((vector_size(32)));
#define VEC_ALIGN 31
#define VEC_ECOUNT 8
#else
typedef uint32_t u32_v __attribute__((vector_size(16)));
#endif
#endif

#ifndef VEC_ALIGN
#define VEC_ALIGN 15
#define VEC_ECOUNT 4
#endif
Expand All @@ -1465,11 +1485,13 @@ static void __cg_memfill32(uint32_t * dst, uint32_t val, int len)
*dst++ = val;
len--;
}
#ifdef __GNUC__
u32_v v = val - (u32_v){};
while (len >= VEC_ECOUNT) {
*(u32_v *)dst = v;
dst += VEC_ECOUNT; len -= VEC_ECOUNT;
}
#endif
// do the last part
while (len > 0) {
*dst++ = val;
Expand Down