Skip to content

Commit bb3fc23

Browse files
Merge pull request #2384 from plugdata-team/testing
Full GPU rendering for whole window, multi-threaded rendering, improved text rendering, many optimisations, UI redesign, new tests, more
2 parents d05f277 + f13a010 commit bb3fc23

150 files changed

Lines changed: 10698 additions & 3077 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.

.github/workflows/cmake.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ jobs:
308308

309309
- name: Configure
310310
working-directory: ${{github.workspace}}
311-
run: CXX=g++ cmake -Bbuild -GNinja -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DENABLE_WAYLAND=1
311+
run: CXX=g++ cmake -Bbuild -GNinja -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
312312

313313
- name: Build
314314
working-directory: ${{github.workspace}}
@@ -406,7 +406,7 @@ jobs:
406406

407407
- name: Configure
408408
working-directory: ${{github.workspace}}
409-
run: CXX=g++ cmake -Bbuild -GNinja -DNANOVG_GLES_IMPLEMENTATION=1 -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DENABLE_WAYLAND=1
409+
run: CXX=g++ cmake -Bbuild -GNinja -DNANOVG_GLES_IMPLEMENTATION=1 -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
410410
- name: Build
411411
working-directory: ${{github.workspace}}
412412
run: cmake --build build --config Release

CMakeLists.txt

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ option(ENABLE_WAYLAND "Enable native wayland support (experimental)" OFF)
3939
option(MACOS_LEGACY "Enable support for old macOS versions (lowers OSX_DEPLOYMENT TARGET and disables Metal" OFF)
4040
option(VERBOSE "" OFF)
4141

42+
if(ENABLE_ASAN)
43+
add_compile_options(-fsanitize=address)
44+
add_link_options(-fsanitize=address)
45+
endif()
46+
4247
if(CMAKE_GENERATOR STREQUAL "Ninja" AND MSVC)
4348
target_compile_options(pd PRIVATE /EHsc)
4449
endif()
@@ -187,11 +192,6 @@ elseif (MSVC)
187192
add_link_options(/OPT:REF /OPT:ICF /INCREMENTAL:NO)
188193
endif()
189194

190-
if(ENABLE_ASAN)
191-
add_compile_options(-fsanitize=address)
192-
add_link_options(-fsanitize=address)
193-
endif()
194-
195195
if(MSVC)
196196
add_compile_options(/MP /wd4244 /wd4311 /wd4003 /wd4047 /wd4477 /wd4068 /wd4133 /wd4311)
197197
add_compile_options("$<$<AND:$<CONFIG:Debug>,$<COMPILE_LANGUAGE:CXX>>:/bigobj>")
@@ -831,13 +831,20 @@ elseif(APPLE)
831831
set(MACOS_COMPAT_LINKER_FLAGS "-Wl,-ld_classic")
832832
endif()
833833

834+
# LuaJIT ships its own DWARF unwind personality routine (_lj_err_unwind_dwarf).
835+
# Together with the gcc/g++/objc personalities this exceeds what the modern
836+
# linker's compact-unwind format can encode. Release builds dodge this via
837+
# -ld_classic above, but that flag is gated to non-Debug configs, so Debug and
838+
# sanitizer builds must fall back to DWARF unwind info instead of compact unwind.
839+
set(MACOS_LUAJIT_UNWIND_FLAGS "$<$<CONFIG:Debug>:-Wl,-no_compact_unwind>")
840+
834841
if(NOT "${CMAKE_SYSTEM_NAME}" MATCHES "iOS")
835842
set(LINK_CARBON "-framework Carbon")
836843
endif()
837-
target_link_libraries(plugdata_standalone PRIVATE plugdata_core pd-src externals ${LINK_CARBON} $<$<NOT:$<CONFIG:Debug>>:${MACOS_COMPAT_LINKER_FLAGS}>)
838-
target_link_libraries(plugdata_midi PRIVATE plugdata_core pd-src-multi externals-multi ${LINK_CARBON} $<$<NOT:$<CONFIG:Debug>>:${MACOS_COMPAT_LINKER_FLAGS}>)
839-
target_link_libraries(plugdata PRIVATE plugdata_core pd-src-multi externals-multi ${LINK_CARBON} $<$<NOT:$<CONFIG:Debug>>:${MACOS_COMPAT_LINKER_FLAGS}>)
840-
target_link_libraries(plugdata_fx PRIVATE plugdata_core pd-src-multi externals-multi ${LINK_CARBON} $<$<NOT:$<CONFIG:Debug>>:${MACOS_COMPAT_LINKER_FLAGS}>)
844+
target_link_libraries(plugdata_standalone PRIVATE plugdata_core pd-src externals ${LINK_CARBON} $<$<NOT:$<CONFIG:Debug>>:${MACOS_COMPAT_LINKER_FLAGS}> ${MACOS_LUAJIT_UNWIND_FLAGS})
845+
target_link_libraries(plugdata_midi PRIVATE plugdata_core pd-src-multi externals-multi ${LINK_CARBON} $<$<NOT:$<CONFIG:Debug>>:${MACOS_COMPAT_LINKER_FLAGS}> ${MACOS_LUAJIT_UNWIND_FLAGS})
846+
target_link_libraries(plugdata PRIVATE plugdata_core pd-src-multi externals-multi ${LINK_CARBON} $<$<NOT:$<CONFIG:Debug>>:${MACOS_COMPAT_LINKER_FLAGS}> ${MACOS_LUAJIT_UNWIND_FLAGS})
847+
target_link_libraries(plugdata_fx PRIVATE plugdata_core pd-src-multi externals-multi ${LINK_CARBON} $<$<NOT:$<CONFIG:Debug>>:${MACOS_COMPAT_LINKER_FLAGS}> ${MACOS_LUAJIT_UNWIND_FLAGS})
841848
else()
842849
target_link_libraries(plugdata PRIVATE plugdata_core pd-multi)
843850
target_link_libraries(plugdata_fx PRIVATE plugdata_core pd-multi)

Libraries/JUCE

Submodule JUCE updated 2757 files

Libraries/pd-else

Submodule pd-else updated 43 files

Resources/Fonts/InterBold.ttf

-405 KB
Binary file not shown.

Resources/Fonts/InterRegular.ttf

-398 KB
Binary file not shown.

Resources/Fonts/InterSemiBold.ttf

-404 KB
Binary file not shown.

Resources/Fonts/InterTabular.ttf

-31 KB
Binary file not shown.

0 commit comments

Comments
 (0)