blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Revert "LineArt: Use CAS for add_triangles." 

This reverts commit 14a5a91e0e.

This caused build errors on x64+arm mac builds and some versions
of MSVC, reverting for now till a better solution is found.
This commit is contained in:
Ray molenkamp 2022-05-23 13:09:51 -06:00
parent b2e5fc72c8
commit 2655f47ca3
4 changed files with 363 additions and 629 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/gpencil_modifiers/CMakeLists.txt
View File

@ -17,7 +17,6 @@ set(INC
../windowmanager
../../../intern/eigen
../../../intern/guardedalloc
../../../intern/atomic
# dna_type_offsets.h in BLO_read_write.h
${CMAKE_BINARY_DIR}/source/blender/makesdna/intern

15
source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h
View File

@ -236,9 +236,6 @@ typedef struct LineartRenderBuffer {
ListBase line_buffer_pointers;
ListBase triangle_buffer_pointers;
LineartElementLinkNode *isect_scheduled_up_to;
int isect_scheduled_up_to_index;
/** This one's memory is not from main pool and is free()ed after culling stage. */
ListBase triangle_adjacent_pointers;
@ -432,19 +429,15 @@ typedef struct LineartBoundingArea {
/** 1,2,3,4 quadrant */
struct LineartBoundingArea *child;
SpinLock lock;
ListBase lp;
ListBase rp;
ListBase up;
ListBase bp;
/* Need uint32 for the atomic cas instruction. */
uint32_t triangle_count;
uint32_t max_triangle_count;
uint32_t line_count;
uint32_t max_line_count;
uint32_t user_count;
uint16_t triangle_count;
uint16_t max_triangle_count;
uint16_t line_count;
uint16_t max_line_count;
/* Use array for speeding up multiple accesses. */
struct LineartTriangle **linked_triangles;

945
source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
View File

File diff suppressed because it is too large Load Diff

31
source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h
View File

@ -82,7 +82,7 @@ void lineart_count_and_print_render_buffer_memory(struct LineartRenderBuffer *rb
/* Initial bounding area row/column count, setting 4 is the simplest way algorithm could function
* efficiently. */
#define LRT_BA_ROWS 10
#define LRT_BA_ROWS 4
#ifdef __cplusplus
extern "C" {
@ -93,32 +93,3 @@ void lineart_sort_adjacent_items(LineartAdjacentEdge *ai, int length);
#ifdef __cplusplus
}
#endif
#ifndef __cplusplus /* Compatibility code for atomics, only for C. */
# if defined __has_include /* Try to use C11 atomics support. */
# if __has_include(<stdatomic.h>)
# include <stdatomic.h>
# define lineart_atomic_load(p) atomic_load((volatile size_t *)p)
# define lineart_atomic_store(p, d) atomic_store((volatile size_t *)p, (size_t)d)
# endif
# endif
# ifdef _MSC_VER /* Atomics walkaround for windows. */
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
# define lineart_atomic_load(p) (MemoryBarrier(), *(p))
# define lineart_atomic_store(p, d) \
do { \
*(p) = (d); \
MemoryBarrier(); \
} while (0)
# endif
# if !defined lineart_atomic_load /* Fallback */
# include "atomic_ops.h"
# define lineart_atomic_load(p) atomic_add_and_fetch_z((size_t *)p, 0)
# define lineart_atomic_store(p, d) atomic_add_and_fetch_z((size_t *)p, (size_t)d)
# endif
#endif /* !__cplusplus */