Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +8 -8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 65d8f9e140 - Show all commits

16
source/blender/blenlib/intern/array_store.c
View File

@ -156,8 +156,8 @@
*/
#define USE_HASH_TABLE_KEY_CACHE
#ifdef USE_HASH_TABLE_KEY_CACHE
# define HASH_TABLE_KEY_UNSET ((uint64_t)-1)
# define HASH_TABLE_KEY_FALLBACK ((uint64_t)-2)
# define HASH_TABLE_KEY_UNSET ((hash_key)-1)
# define HASH_TABLE_KEY_FALLBACK ((hash_key)-2)
#endif
/**
@ -205,7 +205,7 @@
/** \name Internal Structs
* \{ */
typedef uint64_t hash_key;
typedef uint32_t hash_key;
typedef struct BArrayInfo {
size_t chunk_stride;
@ -745,19 +745,19 @@ static void bchunk_list_fill_from_array(const BArrayInfo *info,
#define HASH_INIT (5381)
BLI_INLINE uint hash_data_single(const uchar p)
BLI_INLINE hash_key hash_data_single(const uchar p)
{
return ((HASH_INIT << 5) + HASH_INIT) + (uint)(*((signed char *)&p));
return ((HASH_INIT << 5) + HASH_INIT) + (hash_key)(*((signed char *)&p));
}
/* hash bytes, from BLI_ghashutil_strhash_n */
static uint hash_data(const uchar *key, size_t n)
static hash_key hash_data(const uchar *key, size_t n)
{
const signed char *p;
uint h = HASH_INIT;
hash_key h = HASH_INIT;
for (p = (const signed char *)key; n--; p++) {
h = (uint)((h << 5) + h) + (uint)*p;
h = (hash_key)((h << 5) + h) + (hash_key)*p;
}
return h;