Merge 9a144d10dd into 5391a259f3

README.md

@@ -1787,8 +1787,7 @@ Note: when using the debug tools, their internal colors are represented as 0-255
 
 ```C
 typedef struct {
-    bool isStaticallyAllocated;
+    int length;
-    int32_t length;
     const char *chars;
 } Clay_String;
 ```
@@ -1797,14 +1796,7 @@ typedef struct {
 
 **Fields**
 
-**`.isStaticallyAllocated`** - `bool`
+**`.length`** - `int`
-
-Whether or not the string is statically allocated, or in other words, whether
-or not it lives for the entire lifetime of the program.
-
----
-
-**`.length`** - `int32_t`
 
 The number of characters in the string, _not including an optional null terminator._
 

clay.h

@@ -1392,7 +1392,6 @@ uint64_t Clay__HashData(const uint8_t* data, size_t length) {
     Clay__SIMDARXMix(&v2, &v3);
     v0 = _mm_add_epi64(v0, v2);
     v1 = _mm_add_epi64(v1, v3);
-    v0 = _mm_add_epi64(v0, v1);
 
     uint64_t result[2];
     _mm_storeu_si128((__m128i*)result, v0);
@@ -1446,7 +1445,6 @@ uint64_t Clay__HashData(const uint8_t* data, size_t length) {
     Clay__SIMDARXMix(&v2, &v3);
     v0 = vaddq_u64(v0, v2);
     v1 = vaddq_u64(v1, v3);
-    v0 = vaddq_u64(v0, v1);
 
     uint64_t result[2];
     vst1q_u64(result, v0);

examples/sokol-video-demo/CMakeLists.txt

@@ -22,7 +22,7 @@ FetchContent_MakeAvailable(fontstash)
 FetchContent_Declare(
     sokol
     GIT_REPOSITORY "https://github.com/floooh/sokol.git"
-    GIT_TAG "master"
+    GIT_TAG "da9de496f938b7575eff7f01ab774d77469bd390"
     GIT_PROGRESS TRUE
     GIT_SHALLOW TRUE
 )