From 15d234b79d357faa070d5cd7d29b08daaa23a944 Mon Sep 17 00:00:00 2001 From: Arman Ommid <71801518+ArmanOmmid@users.noreply.github.com> Date: Fri, 26 Sep 2025 11:56:37 -0700 Subject: [PATCH 01/23] GLTF anim correctly inherits world transform (#5206) --- src/rmodels.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/rmodels.c b/src/rmodels.c index 128d5303b..06180cd5d 100644 --- a/src/rmodels.c +++ b/src/rmodels.c @@ -4261,9 +4261,10 @@ static void BuildPoseFromParentJoints(BoneInfo *bones, int boneCount, Transform continue; } transforms[i].rotation = QuaternionMultiply(transforms[bones[i].parent].rotation, transforms[i].rotation); + transforms[i].scale = Vector3Multiply(transforms[i].scale, transforms[bones[i].parent].scale); + transforms[i].translation = Vector3Multiply(transforms[i].translation, transforms[bones[i].parent].scale); transforms[i].translation = Vector3RotateByQuaternion(transforms[i].translation, transforms[bones[i].parent].rotation); transforms[i].translation = Vector3Add(transforms[i].translation, transforms[bones[i].parent].translation); - transforms[i].scale = Vector3Multiply(transforms[i].scale, transforms[bones[i].parent].scale); } } } @@ -6238,6 +6239,20 @@ static ModelAnimation *LoadModelAnimationsGLTF(const char *fileName, int *animCo *animCount = (int)data->animations_count; animations = (ModelAnimation *)RL_CALLOC(data->animations_count, sizeof(ModelAnimation)); + Transform worldTransform; + { + cgltf_float cgltf_worldTransform[16]; + cgltf_node* node = skin.joints[0]; + cgltf_node_transform_world(node->parent, cgltf_worldTransform); + Matrix worldMatrix = { + cgltf_worldTransform[0], cgltf_worldTransform[4], cgltf_worldTransform[8], cgltf_worldTransform[12], + cgltf_worldTransform[1], cgltf_worldTransform[5], cgltf_worldTransform[9], cgltf_worldTransform[13], + cgltf_worldTransform[2], cgltf_worldTransform[6], cgltf_worldTransform[10], cgltf_worldTransform[14], + cgltf_worldTransform[3], cgltf_worldTransform[7], cgltf_worldTransform[11], cgltf_worldTransform[15] + }; + MatrixDecompose(worldMatrix, &(worldTransform.translation), &(worldTransform.rotation), &(worldTransform.scale)); + } + for (unsigned int i = 0; i < data->animations_count; i++) { animations[i].bones = LoadBoneInfoGLTF(skin, &animations[i].boneCount); @@ -6356,6 +6371,13 @@ static ModelAnimation *LoadModelAnimationsGLTF(const char *fileName, int *animCo }; } + Transform* root = &animations[i].framePoses[j][0]; + root->rotation = QuaternionMultiply(worldTransform.rotation, root->rotation); + root->scale = Vector3Multiply(root->scale, worldTransform.scale); + root->translation = Vector3Multiply(root->translation, worldTransform.scale); + root->translation = Vector3RotateByQuaternion(root->translation, worldTransform.rotation); + root->translation = Vector3Add(root->translation, worldTransform.translation); + BuildPoseFromParentJoints(animations[i].bones, animations[i].boneCount, animations[i].framePoses[j]); } From fe8c83b57d623e8343f09cd1a9e8b548defc4da0 Mon Sep 17 00:00:00 2001 From: Smallz3201 Date: Fri, 26 Sep 2025 14:56:54 -0400 Subject: [PATCH 02/23] Update palette_switch.fs (#5205) Removed unnecessary `a` in palette_switch.fs `note` comment --- examples/shaders/resources/shaders/glsl330/palette_switch.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/shaders/resources/shaders/glsl330/palette_switch.fs b/examples/shaders/resources/shaders/glsl330/palette_switch.fs index 6a82529b1..2db8880d1 100644 --- a/examples/shaders/resources/shaders/glsl330/palette_switch.fs +++ b/examples/shaders/resources/shaders/glsl330/palette_switch.fs @@ -17,7 +17,7 @@ out vec4 finalColor; void main() { // Texel color fetching from texture sampler - // NOTE: The texel is actually the a GRAYSCALE index color + // NOTE: The texel is actually the GRAYSCALE index color vec4 texelColor = texture(texture0, fragTexCoord)*fragColor; // Convert the (normalized) texel color RED component (GB would work, too) From 2724f07c9a2acadeea800e2e70d074ccb13d12e3 Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 26 Sep 2025 22:22:43 +0200 Subject: [PATCH 03/23] Update rexm.c --- tools/rexm/rexm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/rexm/rexm.c b/tools/rexm/rexm.c index 6fdf74645..7f303538c 100644 --- a/tools/rexm/rexm.c +++ b/tools/rexm/rexm.c @@ -2047,6 +2047,7 @@ static void SortExampleByName(rlExampleInfo *items, int count) // WARNING: Supported resource file extensions is hardcoded by used file types // but new examples could require other file extensions to be added, // maybe it should look for '.xxx")' patterns instead +// TODO: WARNING: Some resources could require linked resources: .fnt --> .png, .mtl --> .png, .gltf --> .png, ... static char **ScanExampleResources(const char *filePath, int *resPathCount) { #define REXM_MAX_RESOURCE_PATH_LEN 256 From 87f758f9b4796ed14ad844e68b651eaf891922d7 Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 26 Sep 2025 22:26:19 +0200 Subject: [PATCH 04/23] Review latest PRs formatting --- src/platforms/rcore_android.c | 13 ++++++++----- src/rmodels.c | 24 +++++++++++------------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/platforms/rcore_android.c b/src/platforms/rcore_android.c index 6c67dc893..6ecc41888 100644 --- a/src/platforms/rcore_android.c +++ b/src/platforms/rcore_android.c @@ -447,8 +447,8 @@ int GetMonitorCount(void) int GetCurrentMonitor(void) { int displayId = -1; - JNIEnv* env = NULL; - JavaVM* vm = platform.app->activity->vm; + JNIEnv *env = NULL; + JavaVM *vm = platform.app->activity->vm; (*vm)->AttachCurrentThread(vm, &env, NULL); jobject activity = platform.app->activity->clazz; @@ -458,12 +458,15 @@ int GetCurrentMonitor(void) jobject display = (*env)->CallObjectMethod(env, activity, getDisplayMethod); - if (display == NULL) { + if (display == NULL) + { TRACELOG(LOG_ERROR, "GetCurrentMonitor() couldn't get the display object"); - } else { + } + else + { jclass displayClass = (*env)->FindClass(env, "android/view/Display"); jmethodID getDisplayIdMethod = (*env)->GetMethodID(env, displayClass, "getDisplayId", "()I"); - displayId = (int) (*env)->CallIntMethod(env, display, getDisplayIdMethod); + displayId = (int)(*env)->CallIntMethod(env, display, getDisplayIdMethod); (*env)->DeleteLocalRef(env, displayClass); } diff --git a/src/rmodels.c b/src/rmodels.c index 06180cd5d..9aca37a24 100644 --- a/src/rmodels.c +++ b/src/rmodels.c @@ -6239,19 +6239,17 @@ static ModelAnimation *LoadModelAnimationsGLTF(const char *fileName, int *animCo *animCount = (int)data->animations_count; animations = (ModelAnimation *)RL_CALLOC(data->animations_count, sizeof(ModelAnimation)); - Transform worldTransform; - { - cgltf_float cgltf_worldTransform[16]; - cgltf_node* node = skin.joints[0]; - cgltf_node_transform_world(node->parent, cgltf_worldTransform); - Matrix worldMatrix = { - cgltf_worldTransform[0], cgltf_worldTransform[4], cgltf_worldTransform[8], cgltf_worldTransform[12], - cgltf_worldTransform[1], cgltf_worldTransform[5], cgltf_worldTransform[9], cgltf_worldTransform[13], - cgltf_worldTransform[2], cgltf_worldTransform[6], cgltf_worldTransform[10], cgltf_worldTransform[14], - cgltf_worldTransform[3], cgltf_worldTransform[7], cgltf_worldTransform[11], cgltf_worldTransform[15] - }; - MatrixDecompose(worldMatrix, &(worldTransform.translation), &(worldTransform.rotation), &(worldTransform.scale)); - } + Transform worldTransform = { 0 }; + cgltf_float cgltf_worldTransform[16] = { 0 }; + cgltf_node *node = skin.joints[0]; + cgltf_node_transform_world(node->parent, cgltf_worldTransform); + Matrix worldMatrix = { + cgltf_worldTransform[0], cgltf_worldTransform[4], cgltf_worldTransform[8], cgltf_worldTransform[12], + cgltf_worldTransform[1], cgltf_worldTransform[5], cgltf_worldTransform[9], cgltf_worldTransform[13], + cgltf_worldTransform[2], cgltf_worldTransform[6], cgltf_worldTransform[10], cgltf_worldTransform[14], + cgltf_worldTransform[3], cgltf_worldTransform[7], cgltf_worldTransform[11], cgltf_worldTransform[15] + }; + MatrixDecompose(worldMatrix, &worldTransform.translation, &worldTransform.rotation, &worldTransform.scale); for (unsigned int i = 0; i < data->animations_count; i++) { From 06cfda6ff9e06da5ba54670243968b9f5b7216f0 Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 26 Sep 2025 23:03:10 +0200 Subject: [PATCH 05/23] Update raymath.h --- src/raymath.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/raymath.h b/src/raymath.h index d3c8b9697..65a20de59 100644 --- a/src/raymath.h +++ b/src/raymath.h @@ -2555,7 +2555,7 @@ RMAPI int QuaternionEquals(Quaternion p, Quaternion q) // Decompose a transformation matrix into its rotational, translational and scaling components and remove shear RMAPI void MatrixDecompose(Matrix mat, Vector3 *translation, Quaternion *rotation, Vector3 *scale) { - float eps = 1e-9; + float eps = (float)1e-9; // Extract Translation translation->x = mat.m12; From e79603d501387a1984d275888a20754033bd28d3 Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 26 Sep 2025 23:17:37 +0200 Subject: [PATCH 06/23] REDESIGNED: `rcore_desktop_win32` platform backend Now it works! but there is still work to do to support all required features... I really enjoyed reviewing and redesigning this platform backend! --- projects/VS2022/raylib/raylib.vcxproj | 14 + projects/VS2022/raylib/raylib.vcxproj.filters | 3 + src/platforms/rcore_desktop_win32.c | 2300 ++++++++--------- 3 files changed, 1063 insertions(+), 1254 deletions(-) diff --git a/projects/VS2022/raylib/raylib.vcxproj b/projects/VS2022/raylib/raylib.vcxproj index 64695d4de..7721a669a 100644 --- a/projects/VS2022/raylib/raylib.vcxproj +++ b/projects/VS2022/raylib/raylib.vcxproj @@ -504,6 +504,20 @@ true true + + true + true + true + true + true + true + true + true + true + true + true + true + true true diff --git a/projects/VS2022/raylib/raylib.vcxproj.filters b/projects/VS2022/raylib/raylib.vcxproj.filters index 182358229..4588f0521 100644 --- a/projects/VS2022/raylib/raylib.vcxproj.filters +++ b/projects/VS2022/raylib/raylib.vcxproj.filters @@ -46,6 +46,9 @@ Source Files\Platform Files + + Source Files\Platform Files + diff --git a/src/platforms/rcore_desktop_win32.c b/src/platforms/rcore_desktop_win32.c index a79fa692e..29669fd54 100644 --- a/src/platforms/rcore_desktop_win32.c +++ b/src/platforms/rcore_desktop_win32.c @@ -6,19 +6,23 @@ * - Windows (Win32, Win64) * * LIMITATIONS: -* - currently in initial development stage, alot is missing -* - unsure how to support MOUSE_BUTTON_FORWARD/MOUSE_BUTTON_BACK +* - Initial development stage, lot of functionality missing +* - No support for MOUSE_BUTTON_FORWARD/MOUSE_BUTTON_BACK * * POSSIBLE IMPROVEMENTS: +* - Improvement 01 +* - Improvement 02 * * ADDITIONAL NOTES: +* - TRACELOG() function is located in raylib [utils] module * * CONFIGURATION: * #define RCORE_PLATFORM_CUSTOM_FLAG * Custom flag for rcore on target platform -not used- * * DEPENDENCIES: -* - the win32 API, i.e. windows.h +* - Win32 API (windows.h) +* * * LICENSE: zlib/libpng * @@ -41,7 +45,7 @@ * **********************************************************************************************/ -// move windows.h functions to new names to avoid redefining the same functions as raylib +// Move windows.h symbols to new names to avoid redefining the same names as raylib #define CloseWindow CloseWindowWin32 #define Rectangle RectangleWin32 #define ShowCursor ShowCursorWin32 @@ -55,16 +59,16 @@ #define WIN32_LEAN_AND_MEAN #include -#undef CloseWindow -#undef Rectangle -#undef ShowCursor -#undef LoadImage +#undef CloseWindow // raylib symbol collision +#undef Rectangle // raylib symbol collision +#undef ShowCursor // raylib symbol collision +#undef LoadImage // raylib symbol collision #undef LoadImageA #undef LoadImageW -#undef DrawText +#undef DrawText // raylib symbol collision #undef DrawTextA #undef DrawTextW -#undef DrawTextEx +#undef DrawTextEx // raylib symbol collision #undef DrawTextExA #undef DrawTextExW @@ -73,99 +77,181 @@ #include #include -#include +//#include + +//---------------------------------------------------------------------------------- +// Types and Structures Definition +//---------------------------------------------------------------------------------- + +// NOTE: appScreenSize is the last screen size requested by the app, +// the backend must keep the client area this size (after DPI scaling is applied) +// when the window isn't fullscreen/maximized/minimized +typedef struct { + HWND hwnd; + HDC hdc; + HGLRC glContext; + LARGE_INTEGER timerFrequency; + unsigned int appScreenWidth; + unsigned int appScreenHeight; + unsigned int desiredFlags; + bool cursorEnabled; +} PlatformData; + +// Define WGL function pointer types (no wglext.h needed) +typedef HGLRC (WINAPI *PFNWGLCREATECONTEXTATTRIBSARBPROC)(HDC, HGLRC, const int *); +typedef BOOL (WINAPI *PFNWGLCHOOSEPIXELFORMATARBPROC)(HDC, const int *, const FLOAT *, UINT, int *, UINT *); +typedef BOOL (WINAPI *PFNWGLSWAPINTERVALEXTPROC)(int); + +//---------------------------------------------------------------------------------- +// Global Variables Definition +//---------------------------------------------------------------------------------- +extern CoreData CORE; // Global CORE state context + +static PlatformData platform = { 0 }; // Platform specific data + +// Required WGL functions +static PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB = NULL; +static PFNWGLCHOOSEPIXELFORMATARBPROC wglChoosePixelFormatARB = NULL; +static PFNWGLSWAPINTERVALEXTPROC wglSwapIntervalEXT = NULL; // -------------------------------------------------------------------------------- -// This part of the file contains pure functions that never access global state. +// This part of the file contains pure functions that never access global state // This distinction helps keep the backend maintainable as the inputs and outputs -// of every function called in this section can be fully derived from the -// call-site alone. +// of every function called in this section can be fully derived from the call-site alone // -------------------------------------------------------------------------------- // Prevent any code in this part of the file from accessing the global CORE state #define CORE DONT_USE_CORE_HERE +//---------------------------------------------------------------------------------- +// Defines and Macros +//---------------------------------------------------------------------------------- +#define A_TO_W_ALLOCA(outWstr, inAnsi) do { \ + size_t len = AToWLen(inAnsi); \ + outWstr = (WCHAR *)alloca(sizeof(WCHAR)*(len + 1)); \ + AToWCopy(outWstr, len, inAnsi); \ + outWstr[len] = 0; \ +} while (0) + +#define STYLE_MASK_ALL 0xffffffff +#define STYLE_MASK_READONLY (WS_MINIMIZE | WS_MAXIMIZE) +#define STYLE_MASK_WRITABLE (~STYLE_MASK_READONLY) + +#define STYLE_FLAGS_RESIZABLE WS_THICKFRAME + +#define STYLE_FLAGS_UNDECORATED_OFF (WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX) +#define STYLE_FLAGS_UNDECORATED_ON WS_POPUP + +#define WINDOW_STYLE_EX 0 + +#define CLASS_NAME L"RaylibWindow" + +#define FLAG_MASK_OPTIONAL (FLAG_VSYNC_HINT) +#define FLAG_MASK_REQUIRED ~(FLAG_MASK_OPTIONAL) + +// Flags that have no operations to perform during an update +#define FLAG_MASK_NO_UPDATE (FLAG_WINDOW_HIGHDPI | FLAG_MSAA_4X_HINT) + +#define WM_APP_UPDATE_WINDOW_SIZE (WM_APP + 1) + +#define WGL_DRAW_TO_WINDOW_ARB 0x2001 +#define WGL_ACCELERATION_ARB 0x2003 +#define WGL_SUPPORT_OPENGL_ARB 0x2010 +#define WGL_DOUBLE_BUFFER_ARB 0x2011 +#define WGL_PIXEL_TYPE_ARB 0x2013 +#define WGL_COLOR_BITS_ARB 0x2014 +#define WGL_RED_BITS_ARB 0x2015 +#define WGL_RED_SHIFT_ARB 0x2016 +#define WGL_GREEN_BITS_ARB 0x2017 +#define WGL_GREEN_SHIFT_ARB 0x2018 +#define WGL_BLUE_BITS_ARB 0x2019 +#define WGL_BLUE_SHIFT_ARB 0x201a +#define WGL_ALPHA_BITS_ARB 0x201b +#define WGL_ALPHA_SHIFT_ARB 0x201c +#define WGL_DEPTH_BITS_ARB 0x2022 +#define WGL_STENCIL_BITS_ARB 0x2023 +#define WGL_TYPE_RGBA_ARB 0x202b +#define WGL_NO_ACCELERATION_ARB 0x2025 // OpenGL 1.1 GDI software rasterizer +#define WGL_GENERIC_ACCELERATION_ARB 0x2026 +#define WGL_FULL_ACCELERATION_ARB 0x2027 // OpenGL hardware-accelerated, using GPU-drivers provided by vendor + +#define WGL_NUMBER_PIXEL_FORMATS_ARB 0x2000 +#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 +#define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092 +#define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126 +#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001 +#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002 +#define WGL_SAMPLE_BUFFERS_ARB 0x2041 +#define WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20a9 +#define WGL_TRANSPARENT_ARB 0x200A + +//---------------------------------------------------------------------------------- +// Types and Structures Definition +//---------------------------------------------------------------------------------- +typedef enum { MIZED_NONE, MIZED_MIN, MIZED_MAX } Mized; + +typedef enum { + UPDATE_WINDOW_FIRST, + UPDATE_WINDOW_NORMAL, +} UpdateWindowKind; + +typedef enum { + SANITIZE_FLAGS_FIRST, + SANITIZE_FLAGS_NORMAL, +} SanitizeFlagsKind; + +typedef struct { + HMONITOR needle; + int index; + int matchIndex; + RECT rect; +} FindMonitorContext; + +typedef struct { + DWORD set; + DWORD clear; +} FlagsOp; + +//---------------------------------------------------------------------------------- +// Module Internal Functions Declaration +//---------------------------------------------------------------------------------- static size_t AToWLen(const char *a) { int sizeNeeded = MultiByteToWideChar(CP_UTF8, 0, a, -1, NULL, 0); - if (sizeNeeded < 0) - { - TRACELOG(LOG_ERROR, "failed to calculate wide length, result=%d, error=%u", sizeNeeded, GetLastError()); - abort(); - } + + if (sizeNeeded < 0) TRACELOG(LOG_ERROR, "Failed to calculate wide length, result=%d, error=%u", sizeNeeded, GetLastError()); return sizeNeeded; } static void AToWCopy(wchar_t *outPtr, size_t outLen, const char *a) { - int size = MultiByteToWideChar(CP_UTF8, 0, a, -1, outPtr, outLen); - if (size != outLen) - { - TRACELOG(LOG_ERROR, "expected to convert %zu utf8 chars to wide but converted %zu", outLen, size); - abort(); - } -} -#define A_TO_W_ALLOCA(outWstr, inAnsi) do { \ - size_t len = AToWLen(inAnsi); \ - outWstr = (WCHAR*)alloca(sizeof(WCHAR)*(len + 1)); \ - AToWCopy(outWstr, len, inAnsi); \ - outWstr[len] = 0; \ -} while (0) - -static void LogFail(const char *what, DWORD error) -{ - TRACELOG(LOG_ERROR, "%s failed, error=%lu", what, error); -} -static void LogFailHr(const char *what, HRESULT hr) -{ - TRACELOG(LOG_ERROR, "%s failed, hresult=0x%lx", what, (DWORD)hr); + int size = MultiByteToWideChar(CP_UTF8, 0, a, -1, outPtr, (int)outLen); + if (size != outLen) TRACELOG(LOG_WARNING, "WIN32: Convert %zu UTF-8 chars to WCHAR but converted %zu", outLen, size); } -#define STYLE_FLAGS_RESIZABLE WS_THICKFRAME - -#define STYLE_FLAGS_UNDECORATED_OFF (WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX) -#define STYLE_FLAGS_UNDECORATED_ON WS_POPUP - -static bool ResizableFromStyle(DWORD style) -{ - return 0 != (style & STYLE_FLAGS_RESIZABLE); -} static bool DecoratedFromStyle(DWORD style) { if (style & STYLE_FLAGS_UNDECORATED_ON) { - if (style & STYLE_FLAGS_UNDECORATED_OFF) - { - TRACELOG(LOG_ERROR, "style 0x%x has both undecorated on/off flags", style); - abort(); - } - - return false; // not decorated + if (style & STYLE_FLAGS_UNDECORATED_OFF) TRACELOG(LOG_ERROR, "FLAGS: Style 0x%x has both undecorated on/off flags", style); + return false; // Not decorated } DWORD masked = (style & STYLE_FLAGS_UNDECORATED_OFF); - if (STYLE_FLAGS_UNDECORATED_OFF != masked) - { - TRACELOG(LOG_ERROR, "style 0x%x is missing these flags 0x%x", masked, masked ^ STYLE_FLAGS_UNDECORATED_OFF); - abort(); - } + if (STYLE_FLAGS_UNDECORATED_OFF != masked) TRACELOG(LOG_ERROR, "FLAGS: Style 0x%x is missing these flags 0x%x", masked, masked ^ STYLE_FLAGS_UNDECORATED_OFF); - return true; // decorated -} -static bool HiddenFromStyle(DWORD style) -{ - return 0 == (style & WS_VISIBLE); + return true; // Decorated } -typedef enum { MIZED_NONE, MIZED_MIN, MIZED_MAX } Mized; -Mized MizedFromStyle(DWORD style) +static Mized MizedFromStyle(DWORD style) { // minimized takes precedence over maximized if (style & WS_MINIMIZE) return MIZED_MIN; if (style & WS_MAXIMIZE) return MIZED_MAX; return MIZED_NONE; } -Mized MizedFromFlags(unsigned flags) + +static Mized MizedFromFlags(unsigned flags) { // minimized takes precedence over maximized if (flags & FLAG_WINDOW_MINIMIZED) return MIZED_MIN; @@ -175,12 +261,11 @@ Mized MizedFromFlags(unsigned flags) static DWORD MakeWindowStyle(unsigned flags) { - DWORD style = - // we don't need this since we don't have any child windows, but I guess - // it improves efficiency, plus, windows adds this flag automatically anyway - // so it keeps our flags in sync with the OS. - WS_CLIPSIBLINGS - ; + // we don't need this since we don't have any child windows, but I guess + // it improves efficiency, plus, windows adds this flag automatically anyway + // so it keeps our flags in sync with the OS + DWORD style = WS_CLIPSIBLINGS ; + style |= (flags & FLAG_WINDOW_HIDDEN)? 0 : WS_VISIBLE; style |= (flags & FLAG_WINDOW_RESIZABLE)? STYLE_FLAGS_RESIZABLE : 0; style |= (flags & FLAG_WINDOW_UNDECORATED)? STYLE_FLAGS_UNDECORATED_ON : STYLE_FLAGS_UNDECORATED_OFF; @@ -190,15 +275,9 @@ static DWORD MakeWindowStyle(unsigned flags) case MIZED_NONE: break; case MIZED_MIN: style |= WS_MINIMIZE; break; case MIZED_MAX: style |= WS_MAXIMIZE; break; - default: abort(); + default: break; } - // sanity checks, maybe remove later - if (ResizableFromStyle(style) != !!(flags & FLAG_WINDOW_RESIZABLE)) abort(); - if (DecoratedFromStyle(style) != !(flags & FLAG_WINDOW_UNDECORATED)) abort(); - if (HiddenFromStyle(style) != !!(flags & FLAG_WINDOW_HIDDEN)) abort(); - if (MizedFromStyle(style) != MizedFromFlags(flags)) abort(); - return style; } @@ -206,171 +285,91 @@ static bool IsMinimized2(HWND hwnd) { bool isIconic = IsIconic(hwnd); bool styleMinimized = !!(WS_MINIMIZE & GetWindowLongPtrW(hwnd, GWL_STYLE)); - if (isIconic != styleMinimized) - { - TRACELOG(LOG_ERROR, "IsIconic(%d) != WS_MINIMIZED(%d)", isIconic, styleMinimized); - abort(); - } + if (isIconic != styleMinimized) TRACELOG(LOG_WARNING, "IsIconic(%d) != WS_MINIMIZED(%d)", isIconic, styleMinimized); return isIconic; } -#define STYLE_MASK_ALL 0xffffffff -#define STYLE_MASK_READONLY (WS_MINIMIZE | WS_MAXIMIZE) -#define STYLE_MASK_WRITABLE (~STYLE_MASK_READONLY) - // Enforces that the actual window/platform state is in sync with raylib's flags -static void CheckFlags( - const char *context, - HWND hwnd, - DWORD flags, - DWORD expectedStyle, - DWORD styleCheckMask -) { +static void CheckFlags(const char *context, HWND hwnd, DWORD flags, DWORD expectedStyle, DWORD styleCheckMask) +{ //TRACELOG(LOG_INFO, "Verifying Flags 0x%x Style 0x%x Mask 0x%x", flags, expectedStyle & styleCheckMask, styleCheckMask); + DWORD styleFromFlags = MakeWindowStyle(flags); + if ((styleFromFlags & styleCheckMask) != (expectedStyle & styleCheckMask)) { - DWORD styleFromFlags = MakeWindowStyle(flags); - if ((styleFromFlags & styleCheckMask) != (expectedStyle & styleCheckMask)) - { - TRACELOG( - LOG_ERROR, - "%s: window flags (0x%x) produced style 0x%x which != expected 0x%x (diff=0x%x, mask=0x%x)", - context, - flags, - styleFromFlags & styleCheckMask, - expectedStyle & styleCheckMask, - (styleFromFlags & styleCheckMask) ^ (expectedStyle & styleCheckMask), - styleCheckMask - ); - abort(); - } + TRACELOG(LOG_ERROR, "%s: window flags (0x%x) produced style 0x%x which != expected 0x%x (diff=0x%x, mask=0x%x)", + context, flags, styleFromFlags & styleCheckMask, expectedStyle & styleCheckMask, + (styleFromFlags & styleCheckMask) ^ (expectedStyle & styleCheckMask), styleCheckMask); } SetLastError(0); - LONG actualStyle = GetWindowLongPtrW(hwnd, GWL_STYLE); + LONG actualStyle = (LONG)GetWindowLongPtrW(hwnd, GWL_STYLE); if ((actualStyle & styleCheckMask) != (expectedStyle & styleCheckMask)) { - TRACELOG( - LOG_ERROR, - "%s: expected style 0x%x but got 0x%x (diff=0x%x, mask=0x%x, lasterror=%lu)", - context, - expectedStyle & styleCheckMask, - actualStyle & styleCheckMask, + TRACELOG(LOG_ERROR, "%s: expected style 0x%x but got 0x%x (diff=0x%x, mask=0x%x, lasterror=%lu)", + context, expectedStyle & styleCheckMask, actualStyle & styleCheckMask, (expectedStyle & styleCheckMask) ^ (actualStyle & styleCheckMask), - styleCheckMask, - GetLastError() - ); - abort(); + styleCheckMask, GetLastError()); } if (styleCheckMask & WS_MINIMIZE) { bool isIconic = IsIconic(hwnd); bool styleMinimized = !!(WS_MINIMIZE & actualStyle); - if (isIconic != styleMinimized) { - TRACELOG(LOG_ERROR, "IsIconic(%d) != WS_MINIMIZED(%d)", isIconic, styleMinimized); - abort(); - } + if (isIconic != styleMinimized) TRACELOG(LOG_ERROR, "IsIconic(%d) != WS_MINIMIZED(%d)", isIconic, styleMinimized); } if (styleCheckMask & WS_MAXIMIZE) { WINDOWPLACEMENT placement; placement.length = sizeof(placement); - if (!GetWindowPlacement(hwnd, &placement)) { - LogFail("GetWindowPlacement", GetLastError()); - abort(); + if (!GetWindowPlacement(hwnd, &placement)) + { + TRACELOG(LOG_ERROR, "%s failed, error=%lu", "GetWindowPlacement", GetLastError()); } bool placementMaximized = (placement.showCmd == SW_SHOWMAXIMIZED); bool styleMaximized = WS_MAXIMIZE & actualStyle; if (placementMaximized != styleMaximized) { - TRACELOG( - LOG_ERROR, - "maximized state desync, placement maximized=%d (showCmd=%lu) style maximized=%d", - placementMaximized, - placement.showCmd, - styleMaximized - ); - abort(); + TRACELOG(LOG_ERROR, "maximized state desync, placement maximized=%d (showCmd=%lu) style maximized=%d", + placementMaximized, placement.showCmd, styleMaximized); } } } -static float PtFromPx(float dpiScale, bool highdpiEnabled, int pt) -{ - return highdpiEnabled? (((float)pt)/dpiScale) : pt; -} -static int PxFromPt(float dpiScale, bool highdpiEnabled, float pt) -{ - return highdpiEnabled? roundf(pt*dpiScale) : roundf(pt); -} -static SIZE PxFromPt2(float dpiScale, bool highdpiEnabled, Vector2 screenSize) +static SIZE PxFromPt2(float dpiScale, bool highdpiEnabled, int screenWidth, int screenHeight) { + // Get size in pixels from points return (SIZE){ - PxFromPt(dpiScale, highdpiEnabled, screenSize.x), - PxFromPt(dpiScale, highdpiEnabled, screenSize.y), + highdpiEnabled? (int)((float)screenWidth*dpiScale) : screenWidth, + highdpiEnabled? (int)((float)screenHeight*dpiScale) : screenHeight, }; } static SIZE GetClientSize(HWND hwnd) { - RECT rect; - if (0 == GetClientRect(hwnd, &rect)) - { - LogFail("GetClientRect", GetLastError()); - abort(); - } - - if (rect.left != 0) abort(); // never happens AFAIK - if (rect.top != 0) abort(); // never happens AFAIK + RECT rect = { 0 }; + + if (GetClientRect(hwnd, &rect) == 0) TRACELOG(LOG_ERROR, "%s failed, error=%lu", "GetClientRect", GetLastError()); + return (SIZE){ rect.right, rect.bottom }; } -static UINT GetWindowDpi(HWND hwnd) -{ - UINT dpi = GetDpiForWindow(hwnd); - if (dpi == 0) - { - LogFail("GetWindowDpi", GetLastError()); - abort(); - } - - return dpi; -} - -static float ScaleFromDpi(UINT dpi) -{ - return ((float)dpi)/96.0f; -} - -#define WINDOW_STYLE_EX 0 - static SIZE CalcWindowSize(UINT dpi, SIZE clientSize, DWORD style) { RECT rect = { 0, 0, clientSize.cx, clientSize.cy }; - if (!AdjustWindowRectExForDpi(&rect, style, 0, WINDOW_STYLE_EX, dpi)) - { - LogFail("AdjustWindowRect", GetLastError()); - abort(); - } + + int result = AdjustWindowRectExForDpi(&rect, style, 0, WINDOW_STYLE_EX, dpi); + + if (result == 0) TRACELOG(LOG_ERROR, "%s failed, error=%lu", "AdjustWindowRect", GetLastError()); return (SIZE){ rect.right - rect.left, rect.bottom - rect.top }; } -typedef enum { - UPDATE_WINDOW_FIRST, - UPDATE_WINDOW_NORMAL, -} UpdateWindowKind; - // returns true if the window size was updated, false otherwise -static bool UpdateWindowSize( - UpdateWindowKind kind, - HWND hwnd, - Vector2 appScreenSize, - unsigned flags -) { +static bool UpdateWindowSize(UpdateWindowKind kind, HWND hwnd, int width, int height, unsigned flags) +{ if (flags & FLAG_WINDOW_MINIMIZED) return false; if (flags & FLAG_WINDOW_MAXIMIZED) @@ -381,79 +380,52 @@ static bool UpdateWindowSize( if (flags & FLAG_BORDERLESS_WINDOWED_MODE) { + MONITORINFO info = { 0 }; HMONITOR monitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY); - MONITORINFO info; info.cbSize = sizeof(info); - if (!GetMonitorInfoW(monitor, &info)) - { - LogFail("GetMonitorInfo", GetLastError()); - abort(); - } + if (!GetMonitorInfoW(monitor, &info)) TRACELOG(LOG_ERROR, "%s failed, error=%lu", "GetMonitorInfo", GetLastError()); - RECT windowRect; - if (!GetWindowRect(hwnd, &windowRect)) - { - LogFail("GetWindowRect", GetLastError()); - abort(); - } + RECT windowRect = { 0 }; + if (!GetWindowRect(hwnd, &windowRect)) TRACELOG(LOG_ERROR, "%s failed, error=%lu", "GetWindowRect", GetLastError()); - if ( - (windowRect.left == info.rcMonitor.left) && + if ((windowRect.left == info.rcMonitor.left) && (windowRect.top == info.rcMonitor.top) && ((windowRect.right - windowRect.left) == (info.rcMonitor.right - info.rcMonitor.left)) && - ((windowRect.bottom - windowRect.top) == (info.rcMonitor.bottom - info.rcMonitor.top)) - ) return false; + ((windowRect.bottom - windowRect.top) == (info.rcMonitor.bottom - info.rcMonitor.top))) return false; - if (!SetWindowPos( - hwnd, - HWND_TOP, + if (!SetWindowPos(hwnd, HWND_TOP, info.rcMonitor.left, info.rcMonitor.top, info.rcMonitor.right - info.rcMonitor.left, info.rcMonitor.bottom - info.rcMonitor.top, - SWP_NOOWNERZORDER - )) { - LogFail("SetWindowPos", GetLastError()); - abort(); + SWP_NOOWNERZORDER)) + { + TRACELOG(LOG_ERROR, "%s failed, error=%lu", "SetWindowPos", GetLastError()); } return true; } - UINT dpi = GetWindowDpi(hwnd); - float dpiScale = ScaleFromDpi(dpi); + UINT dpi = GetDpiForWindow(hwnd); + float dpiScale = ((float)dpi)/96.0f; bool dpiScaling = flags & FLAG_WINDOW_HIGHDPI; - SIZE desired = PxFromPt2(dpiScale, dpiScaling, appScreenSize); + SIZE desired = PxFromPt2(dpiScale, dpiScaling, width, height); SIZE actual = GetClientSize(hwnd); - if (actual.cx == desired.cx || actual.cy == desired.cy) - return false; + if ((actual.cx == desired.cx) || (actual.cy == desired.cy)) return false; + + TRACELOG(LOG_INFO, "Restoring client size from [%dx%d] to [%dx%d] (dpi:%lu dpiScaling:%d app:%ix%i)", + actual.cx, actual.cy, desired.cx, desired.cy, dpi, dpiScaling, width, height); - TRACELOG( - LOG_INFO, - "restoring client size from %dx%d to %dx%d (dpi=%lu dpiScaling=%d app=%fx%f)", - actual.cx, actual.cy, - desired.cx, desired.cy, - dpi, dpiScaling, - appScreenSize.x, appScreenSize.y - ); SIZE windowSize = CalcWindowSize(dpi, desired, MakeWindowStyle(flags)); POINT windowPos = (POINT){ 0, 0 }; UINT swpFlags = SWP_NOZORDER | SWP_FRAMECHANGED; if (kind == UPDATE_WINDOW_FIRST) { HMONITOR monitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY); - if (!monitor) - { - LogFail("MonitorFromWindow", GetLastError()); - abort(); - } + if (!monitor) TRACELOG(LOG_ERROR, "%s failed, error=%lu", "MonitorFromWindow", GetLastError()); MONITORINFO info; info.cbSize = sizeof(info); - if (!GetMonitorInfoW(monitor, &info)) - { - LogFail("GetMonitorInfo", GetLastError()); - abort(); - } + if (!GetMonitorInfoW(monitor, &info)) TRACELOG(LOG_ERROR, "%s failed, error=%lu", "GetMonitorInfo", GetLastError()); LONG monitorWidth = info.rcMonitor.right - info.rcMonitor.left; LONG monitorHeight = info.rcMonitor.bottom - info.rcMonitor.top; @@ -461,54 +433,26 @@ static bool UpdateWindowSize( MAX(0, (monitorWidth - windowSize.cx)/2), MAX(0, (monitorHeight - windowSize.cy)/2), }; - } else { - swpFlags |= SWP_NOMOVE; } + else swpFlags |= SWP_NOMOVE; - if (!SetWindowPos( - hwnd, NULL, - windowPos.x, windowPos.y, - windowSize.cx, windowSize.cy, - swpFlags - )) { - LogFail("SetWindowPos", GetLastError()); - abort(); + if (!SetWindowPos(hwnd, NULL, windowPos.x, windowPos.y, windowSize.cx, windowSize.cy, swpFlags)) + { + TRACELOG(LOG_ERROR, "%s failed, error=%lu", "SetWindowPos", GetLastError()); } return true; } -#define CLASS_NAME L"RaylibWindow" - -static void CreateWindowAlloca(const char *title, DWORD style) -{ - WCHAR *titleWide; - A_TO_W_ALLOCA(titleWide, title); - CreateWindowExW( - WINDOW_STYLE_EX, - CLASS_NAME, - titleWide, - style, - 0, 0, - 0, 0, - NULL, - NULL, - GetModuleHandleW(NULL), - NULL - ); -} - static BOOL IsWindows10Version1703OrGreaterWin32(void) { HMODULE ntdll = LoadLibraryW(L"ntdll.dll"); - DWORD (*Verify)( - RTL_OSVERSIONINFOEXW*, ULONG, ULONGLONG - ) = (DWORD (*)( - RTL_OSVERSIONINFOEXW*, ULONG, ULONGLONG - ))GetProcAddress(ntdll, "RtlVerifyVersionInfo"); + + DWORD (*Verify)(RTL_OSVERSIONINFOEXW*, ULONG, ULONGLONG) = + (DWORD (*)(RTL_OSVERSIONINFOEXW*, ULONG, ULONGLONG))GetProcAddress(ntdll, "RtlVerifyVersionInfo"); if (!Verify) { - LogFail("GetProcAddress 'RtlVerifyVersionInfo'", GetLastError()); + TRACELOG(LOG_ERROR, "%s failed, error=%lu", "GetProcAddress 'RtlVerifyVersionInfo'", GetLastError()); return 0; } @@ -521,42 +465,32 @@ static BOOL IsWindows10Version1703OrGreaterWin32(void) VER_SET_CONDITION(cond, VER_MAJORVERSION, VER_GREATER_EQUAL); VER_SET_CONDITION(cond, VER_MINORVERSION, VER_GREATER_EQUAL); VER_SET_CONDITION(cond, VER_BUILDNUMBER, VER_GREATER_EQUAL); + return 0 == (*Verify)(&osvi, VER_MAJORVERSION | VER_MINORVERSION | VER_BUILDNUMBER, cond); } -static void *FindProc(const char *name) +// Get OpenGL function pointers +static void *WglGetProcAddress(const char *procname) { + void *proc = (void *)wglGetProcAddress(procname); + + if ((proc == NULL) || + // NOTE: Some GPU drivers could return following + // invalid sentinel values instead of NULL + (proc == (void *)0x1) || + (proc == (void *)0x2) || + (proc == (void *)0x3) || + (proc == (void *)-1)) { - void *proc = wglGetProcAddress(name); - if (proc) return proc; + // TODO: Keep gl module pointer as global platform data? + HMODULE glModule = LoadLibraryW(L"opengl32.dll"); + proc = (void *)GetProcAddress(glModule, procname); + + //if (proc == NULL) TRACELOG(LOG_ERROR, "GL: GetProcAddress() failed to get %s [%p], error=%u", procname, proc, GetLastError()); + //else TRACELOG(LOG_INFO, "GL: Found entry point for %s [%p]", procname, proc); } - static HMODULE opengl = NULL; - if (!opengl) - { - opengl = LoadLibraryW(L"opengl32"); - } - if (opengl) - { - void *proc = GetProcAddress(opengl, name); - if (proc) return proc; - } - - return NULL; -} -static void *WglGetProcAddress(const char *name) -{ - void *result = FindProc(name); - if (result) - { - //TRACELOG(LOG_DEBUG, "GetProcAddress '%s' > %p", name, result); - } - else - { - TRACELOG(LOG_ERROR, "GetProcAddress '%s' > %p failed, error=%u", name, result, GetLastError()); - } - - return result; + return proc; } static KeyboardKey KeyFromWparam(WPARAM wparam) @@ -744,40 +678,36 @@ static KeyboardKey KeyFromWparam(WPARAM wparam) static LPCWSTR GetCursorName(int cursor) { + LPCWSTR name = (LPCWSTR)IDC_ARROW; + switch (cursor) { - case MOUSE_CURSOR_DEFAULT : return (LPCWSTR)IDC_ARROW; - case MOUSE_CURSOR_ARROW : return (LPCWSTR)IDC_ARROW; - case MOUSE_CURSOR_IBEAM : return (LPCWSTR)IDC_IBEAM; - case MOUSE_CURSOR_CROSSHAIR : return (LPCWSTR)IDC_CROSS; - case MOUSE_CURSOR_POINTING_HAND: return (LPCWSTR)IDC_HAND; - case MOUSE_CURSOR_RESIZE_EW : return (LPCWSTR)IDC_SIZEWE; - case MOUSE_CURSOR_RESIZE_NS : return (LPCWSTR)IDC_SIZENS; - case MOUSE_CURSOR_RESIZE_NWSE : return (LPCWSTR)IDC_SIZENWSE; - case MOUSE_CURSOR_RESIZE_NESW : return (LPCWSTR)IDC_SIZENESW; - case MOUSE_CURSOR_RESIZE_ALL : return (LPCWSTR)IDC_SIZEALL; - case MOUSE_CURSOR_NOT_ALLOWED : return (LPCWSTR)IDC_NO; - default: abort(); + case MOUSE_CURSOR_DEFAULT: name = (LPCWSTR)IDC_ARROW; break; + case MOUSE_CURSOR_ARROW: name = (LPCWSTR)IDC_ARROW; break; + case MOUSE_CURSOR_IBEAM: name = (LPCWSTR)IDC_IBEAM; break; + case MOUSE_CURSOR_CROSSHAIR: name = (LPCWSTR)IDC_CROSS; break; + case MOUSE_CURSOR_POINTING_HAND: name = (LPCWSTR)IDC_HAND; break; + case MOUSE_CURSOR_RESIZE_EW: name = (LPCWSTR)IDC_SIZEWE; break; + case MOUSE_CURSOR_RESIZE_NS: name = (LPCWSTR)IDC_SIZENS; break; + case MOUSE_CURSOR_RESIZE_NWSE: name = (LPCWSTR)IDC_SIZENWSE; break; + case MOUSE_CURSOR_RESIZE_NESW: name = (LPCWSTR)IDC_SIZENESW; break; + case MOUSE_CURSOR_RESIZE_ALL: name = (LPCWSTR)IDC_SIZEALL; break; + case MOUSE_CURSOR_NOT_ALLOWED: name = (LPCWSTR)IDC_NO; break; + default: break; } -} + return name; +} static BOOL CALLBACK CountMonitorsProc(HMONITOR handle, HDC _, LPRECT rect, LPARAM lparam) { - int *count = (int*)lparam; + int *count = (int *)lparam; *count += 1; - // always return TRUE to continue the loop, otherwise, the caller + // Always return TRUE to continue the loop, otherwise, the caller // can't distinguish between stopping the loop and an error return TRUE; } -typedef struct { - HMONITOR needle; - int index; - int matchIndex; - RECT rect; -} FindMonitorContext; - static BOOL CALLBACK FindMonitorProc(HMONITOR handle, HDC _, LPRECT rect, LPARAM lparam) { FindMonitorContext *c = (FindMonitorContext*)lparam; @@ -788,96 +718,48 @@ static BOOL CALLBACK FindMonitorProc(HMONITOR handle, HDC _, LPRECT rect, LPARAM } c->index += 1; - // always return TRUE to continue the loop, otherwise, the caller + // Always return TRUE to continue the loop, otherwise, the caller // can't distinguish between stopping the loop and an error return TRUE; } -typedef struct { - DWORD set; - DWORD clear; -} FlagsOp; - -static void GetStyleChangeFlagOps( - DWORD coreWindowFlags, - STYLESTRUCT *ss, - FlagsOp *deferredFlags -) { +static void GetStyleChangeFlagOps(DWORD coreWindowFlags, STYLESTRUCT *ss, FlagsOp *deferredFlags) +{ + // Check window resizable flag change + bool resizable = (coreWindowFlags & FLAG_WINDOW_RESIZABLE); + bool resizableOld = ((ss->styleOld & STYLE_FLAGS_RESIZABLE) != 0); + bool resizableNew = ((ss->styleNew & STYLE_FLAGS_RESIZABLE) != 0); + if (resizable != resizableOld) TRACELOG(LOG_ERROR, "expected resizable %u but got %u", resizable, resizableOld); + if (resizableOld != resizableNew) { - bool resizable = (coreWindowFlags & FLAG_WINDOW_RESIZABLE); - bool resizableOld = ResizableFromStyle(ss->styleOld); - bool resizableNew = ResizableFromStyle(ss->styleNew); - if (resizable != resizableOld) - { - TRACELOG(LOG_ERROR, "expected resizable %u but got %u", resizable, resizableOld); - abort(); - } - - if (resizableOld != resizableNew) - { - //TRACELOG(LOG_INFO, "resizable = %u", resizableNew); - if (resizableNew) - { - deferredFlags->set |= FLAG_WINDOW_RESIZABLE; - } - else - { - deferredFlags->clear |= FLAG_WINDOW_RESIZABLE; - } - } + if (resizableNew) deferredFlags->set |= FLAG_WINDOW_RESIZABLE; + else deferredFlags->clear |= FLAG_WINDOW_RESIZABLE; } + // Check window decorated flag change + bool decorated = (0 == (coreWindowFlags & FLAG_WINDOW_UNDECORATED)); + bool decoratedOld = DecoratedFromStyle(ss->styleOld); + bool decoratedNew = DecoratedFromStyle(ss->styleNew); + if (decorated != decoratedOld) TRACELOG(LOG_ERROR, "expected decorated %u but got %u", decorated, decoratedOld); + if (decoratedOld != decoratedNew) { - bool decorated = (0 == (coreWindowFlags & FLAG_WINDOW_UNDECORATED)); - bool decoratedOld = DecoratedFromStyle(ss->styleOld); - bool decoratedNew = DecoratedFromStyle(ss->styleNew); - if (decorated != decoratedOld) - { - TRACELOG(LOG_ERROR, "expected decorated %u but got %u", decorated, decoratedOld); - abort(); - } - - if (decoratedOld != decoratedNew) - { - //TRACELOG(LOG_INFO, "decorated = %u", decoratedNew); - if (decoratedNew) - { - deferredFlags->clear |= FLAG_WINDOW_UNDECORATED; - } - else - { - deferredFlags->set |= FLAG_WINDOW_UNDECORATED; - } - } + if (decoratedNew) deferredFlags->clear |= FLAG_WINDOW_UNDECORATED; + else deferredFlags->set |= FLAG_WINDOW_UNDECORATED; } + // Check window hidden flag change + bool hidden = (coreWindowFlags & FLAG_WINDOW_HIDDEN); + bool hiddenOld = ((ss->styleOld & WS_VISIBLE) == 0); + bool hiddenNew = ((ss->styleNew & WS_VISIBLE) == 0); + if (hidden != hiddenOld) TRACELOG(LOG_ERROR, "expected hidden %u but got %u", hidden, hiddenOld); + if (hiddenOld != hiddenNew) { - bool hidden = (coreWindowFlags & FLAG_WINDOW_HIDDEN); - bool hiddenOld = HiddenFromStyle(ss->styleOld); - bool hiddenNew = HiddenFromStyle(ss->styleNew); - if (hidden != hiddenOld) - { - TRACELOG(LOG_ERROR, "expected hidden %u but got %u", hidden, hiddenOld); - abort(); - } - - if (hiddenOld != hiddenNew) - { - TRACELOG(LOG_INFO, "hidden = %u", hiddenNew); - if (hiddenNew) - { - deferredFlags->set |= FLAG_WINDOW_HIDDEN; - } - else - { - deferredFlags->clear |= FLAG_WINDOW_HIDDEN; - } - } + if (hiddenNew) deferredFlags->set |= FLAG_WINDOW_HIDDEN; + else deferredFlags->clear |= FLAG_WINDOW_HIDDEN; } } -// call when the window is rezised, returns true if the new window size -// should update the desired app size +// Call when the window is rezised, returns true if the new window size should update the desired app size static bool AdoptWindowResize(unsigned flags) { if (flags & FLAG_WINDOW_MINIMIZED) return false; @@ -885,297 +767,58 @@ static bool AdoptWindowResize(unsigned flags) if (flags & FLAG_FULLSCREEN_MODE) return false; if (flags & FLAG_BORDERLESS_WINDOWED_MODE) return false; if (!(flags & FLAG_WINDOW_RESIZABLE)) return false; + return true; } -// -------------------------------------------------------------------------------- -// Here's the end of the "pure function section", the rest of the file can access -// global state. -// -------------------------------------------------------------------------------- +// --------------------------------------------------------------------------------------------- +// Here's the end of the "pure function section", the rest of the file can access global state +// --------------------------------------------------------------------------------------------- -// unlock the ability to use CORE in the rest of the file +// Unlock the ability to use CORE in the rest of the file #undef CORE -// The last screen size requested by the app, the backend must keep the client area -// this size (after DPI scaling is applied) when the window isn't fullscreen/maximized/minimized. -static Vector2 globalAppScreenSize = (Vector2){0, 0}; -static unsigned globalDesiredFlags = 0; -static HWND globalHwnd = NULL; -static HDC globalHdc = NULL; -static HGLRC globalGlContext = NULL; -static LARGE_INTEGER globalTimerFrequency; -static bool globalCursorEnabled = true; +//---------------------------------------------------------------------------------- +// Module Internal Functions Declaration +//---------------------------------------------------------------------------------- +int InitPlatform(void); // Initialize platform (graphics, inputs and more) +void ClosePlatform(void); // Close platform -static void HandleKey(WPARAM wparam, LPARAM lparam, char state) -{ - KeyboardKey key = KeyFromWparam(wparam); - // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - /* BYTE scancode = lparam >> 16; */ - /* TRACELOG(LOG_INFO, "KEY key=%d vk=%lu scan=%u = %u", key, wparam, scancode, state); */ - if (key != KEY_NULL) - { - /* TRACELOG(LOG_INFO, "KEY[%d] = %d (old=%d)\n", key, state, CORE.Input.Keyboard.currentKeyState[key]); */ - CORE.Input.Keyboard.currentKeyState[key] = state; - if (key == KEY_ESCAPE && state == 1) - { - CORE.Window.shouldClose = 1; - } - } - else - { - TRACELOG(LOG_WARNING, "unknown (or currently unhandled) virtual keycode %d (0x%x)", wparam, wparam); - } +// Win32 process messages management function +static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam); - // TODO: add it to the queue as well? -} -static void HandleMouseButton(int button, char state) -{ - CORE.Input.Mouse.currentButtonState[button] = state; - CORE.Input.Touch.currentTouchState[button] = state; -} +// Win32: Handle inputs functions +static void HandleKey(WPARAM wparam, LPARAM lparam, char state); +static void HandleMouseButton(int button, char state); +static void HandleRawInput(LPARAM lparam); +static void HandleWindowResize(HWND hwnd, int *width, int *height); -static void HandleRawInput(LPARAM lparam) -{ - RAWINPUT input; +static void UpdateWindowStyle(HWND hwnd, unsigned desiredFlags); +static unsigned SanitizeFlags(SanitizeFlagsKind kind, unsigned flags); +static void UpdateFlags(HWND hwnd, unsigned desiredFlags, int width, int height); // Update window flags - { - UINT inputSize = sizeof(input); - UINT size = GetRawInputData((HRAWINPUT)lparam, RID_INPUT, &input, &inputSize, sizeof(RAWINPUTHEADER)); - if (size == (UINT)-1) { - LogFail("GetRawInputData", GetLastError()); - abort(); - } - if (size != inputSize) abort(); // bug? - } +//---------------------------------------------------------------------------------- +// Module Functions Declaration +//---------------------------------------------------------------------------------- +// NOTE: Functions declaration is provided by raylib.h - if (input.header.dwType != RIM_TYPEMOUSE) - { - TRACELOG(LOG_ERROR, "Unexpected WM_INPUT type %lu", input.header.dwType); - abort(); - } - - if (input.data.mouse.usFlags & MOUSE_MOVE_ABSOLUTE) - { - TRACELOG(LOG_ERROR, "TODO: handle absolute mouse inputs!"); - abort(); - } - - if (input.data.mouse.usFlags & MOUSE_VIRTUAL_DESKTOP) - { - TRACELOG(LOG_ERROR, "TODO: handle virtual desktop mouse inputs!"); - abort(); - } - - // bit of a trick, we keep the mouse position at 0,0 and instead move - // the previous position so we can still get a proper mouse delta - CORE.Input.Mouse.previousPosition.x -= input.data.mouse.lLastX; - CORE.Input.Mouse.previousPosition.y -= input.data.mouse.lLastY; - if (CORE.Input.Mouse.currentPosition.x != 0) abort(); - if (CORE.Input.Mouse.currentPosition.y != 0) abort(); -} - -static void HandleWindowResize(HWND hwnd, Vector2 *appScreenSizeRef) -{ - if (CORE.Window.flags & FLAG_WINDOW_MINIMIZED) - return; - - SIZE clientSize = GetClientSize(hwnd); - - // TODO: not sure if this function is doing what we need, leaving this disabled - // call to workaround unused function error - if (0) SetupFramebuffer(0, 0); - - TRACELOG(LOG_DEBUG, "NewClientSize %lux%lu", clientSize.cx, clientSize.cy); - /* CORE.Window.currentFbo.width = clientSize.cx; */ - /* CORE.Window.currentFbo.height = clientSize.cy; */ - /* glViewport(0, 0, clientSize.cx, clientSize.cy); */ - SetupViewport(clientSize.cx, clientSize.cy); - CORE.Window.resizedLastFrame = true; - float dpiScale = ScaleFromDpi(GetWindowDpi(hwnd)); - bool highdpi = !!(CORE.Window.flags & FLAG_WINDOW_HIGHDPI); - Vector2 screenSize = (Vector2){ - PtFromPx(dpiScale, highdpi, clientSize.cx), - PtFromPx(dpiScale, highdpi, clientSize.cy), - }; - CORE.Window.screen.width = roundf(screenSize.x); - CORE.Window.screen.height = roundf(screenSize.y); - if (AdoptWindowResize(CORE.Window.flags)) - { - TRACELOG( - LOG_DEBUG, - "updating app size to %fx%f from window resize", - screenSize.x, screenSize.y - ); - *appScreenSizeRef = screenSize; - } - - CORE.Window.screenScale = MatrixScale( - (float)CORE.Window.render.width/CORE.Window.screen.width, - (float)CORE.Window.render.height/CORE.Window.screen.height, - 1.0f - ); -} - -static void UpdateWindowStyle(HWND hwnd, unsigned desiredFlags) -{ - { - DWORD current = STYLE_MASK_WRITABLE & MakeWindowStyle(CORE.Window.flags); - DWORD desired = STYLE_MASK_WRITABLE & MakeWindowStyle(desiredFlags); - if (current != desired) - { - SetLastError(0); - DWORD previous = STYLE_MASK_WRITABLE & SetWindowLongPtrW(hwnd, GWL_STYLE, desired); - if (previous != current) - { - TRACELOG( - LOG_ERROR, - "SetWindowLong returned writable flags 0x%x but expected 0x%x (diff=0x%x, error=%lu)", - previous, - current, - previous ^ current, - GetLastError() - ); - abort(); - } - - CheckFlags("UpdateWindowStyle", hwnd, desiredFlags, desired, STYLE_MASK_WRITABLE); - } - } - - Mized currentMized = MizedFromStyle(MakeWindowStyle(CORE.Window.flags)); - Mized desiredMized = MizedFromStyle(MakeWindowStyle(desiredFlags)); - if (currentMized != desiredMized) - { - switch (desiredMized) - { - case MIZED_NONE: ShowWindow(hwnd, SW_RESTORE); break; - case MIZED_MIN: ShowWindow(hwnd, SW_MINIMIZE); break; - case MIZED_MAX: ShowWindow(hwnd, SW_MAXIMIZE); break; - } - } -} - -typedef enum { - SANITIZE_FLAGS_FIRST, - SANITIZE_FLAGS_NORMAL, -} SanitizeFlagsKind; - -static unsigned SanitizeFlags(SanitizeFlagsKind kind, unsigned flags) -{ - if ((flags & FLAG_WINDOW_MAXIMIZED) && (flags & FLAG_BORDERLESS_WINDOWED_MODE)) - { - TRACELOG(LOG_INFO, "borderless windows mode is overriding maximized"); - flags &= ~FLAG_WINDOW_MAXIMIZED; - } - - switch (kind) - { - case SANITIZE_FLAGS_FIRST: break; - case SANITIZE_FLAGS_NORMAL: - if ((flags & FLAG_MSAA_4X_HINT) && (!(CORE.Window.flags & FLAG_MSAA_4X_HINT))) - { - TRACELOG(LOG_WARNING, "WINDOW: MSAA can only be configured before window initialization"); - flags &= ~FLAG_MSAA_4X_HINT; - } - break; - } - - return flags; -} - -#define FLAG_MASK_OPTIONAL (FLAG_VSYNC_HINT) -#define FLAG_MASK_REQUIRED ~(FLAG_MASK_OPTIONAL) - -// flags that have no operations to perform during an update -#define FLAG_MASK_NO_UPDATE (FLAG_WINDOW_HIGHDPI | FLAG_MSAA_4X_HINT) - - -// All window state changes from raylib flags go through this function. It performs -// whatever operations are needed to update the window state to match the desired flags. -// In most cases this function should not update CORE.Window.flags directly, instead, -// the window itself should update CORE.Window.flags in response to actual state changes. -// This means that CORE.Window.flags should always represent the actual state of the -// window. This function will continue to perform these update operations so long as -// the state continues to change. -// -// This design takes care of many odd corner cases. For example, if you want to restore -// a window that was previously maximized AND minimized and you want to remove both these -// flags, you actually need to call ShowWindow with SW_RESTORE twice. Another example is -// if you have a maximized window, if the undecorated flag is modified then we'd need to -// update the window style, but updating the style would mean the window size would change -// causing the window to lose its Maximized state which would mean we'd need to update the -// window size and then update the window style a second time to restore that maximized -// state. This implementation is able to handle any/all of these special situations with a -// retry loop that continues until we either reach the desired state or the state stops -// changing. -static void UpdateFlags(HWND hwnd, unsigned desiredFlags, Vector2 appScreenSize) -{ - // flags that just apply immediately without needing any operations - CORE.Window.flags |= (desiredFlags & FLAG_MASK_NO_UPDATE); - - { - int vsync = (CORE.Window.flags & FLAG_VSYNC_HINT)? 1 : 0; - PFNWGLSWAPINTERVALEXTPROC f = (PFNWGLSWAPINTERVALEXTPROC)wglGetProcAddress("wglSwapIntervalEXT"); - if (f) - { - (*f)(vsync); - if (vsync) - { - CORE.Window.flags |= FLAG_VSYNC_HINT; - } - else - { - CORE.Window.flags &= ~FLAG_VSYNC_HINT; - } - } - } - - DWORD previousStyle; - for (unsigned attempt = 1; ; attempt++) - { - CheckFlags("UpdateFlags", hwnd, CORE.Window.flags, MakeWindowStyle(CORE.Window.flags), STYLE_MASK_ALL); - - bool windowSizeUpdated = false; - if (MakeWindowStyle(CORE.Window.flags) == MakeWindowStyle(desiredFlags)) - { - windowSizeUpdated = UpdateWindowSize(UPDATE_WINDOW_NORMAL, hwnd, appScreenSize, desiredFlags); - if ((FLAG_MASK_REQUIRED & desiredFlags) == (FLAG_MASK_REQUIRED & CORE.Window.flags)) - break; - } - - if ( - (attempt > 1) && - (previousStyle == MakeWindowStyle(CORE.Window.flags)) && - !windowSizeUpdated - ) { - TRACELOG( - LOG_ERROR, - // TODO: print more information - "UpdateFlags failed after %u attempt(s) wanted 0x%x but is 0x%x (diff=0x%x)", - attempt, - desiredFlags, - CORE.Window.flags, - desiredFlags ^ CORE.Window.flags - ); - abort(); - } - - previousStyle = MakeWindowStyle(CORE.Window.flags); - UpdateWindowStyle(hwnd, desiredFlags); - } -} +//---------------------------------------------------------------------------------- +// Module Functions Definition: Window and Graphics Device +//---------------------------------------------------------------------------------- +// Check if application should close bool WindowShouldClose(void) { return CORE.Window.shouldClose; } +// Toggle fullscreen mode void ToggleFullscreen(void) { TRACELOG(LOG_WARNING, "ToggleFullscreen not implemented"); - assert(0); // crash debug builds only } +// Toggle borderless windowed mode void ToggleBorderlessWindowed(void) { if (CORE.Window.flags & FLAG_BORDERLESS_WINDOWED_MODE) @@ -1188,11 +831,13 @@ void ToggleBorderlessWindowed(void) } } +// Set window state: maximized, if resizable void MaximizeWindow(void) { SetWindowState(FLAG_WINDOW_MAXIMIZED); } +// Set window state: minimized void MinimizeWindow(void) { SetWindowState(FLAG_WINDOW_MINIMIZED); @@ -1215,62 +860,57 @@ void RestoreWindow(void) // Set window configuration state using flags void SetWindowState(unsigned int flags) { - globalDesiredFlags = SanitizeFlags(SANITIZE_FLAGS_NORMAL, CORE.Window.flags | flags); - UpdateFlags(globalHwnd, globalDesiredFlags, globalAppScreenSize); + platform.desiredFlags = SanitizeFlags(SANITIZE_FLAGS_NORMAL, CORE.Window.flags | flags); + UpdateFlags(platform.hwnd, platform.desiredFlags, platform.appScreenWidth, platform.appScreenHeight); } // Clear window configuration state flags void ClearWindowState(unsigned int flags) { - globalDesiredFlags = SanitizeFlags(SANITIZE_FLAGS_NORMAL, CORE.Window.flags & ~flags); - UpdateFlags(globalHwnd, globalDesiredFlags, globalAppScreenSize); + platform.desiredFlags = SanitizeFlags(SANITIZE_FLAGS_NORMAL, CORE.Window.flags & ~flags); + UpdateFlags(platform.hwnd, platform.desiredFlags, platform.appScreenWidth, platform.appScreenHeight); } // Set icon for window void SetWindowIcon(Image image) { TRACELOG(LOG_WARNING, "SetWindowIcon not implemented"); - assert(0); // crash debug builds only } // Set icon for window void SetWindowIcons(Image *images, int count) { TRACELOG(LOG_WARNING, "SetWindowIcons not implemented"); - assert(0); // crash debug builds only } void SetWindowTitle(const char *title) { CORE.Window.title = title; - WCHAR *titlew; - A_TO_W_ALLOCA(titlew, CORE.Window.title); - if (!SetWindowTextW(globalHwnd, titlew)) - { - LogFail("SetWindowText", GetLastError()); - abort(); - } + + WCHAR *titleWide = NULL; + A_TO_W_ALLOCA(titleWide, CORE.Window.title); + + int result = SetWindowTextW(platform.hwnd, titleWide); + if (result == 0) TRACELOG(LOG_ERROR, "%s failed, error=%lu", "SetWindowText", GetLastError()); } // Set window position on screen (windowed mode) void SetWindowPosition(int x, int y) { TRACELOG(LOG_WARNING, "SetWindowPosition not implemented"); - assert(0); // crash debug builds only } // Set monitor for the current window void SetWindowMonitor(int monitor) { TRACELOG(LOG_WARNING, "SetWindowMonitor not implemented"); - assert(0); // crash debug builds only } // Set window minimum dimensions (FLAG_WINDOW_RESIZABLE) void SetWindowMinSize(int width, int height) { TRACELOG(LOG_WARNING, "SetWindowMinSize not implemented"); - assert(0); // crash debug builds only + CORE.Window.screenMin.width = width; CORE.Window.screenMin.height = height; } @@ -1279,7 +919,7 @@ void SetWindowMinSize(int width, int height) void SetWindowMaxSize(int width, int height) { TRACELOG(LOG_WARNING, "SetWindowMaxSize not implemented"); - assert(0); // crash debug builds only + CORE.Window.screenMax.width = width; CORE.Window.screenMax.height = height; } @@ -1288,36 +928,32 @@ void SetWindowMaxSize(int width, int height) void SetWindowSize(int width, int height) { TRACELOG(LOG_WARNING, "SetWindowSize not implemented"); - assert(0); // crash debug builds only } // Set window opacity, value opacity is between 0.0 and 1.0 void SetWindowOpacity(float opacity) { TRACELOG(LOG_WARNING, "SetWindowOpacity not implemented"); - assert(0); // crash debug builds only } +// Set window focused void SetWindowFocused(void) { TRACELOG(LOG_WARNING, "SetWindowFocused not implemented"); - assert(0); // crash debug builds only } // Get native window handle void *GetWindowHandle(void) { - return globalHwnd; + return platform.hwnd; } int GetMonitorCount(void) { int count = 0; - if (!EnumDisplayMonitors(NULL, NULL, CountMonitorsProc, (LPARAM)&count)) - { - LogFail("EnumDisplayMonitors", GetLastError()); - abort(); - } + + int result = EnumDisplayMonitors(NULL, NULL, CountMonitorsProc, (LPARAM)&count); + if (result == 0) TRACELOG(LOG_ERROR, "%s failed, error=%lu", "EnumDisplayMonitors", GetLastError()); return count; } @@ -1325,22 +961,16 @@ int GetMonitorCount(void) // Get current monitor where window is placed int GetCurrentMonitor(void) { - HMONITOR monitor = MonitorFromWindow(globalHwnd, MONITOR_DEFAULTTOPRIMARY); - if (!monitor) - { - LogFail("MonitorFromWindow", GetLastError()); - abort(); - } + HMONITOR monitor = MonitorFromWindow(platform.hwnd, MONITOR_DEFAULTTOPRIMARY); + if (!monitor) TRACELOG(LOG_ERROR, "%s failed, error=%lu", "MonitorFromWindow", GetLastError()); FindMonitorContext context; context.needle = monitor; context.index = 0; context.matchIndex = -1; - if (!EnumDisplayMonitors(NULL, NULL, FindMonitorProc, (LPARAM)&context)) - { - LogFail("EnumDisplayMonitors", GetLastError()); - abort(); - } + + int result = EnumDisplayMonitors(NULL, NULL, FindMonitorProc, (LPARAM)&context); + if (result == 0) TRACELOG(LOG_ERROR, "%s failed, error=%lu", "EnumDisplayMonitors", GetLastError()); return context.matchIndex; } @@ -1349,7 +979,6 @@ int GetCurrentMonitor(void) Vector2 GetMonitorPosition(int monitor) { TRACELOG(LOG_WARNING, "GetMonitorPosition not implemented"); - assert(0); // crash debug builds only return (Vector2){ 0, 0 }; } @@ -1357,7 +986,6 @@ Vector2 GetMonitorPosition(int monitor) int GetMonitorWidth(int monitor) { TRACELOG(LOG_WARNING, "GetMonitorWidth not implemented"); - assert(0); // crash debug builds only return 0; } @@ -1365,7 +993,6 @@ int GetMonitorWidth(int monitor) int GetMonitorHeight(int monitor) { TRACELOG(LOG_WARNING, "GetMonitorHeight not implemented"); - assert(0); // crash debug builds only return 0; } @@ -1373,7 +1000,6 @@ int GetMonitorHeight(int monitor) int GetMonitorPhysicalWidth(int monitor) { TRACELOG(LOG_WARNING, "GetMonitorPhysicalWidth not implemented"); - assert(0); // crash debug builds only return 0; } @@ -1381,7 +1007,6 @@ int GetMonitorPhysicalWidth(int monitor) int GetMonitorPhysicalHeight(int monitor) { TRACELOG(LOG_WARNING, "GetMonitorPhysicalHeight not implemented"); - assert(0); // crash debug builds only return 0; } @@ -1389,7 +1014,6 @@ int GetMonitorPhysicalHeight(int monitor) int GetMonitorRefreshRate(int monitor) { TRACELOG(LOG_WARNING, "GetMonitorRefreshRate not implemented"); - assert(0); // crash debug builds only return 0; } @@ -1397,7 +1021,6 @@ int GetMonitorRefreshRate(int monitor) const char *GetMonitorName(int monitor) { TRACELOG(LOG_WARNING, "GetMonitorName not implemented"); - assert(0); // crash debug builds only return 0; } @@ -1405,35 +1028,36 @@ const char *GetMonitorName(int monitor) Vector2 GetWindowPosition(void) { TRACELOG(LOG_WARNING, "GetWindowPosition not implemented"); - assert(0); // crash debug builds only return (Vector2){ 0, 0 }; } // Get window scale DPI factor for current monitor Vector2 GetWindowScaleDPI(void) { - float scale = ScaleFromDpi(GetWindowDpi(globalHwnd)); + float scale = ((float)GetDpiForWindow(platform.hwnd))/96.0f; return (Vector2){ scale, scale }; } +// Set clipboard text content void SetClipboardText(const char *text) { TRACELOG(LOG_WARNING, "SetClipboardText not implemented"); - assert(0); // crash debug builds only } +// Get clipboard text content const char *GetClipboardText(void) { TRACELOG(LOG_WARNING, "GetClipboardText not implemented"); - assert(0); // crash debug builds only return NULL; } +// Get clipboard image Image GetClipboardImage(void) { - TRACELOG(LOG_WARNING, "GetClipboardText not implemented"); - assert(0); // crash debug builds only Image image = { 0 }; + + TRACELOG(LOG_WARNING, "GetClipboardText not implemented"); + return image; } @@ -1448,7 +1072,7 @@ void ShowCursor(void) void HideCursor(void) { // NOTE: we use SetCursor instead of ShowCursor because it makes it easy - // to only hide the cursor while it's inside the client area. + // to only hide the cursor while it's inside the client area CORE.Input.Mouse.cursorHidden = true; SetCursor(NULL); } @@ -1456,32 +1080,21 @@ void HideCursor(void) // Enables cursor (unlock cursor) void EnableCursor(void) { - if (globalCursorEnabled) - { - TRACELOG(LOG_INFO, "EnableCursor: already enabled"); - } + if (platform.cursorEnabled) TRACELOG(LOG_INFO, "EnableCursor: already enabled"); else { - if (!ClipCursor(NULL)) - { - LogFail("ClipCursor", GetLastError()); - abort(); - } + if (!ClipCursor(NULL)) TRACELOG(LOG_ERROR, "%s failed, error=%lu", "ClipCursor", GetLastError()); - { - RAWINPUTDEVICE rid; - rid.usUsagePage = 0x01; // HID_USAGE_PAGE_GENERIC - rid.usUsage = 0x02; // HID_USAGE_GENERIC_MOUSE - rid.dwFlags = RIDEV_REMOVE; // Add to this window even in background - rid.hwndTarget = NULL; - if (!RegisterRawInputDevices(&rid, 1, sizeof(rid))) { - LogFail("RegisterRawInputDevices", GetLastError()); - abort(); - } - } + RAWINPUTDEVICE rid = { 0 }; + rid.usUsagePage = 0x01; // HID_USAGE_PAGE_GENERIC + rid.usUsage = 0x02; // HID_USAGE_GENERIC_MOUSE + rid.dwFlags = RIDEV_REMOVE; // Add to this window even in background + rid.hwndTarget = NULL; + int result = RegisterRawInputDevices(&rid, 1, sizeof(rid)); + if (result == 0) TRACELOG(LOG_ERROR, "%s failed, error=%lu", "RegisterRawInputDevices", GetLastError()); ShowCursor(); - globalCursorEnabled = true; + platform.cursorEnabled = true; TRACELOG(LOG_INFO, "EnableCursor: enabled"); } } @@ -1489,95 +1102,67 @@ void EnableCursor(void) // Disables cursor (lock cursor) void DisableCursor(void) { - if (globalCursorEnabled) + if (platform.cursorEnabled) { + RAWINPUTDEVICE rid = { 0 }; + rid.usUsagePage = 0x01; // HID_USAGE_PAGE_GENERIC + rid.usUsage = 0x02; // HID_USAGE_GENERIC_MOUSE + rid.dwFlags = RIDEV_INPUTSINK; // Add to this window even in background + rid.hwndTarget = platform.hwnd; + int result = RegisterRawInputDevices(&rid, 1, sizeof(rid)); + if (result == 0) TRACELOG(LOG_ERROR, "%s failed, error=%lu", "RegisterRawInputDevices", GetLastError()); - { - RAWINPUTDEVICE rid; - rid.usUsagePage = 0x01; // HID_USAGE_PAGE_GENERIC - rid.usUsage = 0x02; // HID_USAGE_GENERIC_MOUSE - rid.dwFlags = RIDEV_INPUTSINK; // Add to this window even in background - rid.hwndTarget = globalHwnd; - if (!RegisterRawInputDevices(&rid, 1, sizeof(rid))) { - LogFail("RegisterRawInputDevices", GetLastError()); - abort(); - } - } - - RECT clientRect; - if (!GetClientRect(globalHwnd, &clientRect)) - { - LogFail("GetClientRect", GetLastError()); - abort(); - } + RECT clientRect = { 0 }; + if (!GetClientRect(platform.hwnd, &clientRect)) TRACELOG(LOG_ERROR, "%s failed, error=%lu", "GetClientRect", GetLastError()); POINT topleft = { clientRect.left, clientRect.top }; - if (!ClientToScreen(globalHwnd, &topleft)) - { - LogFail("ClientToScreen", GetLastError()); - abort(); - } + if (!ClientToScreen(platform.hwnd, &topleft)) TRACELOG(LOG_ERROR, "%s failed, error=%lu", "ClientToScreen", GetLastError()); LONG width = clientRect.right - clientRect.left; LONG height = clientRect.bottom - clientRect.top; TRACELOG(LOG_INFO, "ClipCursor client %d,%d %d,%d (topleft %d,%d)", - clientRect.left, - clientRect.top, - clientRect.right, - clientRect.bottom, - topleft.x, - topleft.y - ); + clientRect.left, clientRect.top, clientRect.right, clientRect.bottom, topleft.x, topleft.y); + LONG centerX = topleft.x + width/2; LONG centerY = topleft.y + height/2; RECT clipRect = { centerX, centerY, centerX + 1, centerY + 1 }; - if (!ClipCursor(&clipRect)) - { - LogFail("ClipCursor", GetLastError()); - abort(); - } + if (!ClipCursor(&clipRect)) TRACELOG(LOG_ERROR, "%s failed, error=%lu", "ClipCursor", GetLastError()); CORE.Input.Mouse.previousPosition = (Vector2){ 0, 0 }; CORE.Input.Mouse.currentPosition = (Vector2){ 0, 0 }; HideCursor(); - globalCursorEnabled = false; + platform.cursorEnabled = false; TRACELOG(LOG_INFO, "DisableCursor: disabled"); } - else - { - TRACELOG(LOG_INFO, "DisableCursor: already disabled"); - } + else TRACELOG(LOG_INFO, "DisableCursor: already disabled"); } +// Swap back buffer with front buffer (screen drawing) void SwapScreenBuffer(void) { - if (!globalHdc) abort(); - if (!SwapBuffers(globalHdc)) - { - LogFail("SwapBuffers", GetLastError()); - abort(); - } - - if (!ValidateRect(globalHwnd, NULL)) - { - LogFail("ValidateRect", GetLastError()); - abort(); - } + if (!platform.hdc) abort(); + if (!SwapBuffers(platform.hdc)) TRACELOG(LOG_ERROR, "%s failed, error=%lu", "SwapBuffers", GetLastError()); + if (!ValidateRect(platform.hwnd, NULL)) TRACELOG(LOG_ERROR, "%s failed, error=%lu", "ValidateRect", GetLastError()); } +//---------------------------------------------------------------------------------- +// Module Functions Definition: Misc +//---------------------------------------------------------------------------------- + +// Get elapsed time measure in seconds double GetTime(void) { LARGE_INTEGER now; QueryPerformanceCounter(&now); - return (double)(now.QuadPart - CORE.Time.base)/(double)globalTimerFrequency.QuadPart; + return (double)(now.QuadPart - CORE.Time.base)/(double)platform.timerFrequency.QuadPart; } // Open URL with default system browser (if available) -// NOTE: This function is only safe to use if you control the URL given. -// A user could craft a malicious string performing another action. -// Only call this function yourself not with user input or make sure to check the string yourself. +// NOTE: This function is only safe to use if you control the URL given +// A user could craft a malicious string performing another action +// Only call this function yourself not with user input or make sure to check the string yourself // Ref: https://github.com/raysan5/raylib/issues/686 void OpenURL(const char *url) { @@ -1586,7 +1171,6 @@ void OpenURL(const char *url) else { TRACELOG(LOG_WARNING, "OpenURL not implemented"); - assert(0); // crash debug builds only } } @@ -1594,53 +1178,47 @@ void OpenURL(const char *url) // Module Functions Definition: Inputs //---------------------------------------------------------------------------------- +// Set internal gamepad mappings int SetGamepadMappings(const char *mappings) { TRACELOG(LOG_WARNING, "SetGamepadMappings not implemented"); - assert(0); // crash debug builds only + return -1; } +// Set gamepad vibration void SetGamepadVibration(int gamepad, float leftMotor, float rightMotor, float duration) { TRACELOG(LOG_WARNING, "SetGamepadVibration not implemented"); - assert(0); // crash debug builds only } +// Set mouse position XY void SetMousePosition(int x, int y) { - if (globalCursorEnabled) + if (platform.cursorEnabled) { CORE.Input.Mouse.currentPosition = (Vector2){ (float)x, (float)y }; CORE.Input.Mouse.previousPosition = CORE.Input.Mouse.currentPosition; TRACELOG(LOG_WARNING, "SetMousePosition not implemented"); - assert(0); // crash debug builds only - } - else - { - TRACELOG(LOG_ERROR, "Possible? Should we allow this?"); - abort(); } + else TRACELOG(LOG_WARNING, "INPUT: MOUSE: Cursor not enabled"); } +// Set mouse cursor void SetMouseCursor(int cursor) { LPCWSTR cursorName = GetCursorName(cursor); HCURSOR hcursor = LoadCursorW(NULL, cursorName); - if (!hcursor) - { - TRACELOG(LOG_ERROR, "LoadCursor %d (win32 %d) failed, error=%lu", cursor, (size_t)cursorName, GetLastError()); - abort(); - } + if (!hcursor) TRACELOG(LOG_ERROR, "LoadCursor %d (win32 %d) failed, error=%lu", cursor, (size_t)cursorName, GetLastError()); SetCursor(hcursor); CORE.Input.Mouse.cursorHidden = false; } +// Get physical key name const char *GetKeyName(int key) { TRACELOG(LOG_WARNING, "GetKeyName not implemented"); - assert(0); // crash debug builds only return NULL; } @@ -1666,11 +1244,7 @@ void PollInputEvents(void) // so, if mouse is not moved it returns a (0, 0) position... this behaviour should be reviewed! //for (int i = 0; i < MAX_TOUCH_POINTS; i++) CORE.Input.Touch.position[i] = (Vector2){ 0, 0 }; - memcpy( - CORE.Input.Keyboard.previousKeyState, - CORE.Input.Keyboard.currentKeyState, - sizeof(CORE.Input.Keyboard.previousKeyState) - ); + memcpy(CORE.Input.Keyboard.previousKeyState, CORE.Input.Keyboard.currentKeyState, sizeof(CORE.Input.Keyboard.previousKeyState)); memset(CORE.Input.Keyboard.keyRepeatInFrame, 0, sizeof(CORE.Input.Keyboard.keyRepeatInFrame)); // Register previous mouse wheel state @@ -1680,11 +1254,11 @@ void PollInputEvents(void) // Register previous mouse position CORE.Input.Mouse.previousPosition = CORE.Input.Mouse.currentPosition; - MSG msg; + // Process windows messages + MSG msg = { 0 }; while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) { - if (msg.message == WM_PAINT) - return; + if (msg.message == WM_PAINT) return; TranslateMessage(&msg); DispatchMessageW(&msg); } @@ -1694,457 +1268,197 @@ void PollInputEvents(void) // Module Internal Functions Definition //---------------------------------------------------------------------------------- -#define WM_APP_UPDATE_WINDOW_SIZE (WM_APP + 1) - -static LRESULT WndProc2(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, FlagsOp *deferredFlags) +// Initialize modern OpenGL context +// NOTE: We need to create a dummy context first to query requried extensions +HGLRC InitOpenGL(HWND hwnd, HDC hdc) { - switch (msg) + // First, create a dummy context to get WGL extensions + PIXELFORMATDESCRIPTOR pixelFormatDesc = { + .nSize = sizeof(PIXELFORMATDESCRIPTOR), + .nVersion = 1, + .dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER, + .iPixelType = PFD_TYPE_RGBA, + .cColorBits = 32, + .cAlphaBits = 8, + .cDepthBits = 24, + .iLayerType = PFD_MAIN_PLANE + }; + + int pixelFormat = ChoosePixelFormat(hdc, &pixelFormatDesc); + SetPixelFormat(hdc, pixelFormat, &pixelFormatDesc); + //int pixelFormat = ChoosePixelFormat(platform.hdc, &pixelFormatDesc); + //if (!pixelFormat) { TRACELOG(LOG_ERROR, "%s failed, error=%lu", "ChoosePixelFormat", GetLastError()); return -1; } + //if (!SetPixelFormat(platform.hdc, pixelFormat, &pixelFormatDesc)) { TRACELOG(LOG_ERROR, "%s failed, error=%lu", "SetPixelFormat", GetLastError()); return -1; } + + HGLRC tempContext = wglCreateContext(hdc); + //if (!tempContext) { TRACELOG(LOG_ERROR, "%s failed, error=%lu", "wglCreateContext", GetLastError()); return -1; } + BOOL result = wglMakeCurrent(hdc, tempContext); + //if (!result) { TRACELOG(LOG_ERROR, "%s failed, error=%lu", "wglMakeCurrent", GetLastError()); return -1; } + + // Load WGL extension entry points + wglCreateContextAttribsARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC)wglGetProcAddress("wglCreateContextAttribsARB"); + wglChoosePixelFormatARB = (PFNWGLCHOOSEPIXELFORMATARBPROC)wglGetProcAddress("wglChoosePixelFormatARB"); + wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC)wglGetProcAddress("wglSwapIntervalEXT"); + + // Setup modern pixel format if extension is available + if (wglChoosePixelFormatARB) { - case WM_CREATE: + int pixelFormatAttribs[] = { + WGL_ACCELERATION_ARB, WGL_FULL_ACCELERATION_ARB, + WGL_DRAW_TO_WINDOW_ARB, GL_TRUE, + WGL_SUPPORT_OPENGL_ARB, GL_TRUE, + WGL_DOUBLE_BUFFER_ARB, GL_TRUE, + WGL_PIXEL_TYPE_ARB, WGL_TYPE_RGBA_ARB, + WGL_COLOR_BITS_ARB, 32, + //WGL_RED_BITS_ARB, 8, + //WGL_GREEN_BITS_ARB, 8, + //WGL_BLUE_BITS_ARB, 8, + //WGL_ALPHA_BITS_ARB, 8, + WGL_DEPTH_BITS_ARB, 24, + WGL_STENCIL_BITS_ARB, 8, + 0 // Terminator + }; + + int format = 0; + UINT numFormats = 0; + if (wglChoosePixelFormatARB(hdc, pixelFormatAttribs, NULL, 1, &format, &numFormats) && (numFormats > 0)) { - globalHdc = GetDC(hwnd); - if (!globalHdc) - { - LogFail("GetDC", GetLastError()); - return -1; - } - - if (CORE.Window.flags & FLAG_MSAA_4X_HINT) - { - TRACELOG(LOG_ERROR, "TODO: implement FLAG_MSAA_4X_HINT"); - assert(0); - } - - PIXELFORMATDESCRIPTOR pixelFormatDesc = {0}; - pixelFormatDesc.nSize = sizeof(PIXELFORMATDESCRIPTOR); - pixelFormatDesc.nVersion = 1; - pixelFormatDesc.dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL; - pixelFormatDesc.iPixelType = PFD_TYPE_RGBA; - pixelFormatDesc.cColorBits = 32; - pixelFormatDesc.cAlphaBits = 8; - pixelFormatDesc.cDepthBits = 24; - - int pixelFormat = ChoosePixelFormat(globalHdc, &pixelFormatDesc); - if (!pixelFormat) - { - LogFail("ChoosePixelFormat", GetLastError()); - return -1; - } - - if (!SetPixelFormat(globalHdc, pixelFormat, &pixelFormatDesc)) - { - LogFail("SetPixelFormat", GetLastError()); - return -1; - } - - globalGlContext = wglCreateContext(globalHdc); - if (!globalGlContext) - { - LogFail("wglCreateContext", GetLastError()); - return -1; - } - - if (!wglMakeCurrent(globalHdc, globalGlContext)) - { - LogFail("wglMakeCurrent", GetLastError()); - return -1; - } - - rlLoadExtensions(WglGetProcAddress); - - globalHwnd = hwnd; - - } return 0; - case WM_DESTROY: - wglMakeCurrent(globalHdc, NULL); - if (globalGlContext) - { - if (!wglDeleteContext(globalGlContext)) abort(); - globalGlContext = NULL; - } - - if (globalHdc) - { - if (!ReleaseDC(hwnd, globalHdc)) abort(); - globalHdc = NULL; - } - - return 0; - case WM_CLOSE: - CORE.Window.shouldClose = true; - return 0; - case WM_KILLFOCUS: - memset(CORE.Input.Keyboard.previousKeyState, 0, sizeof(CORE.Input.Keyboard.previousKeyState)); - memset(CORE.Input.Keyboard.currentKeyState, 0, sizeof(CORE.Input.Keyboard.currentKeyState)); - return 0; - case WM_SIZING: - if (CORE.Window.flags & FLAG_WINDOW_RESIZABLE) { - // TODO: enforce min/max size - TRACELOG(LOG_WARNING, "TODO: enforce min/max size!"); - } else { - TRACELOG(LOG_WARNING, "non-resizable window is being resized"); - // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - abort(); // TODO - } - return TRUE; - case WM_STYLECHANGING: - if (wparam == GWL_STYLE) - { - STYLESTRUCT *ss = (STYLESTRUCT*)lparam; - GetStyleChangeFlagOps(CORE.Window.flags, ss, deferredFlags); - - UINT dpi = GetWindowDpi(hwnd); - SIZE clientSize = GetClientSize(hwnd); - SIZE oldSize = CalcWindowSize(dpi, clientSize, ss->styleOld); - SIZE newSize = CalcWindowSize(dpi, clientSize, ss->styleNew); - if (oldSize.cx != newSize.cx || oldSize.cy != newSize.cy) { - TRACELOG( - LOG_INFO, - "resize from style change: %dx%d to %dx%d", - oldSize.cx, oldSize.cy, - newSize.cx, newSize.cy - ); - if (CORE.Window.flags & FLAG_WINDOW_MAXIMIZED) { - // looks like windows will automatically "unminimize" a window - // if a style changes modifies it's size - TRACELOG(LOG_INFO, "style change modifed window size, removing maximized flag"); - deferredFlags->clear |= FLAG_WINDOW_MAXIMIZED; - } - } - } - return 0; - case WM_WINDOWPOSCHANGING: - { - WINDOWPOS *pos = (WINDOWPOS*)lparam; - if (pos->flags & SWP_SHOWWINDOW) - { - if (pos->flags & SWP_HIDEWINDOW) abort(); - deferredFlags->clear |= FLAG_WINDOW_HIDDEN; - } - else if (pos->flags & SWP_HIDEWINDOW) - { - deferredFlags->set |= FLAG_WINDOW_HIDDEN; - } - - Mized mized = MIZED_NONE; - if (IsMinimized2(hwnd)) - { - mized = MIZED_MIN; - } - else - { - WINDOWPLACEMENT placement; - placement.length = sizeof(placement); - if (!GetWindowPlacement(hwnd, &placement)) - { - LogFail("GetWindowPlacement", GetLastError()); - abort(); - } - - if (placement.showCmd == SW_SHOWMAXIMIZED) { - mized = MIZED_MAX; - } - } - - // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - /* TRACELOG(LOG_INFO, "window pos=%d,%d size=%dx%d", pos->x, pos->y, pos->cx, pos->cy); */ - - switch (mized) - { - case MIZED_NONE: - { - deferredFlags->clear |= ( - FLAG_WINDOW_MINIMIZED | - FLAG_WINDOW_MAXIMIZED - ); - HMONITOR monitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY); - MONITORINFO info; - info.cbSize = sizeof(info); - if (!GetMonitorInfoW(monitor, &info)) - { - LogFail("GetMonitorInfo", GetLastError()); - abort(); - } - - if ( - (pos->x == info.rcMonitor.left) && - (pos->y == info.rcMonitor.top) && - (pos->cx == (info.rcMonitor.right - info.rcMonitor.left)) && - (pos->cy == (info.rcMonitor.bottom - info.rcMonitor.top)) - ) { - deferredFlags->set |= FLAG_BORDERLESS_WINDOWED_MODE; - } - else - { - deferredFlags->clear |= FLAG_BORDERLESS_WINDOWED_MODE; - } - - } break; - case MIZED_MIN: - // !!! NOTE !!! Do not update the maximized/borderless - // flags because when hwnd is minimized it temporarily overrides - // the maximized state/flag which gets restored on SW_RESTORE - deferredFlags->set |= FLAG_WINDOW_MINIMIZED; - break; - case MIZED_MAX: - deferredFlags->clear |= FLAG_WINDOW_MINIMIZED; - deferredFlags->set |= FLAG_WINDOW_MAXIMIZED; - break; - } - - return 0; + PIXELFORMATDESCRIPTOR newPixelFormatDescriptor = { 0 }; + DescribePixelFormat(hdc, format, sizeof(newPixelFormatDescriptor), &newPixelFormatDescriptor); + SetPixelFormat(hdc, format, &newPixelFormatDescriptor); } - case WM_SIZE: - // don't trust the docs, they say you won't get this message if you don't call DefWindowProc - // in response to WM_WINDOWPOSCHANGED but looks like when a window is created you'll get this - // message without getting WM_WINDOWPOSCHANGED. - HandleWindowResize(hwnd, &globalAppScreenSize); - return 0; - case WM_WINDOWPOSCHANGED: { - WINDOWPOS *pos = (WINDOWPOS*)lparam; - if (!(pos->flags & SWP_NOSIZE)) - { - HandleWindowResize(hwnd, &globalAppScreenSize); - } - - return 0; - } - case WM_GETDPISCALEDSIZE: - { - SIZE *inoutSize = (SIZE*)lparam; - UINT newDpi = wparam; - - // for any of these other cases, we might want to post a window - // resize event after the dpi changes? - if (CORE.Window.flags & FLAG_WINDOW_MINIMIZED) return TRUE; - if (CORE.Window.flags & FLAG_WINDOW_MAXIMIZED) return TRUE; - if (CORE.Window.flags & FLAG_BORDERLESS_WINDOWED_MODE) return TRUE; - - float dpiScale = ScaleFromDpi(newDpi); - bool dpiScaling = CORE.Window.flags & FLAG_WINDOW_HIGHDPI; - SIZE desired = PxFromPt2(dpiScale, dpiScaling, globalAppScreenSize); - inoutSize->cx = desired.cx; - inoutSize->cy = desired.cy; - } return TRUE; - case WM_DPICHANGED: - { - RECT *suggestedRect = (RECT*)lparam; - // Never set the window size to anything other than the suggested rect here. - // Doing so can cause a window to stutter between monitors when transitioning - // between them. - if (!SetWindowPos( - hwnd, - NULL, - suggestedRect->left, - suggestedRect->top, - suggestedRect->right - suggestedRect->left, - suggestedRect->bottom - suggestedRect->top, - SWP_NOZORDER | SWP_NOACTIVATE - )) { - LogFail("SetWindowPos", GetLastError()); - abort(); - } - - } return 0; - case WM_SETCURSOR: - if (LOWORD(lparam) == HTCLIENT) - { - SetCursor(CORE.Input.Mouse.cursorHidden? NULL : LoadCursorW(NULL, (LPCWSTR)IDC_ARROW)); - return 0; - } - - return DefWindowProc(hwnd, msg, wparam, lparam); - case WM_INPUT: - if (globalCursorEnabled) - { - TRACELOG(LOG_ERROR, "Unexpected raw mouse input"); // impossible right? - abort(); - } - - HandleRawInput(lparam); - return 0; - case WM_MOUSEMOVE: - if (globalCursorEnabled) - { - CORE.Input.Mouse.currentPosition.x = (float)GET_X_LPARAM(lparam); - CORE.Input.Mouse.currentPosition.y = (float)GET_Y_LPARAM(lparam); - CORE.Input.Touch.position[0] = CORE.Input.Mouse.currentPosition; - } - - return 0; - case WM_KEYDOWN: HandleKey(wparam, lparam, 1); return 0; - case WM_KEYUP: HandleKey(wparam, lparam, 0); return 0; - case WM_LBUTTONDOWN: HandleMouseButton(MOUSE_BUTTON_LEFT, 1); return 0; - case WM_LBUTTONUP : HandleMouseButton(MOUSE_BUTTON_LEFT, 0); return 0; - case WM_RBUTTONDOWN: HandleMouseButton(MOUSE_BUTTON_RIGHT, 1); return 0; - case WM_RBUTTONUP : HandleMouseButton(MOUSE_BUTTON_RIGHT, 0); return 0; - case WM_MBUTTONDOWN: HandleMouseButton(MOUSE_BUTTON_MIDDLE, 1); return 0; - case WM_MBUTTONUP : HandleMouseButton(MOUSE_BUTTON_MIDDLE, 0); return 0; - case WM_XBUTTONDOWN: switch (HIWORD(wparam)) - { - case XBUTTON1: HandleMouseButton(MOUSE_BUTTON_SIDE, 1); return 0; - case XBUTTON2: HandleMouseButton(MOUSE_BUTTON_EXTRA, 1); return 0; - default: - TRACELOG(LOG_WARNING, "TODO: handle ex mouse button DOWN wparam=%u", HIWORD(wparam)); - return 0; - } - case WM_XBUTTONUP: switch (HIWORD(wparam)) - { - case XBUTTON1: HandleMouseButton(MOUSE_BUTTON_SIDE, 0); return 0; - case XBUTTON2: HandleMouseButton(MOUSE_BUTTON_EXTRA, 0); return 0; - default: - TRACELOG(LOG_WARNING, "TODO: handle ex mouse button UP wparam=%u", HIWORD(wparam)); - return 0; - } - case WM_MOUSEWHEEL: - CORE.Input.Mouse.currentWheelMove.y = ((float)GET_WHEEL_DELTA_WPARAM(wparam))/WHEEL_DELTA; - return 0; - case WM_MOUSEHWHEEL: - CORE.Input.Mouse.currentWheelMove.x = ((float)GET_WHEEL_DELTA_WPARAM(wparam))/WHEEL_DELTA; - return 0; - case WM_APP_UPDATE_WINDOW_SIZE: - UpdateWindowSize(UPDATE_WINDOW_NORMAL, hwnd, globalAppScreenSize, CORE.Window.flags); - return 0; - default: - return DefWindowProcW(hwnd, msg, wparam, lparam); } + + // Create real modern OpenGL context (3.3 core) + HGLRC realContext = NULL; + if (wglCreateContextAttribsARB) + { + int contextAttribs[] = { + WGL_CONTEXT_MAJOR_VERSION_ARB, 3, + WGL_CONTEXT_MINOR_VERSION_ARB, 3, + WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB, // WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB, WGL_CONTEXT_ES_PROFILE_BIT_EXT (if supported) + //WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB | WGL_CONTEXT_DEBUG_BIT_ARB [glDebugMessageCallback()] + 0 // Terminator + }; + + // NOTE: We are not sharing context resources so, second parameters is NULL + realContext = wglCreateContextAttribsARB(hdc, NULL, contextAttribs); + + // Check for error context creation errors + // ERROR_INVALID_VERSION_ARB (0x2095) + // ERROR_INVALID_PROFILE_ARB (0x2096) + if (realContext == NULL) TRACELOG(LOG_ERROR, "GL: Error creating requested context: %lu", GetLastError()); + } + + // Cleanup dummy temp context + wglMakeCurrent(NULL, NULL); + wglDeleteContext(tempContext); + + // Activate real context + if (realContext) wglMakeCurrent(hdc, realContext); + + // Once we got a real modern OpenGL context, + // we can load required extensions (function pointers) + rlLoadExtensions(WglGetProcAddress); + + return realContext; } -static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) -{ - // sanity check, should we remove this? - DWORD mask = STYLE_MASK_ALL; - if (globalHwnd == hwnd) - { - if (msg == WM_WINDOWPOSCHANGING) { - mask &= ~(WS_MINIMIZE | WS_MAXIMIZE); - } - CheckFlags("WndProc", hwnd, CORE.Window.flags, MakeWindowStyle(CORE.Window.flags), mask); - } - - FlagsOp flagsOp; - flagsOp.set = 0; - flagsOp.clear = 0; - LRESULT result = WndProc2(hwnd, msg, wparam, lparam, &flagsOp); - - // sanity check, should we remove this? - if (globalHwnd == hwnd) - { - CheckFlags("After WndProc", hwnd, CORE.Window.flags, MakeWindowStyle(CORE.Window.flags), mask); - } - - // Operations to execute after the above check - if (flagsOp.set & flagsOp.clear) - { - TRACELOG(LOG_ERROR, "the flags 0x%x were both set and cleared!", flagsOp.set & flagsOp.clear); - abort(); - } - - { - DWORD save = CORE.Window.flags; - CORE.Window.flags |= flagsOp.set; - CORE.Window.flags &= ~flagsOp.clear; - if (save != CORE.Window.flags) - { - TRACELOG( - LOG_DEBUG, - "DeferredFlags: 0x%x > 0x%x (diff 0x%x)", - save, - CORE.Window.flags, - save ^ CORE.Window.flags - ); - } - } - - return result; -} - - +// Initialize platform: graphics, inputs and more int InitPlatform(void) { - globalDesiredFlags = SanitizeFlags(SANITIZE_FLAGS_FIRST, CORE.Window.flags); - // from this point CORE.Window.flags should always reflect the actual state of the window - CORE.Window.flags = FLAG_WINDOW_HIDDEN | (globalDesiredFlags & FLAG_MASK_NO_UPDATE); + platform.desiredFlags = SanitizeFlags(SANITIZE_FLAGS_FIRST, CORE.Window.flags); + platform.appScreenWidth = CORE.Window.screen.width; + platform.appScreenHeight = CORE.Window.screen.height; - globalAppScreenSize = (Vector2){ CORE.Window.screen.width, CORE.Window.screen.height }; + // NOTE: From this point CORE.Window.flags should always reflect the actual state of the window + CORE.Window.flags = FLAG_WINDOW_HIDDEN | (platform.desiredFlags & FLAG_MASK_NO_UPDATE); +/* + // TODO: Review SetProcessDpiAwarenessContext() + // NOTE: SetProcessDpiAwarenessContext() requires Windows 10, version 1703 and shcore.lib linkage if (IsWindows10Version1703OrGreaterWin32()) { TRACELOG(LOG_INFO, "DpiAware: >=Win10Creators"); - if (!SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2)) { - LogFail("SetProcessDpiAwarenessContext", GetLastError()); - abort(); - } + if (!SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2)) + TRACELOG(LOG_ERROR, "%s failed, error %u", "SetProcessDpiAwarenessContext", GetLastError()); } else { TRACELOG(LOG_INFO, "DpiAware: Use default value as 0 + platform.cursorEnabled = true; TRACELOG(LOG_INFO, "PLATFORM: DESKTOP: WIN32: Initialized successfully"); + return 0; } +// Close platform void ClosePlatform(void) { - if (globalHwnd) + if (platform.hwnd) { - if (0 == DestroyWindow(globalHwnd)) + int result = DestroyWindow(platform.hwnd); + if (result == 0) TRACELOG(LOG_WARNING, "WIN32: Error on window destroy: %u", GetLastError()); + platform.hwnd = NULL; + } +} + +// Window procedure, message processing callback +// NOTE: All window event messages are processed here +static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + LRESULT result = 0; + + // Sanity check + DWORD mask = STYLE_MASK_ALL; + if (platform.hwnd == hwnd) + { + if (msg == WM_WINDOWPOSCHANGING) mask &= ~(WS_MINIMIZE | WS_MAXIMIZE); + CheckFlags("WndProc", hwnd, CORE.Window.flags, MakeWindowStyle(CORE.Window.flags), mask); + } + + FlagsOp flagsOp = { 0 }; + FlagsOp *deferredFlags = &flagsOp; + + // Message processing + //------------------------------------------------------------------------------------ + switch (msg) + { + case WM_CREATE: + { + // WARNING: Not recommended to do OpenGL intialization at this point + + } break; + //case WM_ACTIVATE + case WM_DESTROY: + { + // Clean up for window destruction + wglMakeCurrent(platform.hdc, NULL); + if (platform.glContext) + { + if (!wglDeleteContext(platform.glContext)) abort(); + platform.glContext = NULL; + } + + if (platform.hdc) + { + if (!ReleaseDC(hwnd, platform.hdc)) abort(); + platform.hdc = NULL; + } + + } break; + case WM_CLOSE: CORE.Window.shouldClose = true; break; // Window close button [x], ALT+F4 + //case WM_QUIT: // Application closing, not related to window + case WM_KILLFOCUS: + { + memset(CORE.Input.Keyboard.previousKeyState, 0, sizeof(CORE.Input.Keyboard.previousKeyState)); + memset(CORE.Input.Keyboard.currentKeyState, 0, sizeof(CORE.Input.Keyboard.currentKeyState)); + } break; + case WM_SIZING: + { + if (CORE.Window.flags & FLAG_WINDOW_RESIZABLE) + { + // TODO: Enforce min/max size + } + else TRACELOG(LOG_WARNING, "WINDOW: Trying to resize a non-resizable window"); + + result = TRUE; + } break; + case WM_STYLECHANGING: + { + if (wparam == GWL_STYLE) + { + STYLESTRUCT *ss = (STYLESTRUCT *)lparam; + GetStyleChangeFlagOps(CORE.Window.flags, ss, deferredFlags); + + UINT dpi = GetDpiForWindow(hwnd); + SIZE clientSize = GetClientSize(hwnd); + SIZE oldSize = CalcWindowSize(dpi, clientSize, ss->styleOld); + SIZE newSize = CalcWindowSize(dpi, clientSize, ss->styleNew); + + if (oldSize.cx != newSize.cx || oldSize.cy != newSize.cy) + { + TRACELOG(LOG_INFO, "resize from style change: %dx%d to %dx%d", oldSize.cx, oldSize.cy, newSize.cx, newSize.cy); + + if (CORE.Window.flags & FLAG_WINDOW_MAXIMIZED) + { + // looks like windows will automatically "unminimize" a window + // if a style changes modifies it's size + TRACELOG(LOG_INFO, "style change modifed window size, removing maximized flag"); + deferredFlags->clear |= FLAG_WINDOW_MAXIMIZED; + } + } + } + } break; + case WM_WINDOWPOSCHANGING: + { + WINDOWPOS *pos = (WINDOWPOS *)lparam; + if (pos->flags & SWP_SHOWWINDOW) + { + //if (pos->flags & SWP_HIDEWINDOW) abort(); + deferredFlags->clear |= FLAG_WINDOW_HIDDEN; + } + else if (pos->flags & SWP_HIDEWINDOW) + { + deferredFlags->set |= FLAG_WINDOW_HIDDEN; + } + + Mized mized = MIZED_NONE; + bool isIconic = IsIconic(hwnd); + bool styleMinimized = !!(WS_MINIMIZE & GetWindowLongPtrW(hwnd, GWL_STYLE)); + if (isIconic != styleMinimized) TRACELOG(LOG_WARNING, "IsIconic(%d) != WS_MINIMIZED(%d)", isIconic, styleMinimized); + + if (isIconic) mized = MIZED_MIN; + else + { + WINDOWPLACEMENT placement; + placement.length = sizeof(placement); + if (!GetWindowPlacement(hwnd, &placement)) TRACELOG(LOG_ERROR, "%s failed, error=%lu", "GetWindowPlacement", GetLastError()); + + if (placement.showCmd == SW_SHOWMAXIMIZED) mized = MIZED_MAX; + } + + switch (mized) + { + case MIZED_NONE: + { + deferredFlags->clear |= (FLAG_WINDOW_MINIMIZED | FLAG_WINDOW_MAXIMIZED); + HMONITOR monitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY); + MONITORINFO info; + info.cbSize = sizeof(info); + if (!GetMonitorInfoW(monitor, &info)) TRACELOG(LOG_ERROR, "%s failed, error=%lu", "GetMonitorInfo", GetLastError()); + + if ((pos->x == info.rcMonitor.left) && + (pos->y == info.rcMonitor.top) && + (pos->cx == (info.rcMonitor.right - info.rcMonitor.left)) && + (pos->cy == (info.rcMonitor.bottom - info.rcMonitor.top))) + { + deferredFlags->set |= FLAG_BORDERLESS_WINDOWED_MODE; + } + else + { + deferredFlags->clear |= FLAG_BORDERLESS_WINDOWED_MODE; + } + + } break; + case MIZED_MIN: + { + // !!! NOTE !!! Do not update the maximized/borderless + // flags because when hwnd is minimized it temporarily overrides + // the maximized state/flag which gets restored on SW_RESTORE + deferredFlags->set |= FLAG_WINDOW_MINIMIZED; + } break; + case MIZED_MAX: + { + deferredFlags->clear |= FLAG_WINDOW_MINIMIZED; + deferredFlags->set |= FLAG_WINDOW_MAXIMIZED; + } break; + default: break; + } + } break; + case WM_SIZE: + { + // WARNING: Don't trust the docs, they say you won't get this message if you don't call DefWindowProc + // in response to WM_WINDOWPOSCHANGED but looks like when a window is created you'll get this + // message without getting WM_WINDOWPOSCHANGED + HandleWindowResize(hwnd, &platform.appScreenWidth, &platform.appScreenHeight); + } break; + //case WM_MOVE + case WM_WINDOWPOSCHANGED: + { + WINDOWPOS *pos = (WINDOWPOS*)lparam; + if (!(pos->flags & SWP_NOSIZE)) HandleWindowResize(hwnd, &platform.appScreenWidth, &platform.appScreenHeight); + } break; + case WM_GETDPISCALEDSIZE: + { + SIZE *inoutSize = (SIZE *)lparam; + UINT newDpi = (UINT)wparam; // TODO: WARNING: Converting from WPARAM = UINT_PTR + + // for any of these other cases, we might want to post a window + // resize event after the dpi changes? + if (CORE.Window.flags & FLAG_WINDOW_MINIMIZED) return TRUE; + if (CORE.Window.flags & FLAG_WINDOW_MAXIMIZED) return TRUE; + if (CORE.Window.flags & FLAG_BORDERLESS_WINDOWED_MODE) return TRUE; + + float dpiScale = ((float)newDpi)/96.0f; + bool dpiScaling = CORE.Window.flags & FLAG_WINDOW_HIGHDPI; + SIZE desired = PxFromPt2(dpiScale, dpiScaling, platform.appScreenWidth, platform.appScreenHeight); + inoutSize->cx = desired.cx; + inoutSize->cy = desired.cy; + + result = TRUE; + } break; + case WM_DPICHANGED: + { + RECT *suggestedRect = (RECT*)lparam; + // Never set the window size to anything other than the suggested rect here + // Doing so can cause a window to stutter between monitors when transitioning between them + if (!SetWindowPos(hwnd, NULL, + suggestedRect->left, + suggestedRect->top, + suggestedRect->right - suggestedRect->left, + suggestedRect->bottom - suggestedRect->top, + SWP_NOZORDER | SWP_NOACTIVATE)) + { + TRACELOG(LOG_ERROR, "%s failed, error=%lu", "SetWindowPos", GetLastError()); + } + } break; + case WM_SETCURSOR: + { + if (LOWORD(lparam) == HTCLIENT) + { + SetCursor(CORE.Input.Mouse.cursorHidden? NULL : LoadCursorW(NULL, (LPCWSTR)IDC_ARROW)); + return 0; + } + + result = DefWindowProc(hwnd, msg, wparam, lparam); + } break; + //case WM_PAINT + case WM_INPUT: + { + HandleRawInput(lparam); + } break; + case WM_MOUSEMOVE: + { + if (platform.cursorEnabled) + { + CORE.Input.Mouse.currentPosition.x = (float)GET_X_LPARAM(lparam); + CORE.Input.Mouse.currentPosition.y = (float)GET_Y_LPARAM(lparam); + CORE.Input.Touch.position[0] = CORE.Input.Mouse.currentPosition; + } + } break; + case WM_KEYDOWN: HandleKey(wparam, lparam, 1); break; + case WM_KEYUP: HandleKey(wparam, lparam, 0); break; + case WM_LBUTTONDOWN: HandleMouseButton(MOUSE_BUTTON_LEFT, 1); break; + case WM_LBUTTONUP : HandleMouseButton(MOUSE_BUTTON_LEFT, 0); break; + case WM_RBUTTONDOWN: HandleMouseButton(MOUSE_BUTTON_RIGHT, 1); break; + case WM_RBUTTONUP : HandleMouseButton(MOUSE_BUTTON_RIGHT, 0); break; + case WM_MBUTTONDOWN: HandleMouseButton(MOUSE_BUTTON_MIDDLE, 1); break; + case WM_MBUTTONUP : HandleMouseButton(MOUSE_BUTTON_MIDDLE, 0); break; + case WM_XBUTTONDOWN: + { + switch (HIWORD(wparam)) + { + case XBUTTON1: HandleMouseButton(MOUSE_BUTTON_SIDE, 1); break; + case XBUTTON2: HandleMouseButton(MOUSE_BUTTON_EXTRA, 1); break; + default: TRACELOG(LOG_WARNING, "TODO: handle ex mouse button DOWN wparam=%u", HIWORD(wparam)); break; + } + } break; + case WM_XBUTTONUP: + { + switch (HIWORD(wparam)) + { + case XBUTTON1: HandleMouseButton(MOUSE_BUTTON_SIDE, 0); break; + case XBUTTON2: HandleMouseButton(MOUSE_BUTTON_EXTRA, 0); break; + default: TRACELOG(LOG_WARNING, "TODO: handle ex mouse button UP wparam=%u", HIWORD(wparam)); break; + } + } break; + case WM_MOUSEWHEEL: CORE.Input.Mouse.currentWheelMove.y = ((float)GET_WHEEL_DELTA_WPARAM(wparam))/WHEEL_DELTA; break; + case WM_MOUSEHWHEEL: CORE.Input.Mouse.currentWheelMove.x = ((float)GET_WHEEL_DELTA_WPARAM(wparam))/WHEEL_DELTA; break; + case WM_APP_UPDATE_WINDOW_SIZE: + { + UpdateWindowSize(UPDATE_WINDOW_NORMAL, hwnd, platform.appScreenWidth, platform.appScreenHeight, CORE.Window.flags); + } break; + + default: result = DefWindowProcW(hwnd, msg, wparam, lparam); // Message passed directly for execution (default behaviour) + } + //------------------------------------------------------------------------------------ + + // Sanity check + if (platform.hwnd == hwnd) + { + CheckFlags("After WndProc", hwnd, CORE.Window.flags, MakeWindowStyle(CORE.Window.flags), mask); + } + + // Operations to execute after the above check + if (flagsOp.set & flagsOp.clear) + { + TRACELOG(LOG_ERROR, "the flags 0x%x were both set and cleared!", flagsOp.set & flagsOp.clear); + } + + DWORD save = CORE.Window.flags; + CORE.Window.flags |= flagsOp.set; + CORE.Window.flags &= ~flagsOp.clear; + if (save != CORE.Window.flags) + { + TRACELOG(LOG_DEBUG, "DeferredFlags: 0x%x > 0x%x (diff 0x%x)", save, CORE.Window.flags, save ^ CORE.Window.flags); + } + + return result; +} + +static void HandleKey(WPARAM wparam, LPARAM lparam, char state) +{ + KeyboardKey key = KeyFromWparam(wparam); + + // TODO: Use scancode? + //BYTE scancode = lparam >> 16; + //TRACELOG(LOG_INFO, "KEY key=%d vk=%lu scan=%u = %u", key, wparam, scancode, state); + + if (key != KEY_NULL) + { + CORE.Input.Keyboard.currentKeyState[key] = state; + + if ((key == KEY_ESCAPE) && (state == 1)) CORE.Window.shouldClose = 1; + } + else TRACELOG(LOG_WARNING, "INPUT: Unknown (or currently unhandled) virtual keycode %d (0x%x)", wparam, wparam); + + // TODO: Add key to the queue as well? +} + +static void HandleMouseButton(int button, char state) +{ + CORE.Input.Mouse.currentButtonState[button] = state; + CORE.Input.Touch.currentTouchState[button] = state; +} + +static void HandleRawInput(LPARAM lparam) +{ + RAWINPUT input = { 0 }; + + UINT inputSize = sizeof(input); + UINT size = GetRawInputData((HRAWINPUT)lparam, RID_INPUT, &input, &inputSize, sizeof(RAWINPUTHEADER)); + + if (size == (UINT)-1) TRACELOG(LOG_ERROR, "%s failed, error=%lu", "GetRawInputData", GetLastError()); + + if (input.header.dwType != RIM_TYPEMOUSE) TRACELOG(LOG_ERROR, "Unexpected WM_INPUT type %lu", input.header.dwType); + + if (input.data.mouse.usFlags & MOUSE_MOVE_ABSOLUTE) TRACELOG(LOG_ERROR, "TODO: handle absolute mouse inputs!"); + + if (input.data.mouse.usFlags & MOUSE_VIRTUAL_DESKTOP) TRACELOG(LOG_ERROR, "TODO: handle virtual desktop mouse inputs!"); + + // Trick to keep the mouse position at 0,0 and instead move + // the previous position so we can still get a proper mouse delta + //CORE.Input.Mouse.previousPosition.x -= input.data.mouse.lLastX; + //CORE.Input.Mouse.previousPosition.y -= input.data.mouse.lLastY; + //if (CORE.Input.Mouse.currentPosition.x != 0) abort(); + //if (CORE.Input.Mouse.currentPosition.y != 0) abort(); +} + +static void HandleWindowResize(HWND hwnd, int *width, int *height) +{ + if (CORE.Window.flags & FLAG_WINDOW_MINIMIZED) return; + + SIZE clientSize = GetClientSize(hwnd); + + //TRACELOG(LOG_DEBUG, "WINDOW: New widow client size: [%lux%lu]", clientSize.cx, clientSize.cy); + + //CORE.Window.currentFbo.width = clientSize.cx; + //CORE.Window.currentFbo.height = clientSize.cy; + //glViewport(0, 0, clientSize.cx, clientSize.cy); + //SetupFramebuffer(0, 0); + + SetupViewport(clientSize.cx, clientSize.cy); + CORE.Window.resizedLastFrame = true; + float dpiScale = ((float)GetDpiForWindow(hwnd))/96.0f; + bool highdpi = !!(CORE.Window.flags & FLAG_WINDOW_HIGHDPI); + unsigned int screenWidth = highdpi? (unsigned int)(((float)clientSize.cx)/dpiScale) : clientSize.cx; + unsigned int screenHeight = highdpi? (unsigned int)(((float)clientSize.cy)/dpiScale) : clientSize.cy; + CORE.Window.screen.width = screenWidth; + CORE.Window.screen.height = screenHeight; + + if (AdoptWindowResize(CORE.Window.flags)) + { + TRACELOG(LOG_DEBUG, "WINDOW: Updating app size to %ix%i from window resize", screenWidth, screenHeight); + *width = screenWidth; + *height = screenHeight; + } + + CORE.Window.screenScale = MatrixScale( + (float)CORE.Window.render.width/CORE.Window.screen.width, + (float)CORE.Window.render.height/CORE.Window.screen.height, + 1.0f); +} + +// Update window style +static void UpdateWindowStyle(HWND hwnd, unsigned desiredFlags) +{ + DWORD current = STYLE_MASK_WRITABLE & MakeWindowStyle(CORE.Window.flags); + DWORD desired = STYLE_MASK_WRITABLE & MakeWindowStyle(desiredFlags); + + if (current != desired) + { + SetLastError(0); + DWORD previous = STYLE_MASK_WRITABLE & SetWindowLongPtrW(hwnd, GWL_STYLE, desired); + if (previous != current) + { + TRACELOG(LOG_ERROR, "SetWindowLong returned writable flags 0x%x but expected 0x%x (diff=0x%x, error=%lu)", + previous, current, previous ^ current, GetLastError()); + } + + CheckFlags("UpdateWindowStyle", hwnd, desiredFlags, desired, STYLE_MASK_WRITABLE); + } + + Mized currentMized = MizedFromStyle(MakeWindowStyle(CORE.Window.flags)); + Mized desiredMized = MizedFromStyle(MakeWindowStyle(desiredFlags)); + if (currentMized != desiredMized) + { + switch (desiredMized) + { + case MIZED_NONE: ShowWindow(hwnd, SW_RESTORE); break; + case MIZED_MIN: ShowWindow(hwnd, SW_MINIMIZE); break; + case MIZED_MAX: ShowWindow(hwnd, SW_MAXIMIZE); break; + } + } +} + +// Sanitize flags +static unsigned SanitizeFlags(SanitizeFlagsKind kind, unsigned flags) +{ + if ((flags & FLAG_WINDOW_MAXIMIZED) && (flags & FLAG_BORDERLESS_WINDOWED_MODE)) + { + TRACELOG(LOG_INFO, "borderless windows mode is overriding maximized"); + flags &= ~FLAG_WINDOW_MAXIMIZED; + } + + switch (kind) + { + case SANITIZE_FLAGS_FIRST: break; + case SANITIZE_FLAGS_NORMAL: + if ((flags & FLAG_MSAA_4X_HINT) && (!(CORE.Window.flags & FLAG_MSAA_4X_HINT))) + { + TRACELOG(LOG_WARNING, "WINDOW: MSAA can only be configured before window initialization"); + flags &= ~FLAG_MSAA_4X_HINT; + } + break; + } + + return flags; +} + +// All window state changes from raylib flags go through this function. It performs +// whatever operations are needed to update the window state to match the desired flags +// In most cases this function should not update CORE.Window.flags directly, instead, +// the window itself should update CORE.Window.flags in response to actual state changes +// This means that CORE.Window.flags should always represent the actual state of the +// window. This function will continue to perform these update operations so long as +// the state continues to change +// +// This design takes care of many odd corner cases. For example, if you want to restore +// a window that was previously maximized AND minimized and you want to remove both these +// flags, you actually need to call ShowWindow with SW_RESTORE twice. Another example is +// if you have a maximized window, if the undecorated flag is modified then we'd need to +// update the window style, but updating the style would mean the window size would change +// causing the window to lose its Maximized state which would mean we'd need to update the +// window size and then update the window style a second time to restore that maximized +// state. This implementation is able to handle any/all of these special situations with a +// retry loop that continues until we either reach the desired state or the state stops changing +static void UpdateFlags(HWND hwnd, unsigned desiredFlags, int width, int height) +{ + // Flags that just apply immediately without needing any operations + CORE.Window.flags |= (desiredFlags & FLAG_MASK_NO_UPDATE); + + int vsync = (CORE.Window.flags & FLAG_VSYNC_HINT)? 1 : 0; + PFNWGLSWAPINTERVALEXTPROC wglSwapInterval = (PFNWGLSWAPINTERVALEXTPROC)wglGetProcAddress("wglSwapIntervalEXT"); + if (wglSwapInterval) + { + (*wglSwapInterval)(vsync); + if (vsync) CORE.Window.flags |= FLAG_VSYNC_HINT; + else CORE.Window.flags &= ~FLAG_VSYNC_HINT; + } + + DWORD previousStyle; + for (unsigned attempt = 1; ; attempt++) + { + CheckFlags("UpdateFlags", hwnd, CORE.Window.flags, MakeWindowStyle(CORE.Window.flags), STYLE_MASK_ALL); + + bool windowSizeUpdated = false; + if (MakeWindowStyle(CORE.Window.flags) == MakeWindowStyle(desiredFlags)) + { + windowSizeUpdated = UpdateWindowSize(UPDATE_WINDOW_NORMAL, hwnd, width, height, desiredFlags); + if ((FLAG_MASK_REQUIRED & desiredFlags) == (FLAG_MASK_REQUIRED & CORE.Window.flags)) break; + } + + if ((attempt > 1) && + (previousStyle == MakeWindowStyle(CORE.Window.flags)) && + !windowSizeUpdated) { - LogFail("DestroyWindow", GetLastError()); - abort(); + TRACELOG(LOG_ERROR, "WINDOW: UpdateFlags() failed after %u attempt(s) wanted 0x%x but is 0x%x (diff=0x%x)", + attempt, desiredFlags, CORE.Window.flags, desiredFlags ^ CORE.Window.flags); } - globalHwnd = NULL; + previousStyle = MakeWindowStyle(CORE.Window.flags); + UpdateWindowStyle(hwnd, desiredFlags); } } From 070c7894c6901eb206c76534627858e5913826f5 Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 26 Sep 2025 23:35:28 +0200 Subject: [PATCH 07/23] REVIEWED: Some flags for window/context creation attributes --- src/platforms/rcore_desktop_win32.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/platforms/rcore_desktop_win32.c b/src/platforms/rcore_desktop_win32.c index 29669fd54..c7740ba2e 100644 --- a/src/platforms/rcore_desktop_win32.c +++ b/src/platforms/rcore_desktop_win32.c @@ -171,19 +171,25 @@ static PFNWGLSWAPINTERVALEXTPROC wglSwapIntervalEXT = NULL; #define WGL_DEPTH_BITS_ARB 0x2022 #define WGL_STENCIL_BITS_ARB 0x2023 #define WGL_TYPE_RGBA_ARB 0x202b + +// Context acceleration types #define WGL_NO_ACCELERATION_ARB 0x2025 // OpenGL 1.1 GDI software rasterizer #define WGL_GENERIC_ACCELERATION_ARB 0x2026 #define WGL_FULL_ACCELERATION_ARB 0x2027 // OpenGL hardware-accelerated, using GPU-drivers provided by vendor +// WGL_ARB_multisample extension supported +#define WGL_SAMPLE_BUFFERS_ARB 0x2041 // Multisampling: 1 if multisample buffers are supported +#define WGL_SAMPLES_ARB 0x2042 // Multisampling: Number of samples per pixel (4, 8, 16) + +// WGL_ARB_framebuffer_sRGB extension supported +#define WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20a9 // GL_TRUE if the framebuffer can do sRGB conversion + #define WGL_NUMBER_PIXEL_FORMATS_ARB 0x2000 #define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 #define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092 #define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126 #define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001 #define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002 -#define WGL_SAMPLE_BUFFERS_ARB 0x2041 -#define WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20a9 -#define WGL_TRANSPARENT_ARB 0x200A //---------------------------------------------------------------------------------- // Types and Structures Definition From 4cd131cf292bf4f5e06c7db89e9224fe36894330 Mon Sep 17 00:00:00 2001 From: Alexandre Almeida Date: Sun, 28 Sep 2025 13:53:40 -0300 Subject: [PATCH 08/23] Update miniaudio to v0.11.23 (#5208) --- src/external/miniaudio.h | 6087 ++++++++++++++++++++++++++------------ 1 file changed, 4134 insertions(+), 1953 deletions(-) diff --git a/src/external/miniaudio.h b/src/external/miniaudio.h index c74bebeb3..1e4e2c655 100644 --- a/src/external/miniaudio.h +++ b/src/external/miniaudio.h @@ -1,6 +1,6 @@ /* Audio playback and capture library. Choice of public domain or MIT-0. See license statements at the end of this file. -miniaudio - v0.11.22 - 2025-02-24 +miniaudio - v0.11.23 - 2025-09-11 David Reid - mackron@gmail.com @@ -12,18 +12,10 @@ GitHub: https://github.com/mackron/miniaudio /* 1. Introduction =============== -To use miniaudio, include "miniaudio.h": - - ```c - #include "miniaudio.h" - ``` - -The implementation is contained in "miniaudio.c". Just compile this like any other source file. You -can include miniaudio.c if you want to compile your project as a single translation unit: - - ```c - #include "miniaudio.c" - ``` +To use miniaudio, just include "miniaudio.h" like any other header and add "miniaudio.c" to your +source tree. If you don't want to add it to your source tree you can compile and link to it like +any other library. Note that ABI compatibility is not guaranteed between versions, even with bug +fix releases, so take care if compiling as a shared object. miniaudio includes both low level and high level APIs. The low level API is good for those who want to do all of their mixing themselves and only require a light weight interface to the underlying @@ -303,7 +295,7 @@ The engine encapsulates both the resource manager and the node graph to create a use high level API. The resource manager and node graph APIs are covered in more later sections of this manual. -The code below shows how you can initialize an engine using it's default configuration. +The code below shows how you can initialize an engine using its default configuration. ```c ma_result result; @@ -391,7 +383,7 @@ Sounds are not started by default. Start a sound with `ma_sound_start()` and sto `ma_sound_stop()`. When a sound is stopped, it is not rewound to the start. Use `ma_sound_seek_to_pcm_frame(&sound, 0)` to seek back to the start of a sound. By default, starting and stopping sounds happens immediately, but sometimes it might be convenient to schedule the sound -the be started and/or stopped at a specific time. This can be done with the following functions: +to be started and/or stopped at a specific time. This can be done with the following functions: ```c ma_sound_set_start_time_in_pcm_frames() @@ -463,6 +455,11 @@ is at the end, use `ma_sound_at_end()`. Looping of a sound can be controlled wit miniaudio should work cleanly out of the box without the need to download or install any dependencies. See below for platform-specific details. +This library has been designed to be added directly to your source tree which is the preferred way +of using it, but you can compile it as a normal library if that's your preference. Be careful if +compiling as a shared object because miniaudio is not ABI compatible between any release, including +bug fix releases. It's recommended you link statically. + Note that GCC and Clang require `-msse2`, `-mavx2`, etc. for SIMD optimizations. If you get errors about undefined references to `__sync_val_compare_and_swap_8`, `__atomic_load_8`, @@ -532,7 +529,7 @@ you'll need to disable run-time linking with `MA_NO_RUNTIME_LINKING` and link wi The Emscripten build emits Web Audio JavaScript directly and should compile cleanly out of the box. You cannot use `-std=c*` compiler flags, nor `-ansi`. -You can enable the use of AudioWorkets by defining `MA_ENABLE_AUDIO_WORKLETS` and then compiling +You can enable the use of AudioWorklets by defining `MA_ENABLE_AUDIO_WORKLETS` and then compiling with the following options: -sAUDIO_WORKLET=1 -sWASM_WORKERS=1 -sASYNCIFY @@ -881,7 +878,7 @@ read data within a certain range of the underlying data. To do this you can use This is useful if you have a sound bank where many sounds are stored in the same file and you want the data source to only play one of those sub-sounds. Note that once the range is set, everything -that takes a position, such as cursors and loop points, should always be relatvie to the start of +that takes a position, such as cursors and loop points, should always be relative to the start of the range. When the range is set, any previously defined loop point will be reset. Custom loop points can also be used with data sources. By default, data sources will loop after @@ -889,7 +886,7 @@ they reach the end of the data source, but if you need to loop at a specific loc the following: ```c - result = ma_data_set_loop_point_in_pcm_frames(pDataSource, loopBegInFrames, loopEndInFrames); + result = ma_data_source_set_loop_point_in_pcm_frames(pDataSource, loopBegInFrames, loopEndInFrames); if (result != MA_SUCCESS) { return result; // Failed to set the loop point. } @@ -3750,7 +3747,7 @@ extern "C" { #define MA_VERSION_MAJOR 0 #define MA_VERSION_MINOR 11 -#define MA_VERSION_REVISION 22 +#define MA_VERSION_REVISION 23 #define MA_VERSION_STRING MA_XSTRINGIFY(MA_VERSION_MAJOR) "." MA_XSTRINGIFY(MA_VERSION_MINOR) "." MA_XSTRINGIFY(MA_VERSION_REVISION) #if defined(_MSC_VER) && !defined(__clang__) @@ -3857,6 +3854,8 @@ typedef ma_uint16 wchar_t; #define MA_SIZE_MAX 0xFFFFFFFF /* When SIZE_MAX is not defined by the standard library just default to the maximum 32-bit unsigned integer. */ #endif +#define MA_UINT64_MAX (((ma_uint64)0xFFFFFFFF << 32) | (ma_uint64)0xFFFFFFFF) /* Weird shifting syntax is for VC6 compatibility. */ + /* Platform/backend detection. */ #if defined(_WIN32) || defined(__COSMOPOLITAN__) @@ -3865,29 +3864,55 @@ typedef ma_uint16 wchar_t; #define MA_WIN32_UWP #elif defined(WINAPI_FAMILY) && (defined(WINAPI_FAMILY_GAMES) && WINAPI_FAMILY == WINAPI_FAMILY_GAMES) #define MA_WIN32_GDK + #elif defined(NXDK) + #define MA_WIN32_NXDK #else #define MA_WIN32_DESKTOP #endif + + /* The original Xbox. */ + #if defined(NXDK) /* <-- Add other Xbox compiler toolchains here, and then add a toolchain-specific define in case we need to discriminate between them later. */ + #define MA_XBOX + + #if defined(NXDK) + #define MA_XBOX_NXDK + #endif + #endif #endif -#if !defined(_WIN32) /* If it's not Win32, assume POSIX. */ +#if defined(__MSDOS__) || defined(MSDOS) || defined(_MSDOS) || defined(__DOS__) + #define MA_DOS + + /* No threading allowed on DOS. */ + #ifndef MA_NO_THREADING + #define MA_NO_THREADING + #endif + + /* No runtime linking allowed on DOS. */ + #ifndef MA_NO_RUNTIME_LINKING + #define MA_NO_RUNTIME_LINKING + #endif +#endif +#if !defined(MA_WIN32) && !defined(MA_DOS) /* If it's not Win32, assume POSIX. */ #define MA_POSIX - /* - Use the MA_NO_PTHREAD_IN_HEADER option at your own risk. This is intentionally undocumented. - You can use this to avoid including pthread.h in the header section. The downside is that it - results in some fixed sized structures being declared for the various types that are used in - miniaudio. The risk here is that these types might be too small for a given platform. This - risk is yours to take and no support will be offered if you enable this option. - */ - #ifndef MA_NO_PTHREAD_IN_HEADER - #include /* Unfortunate #include, but needed for pthread_t, pthread_mutex_t and pthread_cond_t types. */ - typedef pthread_t ma_pthread_t; - typedef pthread_mutex_t ma_pthread_mutex_t; - typedef pthread_cond_t ma_pthread_cond_t; - #else - typedef ma_uintptr ma_pthread_t; - typedef union ma_pthread_mutex_t { char __data[40]; ma_uint64 __alignment; } ma_pthread_mutex_t; - typedef union ma_pthread_cond_t { char __data[48]; ma_uint64 __alignment; } ma_pthread_cond_t; + #if !defined(MA_NO_THREADING) + /* + Use the MA_NO_PTHREAD_IN_HEADER option at your own risk. This is intentionally undocumented. + You can use this to avoid including pthread.h in the header section. The downside is that it + results in some fixed sized structures being declared for the various types that are used in + miniaudio. The risk here is that these types might be too small for a given platform. This + risk is yours to take and no support will be offered if you enable this option. + */ + #ifndef MA_NO_PTHREAD_IN_HEADER + #include /* Unfortunate #include, but needed for pthread_t, pthread_mutex_t and pthread_cond_t types. */ + typedef pthread_t ma_pthread_t; + typedef pthread_mutex_t ma_pthread_mutex_t; + typedef pthread_cond_t ma_pthread_cond_t; + #else + typedef ma_uintptr ma_pthread_t; + typedef union ma_pthread_mutex_t { char __data[40]; ma_uint64 __alignment; } ma_pthread_mutex_t; + typedef union ma_pthread_cond_t { char __data[48]; ma_uint64 __alignment; } ma_pthread_cond_t; + #endif #endif #if defined(__unix__) @@ -3914,8 +3939,11 @@ typedef ma_uint16 wchar_t; #if defined(__PROSPERO__) #define MA_PROSPERO #endif - #if defined(__NX__) - #define MA_NX + #if defined(__3DS__) + #define MA_3DS + #endif + #if defined(__SWITCH__) || defined(__NX__) + #define MA_SWITCH #endif #if defined(__BEOS__) || defined(__HAIKU__) #define MA_BEOS @@ -3925,12 +3953,13 @@ typedef ma_uint16 wchar_t; #endif #endif -#if defined(__has_c_attribute) - #if __has_c_attribute(fallthrough) - #define MA_FALLTHROUGH [[fallthrough]] - #endif +#if !defined(MA_FALLTHROUGH) && defined(__cplusplus) && __cplusplus >= 201703L + #define MA_FALLTHROUGH [[fallthrough]] #endif -#if !defined(MA_FALLTHROUGH) && defined(__has_attribute) && (defined(__clang__) || defined(__GNUC__)) +#if !defined(MA_FALLTHROUGH) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202000L + #define MA_FALLTHROUGH [[fallthrough]] +#endif +#if !defined(MA_FALLTHROUGH) && defined(__has_attribute) #if __has_attribute(fallthrough) #define MA_FALLTHROUGH __attribute__((fallthrough)) #endif @@ -3967,7 +3996,7 @@ typedef ma_uint16 wchar_t; #define MA_NO_INLINE __attribute__((noinline)) #else #define MA_INLINE MA_GNUC_INLINE_HINT - #define MA_NO_INLINE __attribute__((noinline)) + #define MA_NO_INLINE #endif #elif defined(__WATCOMC__) #define MA_INLINE __inline @@ -4350,7 +4379,7 @@ typedef struct typedef struct { - ma_int32 state; + ma_uint32 state; } ma_lcg; @@ -6569,7 +6598,7 @@ This section contains the APIs for device playback and capture. Here is where yo ************************************************************************************************************************************************************/ #ifndef MA_NO_DEVICE_IO /* Some backends are only supported on certain platforms. */ -#if defined(MA_WIN32) +#if defined(MA_WIN32) && !defined(MA_XBOX) #define MA_SUPPORT_WASAPI #if defined(MA_WIN32_DESKTOP) /* DirectSound and WinMM backends are only supported on desktops. */ @@ -7426,6 +7455,7 @@ struct ma_context ma_proc snd_pcm_hw_params_set_rate_resample; ma_proc snd_pcm_hw_params_set_rate; ma_proc snd_pcm_hw_params_set_rate_near; + ma_proc snd_pcm_hw_params_set_rate_minmax; ma_proc snd_pcm_hw_params_set_buffer_size_near; ma_proc snd_pcm_hw_params_set_periods_near; ma_proc snd_pcm_hw_params_set_access; @@ -7986,6 +8016,7 @@ struct ma_device /*AAudioStream**/ ma_ptr pStreamPlayback; /*AAudioStream**/ ma_ptr pStreamCapture; ma_mutex rerouteLock; + ma_atomic_bool32 isTearingDown; ma_aaudio_usage usage; ma_aaudio_content_type contentType; ma_aaudio_input_preset inputPreset; @@ -11255,7 +11286,7 @@ typedef struct ma_log* pLog; /* When set to NULL, will use the context's log. */ ma_uint32 listenerCount; /* Must be between 1 and MA_ENGINE_MAX_LISTENERS. */ ma_uint32 channels; /* The number of channels to use when mixing and spatializing. When set to 0, will use the native channel count of the device. */ - ma_uint32 sampleRate; /* The sample rate. When set to 0 will use the native channel count of the device. */ + ma_uint32 sampleRate; /* The sample rate. When set to 0 will use the native sample rate of the device. */ ma_uint32 periodSizeInFrames; /* If set to something other than 0, updates will always be exactly this size. The underlying device may be a different size, but from the perspective of the mixer that won't matter.*/ ma_uint32 periodSizeInMilliseconds; /* Used if periodSizeInFrames is unset. */ ma_uint32 gainSmoothTimeInFrames; /* The number of frames to interpolate the gain of spatialized sounds across. If set to 0, will use gainSmoothTimeInMilliseconds. */ @@ -11419,11 +11450,11 @@ MA_API ma_bool32 ma_sound_is_looping(const ma_sound* pSound); MA_API ma_bool32 ma_sound_at_end(const ma_sound* pSound); MA_API ma_result ma_sound_seek_to_pcm_frame(ma_sound* pSound, ma_uint64 frameIndex); /* Just a wrapper around ma_data_source_seek_to_pcm_frame(). */ MA_API ma_result ma_sound_seek_to_second(ma_sound* pSound, float seekPointInSeconds); /* Abstraction to ma_sound_seek_to_pcm_frame() */ -MA_API ma_result ma_sound_get_data_format(ma_sound* pSound, ma_format* pFormat, ma_uint32* pChannels, ma_uint32* pSampleRate, ma_channel* pChannelMap, size_t channelMapCap); -MA_API ma_result ma_sound_get_cursor_in_pcm_frames(ma_sound* pSound, ma_uint64* pCursor); -MA_API ma_result ma_sound_get_length_in_pcm_frames(ma_sound* pSound, ma_uint64* pLength); -MA_API ma_result ma_sound_get_cursor_in_seconds(ma_sound* pSound, float* pCursor); -MA_API ma_result ma_sound_get_length_in_seconds(ma_sound* pSound, float* pLength); +MA_API ma_result ma_sound_get_data_format(const ma_sound* pSound, ma_format* pFormat, ma_uint32* pChannels, ma_uint32* pSampleRate, ma_channel* pChannelMap, size_t channelMapCap); +MA_API ma_result ma_sound_get_cursor_in_pcm_frames(const ma_sound* pSound, ma_uint64* pCursor); +MA_API ma_result ma_sound_get_length_in_pcm_frames(const ma_sound* pSound, ma_uint64* pLength); +MA_API ma_result ma_sound_get_cursor_in_seconds(const ma_sound* pSound, float* pCursor); +MA_API ma_result ma_sound_get_length_in_seconds(const ma_sound* pSound, float* pLength); MA_API ma_result ma_sound_set_end_callback(ma_sound* pSound, ma_sound_end_proc callback, void* pUserData); MA_API ma_result ma_sound_group_init(ma_engine* pEngine, ma_uint32 flags, ma_sound_group* pParentGroup, ma_sound_group* pGroup); @@ -11544,17 +11575,23 @@ IMPLEMENTATION #endif #if !defined(MA_WIN32) -#include -#include /* select() (used for ma_sleep()). */ -#include + #if !defined(MA_NO_THREADING) + #include + #include /* For pthreads. */ + #endif + + #include /* select() (used for ma_sleep()). */ + #include /* For nanosleep() */ + #include #endif -#ifdef MA_NX -#include /* For nanosleep() */ +/* For fstat(), etc. */ +#if defined(MA_XBOX_NXDK) + #include /* Suggestion for NXDK: Add a sys/stat.h wrapper for compatibility. */ +#else + #include #endif -#include /* For fstat(), etc. */ - #ifdef MA_EMSCRIPTEN #include #endif @@ -11861,7 +11898,7 @@ static MA_INLINE ma_bool32 ma_has_neon(void) #endif #ifndef MA_RESTRICT - #if defined(__clang__) || defined(__GNUC__) || defined(_MSC_VER) + #if defined(__clang__) || defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))) #define MA_RESTRICT __restrict #else #define MA_RESTRICT @@ -11955,7 +11992,7 @@ static void ma_sleep__posix(ma_uint32 milliseconds) (void)milliseconds; MA_ASSERT(MA_FALSE); /* The Emscripten build should never sleep. */ #else - #if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199309L) || defined(MA_NX) + #if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199309L) || defined(MA_SWITCH) struct timespec ts; ts.tv_sec = milliseconds / 1000; ts.tv_nsec = milliseconds % 1000 * 1000000; @@ -11997,7 +12034,7 @@ static MA_INLINE void ma_yield(void) #endif #endif #else - __asm__ __volatile__ ("pause"); + __asm__ __volatile__ ("rep; nop"); #endif #elif (defined(__arm__) && defined(__ARM_ARCH) && __ARM_ARCH >= 7) || defined(_M_ARM64) || (defined(_M_ARM) && _M_ARM >= 7) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) /* ARM */ @@ -12020,7 +12057,7 @@ static MA_INLINE unsigned int ma_disable_denormals(void) { unsigned int prevState; - #if defined(_MSC_VER) + #if defined(_MSC_VER) && !defined(MA_XBOX_NXDK) { /* Older versions of Visual Studio don't support the "safe" versions of _controlfp_s(). I don't @@ -12043,7 +12080,7 @@ static MA_INLINE unsigned int ma_disable_denormals(void) } #elif defined(MA_X86) || defined(MA_X64) { - #if defined(__SSE2__) && !(defined(__TINYC__) || defined(__WATCOMC__) || defined(__COSMOPOLITAN__)) /* <-- Add compilers that lack support for _mm_getcsr() and _mm_setcsr() to this list. */ + #if defined(MA_SUPPORT_SSE2) && defined(__SSE2__) && !(defined(__TINYC__) || defined(__WATCOMC__) || defined(__COSMOPOLITAN__)) /* <-- Add compilers that lack support for _mm_getcsr() and _mm_setcsr() to this list. */ { prevState = _mm_getcsr(); _mm_setcsr(prevState | MA_MM_DENORMALS_ZERO_MASK | MA_MM_FLUSH_ZERO_MASK); @@ -12067,7 +12104,7 @@ static MA_INLINE unsigned int ma_disable_denormals(void) static MA_INLINE void ma_restore_denormals(unsigned int prevState) { - #if defined(_MSC_VER) + #if defined(_MSC_VER) && !defined(MA_XBOX_NXDK) { /* Older versions of Visual Studio do not support _controlfp_s(). See ma_disable_denormals(). */ #if _MSC_VER <= 1200 @@ -12083,7 +12120,7 @@ static MA_INLINE void ma_restore_denormals(unsigned int prevState) } #elif defined(MA_X86) || defined(MA_X64) { - #if defined(__SSE2__) && !(defined(__TINYC__) || defined(__WATCOMC__) || defined(__COSMOPOLITAN__)) /* <-- Add compilers that lack support for _mm_getcsr() and _mm_setcsr() to this list. */ + #if defined(MA_SUPPORT_SSE2) && defined(__SSE2__) && !(defined(__TINYC__) || defined(__WATCOMC__) || defined(__COSMOPOLITAN__)) /* <-- Add compilers that lack support for _mm_getcsr() and _mm_setcsr() to this list. */ { _mm_setcsr(prevState); } @@ -12719,6 +12756,29 @@ MA_API MA_NO_INLINE int ma_strcmp(const char* str1, const char* str2) return ((unsigned char*)str1)[0] - ((unsigned char*)str2)[0]; } +MA_API MA_NO_INLINE int ma_wcscmp(const wchar_t* str1, const wchar_t* str2) +{ + if (str1 == str2) return 0; + + /* These checks differ from the standard implementation. It's not important, but I prefer it just for sanity. */ + if (str1 == NULL) return -1; + if (str2 == NULL) return 1; + + for (;;) { + if (str1[0] == L'\0') { + break; + } + if (str1[0] != str2[0]) { + break; + } + + str1 += 1; + str2 += 1; + } + + return ((unsigned short*)str1)[0] - ((unsigned short*)str2)[0]; +} + MA_API MA_NO_INLINE int ma_strappend(char* dst, size_t dstSize, const char* srcA, const char* srcB) { int result; @@ -12736,6 +12796,22 @@ MA_API MA_NO_INLINE int ma_strappend(char* dst, size_t dstSize, const char* srcA return result; } +MA_API MA_NO_INLINE size_t ma_wcslen(const wchar_t* str) +{ + const wchar_t* end; + + if (str == NULL) { + return 0; + } + + end = str; + while (end[0] != '\0') { + end += 1; + } + + return end - str; +} + MA_API MA_NO_INLINE char* ma_copy_string(const char* src, const ma_allocation_callbacks* pAllocationCallbacks) { size_t sz; @@ -12758,7 +12834,7 @@ MA_API MA_NO_INLINE char* ma_copy_string(const char* src, const ma_allocation_ca MA_API MA_NO_INLINE wchar_t* ma_copy_string_w(const wchar_t* src, const ma_allocation_callbacks* pAllocationCallbacks) { - size_t sz = wcslen(src)+1; + size_t sz = ma_wcslen(src)+1; wchar_t* dst = (wchar_t*)ma_malloc(sz * sizeof(*dst), pAllocationCallbacks); if (dst == NULL) { return NULL; @@ -13189,7 +13265,7 @@ MA_API ma_result ma_fopen(FILE** ppFile, const char* pFilePath, const char* pOpe return MA_INVALID_ARGS; } -#if defined(_MSC_VER) && _MSC_VER >= 1400 +#if (defined(_MSC_VER) && _MSC_VER >= 1400) && !defined(MA_XBOX_NXDK) err = fopen_s(ppFile, pFilePath, pOpenMode); if (err != 0) { return ma_result_from_errno(err); @@ -13231,7 +13307,7 @@ _wfopen() isn't always available in all compilation environments. This can be reviewed as compatibility issues arise. The preference is to use _wfopen_s() and _wfopen() as opposed to the wcsrtombs() fallback, so if you notice your compiler not detecting this properly I'm happy to look at adding support. */ -#if defined(_WIN32) +#if defined(_WIN32) && !defined(MA_XBOX_NXDK) #if defined(_MSC_VER) || defined(__MINGW64__) || (!defined(__STRICT_ANSI__) && !defined(_NO_EXT_KEYS)) #define MA_HAS_WFOPEN #endif @@ -13247,29 +13323,34 @@ MA_API ma_result ma_wfopen(FILE** ppFile, const wchar_t* pFilePath, const wchar_ return MA_INVALID_ARGS; } -#if defined(MA_HAS_WFOPEN) + #if defined(MA_HAS_WFOPEN) { /* Use _wfopen() on Windows. */ - #if defined(_MSC_VER) && _MSC_VER >= 1400 - errno_t err = _wfopen_s(ppFile, pFilePath, pOpenMode); - if (err != 0) { - return ma_result_from_errno(err); + #if defined(_MSC_VER) && _MSC_VER >= 1400 + { + errno_t err = _wfopen_s(ppFile, pFilePath, pOpenMode); + if (err != 0) { + return ma_result_from_errno(err); + } } - #else - *ppFile = _wfopen(pFilePath, pOpenMode); - if (*ppFile == NULL) { - return ma_result_from_errno(errno); + #else + { + *ppFile = _wfopen(pFilePath, pOpenMode); + if (*ppFile == NULL) { + return ma_result_from_errno(errno); + } } - #endif + #endif + (void)pAllocationCallbacks; } -#else - /* - Use fopen() on anything other than Windows. Requires a conversion. This is annoying because fopen() is locale specific. The only real way I can - think of to do this is with wcsrtombs(). Note that wcstombs() is apparently not thread-safe because it uses a static global mbstate_t object for - maintaining state. I've checked this with -std=c89 and it works, but if somebody get's a compiler error I'll look into improving compatibility. - */ + #elif !defined(MA_XBOX_NXDK) && !defined(MA_DOS) /* If your compiler does not support wcsrtombs(), add it here. */ { + /* + Use fopen() on anything other than Windows. Requires a conversion. This is annoying because fopen() is locale specific. The only real way I can + think of to do this is with wcsrtombs(). Note that wcstombs() is apparently not thread-safe because it uses a static global mbstate_t object for + maintaining state. I've checked this with -std=c89 and it works, but if somebody get's a compiler error I'll look into improving compatibility. + */ mbstate_t mbs; size_t lenMB; const wchar_t* pFilePathTemp = pFilePath; @@ -13310,11 +13391,16 @@ MA_API ma_result ma_wfopen(FILE** ppFile, const wchar_t* pFilePath, const wchar_ ma_free(pFilePathMB, pAllocationCallbacks); } + #else + { + /* Getting here means there is no way to open the file with a wide character string. */ + *ppFile = NULL; + } + #endif if (*ppFile == NULL) { return MA_ERROR; } -#endif return MA_SUCCESS; } @@ -13323,7 +13409,7 @@ MA_API ma_result ma_wfopen(FILE** ppFile, const wchar_t* pFilePath, const wchar_ static MA_INLINE void ma_copy_memory_64(void* dst, const void* src, ma_uint64 sizeInBytes) { -#if 0xFFFFFFFFFFFFFFFF <= MA_SIZE_MAX +#if MA_SIZE_MAX > 0xFFFFFFFF MA_COPY_MEMORY(dst, src, (size_t)sizeInBytes); #else while (sizeInBytes > 0) { @@ -13343,7 +13429,7 @@ static MA_INLINE void ma_copy_memory_64(void* dst, const void* src, ma_uint64 si static MA_INLINE void ma_zero_memory_64(void* dst, ma_uint64 sizeInBytes) { -#if 0xFFFFFFFFFFFFFFFF <= MA_SIZE_MAX +#if MA_SIZE_MAX > 0xFFFFFFFF MA_ZERO_MEMORY(dst, (size_t)sizeInBytes); #else while (sizeInBytes > 0) { @@ -13472,6 +13558,18 @@ static ma_result ma_allocation_callbacks_init_copy(ma_allocation_callbacks* pDst Logging **************************************************************************************************************************************************************/ +#ifndef ma_va_copy + #if !defined(_MSC_VER) || _MSC_VER >= 1800 + #if (defined(__GNUC__) && __GNUC__ < 3) + #define ma_va_copy(dst, src) ((dst) = (src)) /* This is untested. Not sure if this is correct for old GCC. */ + #else + #define ma_va_copy(dst, src) va_copy((dst), (src)) + #endif + #else + #define ma_va_copy(dst, src) ((dst) = (src)) + #endif +#endif + MA_API const char* ma_log_level_to_string(ma_uint32 logLevel) { switch (logLevel) @@ -13712,9 +13810,15 @@ MA_API ma_result ma_log_postv(ma_log* pLog, ma_uint32 level, const char* pFormat int length; char pFormattedMessageStack[1024]; char* pFormattedMessageHeap = NULL; + va_list args2; /* First try formatting into our fixed sized stack allocated buffer. If this is too small we'll fallback to a heap allocation. */ - length = vsnprintf(pFormattedMessageStack, sizeof(pFormattedMessageStack), pFormat, args); + ma_va_copy(args2, args); + { + length = vsnprintf(pFormattedMessageStack, sizeof(pFormattedMessageStack), pFormat, args2); + } + va_end(args2); + if (length < 0) { return MA_INVALID_OPERATION; /* An error occurred when trying to convert the buffer. */ } @@ -13755,17 +13859,10 @@ MA_API ma_result ma_log_postv(ma_log* pLog, ma_uint32 level, const char* pFormat char* pFormattedMessage = NULL; va_list args2; - #if _MSC_VER >= 1800 + ma_va_copy(args2, args); { - va_copy(args2, args); + formattedLen = ma_vscprintf(&pLog->allocationCallbacks, pFormat, args2); } - #else - { - args2 = args; - } - #endif - - formattedLen = ma_vscprintf(&pLog->allocationCallbacks, pFormat, args2); va_end(args2); if (formattedLen <= 0) { @@ -13964,7 +14061,7 @@ miniaudio's purposes. #define MA_LCG_A 48271 #define MA_LCG_C 0 -static ma_lcg g_maLCG = {MA_DEFAULT_LCG_SEED}; /* Non-zero initial seed. Use ma_seed() to use an explicit seed. */ +static ma_lcg g_maLCG = {MA_DEFAULT_LCG_SEED}; /* Non-zero initial seed. Use ma_lcg_seed() to use an explicit seed. */ static MA_INLINE void ma_lcg_seed(ma_lcg* pLCG, ma_int32 seed) { @@ -14013,7 +14110,7 @@ static MA_INLINE ma_int32 ma_lcg_rand_range_s32(ma_lcg* pLCG, ma_int32 lo, ma_in } - +#if 0 /* Currently unused. */ static MA_INLINE void ma_seed(ma_int32 seed) { ma_lcg_seed(&g_maLCG, seed); @@ -14038,6 +14135,7 @@ static MA_INLINE float ma_rand_f32(void) { return ma_lcg_rand_f32(&g_maLCG); } +#endif static MA_INLINE float ma_rand_range_f32(float lo, float hi) { @@ -14097,6 +14195,7 @@ Atomics **************************************************************************************************************************************************************/ /* c89atomic.h begin */ #ifndef ma_atomic_h +#define ma_atomic_h #if defined(__cplusplus) extern "C" { #endif @@ -14108,11 +14207,40 @@ extern "C" { #endif #endif typedef int ma_atomic_memory_order; -#define MA_ATOMIC_HAS_8 -#define MA_ATOMIC_HAS_16 -#define MA_ATOMIC_HAS_32 -#define MA_ATOMIC_HAS_64 -#if (defined(_MSC_VER) ) || defined(__WATCOMC__) || defined(__DMC__) +#if !defined(MA_ATOMIC_MODERN_MSVC) && \ + !defined(MA_ATOMIC_LEGACY_MSVC) && \ + !defined(MA_ATOMIC_LEGACY_MSVC_ASM) && \ + !defined(MA_ATOMIC_MODERN_GCC) && \ + !defined(MA_ATOMIC_LEGACY_GCC) && \ + !defined(MA_ATOMIC_LEGACY_GCC_ASM) + #if defined(_MSC_VER) || defined(__WATCOMC__) || defined(__DMC__) || defined(__BORLANDC__) + #if (defined(_MSC_VER) && _MSC_VER > 1600) + #define MA_ATOMIC_MODERN_MSVC + #else + #if defined(MA_X64) + #define MA_ATOMIC_LEGACY_MSVC + #else + #define MA_ATOMIC_LEGACY_MSVC_ASM + #endif + #endif + #elif (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))) || defined(__clang__) + #define MA_ATOMIC_MODERN_GCC + #else + #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) + #define MA_ATOMIC_LEGACY_GCC + #else + #define MA_ATOMIC_LEGACY_GCC_ASM + #endif + #endif +#endif +#if defined(MA_ATOMIC_MODERN_MSVC) || defined(MA_ATOMIC_LEGACY_MSVC) + #include + #define ma_atomic_memory_order_relaxed 1 + #define ma_atomic_memory_order_consume 2 + #define ma_atomic_memory_order_acquire 3 + #define ma_atomic_memory_order_release 4 + #define ma_atomic_memory_order_acq_rel 5 + #define ma_atomic_memory_order_seq_cst 6 #define MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, intrin, ma_atomicType, msvcType) \ ma_atomicType result; \ switch (order) \ @@ -14138,720 +14266,1501 @@ typedef int ma_atomic_memory_order; } break; \ } \ return result; - #define MA_ATOMIC_MSVC_ARM_INTRINSIC_COMPARE_EXCHANGE(ptr, expected, desired, order, intrin, ma_atomicType, msvcType) \ + typedef ma_uint32 ma_atomic_flag; + static MA_INLINE ma_atomic_flag ma_atomic_flag_test_and_set_explicit(volatile ma_atomic_flag* dst, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + { + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, 1, order, _InterlockedExchange, ma_atomic_flag, long); + } + #else + { + (void)order; + return (ma_atomic_flag)_InterlockedExchange((volatile long*)dst, (long)1); + } + #endif + } + static MA_INLINE void ma_atomic_flag_clear_explicit(volatile ma_atomic_flag* dst, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + { + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, 0, order, _InterlockedExchange, ma_atomic_flag, long); + } + #else + { + (void)order; + _InterlockedExchange((volatile long*)dst, (long)0); + } + #endif + } + static MA_INLINE ma_atomic_flag ma_atomic_flag_load_explicit(volatile const ma_atomic_flag* dst, ma_atomic_memory_order order) + { + (void)order; + return (ma_uint32)_InterlockedCompareExchange((volatile long*)dst, 0, 0); + } +#endif +#if defined(MA_ATOMIC_LEGACY_MSVC_ASM) + #define ma_atomic_memory_order_relaxed 1 + #define ma_atomic_memory_order_consume 2 + #define ma_atomic_memory_order_acquire 3 + #define ma_atomic_memory_order_release 4 + #define ma_atomic_memory_order_acq_rel 5 + #define ma_atomic_memory_order_seq_cst 6 + typedef ma_uint32 ma_atomic_flag; + static MA_INLINE ma_atomic_flag ma_atomic_flag_test_and_set_explicit(volatile ma_atomic_flag* dst, ma_atomic_memory_order order) + { + ma_atomic_flag result = 0; + (void)order; + __asm { + mov ecx, dst + mov eax, 1 + xchg [ecx], eax + mov result, eax + } + return result; + } + static MA_INLINE void ma_atomic_flag_clear_explicit(volatile ma_atomic_flag* dst, ma_atomic_memory_order order) + { + if (order == ma_atomic_memory_order_relaxed) { + __asm { + mov esi, dst + mov dword ptr [esi], 0 + } + } else { + __asm { + mov esi, dst + mov eax, 0 + xchg [esi], eax + } + } + } + static MA_INLINE ma_atomic_flag ma_atomic_flag_load_explicit(volatile const ma_atomic_flag* dst, ma_atomic_memory_order order) + { + ma_atomic_flag result = 0; + if (order == ma_atomic_memory_order_relaxed) { + __asm { + mov esi, dst + mov eax, [esi] + mov result, eax + } + } else if (order <= ma_atomic_memory_order_release) { + __asm { + mov esi, dst + mov eax, [esi] + lock add dword ptr [esp], 0 + mov result, eax + } + } else { + __asm { + lock add dword ptr [esp], 0 + mov esi, dst + mov eax, [esi] + mov result, eax + lock add dword ptr [esp], 0 + } + } + return result; + } +#endif +#if defined(MA_ATOMIC_MODERN_GCC) + #define ma_atomic_memory_order_relaxed __ATOMIC_RELAXED + #define ma_atomic_memory_order_consume __ATOMIC_CONSUME + #define ma_atomic_memory_order_acquire __ATOMIC_ACQUIRE + #define ma_atomic_memory_order_release __ATOMIC_RELEASE + #define ma_atomic_memory_order_acq_rel __ATOMIC_ACQ_REL + #define ma_atomic_memory_order_seq_cst __ATOMIC_SEQ_CST + typedef ma_uint32 ma_atomic_flag; + #define ma_atomic_flag_test_and_set_explicit(dst, order) __atomic_exchange_n(dst, 1, order) + #define ma_atomic_flag_clear_explicit(dst, order) __atomic_store_n(dst, 0, order) + #define ma_atomic_flag_load_explicit(dst, order) __atomic_load_n(dst, order) +#endif +#if defined(MA_ATOMIC_LEGACY_GCC) + #define ma_atomic_memory_order_relaxed 1 + #define ma_atomic_memory_order_consume 2 + #define ma_atomic_memory_order_acquire 3 + #define ma_atomic_memory_order_release 4 + #define ma_atomic_memory_order_acq_rel 5 + #define ma_atomic_memory_order_seq_cst 6 + typedef ma_uint32 ma_atomic_flag; + static MA_INLINE ma_atomic_flag ma_atomic_flag_test_and_set_explicit(volatile ma_atomic_flag* dst, ma_atomic_memory_order order) + { + if (order > ma_atomic_memory_order_acquire) { + __sync_synchronize(); + } + return __sync_lock_test_and_set(dst, 1); + } + static MA_INLINE void ma_atomic_flag_clear_explicit(volatile ma_atomic_flag* dst, ma_atomic_memory_order order) + { + if (order > ma_atomic_memory_order_release) { + __sync_synchronize(); + } + __sync_lock_release(dst); + } + static MA_INLINE ma_atomic_flag ma_atomic_flag_load_explicit(volatile const ma_atomic_flag* dst, ma_atomic_memory_order order) + { + (void)order; + return __sync_val_compare_and_swap((ma_atomic_flag*)dst, 0, 0); + } +#endif +#if defined(MA_ATOMIC_LEGACY_GCC_ASM) + #define ma_atomic_memory_order_relaxed 1 + #define ma_atomic_memory_order_consume 2 + #define ma_atomic_memory_order_acquire 3 + #define ma_atomic_memory_order_release 4 + #define ma_atomic_memory_order_acq_rel 5 + #define ma_atomic_memory_order_seq_cst 6 + #if defined(MA_X86) + #define ma_atomic_thread_fence(order) __asm__ __volatile__("lock; addl $0, (%%esp)" ::: "memory") + #elif defined(MA_X64) + #define ma_atomic_thread_fence(order) __asm__ __volatile__("lock; addq $0, (%%rsp)" ::: "memory") + #else + #error Unsupported architecture. + #endif + #define MA_ATOMIC_XCHG_GCC_X86(instructionSizeSuffix, result, dst, src) \ + __asm__ __volatile__( \ + "xchg"instructionSizeSuffix" %0, %1" \ + : "=r"(result), \ + "=m"(*dst) \ + : "0"(src), \ + "m"(*dst) \ + : "memory" \ + ) + #define MA_ATOMIC_LOAD_RELAXED_GCC_X86(instructionSizeSuffix, result, dst) \ + __asm__ __volatile__( \ + "mov"instructionSizeSuffix" %1, %0" \ + : "=r"(result) \ + : "m"(*dst) \ + ) + #define MA_ATOMIC_LOAD_RELEASE_GCC_X86(instructionSizeSuffix, result, dst) \ + ma_atomic_thread_fence(ma_atomic_memory_order_release); \ + __asm__ __volatile__( \ + "mov"instructionSizeSuffix" %1, %0" \ + : "=r"(result) \ + : "m"(*dst) \ + : "memory" \ + ) + #define MA_ATOMIC_LOAD_SEQ_CST_GCC_X86(instructionSizeSuffix, result, dst) \ + ma_atomic_thread_fence(ma_atomic_memory_order_seq_cst); \ + __asm__ __volatile__( \ + "mov"instructionSizeSuffix" %1, %0" \ + : "=r"(result) \ + : "m"(*dst) \ + : "memory" \ + ); \ + ma_atomic_thread_fence(ma_atomic_memory_order_seq_cst) + typedef ma_uint32 ma_atomic_flag; + static MA_INLINE ma_atomic_flag ma_atomic_flag_test_and_set_explicit(volatile ma_atomic_flag* dst, ma_atomic_memory_order order) + { + ma_atomic_flag result; + #if defined(MA_X86) || defined(MA_X64) + { + (void)order; + MA_ATOMIC_XCHG_GCC_X86("l", result, dst, 1); + } + #else + { + #error Unsupported architecture. + } + #endif + return result; + } + static MA_INLINE void ma_atomic_flag_clear_explicit(volatile ma_atomic_flag* dst, ma_atomic_memory_order order) + { + #if defined(MA_X86) || defined(MA_X64) + { + if (order == ma_atomic_memory_order_relaxed) { + __asm__ __volatile__( + "movl $0, %0" + : "=m"(*dst) + ); + } else if (order == ma_atomic_memory_order_release) { + __asm__ __volatile__( + "movl $0, %0" + : "=m"(*dst) + : + : "memory" + ); + } else { + ma_atomic_flag tmp = 0; + __asm__ __volatile__( + "xchgl %0, %1" + : "=r"(tmp), + "=m"(*dst) + : "0"(tmp), + "m"(*dst) + : "memory" + ); + } + } + #else + { + #error Unsupported architecture. + } + #endif + } + static MA_INLINE ma_atomic_flag ma_atomic_flag_load_explicit(volatile const ma_atomic_flag* dst, ma_atomic_memory_order order) + { + #if defined(MA_X86) || defined(MA_X64) + { + ma_atomic_flag result; + if (order == ma_atomic_memory_order_relaxed) { + MA_ATOMIC_LOAD_RELAXED_GCC_X86("l", result, dst); + } else if (order <= ma_atomic_memory_order_release) { + MA_ATOMIC_LOAD_RELEASE_GCC_X86("l", result, dst); + } else { + MA_ATOMIC_LOAD_SEQ_CST_GCC_X86("l", result, dst); + } + return result; + } + #else + { + #error Unsupported architecture. + } + #endif + } +#endif +#define ma_atomic_flag_test_and_set(dst) ma_atomic_flag_test_and_set_explicit(dst, ma_atomic_memory_order_acquire) +#define ma_atomic_flag_clear(dst) ma_atomic_flag_clear_explicit(dst, ma_atomic_memory_order_release) +typedef ma_atomic_flag ma_atomic_spinlock; +static MA_INLINE void ma_atomic_spinlock_lock(volatile ma_atomic_spinlock* pSpinlock) +{ + for (;;) { + if (ma_atomic_flag_test_and_set_explicit(pSpinlock, ma_atomic_memory_order_acquire) == 0) { + break; + } + while (ma_atomic_flag_load_explicit(pSpinlock, ma_atomic_memory_order_relaxed) == 1) { + } + } +} +static MA_INLINE void ma_atomic_spinlock_unlock(volatile ma_atomic_spinlock* pSpinlock) +{ + ma_atomic_flag_clear_explicit(pSpinlock, ma_atomic_memory_order_release); +} +ma_atomic_spinlock ma_atomic_global_lock; +#if defined(MA_ATOMIC_MODERN_MSVC) || defined(MA_ATOMIC_LEGACY_MSVC) || defined(MA_ATOMIC_LEGACY_MSVC_ASM) || defined(MA_ATOMIC_LEGACY_GCC) || defined(MA_ATOMIC_LEGACY_GCC_ASM) + #if defined(MA_X64) || (defined(MA_X86) && ((defined(__GNUC__) && defined(__i486__)) || (defined(_M_IX86) && _M_IX86 >= 400))) + #if defined(MA_ATOMIC_LEGACY_MSVC) && defined(MA_X64) + #else + #define MA_ATOMIC_IS_LOCK_FREE_8 1 + #define MA_ATOMIC_IS_LOCK_FREE_16 1 + #endif + #define MA_ATOMIC_IS_LOCK_FREE_32 1 + #if defined(MA_X64) || (defined(MA_X86) && ((defined(__GNUC__) && defined(__i586__)) || (defined(_M_IX86) && _M_IX86 >= 500))) + #define MA_ATOMIC_IS_LOCK_FREE_64 1 + #else + #endif + #else + #endif + #if defined(MA_ARM32) || defined(MA_ARM64) + #define MA_ATOMIC_IS_LOCK_FREE_8 1 + #define MA_ATOMIC_IS_LOCK_FREE_16 1 + #define MA_ATOMIC_IS_LOCK_FREE_32 1 + #if defined(MA_ARM64) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) + #define MA_ATOMIC_IS_LOCK_FREE_64 1 + #endif + #endif + #if defined(MA_ATOMIC_PPC32) || defined(MA_ATOMIC_PPC64) + #if (defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7))) && !defined(__clang__) + #else + #define MA_ATOMIC_IS_LOCK_FREE_8 1 + #define MA_ATOMIC_IS_LOCK_FREE_16 1 + #endif + #define MA_ATOMIC_IS_LOCK_FREE_32 1 + #if defined(MA_ATOMIC_PPC64) + #define MA_ATOMIC_IS_LOCK_FREE_64 1 + #endif + #endif + static MA_INLINE ma_bool32 ma_atomic_is_lock_free_8(volatile void* ptr) + { + (void)ptr; + #if defined(MA_ATOMIC_IS_LOCK_FREE_8) + return 1; + #else + return 0; + #endif + } + static MA_INLINE ma_bool32 ma_atomic_is_lock_free_16(volatile void* ptr) + { + (void)ptr; + #if defined(MA_ATOMIC_IS_LOCK_FREE_16) + return 1; + #else + return 0; + #endif + } + static MA_INLINE ma_bool32 ma_atomic_is_lock_free_32(volatile void* ptr) + { + (void)ptr; + #if defined(MA_ATOMIC_IS_LOCK_FREE_32) + return 1; + #else + return 0; + #endif + } + static MA_INLINE ma_bool32 ma_atomic_is_lock_free_64(volatile void* ptr) + { + (void)ptr; + #if defined(MA_ATOMIC_IS_LOCK_FREE_64) + return 1; + #else + return 0; + #endif + } +#endif +#define MA_ATOMIC_COMPARE_AND_SWAP_LOCK(sizeInBits, dst, expected, replacement) \ + ma_uint##sizeInBits result; \ + ma_atomic_spinlock_lock(&ma_atomic_global_lock); \ + { \ + result = *dst; \ + if (result == expected) { \ + *dst = replacement; \ + } \ + } \ + ma_atomic_spinlock_unlock(&ma_atomic_global_lock); \ + return result +#define MA_ATOMIC_LOAD_EXPLICIT_LOCK(sizeInBits, ptr, order) \ + ma_uint##sizeInBits result; \ + ma_atomic_spinlock_lock(&ma_atomic_global_lock); \ + { \ + result = *ptr; \ + (void)order; \ + } \ + ma_atomic_spinlock_unlock(&ma_atomic_global_lock); \ + return result +#define MA_ATOMIC_STORE_EXPLICIT_LOCK(sizeInBits, dst, src, order) \ + ma_atomic_spinlock_lock(&ma_atomic_global_lock); \ + { \ + *dst = src; \ + (void)order; \ + } \ + ma_atomic_spinlock_unlock(&ma_atomic_global_lock) +#define MA_ATOMIC_STORE_EXPLICIT_CAS(sizeInBits, dst, src, order) \ + ma_uint##sizeInBits oldValue; \ + do { \ + oldValue = ma_atomic_load_explicit_##sizeInBits(dst, ma_atomic_memory_order_relaxed); \ + } while (ma_atomic_compare_and_swap_##sizeInBits(dst, oldValue, src) != oldValue); \ + (void)order +#define MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(sizeInBits, dst, src, order) \ + ma_uint##sizeInBits result; \ + ma_atomic_spinlock_lock(&ma_atomic_global_lock); \ + { \ + result = *dst; \ + *dst = src; \ + (void)order; \ + } \ + ma_atomic_spinlock_unlock(&ma_atomic_global_lock); \ + return result +#define MA_ATOMIC_EXCHANGE_EXPLICIT_CAS(sizeInBits, dst, src, order) \ + ma_uint##sizeInBits oldValue; \ + do { \ + oldValue = ma_atomic_load_explicit_##sizeInBits(dst, ma_atomic_memory_order_relaxed); \ + } while (ma_atomic_compare_and_swap_##sizeInBits(dst, oldValue, src) != oldValue); \ + (void)order; \ + return oldValue +#define MA_ATOMIC_FETCH_ADD_LOCK(sizeInBits, dst, src, order) \ + ma_uint##sizeInBits result; \ + ma_atomic_spinlock_lock(&ma_atomic_global_lock); \ + { \ + result = *dst; \ + *dst += src; \ + (void)order; \ + } \ + ma_atomic_spinlock_unlock(&ma_atomic_global_lock); \ + return result +#define MA_ATOMIC_FETCH_ADD_CAS(sizeInBits, dst, src, order) \ + ma_uint##sizeInBits oldValue; \ + ma_uint##sizeInBits newValue; \ + do { \ + oldValue = ma_atomic_load_explicit_##sizeInBits(dst, ma_atomic_memory_order_relaxed); \ + newValue = oldValue + src; \ + } while (ma_atomic_compare_and_swap_##sizeInBits(dst, oldValue, newValue) != oldValue); \ + (void)order; \ + return oldValue +#define MA_ATOMIC_FETCH_AND_CAS(sizeInBits, dst, src, order) \ + ma_uint##sizeInBits oldValue; \ + ma_uint##sizeInBits newValue; \ + do { \ + oldValue = ma_atomic_load_explicit_##sizeInBits(dst, ma_atomic_memory_order_relaxed); \ + newValue = (ma_uint##sizeInBits)(oldValue & src); \ + } while (ma_atomic_compare_and_swap_##sizeInBits(dst, oldValue, newValue) != oldValue); \ + (void)order; \ + return oldValue +#define MA_ATOMIC_FETCH_OR_CAS(sizeInBits, dst, src, order) \ + ma_uint##sizeInBits oldValue; \ + ma_uint##sizeInBits newValue; \ + do { \ + oldValue = ma_atomic_load_explicit_##sizeInBits(dst, ma_atomic_memory_order_relaxed); \ + newValue = (ma_uint##sizeInBits)(oldValue | src); \ + } while (ma_atomic_compare_and_swap_##sizeInBits(dst, oldValue, newValue) != oldValue); \ + (void)order; \ + return oldValue +#define MA_ATOMIC_FETCH_XOR_CAS(sizeInBits, dst, src, order) \ + ma_uint##sizeInBits oldValue; \ + ma_uint##sizeInBits newValue; \ + do { \ + oldValue = ma_atomic_load_explicit_##sizeInBits(dst, ma_atomic_memory_order_relaxed); \ + newValue = (ma_uint##sizeInBits)(oldValue ^ src); \ + } while (ma_atomic_compare_and_swap_##sizeInBits(dst, oldValue, newValue) != oldValue); \ + (void)order; \ + return oldValue +#if defined(MA_ATOMIC_MODERN_MSVC) || defined(MA_ATOMIC_LEGACY_MSVC) + #define MA_ATOMIC_MSVC_ARM_INTRINSIC_COMPARE_EXCHANGE(ptr, expected, replacement, order, intrin, ma_atomicType, msvcType) \ ma_atomicType result; \ switch (order) \ { \ case ma_atomic_memory_order_relaxed: \ { \ - result = (ma_atomicType)intrin##_nf((volatile msvcType*)ptr, (msvcType)expected, (msvcType)desired); \ + result = (ma_atomicType)intrin##_nf((volatile msvcType*)ptr, (msvcType)expected, (msvcType)replacement); \ } break; \ case ma_atomic_memory_order_consume: \ case ma_atomic_memory_order_acquire: \ { \ - result = (ma_atomicType)intrin##_acq((volatile msvcType*)ptr, (msvcType)expected, (msvcType)desired); \ + result = (ma_atomicType)intrin##_acq((volatile msvcType*)ptr, (msvcType)expected, (msvcType)replacement); \ } break; \ case ma_atomic_memory_order_release: \ { \ - result = (ma_atomicType)intrin##_rel((volatile msvcType*)ptr, (msvcType)expected, (msvcType)desired); \ + result = (ma_atomicType)intrin##_rel((volatile msvcType*)ptr, (msvcType)expected, (msvcType)replacement); \ } break; \ case ma_atomic_memory_order_acq_rel: \ case ma_atomic_memory_order_seq_cst: \ default: \ { \ - result = (ma_atomicType)intrin((volatile msvcType*)ptr, (msvcType)expected, (msvcType)desired); \ + result = (ma_atomicType)intrin((volatile msvcType*)ptr, (msvcType)expected, (msvcType)replacement); \ } break; \ } \ return result; - #define ma_atomic_memory_order_relaxed 0 - #define ma_atomic_memory_order_consume 1 - #define ma_atomic_memory_order_acquire 2 - #define ma_atomic_memory_order_release 3 - #define ma_atomic_memory_order_acq_rel 4 - #define ma_atomic_memory_order_seq_cst 5 - #if _MSC_VER < 1600 && defined(MA_X86) - #define MA_ATOMIC_MSVC_USE_INLINED_ASSEMBLY - #endif - #if _MSC_VER < 1600 - #undef MA_ATOMIC_HAS_8 - #undef MA_ATOMIC_HAS_16 - #endif - #if !defined(MA_ATOMIC_MSVC_USE_INLINED_ASSEMBLY) - #include - #endif - #if defined(MA_ATOMIC_MSVC_USE_INLINED_ASSEMBLY) - #if defined(MA_ATOMIC_HAS_8) - static MA_INLINE ma_uint8 __stdcall ma_atomic_compare_and_swap_8(volatile ma_uint8* dst, ma_uint8 expected, ma_uint8 desired) - { - ma_uint8 result = 0; - __asm { - mov ecx, dst - mov al, expected - mov dl, desired - lock cmpxchg [ecx], dl - mov result, al - } - return result; - } - #endif - #if defined(MA_ATOMIC_HAS_16) - static MA_INLINE ma_uint16 __stdcall ma_atomic_compare_and_swap_16(volatile ma_uint16* dst, ma_uint16 expected, ma_uint16 desired) - { - ma_uint16 result = 0; - __asm { - mov ecx, dst - mov ax, expected - mov dx, desired - lock cmpxchg [ecx], dx - mov result, ax - } - return result; - } - #endif - #if defined(MA_ATOMIC_HAS_32) - static MA_INLINE ma_uint32 __stdcall ma_atomic_compare_and_swap_32(volatile ma_uint32* dst, ma_uint32 expected, ma_uint32 desired) - { - ma_uint32 result = 0; - __asm { - mov ecx, dst - mov eax, expected - mov edx, desired - lock cmpxchg [ecx], edx - mov result, eax - } - return result; - } - #endif - #if defined(MA_ATOMIC_HAS_64) - static MA_INLINE ma_uint64 __stdcall ma_atomic_compare_and_swap_64(volatile ma_uint64* dst, ma_uint64 expected, ma_uint64 desired) - { - ma_uint32 resultEAX = 0; - ma_uint32 resultEDX = 0; - __asm { - mov esi, dst - mov eax, dword ptr expected - mov edx, dword ptr expected + 4 - mov ebx, dword ptr desired - mov ecx, dword ptr desired + 4 - lock cmpxchg8b qword ptr [esi] - mov resultEAX, eax - mov resultEDX, edx - } - return ((ma_uint64)resultEDX << 32) | resultEAX; - } - #endif + #if defined(MA_ATOMIC_IS_LOCK_FREE_8) + #define ma_atomic_compare_and_swap_8( dst, expected, replacement) (ma_uint8 )_InterlockedCompareExchange8((volatile char*)dst, (char)replacement, (char)expected) #else - #if defined(MA_ATOMIC_HAS_8) - #define ma_atomic_compare_and_swap_8( dst, expected, desired) (ma_uint8 )_InterlockedCompareExchange8((volatile char*)dst, (char)desired, (char)expected) - #endif - #if defined(MA_ATOMIC_HAS_16) - #define ma_atomic_compare_and_swap_16(dst, expected, desired) (ma_uint16)_InterlockedCompareExchange16((volatile short*)dst, (short)desired, (short)expected) - #endif - #if defined(MA_ATOMIC_HAS_32) - #define ma_atomic_compare_and_swap_32(dst, expected, desired) (ma_uint32)_InterlockedCompareExchange((volatile long*)dst, (long)desired, (long)expected) - #endif - #if defined(MA_ATOMIC_HAS_64) - #define ma_atomic_compare_and_swap_64(dst, expected, desired) (ma_uint64)_InterlockedCompareExchange64((volatile ma_int64*)dst, (ma_int64)desired, (ma_int64)expected) - #endif + static MA_INLINE ma_uint8 __stdcall ma_atomic_compare_and_swap_8(volatile ma_uint8* dst, ma_uint8 expected, ma_uint8 replacement) + { + MA_ATOMIC_COMPARE_AND_SWAP_LOCK(8, dst, expected, replacement); + } #endif - #if defined(MA_ATOMIC_MSVC_USE_INLINED_ASSEMBLY) - #if defined(MA_ATOMIC_HAS_8) - static MA_INLINE ma_uint8 __stdcall ma_atomic_exchange_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - ma_uint8 result = 0; - (void)order; - __asm { - mov ecx, dst - mov al, src - lock xchg [ecx], al - mov result, al - } - return result; - } - #endif - #if defined(MA_ATOMIC_HAS_16) - static MA_INLINE ma_uint16 __stdcall ma_atomic_exchange_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - ma_uint16 result = 0; - (void)order; - __asm { - mov ecx, dst - mov ax, src - lock xchg [ecx], ax - mov result, ax - } - return result; - } - #endif - #if defined(MA_ATOMIC_HAS_32) - static MA_INLINE ma_uint32 __stdcall ma_atomic_exchange_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - ma_uint32 result = 0; - (void)order; - __asm { - mov ecx, dst - mov eax, src - lock xchg [ecx], eax - mov result, eax - } - return result; - } - #endif + #if defined(MA_ATOMIC_IS_LOCK_FREE_16) + #define ma_atomic_compare_and_swap_16(dst, expected, replacement) (ma_uint16)_InterlockedCompareExchange16((volatile short*)dst, (short)replacement, (short)expected) #else - #if defined(MA_ATOMIC_HAS_8) - static MA_INLINE ma_uint8 __stdcall ma_atomic_exchange_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { + static MA_INLINE ma_uint16 __stdcall ma_atomic_compare_and_swap_16(volatile ma_uint16* dst, ma_uint16 expected, ma_uint16 replacement) + { + MA_ATOMIC_COMPARE_AND_SWAP_LOCK(16, dst, expected, replacement); + } + #endif + #if defined(MA_ATOMIC_IS_LOCK_FREE_32) + #define ma_atomic_compare_and_swap_32(dst, expected, replacement) (ma_uint32)_InterlockedCompareExchange((volatile long*)dst, (long)replacement, (long)expected) + #else + static MA_INLINE ma_uint32 __stdcall ma_atomic_compare_and_swap_32(volatile ma_uint32* dst, ma_uint32 expected, ma_uint32 replacement) + { + MA_ATOMIC_COMPARE_AND_SWAP_LOCK(32, dst, expected, replacement); + } + #endif + #if defined(MA_ATOMIC_IS_LOCK_FREE_32) + #define ma_atomic_compare_and_swap_64(dst, expected, replacement) (ma_uint64)_InterlockedCompareExchange64((volatile ma_int64*)dst, (ma_int64)replacement, (ma_int64)expected) + #else + static MA_INLINE ma_uint64 __stdcall ma_atomic_compare_and_swap_64(volatile ma_uint64* dst, ma_uint64 expected, ma_uint64 replacement) + { + MA_ATOMIC_COMPARE_AND_SWAP_LOCK(64, dst, expected, replacement); + } + #endif + static MA_INLINE ma_uint8 ma_atomic_load_explicit_8(volatile const ma_uint8* ptr, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_8) + { #if defined(MA_ARM) - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchange8, ma_uint8, char); + { + MA_ATOMIC_MSVC_ARM_INTRINSIC_COMPARE_EXCHANGE(ptr, 0, 0, order, _InterlockedCompareExchange8, ma_uint8, char); + } #else + { + (void)order; + return ma_atomic_compare_and_swap_8((volatile ma_uint8*)ptr, 0, 0); + } + #endif + } + #else + { + MA_ATOMIC_LOAD_EXPLICIT_LOCK(8, ptr, order); + } + #endif + } + static MA_INLINE ma_uint16 ma_atomic_load_explicit_16(volatile const ma_uint16* ptr, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_16) + { + #if defined(MA_ARM) + { + MA_ATOMIC_MSVC_ARM_INTRINSIC_COMPARE_EXCHANGE(ptr, 0, 0, order, _InterlockedCompareExchange16, ma_uint16, short); + } + #else + { + (void)order; + return ma_atomic_compare_and_swap_16((volatile ma_uint16*)ptr, 0, 0); + } + #endif + } + #else + { + MA_ATOMIC_LOAD_EXPLICIT_LOCK(16, ptr, order); + } + #endif + } + static MA_INLINE ma_uint32 ma_atomic_load_explicit_32(volatile const ma_uint32* ptr, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_32) + { + #if defined(MA_ARM) + { + MA_ATOMIC_MSVC_ARM_INTRINSIC_COMPARE_EXCHANGE(ptr, 0, 0, order, _InterlockedCompareExchange, ma_uint32, long); + } + #else + { + (void)order; + return ma_atomic_compare_and_swap_32((volatile ma_uint32*)ptr, 0, 0); + } + #endif + } + #else + { + MA_ATOMIC_LOAD_EXPLICIT_LOCK(32, ptr, order); + } + #endif + } + static MA_INLINE ma_uint64 ma_atomic_load_explicit_64(volatile const ma_uint64* ptr, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_32) + { + #if defined(MA_ARM) + { + MA_ATOMIC_MSVC_ARM_INTRINSIC_COMPARE_EXCHANGE(ptr, 0, 0, order, _InterlockedCompareExchange64, ma_uint64, long long); + } + #else + { + (void)order; + return ma_atomic_compare_and_swap_64((volatile ma_uint64*)ptr, 0, 0); + } + #endif + } + #else + { + MA_ATOMIC_LOAD_EXPLICIT_LOCK(64, ptr, order); + } + #endif + } + static MA_INLINE ma_uint8 __stdcall ma_atomic_exchange_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_8) + { + #if defined(MA_ARM) + { + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchange8, ma_uint8, char); + } + #else + { (void)order; return (ma_uint8)_InterlockedExchange8((volatile char*)dst, (char)src); - #endif } + #endif + } + #else + { + MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(8, dst, src, order); + } #endif - #if defined(MA_ATOMIC_HAS_16) - static MA_INLINE ma_uint16 __stdcall ma_atomic_exchange_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { + } + static MA_INLINE ma_uint16 __stdcall ma_atomic_exchange_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_16) + { #if defined(MA_ARM) + { MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchange16, ma_uint16, short); + } #else + { (void)order; return (ma_uint16)_InterlockedExchange16((volatile short*)dst, (short)src); - #endif } + #endif + } + #else + { + MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(16, dst, src, order); + } #endif - #if defined(MA_ATOMIC_HAS_32) - static MA_INLINE ma_uint32 __stdcall ma_atomic_exchange_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { + } + static MA_INLINE ma_uint32 __stdcall ma_atomic_exchange_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_32) + { #if defined(MA_ARM) + { MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchange, ma_uint32, long); + } #else + { (void)order; return (ma_uint32)_InterlockedExchange((volatile long*)dst, (long)src); - #endif } - #endif - #if defined(MA_ATOMIC_HAS_64) && defined(MA_64BIT) - static MA_INLINE ma_uint64 __stdcall ma_atomic_exchange_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - #if defined(MA_ARM) - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchange64, ma_uint64, long long); - #else - (void)order; - return (ma_uint64)_InterlockedExchange64((volatile long long*)dst, (long long)src); #endif - } - #else - #endif - #endif - #if defined(MA_ATOMIC_HAS_64) && !defined(MA_64BIT) - static MA_INLINE ma_uint64 __stdcall ma_atomic_exchange_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - ma_uint64 oldValue; - do { - oldValue = *dst; - } while (ma_atomic_compare_and_swap_64(dst, oldValue, src) != oldValue); - (void)order; - return oldValue; } - #endif - #if defined(MA_ATOMIC_MSVC_USE_INLINED_ASSEMBLY) - #if defined(MA_ATOMIC_HAS_8) - static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_add_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - ma_uint8 result = 0; - (void)order; - __asm { - mov ecx, dst - mov al, src - lock xadd [ecx], al - mov result, al - } - return result; - } + #else + { + MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(32, dst, src, order); + } #endif - #if defined(MA_ATOMIC_HAS_16) - static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_add_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + } + static MA_INLINE ma_uint64 __stdcall ma_atomic_exchange_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_64) + { + #if defined(MA_32BIT) { - ma_uint16 result = 0; - (void)order; - __asm { - mov ecx, dst - mov ax, src - lock xadd [ecx], ax - mov result, ax - } - return result; + MA_ATOMIC_EXCHANGE_EXPLICIT_CAS(64, dst, src, order); } - #endif - #if defined(MA_ATOMIC_HAS_32) - static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_add_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - ma_uint32 result = 0; - (void)order; - __asm { - mov ecx, dst - mov eax, src - lock xadd [ecx], eax - mov result, eax - } - return result; - } - #endif - #else - #if defined(MA_ATOMIC_HAS_8) - static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_add_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - #if defined(MA_ARM) - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchangeAdd8, ma_uint8, char); #else + { + #if defined(MA_ARM) + { + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchange64, ma_uint64, long long); + } + #else + { + (void)order; + return (ma_uint64)_InterlockedExchange64((volatile long long*)dst, (long long)src); + } + #endif + } + #endif + } + #else + { + MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(64, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_add_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_8) + { + #if defined(MA_ARM) + { + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchangeAdd8, ma_uint8, char); + } + #else + { (void)order; return (ma_uint8)_InterlockedExchangeAdd8((volatile char*)dst, (char)src); - #endif } + #endif + } + #else + { + MA_ATOMIC_FETCH_ADD_LOCK(8, dst, src, order); + } #endif - #if defined(MA_ATOMIC_HAS_16) - static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_add_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { + } + static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_add_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_16) + { #if defined(MA_ARM) + { MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchangeAdd16, ma_uint16, short); + } #else + { (void)order; return (ma_uint16)_InterlockedExchangeAdd16((volatile short*)dst, (short)src); - #endif } + #endif + } + #else + { + MA_ATOMIC_FETCH_ADD_LOCK(16, dst, src, order); + } #endif - #if defined(MA_ATOMIC_HAS_32) - static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_add_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { + } + static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_add_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_32) + { #if defined(MA_ARM) + { MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchangeAdd, ma_uint32, long); + } #else + { (void)order; return (ma_uint32)_InterlockedExchangeAdd((volatile long*)dst, (long)src); - #endif } - #endif - #if defined(MA_ATOMIC_HAS_64) && defined(MA_64BIT) - static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_add_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - #if defined(MA_ARM) - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchangeAdd64, ma_uint64, long long); - #else - (void)order; - return (ma_uint64)_InterlockedExchangeAdd64((volatile long long*)dst, (long long)src); #endif - } + } #else - #endif - #endif - #if defined(MA_ATOMIC_HAS_64) && !defined(MA_64BIT) - static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_add_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) { - ma_uint64 oldValue; - ma_uint64 newValue; - do { - oldValue = *dst; - newValue = oldValue + src; - } while (ma_atomic_compare_and_swap_64(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; + MA_ATOMIC_FETCH_ADD_LOCK(32, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_add_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_64) + { + #if defined(MA_32BIT) + { + MA_ATOMIC_FETCH_ADD_CAS(64, dst, src, order); + } + #else + { + #if defined(MA_ARM) + { + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchangeAdd64, ma_uint64, long long); + } + #else + { + (void)order; + return (ma_uint64)_InterlockedExchangeAdd64((volatile long long*)dst, (long long)src); + } + #endif + } + #endif + } + #else + { + MA_ATOMIC_FETCH_ADD_LOCK(64, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_sub_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + return ma_atomic_fetch_add_explicit_8(dst, (ma_uint8)(-(ma_int8)src), order); + } + static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_sub_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + return ma_atomic_fetch_add_explicit_16(dst, (ma_uint16)(-(ma_int16)src), order); + } + static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_sub_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + return ma_atomic_fetch_add_explicit_32(dst, (ma_uint32)(-(ma_int32)src), order); + } + static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_sub_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + return ma_atomic_fetch_add_explicit_64(dst, (ma_uint64)(-(ma_int64)src), order); + } + static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_and_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + { + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedAnd8, ma_uint8, char); + } + #else + { + MA_ATOMIC_FETCH_AND_CAS(8, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_and_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + { + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedAnd16, ma_uint16, short); + } + #else + { + MA_ATOMIC_FETCH_AND_CAS(16, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_and_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + { + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedAnd, ma_uint32, long); + } + #else + { + MA_ATOMIC_FETCH_AND_CAS(32, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_and_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + { + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedAnd64, ma_uint64, long long); + } + #else + { + MA_ATOMIC_FETCH_AND_CAS(64, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_or_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + { + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedOr8, ma_uint8, char); + } + #else + { + MA_ATOMIC_FETCH_OR_CAS(8, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_or_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + { + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedOr16, ma_uint16, short); + } + #else + { + MA_ATOMIC_FETCH_OR_CAS(16, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_or_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + { + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedOr, ma_uint32, long); + } + #else + { + MA_ATOMIC_FETCH_OR_CAS(32, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_or_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + { + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedOr64, ma_uint64, long long); + } + #else + { + MA_ATOMIC_FETCH_OR_CAS(64, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_xor_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + { + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedXor8, ma_uint8, char); + } + #else + { + MA_ATOMIC_FETCH_XOR_CAS(8, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_xor_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + { + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedXor16, ma_uint16, short); + } + #else + { + MA_ATOMIC_FETCH_XOR_CAS(16, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_xor_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + { + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedXor, ma_uint32, long); + } + #else + { + MA_ATOMIC_FETCH_XOR_CAS(32, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_xor_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + { + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedXor64, ma_uint64, long long); + } + #else + { + MA_ATOMIC_FETCH_XOR_CAS(64, dst, src, order); + } + #endif + } + #define ma_atomic_store_explicit_8( dst, src, order) (void)ma_atomic_exchange_explicit_8 (dst, src, order) + #define ma_atomic_store_explicit_16(dst, src, order) (void)ma_atomic_exchange_explicit_16(dst, src, order) + #define ma_atomic_store_explicit_32(dst, src, order) (void)ma_atomic_exchange_explicit_32(dst, src, order) + #define ma_atomic_store_explicit_64(dst, src, order) (void)ma_atomic_exchange_explicit_64(dst, src, order) + #if defined(MA_X64) + #define ma_atomic_thread_fence(order) __faststorefence(), (void)order + #elif defined(MA_ARM64) + #define ma_atomic_thread_fence(order) __dmb(_ARM64_BARRIER_ISH), (void)order + #else + static MA_INLINE void ma_atomic_thread_fence(ma_atomic_memory_order order) + { + volatile ma_uint32 barrier = 0; + ma_atomic_fetch_add_explicit_32(&barrier, 0, order); } #endif - #if defined(MA_ATOMIC_MSVC_USE_INLINED_ASSEMBLY) - static MA_INLINE void __stdcall ma_atomic_thread_fence(ma_atomic_memory_order order) + #define ma_atomic_signal_fence(order) _ReadWriteBarrier(), (void)order +#endif +#if defined(MA_ATOMIC_LEGACY_MSVC_ASM) + static MA_INLINE ma_uint8 __stdcall ma_atomic_compare_and_swap_8(volatile ma_uint8* dst, ma_uint8 expected, ma_uint8 replacement) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_8) { + ma_uint8 result = 0; + __asm { + mov ecx, dst + mov al, expected + mov dl, replacement + lock cmpxchg [ecx], dl + mov result, al + } + return result; + } + #else + { + MA_ATOMIC_COMPARE_AND_SWAP_LOCK(8, dst, expected, replacement); + } + #endif + } + static MA_INLINE ma_uint16 __stdcall ma_atomic_compare_and_swap_16(volatile ma_uint16* dst, ma_uint16 expected, ma_uint16 replacement) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_16) + { + ma_uint16 result = 0; + __asm { + mov ecx, dst + mov ax, expected + mov dx, replacement + lock cmpxchg [ecx], dx + mov result, ax + } + return result; + } + #else + { + MA_ATOMIC_COMPARE_AND_SWAP_LOCK(16, dst, expected, replacement); + } + #endif + } + static MA_INLINE ma_uint32 __stdcall ma_atomic_compare_and_swap_32(volatile ma_uint32* dst, ma_uint32 expected, ma_uint32 replacement) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_32) + { + ma_uint32 result = 0; + __asm { + mov ecx, dst + mov eax, expected + mov edx, replacement + lock cmpxchg [ecx], edx + mov result, eax + } + return result; + } + #else + { + MA_ATOMIC_COMPARE_AND_SWAP_LOCK(32, dst, expected, replacement); + } + #endif + } + static MA_INLINE ma_uint64 __stdcall ma_atomic_compare_and_swap_64(volatile ma_uint64* dst, ma_uint64 expected, ma_uint64 replacement) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_64) + { + ma_uint32 resultEAX = 0; + ma_uint32 resultEDX = 0; + __asm { + mov esi, dst + mov eax, dword ptr expected + mov edx, dword ptr expected + 4 + mov ebx, dword ptr replacement + mov ecx, dword ptr replacement + 4 + lock cmpxchg8b qword ptr [esi] + mov resultEAX, eax + mov resultEDX, edx + } + return ((ma_uint64)resultEDX << 32) | resultEAX; + } + #else + { + MA_ATOMIC_COMPARE_AND_SWAP_LOCK(64, dst, expected, replacement); + } + #endif + } + static MA_INLINE ma_uint8 ma_atomic_load_explicit_8(volatile const ma_uint8* dst, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_8) + { + ma_uint8 result = 0; + if (order == ma_atomic_memory_order_relaxed) { + __asm { + mov esi, dst + mov al, [esi] + mov result, al + } + } else if (order <= ma_atomic_memory_order_release) { + __asm { + mov esi, dst + mov al, [esi] + lock add dword ptr [esp], 0 + mov result, al + } + } else { + __asm { + lock add dword ptr [esp], 0 + mov esi, dst + mov al, [esi] + mov result, al + lock add dword ptr [esp], 0 + } + } + return result; + } + #else + { + MA_ATOMIC_LOAD_EXPLICIT_LOCK(8, dst, order); + } + #endif + } + static MA_INLINE ma_uint16 ma_atomic_load_explicit_16(volatile const ma_uint16* dst, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_16) + { + ma_uint16 result = 0; + if (order == ma_atomic_memory_order_relaxed) { + __asm { + mov esi, dst + mov ax, [esi] + mov result, ax + } + } else if (order <= ma_atomic_memory_order_release) { + __asm { + mov esi, dst + mov ax, [esi] + lock add dword ptr [esp], 0 + mov result, ax + } + } else { + __asm { + lock add dword ptr [esp], 0 + mov esi, dst + mov ax, [esi] + mov result, ax + lock add dword ptr [esp], 0 + } + } + return result; + } + #else + { + MA_ATOMIC_LOAD_EXPLICIT_LOCK(16, dst, order); + } + #endif + } + static MA_INLINE ma_uint32 ma_atomic_load_explicit_32(volatile const ma_uint32* dst, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_32) + { + ma_uint32 result = 0; + if (order == ma_atomic_memory_order_relaxed) { + __asm { + mov esi, dst + mov eax, [esi] + mov result, eax + } + } else if (order <= ma_atomic_memory_order_release) { + __asm { + mov esi, dst + mov eax, [esi] + lock add dword ptr [esp], 0 + mov result, eax + } + } else { + __asm { + lock add dword ptr [esp], 0 + mov esi, dst + mov eax, [esi] + mov result, eax + lock add dword ptr [esp], 0 + } + } + return result; + } + #else + { + MA_ATOMIC_LOAD_EXPLICIT_LOCK(32, dst, order); + } + #endif + } + static MA_INLINE ma_uint64 ma_atomic_load_explicit_64(volatile const ma_uint64* dst, ma_atomic_memory_order order) + { + (void)order; + return ma_atomic_compare_and_swap_64((volatile ma_uint64*)dst, 0, 0); + } + static MA_INLINE void __stdcall ma_atomic_store_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + if (order == ma_atomic_memory_order_relaxed) { + __asm { + mov esi, dst + mov al, src + mov [esi], al + } + } else { + #if defined(MA_ATOMIC_IS_LOCK_FREE_8) + { + __asm { + mov esi, dst + mov al, src + xchg [esi], al + } + } + #else + { + MA_ATOMIC_STORE_EXPLICIT_LOCK(8, dst, src, order); + } + #endif + } + } + static MA_INLINE void __stdcall ma_atomic_store_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + if (order == ma_atomic_memory_order_relaxed) { + __asm { + mov esi, dst + mov ax, src + mov [esi], ax + } + } else { + #if defined(MA_ATOMIC_IS_LOCK_FREE_16) + { + __asm { + mov esi, dst + mov ax, src + xchg [esi], ax + } + } + #else + { + MA_ATOMIC_STORE_EXPLICIT_LOCK(16, dst, src, order); + } + #endif + } + } + static MA_INLINE void __stdcall ma_atomic_store_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + if (order == ma_atomic_memory_order_relaxed) { + __asm { + mov esi, dst + mov eax, src + mov [esi], eax + } + } else { + #if defined(MA_ATOMIC_IS_LOCK_FREE_32) + { + __asm { + mov esi, dst + mov eax, src + xchg [esi], eax + } + } + #else + { + MA_ATOMIC_STORE_EXPLICIT_LOCK(32, dst, src, order); + } + #endif + } + } + static MA_INLINE void __stdcall ma_atomic_store_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_64) + { + MA_ATOMIC_STORE_EXPLICIT_CAS(64, dst, src, order); + } + #else + { + MA_ATOMIC_STORE_EXPLICIT_LOCK(64, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint8 __stdcall ma_atomic_exchange_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_8) + { + ma_uint8 result = 0; (void)order; __asm { - lock add [esp], 0 + mov ecx, dst + mov al, src + lock xchg [ecx], al + mov result, al } + return result; } - #else - #if defined(MA_X64) - #define ma_atomic_thread_fence(order) __faststorefence(), (void)order - #elif defined(MA_ARM64) - #define ma_atomic_thread_fence(order) __dmb(_ARM64_BARRIER_ISH), (void)order #else - static MA_INLINE void ma_atomic_thread_fence(ma_atomic_memory_order order) - { - volatile ma_uint32 barrier = 0; - ma_atomic_fetch_add_explicit_32(&barrier, 0, order); + { + MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(8, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint16 __stdcall ma_atomic_exchange_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_16) + { + ma_uint16 result = 0; + (void)order; + __asm { + mov ecx, dst + mov ax, src + lock xchg [ecx], ax + mov result, ax } - #endif - #endif - #define ma_atomic_compiler_fence() ma_atomic_thread_fence(ma_atomic_memory_order_seq_cst) - #define ma_atomic_signal_fence(order) ma_atomic_thread_fence(order) - #if defined(MA_ATOMIC_HAS_8) - static MA_INLINE ma_uint8 ma_atomic_load_explicit_8(volatile const ma_uint8* ptr, ma_atomic_memory_order order) - { - #if defined(MA_ARM) - MA_ATOMIC_MSVC_ARM_INTRINSIC_COMPARE_EXCHANGE(ptr, 0, 0, order, _InterlockedCompareExchange8, ma_uint8, char); + return result; + } #else - (void)order; - return ma_atomic_compare_and_swap_8((volatile ma_uint8*)ptr, 0, 0); - #endif - } - #endif - #if defined(MA_ATOMIC_HAS_16) - static MA_INLINE ma_uint16 ma_atomic_load_explicit_16(volatile const ma_uint16* ptr, ma_atomic_memory_order order) { - #if defined(MA_ARM) - MA_ATOMIC_MSVC_ARM_INTRINSIC_COMPARE_EXCHANGE(ptr, 0, 0, order, _InterlockedCompareExchange16, ma_uint16, short); + MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(16, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint32 __stdcall ma_atomic_exchange_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_32) + { + ma_uint32 result = 0; + (void)order; + __asm { + mov ecx, dst + mov eax, src + xchg [ecx], eax + mov result, eax + } + return result; + } #else - (void)order; - return ma_atomic_compare_and_swap_16((volatile ma_uint16*)ptr, 0, 0); - #endif - } - #endif - #if defined(MA_ATOMIC_HAS_32) - static MA_INLINE ma_uint32 ma_atomic_load_explicit_32(volatile const ma_uint32* ptr, ma_atomic_memory_order order) { - #if defined(MA_ARM) - MA_ATOMIC_MSVC_ARM_INTRINSIC_COMPARE_EXCHANGE(ptr, 0, 0, order, _InterlockedCompareExchange, ma_uint32, long); + MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(32, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint64 __stdcall ma_atomic_exchange_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_64) + { + MA_ATOMIC_EXCHANGE_EXPLICIT_CAS(64, dst, src, order); + } #else - (void)order; - return ma_atomic_compare_and_swap_32((volatile ma_uint32*)ptr, 0, 0); - #endif - } - #endif - #if defined(MA_ATOMIC_HAS_64) - static MA_INLINE ma_uint64 ma_atomic_load_explicit_64(volatile const ma_uint64* ptr, ma_atomic_memory_order order) { - #if defined(MA_ARM) - MA_ATOMIC_MSVC_ARM_INTRINSIC_COMPARE_EXCHANGE(ptr, 0, 0, order, _InterlockedCompareExchange64, ma_uint64, long long); + MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(64, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_add_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_8) + { + ma_uint8 result = 0; + (void)order; + __asm { + mov ecx, dst + mov al, src + lock xadd [ecx], al + mov result, al + } + return result; + } #else - (void)order; - return ma_atomic_compare_and_swap_64((volatile ma_uint64*)ptr, 0, 0); + { + MA_ATOMIC_FETCH_ADD_LOCK(8, dst, src, order); + } #endif - } - #endif - #if defined(MA_ATOMIC_HAS_8) - #define ma_atomic_store_explicit_8( dst, src, order) (void)ma_atomic_exchange_explicit_8 (dst, src, order) - #endif - #if defined(MA_ATOMIC_HAS_16) - #define ma_atomic_store_explicit_16(dst, src, order) (void)ma_atomic_exchange_explicit_16(dst, src, order) - #endif - #if defined(MA_ATOMIC_HAS_32) - #define ma_atomic_store_explicit_32(dst, src, order) (void)ma_atomic_exchange_explicit_32(dst, src, order) - #endif - #if defined(MA_ATOMIC_HAS_64) - #define ma_atomic_store_explicit_64(dst, src, order) (void)ma_atomic_exchange_explicit_64(dst, src, order) - #endif - #if defined(MA_ATOMIC_HAS_8) - static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_sub_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + } + static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_add_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_16) { - ma_uint8 oldValue; - ma_uint8 newValue; - do { - oldValue = *dst; - newValue = (ma_uint8)(oldValue - src); - } while (ma_atomic_compare_and_swap_8(dst, oldValue, newValue) != oldValue); + ma_uint16 result = 0; (void)order; - return oldValue; + __asm { + mov ecx, dst + mov ax, src + lock xadd [ecx], ax + mov result, ax + } + return result; } - #endif - #if defined(MA_ATOMIC_HAS_16) - static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_sub_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - ma_uint16 oldValue; - ma_uint16 newValue; - do { - oldValue = *dst; - newValue = (ma_uint16)(oldValue - src); - } while (ma_atomic_compare_and_swap_16(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; - } - #endif - #if defined(MA_ATOMIC_HAS_32) - static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_sub_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - ma_uint32 oldValue; - ma_uint32 newValue; - do { - oldValue = *dst; - newValue = oldValue - src; - } while (ma_atomic_compare_and_swap_32(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; - } - #endif - #if defined(MA_ATOMIC_HAS_64) - static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_sub_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - ma_uint64 oldValue; - ma_uint64 newValue; - do { - oldValue = *dst; - newValue = oldValue - src; - } while (ma_atomic_compare_and_swap_64(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; - } - #endif - #if defined(MA_ATOMIC_HAS_8) - static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_and_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - #if defined(MA_ARM) - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedAnd8, ma_uint8, char); #else - ma_uint8 oldValue; - ma_uint8 newValue; - do { - oldValue = *dst; - newValue = (ma_uint8)(oldValue & src); - } while (ma_atomic_compare_and_swap_8(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; - #endif - } - #endif - #if defined(MA_ATOMIC_HAS_16) - static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_and_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) { - #if defined(MA_ARM) - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedAnd16, ma_uint16, short); - #else - ma_uint16 oldValue; - ma_uint16 newValue; - do { - oldValue = *dst; - newValue = (ma_uint16)(oldValue & src); - } while (ma_atomic_compare_and_swap_16(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; - #endif + MA_ATOMIC_FETCH_ADD_LOCK(16, dst, src, order); } - #endif - #if defined(MA_ATOMIC_HAS_32) - static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_and_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + #endif + } + static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_add_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_32) { - #if defined(MA_ARM) - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedAnd, ma_uint32, long); - #else - ma_uint32 oldValue; - ma_uint32 newValue; - do { - oldValue = *dst; - newValue = oldValue & src; - } while (ma_atomic_compare_and_swap_32(dst, oldValue, newValue) != oldValue); + ma_uint32 result = 0; (void)order; - return oldValue; - #endif + __asm { + mov ecx, dst + mov eax, src + lock xadd [ecx], eax + mov result, eax + } + return result; } - #endif - #if defined(MA_ATOMIC_HAS_64) - static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_and_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + #else { - #if defined(MA_ARM) - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedAnd64, ma_uint64, long long); - #else - ma_uint64 oldValue; - ma_uint64 newValue; - do { - oldValue = *dst; - newValue = oldValue & src; - } while (ma_atomic_compare_and_swap_64(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; - #endif + MA_ATOMIC_FETCH_ADD_LOCK(32, dst, src, order); } - #endif - #if defined(MA_ATOMIC_HAS_8) - static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_xor_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + #endif + } + static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_add_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_64) { - #if defined(MA_ARM) - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedXor8, ma_uint8, char); - #else - ma_uint8 oldValue; - ma_uint8 newValue; - do { - oldValue = *dst; - newValue = (ma_uint8)(oldValue ^ src); - } while (ma_atomic_compare_and_swap_8(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; - #endif + MA_ATOMIC_FETCH_ADD_CAS(64, dst, src, order); } - #endif - #if defined(MA_ATOMIC_HAS_16) - static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_xor_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + #else { - #if defined(MA_ARM) - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedXor16, ma_uint16, short); - #else - ma_uint16 oldValue; - ma_uint16 newValue; - do { - oldValue = *dst; - newValue = (ma_uint16)(oldValue ^ src); - } while (ma_atomic_compare_and_swap_16(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; - #endif + MA_ATOMIC_FETCH_ADD_LOCK(64, dst, src, order); } - #endif - #if defined(MA_ATOMIC_HAS_32) - static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_xor_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + #endif + } + static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_sub_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_8) { - #if defined(MA_ARM) - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedXor, ma_uint32, long); - #else - ma_uint32 oldValue; - ma_uint32 newValue; - do { - oldValue = *dst; - newValue = oldValue ^ src; - } while (ma_atomic_compare_and_swap_32(dst, oldValue, newValue) != oldValue); + ma_uint8 result = 0; (void)order; - return oldValue; - #endif + __asm { + mov ecx, dst + mov al, src + neg al + lock xadd [ecx], al + mov result, al + } + return result; } - #endif - #if defined(MA_ATOMIC_HAS_64) - static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_xor_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + #else { - #if defined(MA_ARM) - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedXor64, ma_uint64, long long); - #else - ma_uint64 oldValue; - ma_uint64 newValue; - do { - oldValue = *dst; - newValue = oldValue ^ src; - } while (ma_atomic_compare_and_swap_64(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; - #endif + MA_ATOMIC_FETCH_ADD_LOCK(8, dst, (ma_uint8)(-(ma_int8)src), order); } - #endif - #if defined(MA_ATOMIC_HAS_8) - static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_or_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + #endif + } + static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_sub_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_16) { - #if defined(MA_ARM) - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedOr8, ma_uint8, char); - #else - ma_uint8 oldValue; - ma_uint8 newValue; - do { - oldValue = *dst; - newValue = (ma_uint8)(oldValue | src); - } while (ma_atomic_compare_and_swap_8(dst, oldValue, newValue) != oldValue); + ma_uint16 result = 0; (void)order; - return oldValue; - #endif + __asm { + mov ecx, dst + mov ax, src + neg ax + lock xadd [ecx], ax + mov result, ax + } + return result; } - #endif - #if defined(MA_ATOMIC_HAS_16) - static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_or_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + #else { - #if defined(MA_ARM) - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedOr16, ma_uint16, short); - #else - ma_uint16 oldValue; - ma_uint16 newValue; - do { - oldValue = *dst; - newValue = (ma_uint16)(oldValue | src); - } while (ma_atomic_compare_and_swap_16(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; - #endif + MA_ATOMIC_FETCH_ADD_LOCK(16, dst, (ma_uint16)(-(ma_int16)src), order); } - #endif - #if defined(MA_ATOMIC_HAS_32) - static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_or_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + #endif + } + static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_sub_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_32) { - #if defined(MA_ARM) - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedOr, ma_uint32, long); - #else - ma_uint32 oldValue; - ma_uint32 newValue; - do { - oldValue = *dst; - newValue = oldValue | src; - } while (ma_atomic_compare_and_swap_32(dst, oldValue, newValue) != oldValue); + ma_uint32 result = 0; (void)order; - return oldValue; - #endif + __asm { + mov ecx, dst + mov eax, src + neg eax + lock xadd [ecx], eax + mov result, eax + } + return result; } - #endif - #if defined(MA_ATOMIC_HAS_64) - static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_or_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + #else { - #if defined(MA_ARM) - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedOr64, ma_uint64, long long); - #else - ma_uint64 oldValue; - ma_uint64 newValue; - do { - oldValue = *dst; - newValue = oldValue | src; - } while (ma_atomic_compare_and_swap_64(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; - #endif + MA_ATOMIC_FETCH_ADD_LOCK(32, dst, (ma_uint32)(-(ma_int32)src), order); } - #endif - #if defined(MA_ATOMIC_HAS_8) - #define ma_atomic_test_and_set_explicit_8( dst, order) ma_atomic_exchange_explicit_8 (dst, 1, order) - #endif - #if defined(MA_ATOMIC_HAS_16) - #define ma_atomic_test_and_set_explicit_16(dst, order) ma_atomic_exchange_explicit_16(dst, 1, order) - #endif - #if defined(MA_ATOMIC_HAS_32) - #define ma_atomic_test_and_set_explicit_32(dst, order) ma_atomic_exchange_explicit_32(dst, 1, order) - #endif - #if defined(MA_ATOMIC_HAS_64) - #define ma_atomic_test_and_set_explicit_64(dst, order) ma_atomic_exchange_explicit_64(dst, 1, order) - #endif - #if defined(MA_ATOMIC_HAS_8) - #define ma_atomic_clear_explicit_8( dst, order) ma_atomic_store_explicit_8 (dst, 0, order) - #endif - #if defined(MA_ATOMIC_HAS_16) - #define ma_atomic_clear_explicit_16(dst, order) ma_atomic_store_explicit_16(dst, 0, order) - #endif - #if defined(MA_ATOMIC_HAS_32) - #define ma_atomic_clear_explicit_32(dst, order) ma_atomic_store_explicit_32(dst, 0, order) - #endif - #if defined(MA_ATOMIC_HAS_64) - #define ma_atomic_clear_explicit_64(dst, order) ma_atomic_store_explicit_64(dst, 0, order) - #endif - #if defined(MA_ATOMIC_HAS_8) - typedef ma_uint8 ma_atomic_flag; - #define ma_atomic_flag_test_and_set_explicit(ptr, order) (ma_bool32)ma_atomic_test_and_set_explicit_8(ptr, order) - #define ma_atomic_flag_clear_explicit(ptr, order) ma_atomic_clear_explicit_8(ptr, order) - #define ma_atomic_flag_load_explicit(ptr, order) ma_atomic_load_explicit_8(ptr, order) - #else - typedef ma_uint32 ma_atomic_flag; - #define ma_atomic_flag_test_and_set_explicit(ptr, order) (ma_bool32)ma_atomic_test_and_set_explicit_32(ptr, order) - #define ma_atomic_flag_clear_explicit(ptr, order) ma_atomic_clear_explicit_32(ptr, order) - #define ma_atomic_flag_load_explicit(ptr, order) ma_atomic_load_explicit_32(ptr, order) - #endif -#elif defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))) + #endif + } + static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_sub_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + MA_ATOMIC_FETCH_ADD_CAS(64, dst, (ma_uint64)(-(ma_int64)src), order); + } + static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_and_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + MA_ATOMIC_FETCH_AND_CAS(8, dst, src, order); + } + static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_and_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + MA_ATOMIC_FETCH_AND_CAS(16, dst, src, order); + } + static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_and_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + MA_ATOMIC_FETCH_AND_CAS(32, dst, src, order); + } + static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_and_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + MA_ATOMIC_FETCH_AND_CAS(64, dst, src, order); + } + static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_or_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + MA_ATOMIC_FETCH_OR_CAS(8, dst, src, order); + } + static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_or_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + MA_ATOMIC_FETCH_OR_CAS(16, dst, src, order); + } + static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_or_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + MA_ATOMIC_FETCH_OR_CAS(32, dst, src, order); + } + static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_or_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + MA_ATOMIC_FETCH_OR_CAS(64, dst, src, order); + } + static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_xor_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + MA_ATOMIC_FETCH_XOR_CAS(8, dst, src, order); + } + static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_xor_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + MA_ATOMIC_FETCH_XOR_CAS(16, dst, src, order); + } + static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_xor_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + MA_ATOMIC_FETCH_XOR_CAS(32, dst, src, order); + } + static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_xor_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + MA_ATOMIC_FETCH_XOR_CAS(64, dst, src, order); + } + static MA_INLINE void __stdcall ma_atomic_thread_fence(ma_atomic_memory_order order) + { + (void)order; + __asm { + lock add dword ptr [esp], 0 + } + } + #define ma_atomic_signal_fence(order) __asm {}; (void)order +#endif +#if defined(MA_ATOMIC_MODERN_GCC) #define MA_ATOMIC_HAS_NATIVE_COMPARE_EXCHANGE - #define MA_ATOMIC_HAS_NATIVE_IS_LOCK_FREE - #define ma_atomic_memory_order_relaxed __ATOMIC_RELAXED - #define ma_atomic_memory_order_consume __ATOMIC_CONSUME - #define ma_atomic_memory_order_acquire __ATOMIC_ACQUIRE - #define ma_atomic_memory_order_release __ATOMIC_RELEASE - #define ma_atomic_memory_order_acq_rel __ATOMIC_ACQ_REL - #define ma_atomic_memory_order_seq_cst __ATOMIC_SEQ_CST - #define ma_atomic_compiler_fence() __asm__ __volatile__("":::"memory") #define ma_atomic_thread_fence(order) __atomic_thread_fence(order) #define ma_atomic_signal_fence(order) __atomic_signal_fence(order) #define ma_atomic_is_lock_free_8(ptr) __atomic_is_lock_free(1, ptr) #define ma_atomic_is_lock_free_16(ptr) __atomic_is_lock_free(2, ptr) #define ma_atomic_is_lock_free_32(ptr) __atomic_is_lock_free(4, ptr) #define ma_atomic_is_lock_free_64(ptr) __atomic_is_lock_free(8, ptr) - #define ma_atomic_test_and_set_explicit_8( dst, order) __atomic_exchange_n(dst, 1, order) - #define ma_atomic_test_and_set_explicit_16(dst, order) __atomic_exchange_n(dst, 1, order) - #define ma_atomic_test_and_set_explicit_32(dst, order) __atomic_exchange_n(dst, 1, order) - #define ma_atomic_test_and_set_explicit_64(dst, order) __atomic_exchange_n(dst, 1, order) - #define ma_atomic_clear_explicit_8( dst, order) __atomic_store_n(dst, 0, order) - #define ma_atomic_clear_explicit_16(dst, order) __atomic_store_n(dst, 0, order) - #define ma_atomic_clear_explicit_32(dst, order) __atomic_store_n(dst, 0, order) - #define ma_atomic_clear_explicit_64(dst, order) __atomic_store_n(dst, 0, order) #define ma_atomic_store_explicit_8( dst, src, order) __atomic_store_n(dst, src, order) #define ma_atomic_store_explicit_16(dst, src, order) __atomic_store_n(dst, src, order) #define ma_atomic_store_explicit_32(dst, src, order) __atomic_store_n(dst, src, order) @@ -14864,14 +15773,14 @@ typedef int ma_atomic_memory_order; #define ma_atomic_exchange_explicit_16(dst, src, order) __atomic_exchange_n(dst, src, order) #define ma_atomic_exchange_explicit_32(dst, src, order) __atomic_exchange_n(dst, src, order) #define ma_atomic_exchange_explicit_64(dst, src, order) __atomic_exchange_n(dst, src, order) - #define ma_atomic_compare_exchange_strong_explicit_8( dst, expected, desired, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, desired, 0, successOrder, failureOrder) - #define ma_atomic_compare_exchange_strong_explicit_16(dst, expected, desired, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, desired, 0, successOrder, failureOrder) - #define ma_atomic_compare_exchange_strong_explicit_32(dst, expected, desired, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, desired, 0, successOrder, failureOrder) - #define ma_atomic_compare_exchange_strong_explicit_64(dst, expected, desired, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, desired, 0, successOrder, failureOrder) - #define ma_atomic_compare_exchange_weak_explicit_8( dst, expected, desired, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, desired, 1, successOrder, failureOrder) - #define ma_atomic_compare_exchange_weak_explicit_16(dst, expected, desired, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, desired, 1, successOrder, failureOrder) - #define ma_atomic_compare_exchange_weak_explicit_32(dst, expected, desired, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, desired, 1, successOrder, failureOrder) - #define ma_atomic_compare_exchange_weak_explicit_64(dst, expected, desired, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, desired, 1, successOrder, failureOrder) + #define ma_atomic_compare_exchange_strong_explicit_8( dst, expected, replacement, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, replacement, 0, successOrder, failureOrder) + #define ma_atomic_compare_exchange_strong_explicit_16(dst, expected, replacement, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, replacement, 0, successOrder, failureOrder) + #define ma_atomic_compare_exchange_strong_explicit_32(dst, expected, replacement, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, replacement, 0, successOrder, failureOrder) + #define ma_atomic_compare_exchange_strong_explicit_64(dst, expected, replacement, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, replacement, 0, successOrder, failureOrder) + #define ma_atomic_compare_exchange_weak_explicit_8( dst, expected, replacement, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, replacement, 1, successOrder, failureOrder) + #define ma_atomic_compare_exchange_weak_explicit_16(dst, expected, replacement, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, replacement, 1, successOrder, failureOrder) + #define ma_atomic_compare_exchange_weak_explicit_32(dst, expected, replacement, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, replacement, 1, successOrder, failureOrder) + #define ma_atomic_compare_exchange_weak_explicit_64(dst, expected, replacement, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, replacement, 1, successOrder, failureOrder) #define ma_atomic_fetch_add_explicit_8( dst, src, order) __atomic_fetch_add(dst, src, order) #define ma_atomic_fetch_add_explicit_16(dst, src, order) __atomic_fetch_add(dst, src, order) #define ma_atomic_fetch_add_explicit_32(dst, src, order) __atomic_fetch_add(dst, src, order) @@ -14892,19 +15801,19 @@ typedef int ma_atomic_memory_order; #define ma_atomic_fetch_and_explicit_16(dst, src, order) __atomic_fetch_and(dst, src, order) #define ma_atomic_fetch_and_explicit_32(dst, src, order) __atomic_fetch_and(dst, src, order) #define ma_atomic_fetch_and_explicit_64(dst, src, order) __atomic_fetch_and(dst, src, order) - static MA_INLINE ma_uint8 ma_atomic_compare_and_swap_8(volatile ma_uint8* dst, ma_uint8 expected, ma_uint8 desired) + static MA_INLINE ma_uint8 ma_atomic_compare_and_swap_8(volatile ma_uint8* dst, ma_uint8 expected, ma_uint8 replacement) { - __atomic_compare_exchange_n(dst, &expected, desired, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); + __atomic_compare_exchange_n(dst, &expected, replacement, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); return expected; } - static MA_INLINE ma_uint16 ma_atomic_compare_and_swap_16(volatile ma_uint16* dst, ma_uint16 expected, ma_uint16 desired) + static MA_INLINE ma_uint16 ma_atomic_compare_and_swap_16(volatile ma_uint16* dst, ma_uint16 expected, ma_uint16 replacement) { - __atomic_compare_exchange_n(dst, &expected, desired, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); + __atomic_compare_exchange_n(dst, &expected, replacement, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); return expected; } - static MA_INLINE ma_uint32 ma_atomic_compare_and_swap_32(volatile ma_uint32* dst, ma_uint32 expected, ma_uint32 desired) + static MA_INLINE ma_uint32 ma_atomic_compare_and_swap_32(volatile ma_uint32* dst, ma_uint32 expected, ma_uint32 replacement) { - __atomic_compare_exchange_n(dst, &expected, desired, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); + __atomic_compare_exchange_n(dst, &expected, replacement, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); return expected; } #if defined(__clang__) @@ -14913,636 +15822,1134 @@ typedef int ma_atomic_memory_order; #pragma clang diagnostic ignored "-Watomic-alignment" #endif #endif - static MA_INLINE ma_uint64 ma_atomic_compare_and_swap_64(volatile ma_uint64* dst, ma_uint64 expected, ma_uint64 desired) + static MA_INLINE ma_uint64 ma_atomic_compare_and_swap_64(volatile ma_uint64* dst, ma_uint64 expected, ma_uint64 replacement) { - __atomic_compare_exchange_n(dst, &expected, desired, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); + __atomic_compare_exchange_n(dst, &expected, replacement, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); return expected; } #if defined(__clang__) #pragma clang diagnostic pop #endif - typedef ma_uint8 ma_atomic_flag; - #define ma_atomic_flag_test_and_set_explicit(dst, order) (ma_bool32)__atomic_test_and_set(dst, order) - #define ma_atomic_flag_clear_explicit(dst, order) __atomic_clear(dst, order) - #define ma_atomic_flag_load_explicit(ptr, order) ma_atomic_load_explicit_8(ptr, order) -#else - #define ma_atomic_memory_order_relaxed 1 - #define ma_atomic_memory_order_consume 2 - #define ma_atomic_memory_order_acquire 3 - #define ma_atomic_memory_order_release 4 - #define ma_atomic_memory_order_acq_rel 5 - #define ma_atomic_memory_order_seq_cst 6 - #define ma_atomic_compiler_fence() __asm__ __volatile__("":::"memory") - #if defined(__GNUC__) +#endif +#if defined(MA_ATOMIC_LEGACY_GCC) || defined(MA_ATOMIC_LEGACY_GCC_ASM) + #define ma_atomic_signal_fence(order) __asm__ __volatile__("":::"memory") + #if defined(MA_ATOMIC_LEGACY_GCC) #define ma_atomic_thread_fence(order) __sync_synchronize(), (void)order - static MA_INLINE ma_uint8 ma_atomic_exchange_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + static MA_INLINE ma_uint8 ma_atomic_compare_and_swap_8(volatile ma_uint8* dst, ma_uint8 expected, ma_uint8 replacement) { - if (order > ma_atomic_memory_order_acquire) { - __sync_synchronize(); + #if defined(MA_ATOMIC_IS_LOCK_FREE_8) + { + return __sync_val_compare_and_swap(dst, expected, replacement); } - return __sync_lock_test_and_set(dst, src); + #else + { + MA_ATOMIC_COMPARE_AND_SWAP_LOCK(8, dst, expected, replacement); + } + #endif } - static MA_INLINE ma_uint16 ma_atomic_exchange_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + static MA_INLINE ma_uint16 ma_atomic_compare_and_swap_16(volatile ma_uint16* dst, ma_uint16 expected, ma_uint16 replacement) { - ma_uint16 oldValue; - do { - oldValue = *dst; - } while (__sync_val_compare_and_swap(dst, oldValue, src) != oldValue); - (void)order; - return oldValue; + #if defined(MA_ATOMIC_IS_LOCK_FREE_16) + { + return __sync_val_compare_and_swap(dst, expected, replacement); + } + #else + { + MA_ATOMIC_COMPARE_AND_SWAP_LOCK(16, dst, expected, replacement); + } + #endif } - static MA_INLINE ma_uint32 ma_atomic_exchange_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + static MA_INLINE ma_uint32 ma_atomic_compare_and_swap_32(volatile ma_uint32* dst, ma_uint32 expected, ma_uint32 replacement) { - ma_uint32 oldValue; - do { - oldValue = *dst; - } while (__sync_val_compare_and_swap(dst, oldValue, src) != oldValue); - (void)order; - return oldValue; + #if defined(MA_ATOMIC_IS_LOCK_FREE_32) + { + return __sync_val_compare_and_swap(dst, expected, replacement); + } + #else + { + MA_ATOMIC_COMPARE_AND_SWAP_LOCK(32, dst, expected, replacement); + } + #endif } - static MA_INLINE ma_uint64 ma_atomic_exchange_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + static MA_INLINE ma_uint64 ma_atomic_compare_and_swap_64(volatile ma_uint64* dst, ma_uint64 expected, ma_uint64 replacement) { - ma_uint64 oldValue; - do { - oldValue = *dst; - } while (__sync_val_compare_and_swap(dst, oldValue, src) != oldValue); - (void)order; - return oldValue; + #if defined(MA_ATOMIC_IS_LOCK_FREE_64) + { + return __sync_val_compare_and_swap(dst, expected, replacement); + } + #else + { + MA_ATOMIC_COMPARE_AND_SWAP_LOCK(64, dst, expected, replacement); + } + #endif } - static MA_INLINE ma_uint8 ma_atomic_fetch_add_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + static MA_INLINE ma_uint8 ma_atomic_load_explicit_8(volatile const ma_uint8* ptr, ma_atomic_memory_order order) { - (void)order; - return __sync_fetch_and_add(dst, src); + #if defined(MA_ATOMIC_IS_LOCK_FREE_8) + { + (void)order; + return ma_atomic_compare_and_swap_8((ma_uint8*)ptr, 0, 0); + } + #else + { + MA_ATOMIC_LOAD_EXPLICIT_LOCK(8, ptr, order); + } + #endif } - static MA_INLINE ma_uint16 ma_atomic_fetch_add_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + static MA_INLINE ma_uint16 ma_atomic_load_explicit_16(volatile const ma_uint16* ptr, ma_atomic_memory_order order) { - (void)order; - return __sync_fetch_and_add(dst, src); + #if defined(MA_ATOMIC_IS_LOCK_FREE_16) + { + (void)order; + return ma_atomic_compare_and_swap_16((ma_uint16*)ptr, 0, 0); + } + #else + { + MA_ATOMIC_LOAD_EXPLICIT_LOCK(16, ptr, order); + } + #endif } - static MA_INLINE ma_uint32 ma_atomic_fetch_add_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + static MA_INLINE ma_uint32 ma_atomic_load_explicit_32(volatile const ma_uint32* ptr, ma_atomic_memory_order order) { - (void)order; - return __sync_fetch_and_add(dst, src); + #if defined(MA_ATOMIC_IS_LOCK_FREE_32) + { + (void)order; + return ma_atomic_compare_and_swap_32((ma_uint32*)ptr, 0, 0); + } + #else + { + MA_ATOMIC_LOAD_EXPLICIT_LOCK(32, ptr, order); + } + #endif } - static MA_INLINE ma_uint64 ma_atomic_fetch_add_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + static MA_INLINE ma_uint64 ma_atomic_load_explicit_64(volatile const ma_uint64* ptr, ma_atomic_memory_order order) { - (void)order; - return __sync_fetch_and_add(dst, src); - } - static MA_INLINE ma_uint8 ma_atomic_fetch_sub_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - (void)order; - return __sync_fetch_and_sub(dst, src); - } - static MA_INLINE ma_uint16 ma_atomic_fetch_sub_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - (void)order; - return __sync_fetch_and_sub(dst, src); - } - static MA_INLINE ma_uint32 ma_atomic_fetch_sub_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - (void)order; - return __sync_fetch_and_sub(dst, src); - } - static MA_INLINE ma_uint64 ma_atomic_fetch_sub_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - (void)order; - return __sync_fetch_and_sub(dst, src); - } - static MA_INLINE ma_uint8 ma_atomic_fetch_or_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - (void)order; - return __sync_fetch_and_or(dst, src); - } - static MA_INLINE ma_uint16 ma_atomic_fetch_or_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - (void)order; - return __sync_fetch_and_or(dst, src); - } - static MA_INLINE ma_uint32 ma_atomic_fetch_or_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - (void)order; - return __sync_fetch_and_or(dst, src); - } - static MA_INLINE ma_uint64 ma_atomic_fetch_or_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - (void)order; - return __sync_fetch_and_or(dst, src); - } - static MA_INLINE ma_uint8 ma_atomic_fetch_xor_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - (void)order; - return __sync_fetch_and_xor(dst, src); - } - static MA_INLINE ma_uint16 ma_atomic_fetch_xor_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - (void)order; - return __sync_fetch_and_xor(dst, src); - } - static MA_INLINE ma_uint32 ma_atomic_fetch_xor_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - (void)order; - return __sync_fetch_and_xor(dst, src); - } - static MA_INLINE ma_uint64 ma_atomic_fetch_xor_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - (void)order; - return __sync_fetch_and_xor(dst, src); - } - static MA_INLINE ma_uint8 ma_atomic_fetch_and_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - (void)order; - return __sync_fetch_and_and(dst, src); - } - static MA_INLINE ma_uint16 ma_atomic_fetch_and_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - (void)order; - return __sync_fetch_and_and(dst, src); - } - static MA_INLINE ma_uint32 ma_atomic_fetch_and_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - (void)order; - return __sync_fetch_and_and(dst, src); - } - static MA_INLINE ma_uint64 ma_atomic_fetch_and_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - (void)order; - return __sync_fetch_and_and(dst, src); - } - #define ma_atomic_compare_and_swap_8( dst, expected, desired) __sync_val_compare_and_swap(dst, expected, desired) - #define ma_atomic_compare_and_swap_16(dst, expected, desired) __sync_val_compare_and_swap(dst, expected, desired) - #define ma_atomic_compare_and_swap_32(dst, expected, desired) __sync_val_compare_and_swap(dst, expected, desired) - #define ma_atomic_compare_and_swap_64(dst, expected, desired) __sync_val_compare_and_swap(dst, expected, desired) - #else - #if defined(MA_X86) - #define ma_atomic_thread_fence(order) __asm__ __volatile__("lock; addl $0, (%%esp)" ::: "memory", "cc") - #elif defined(MA_X64) - #define ma_atomic_thread_fence(order) __asm__ __volatile__("lock; addq $0, (%%rsp)" ::: "memory", "cc") - #else - #error Unsupported architecture. Please submit a feature request. - #endif - static MA_INLINE ma_uint8 ma_atomic_compare_and_swap_8(volatile ma_uint8* dst, ma_uint8 expected, ma_uint8 desired) - { - ma_uint8 result; - #if defined(MA_X86) || defined(MA_X64) - __asm__ __volatile__("lock; cmpxchg %3, %0" : "+m"(*dst), "=a"(result) : "a"(expected), "d"(desired) : "cc"); - #else - #error Unsupported architecture. Please submit a feature request. - #endif - return result; - } - static MA_INLINE ma_uint16 ma_atomic_compare_and_swap_16(volatile ma_uint16* dst, ma_uint16 expected, ma_uint16 desired) - { - ma_uint16 result; - #if defined(MA_X86) || defined(MA_X64) - __asm__ __volatile__("lock; cmpxchg %3, %0" : "+m"(*dst), "=a"(result) : "a"(expected), "d"(desired) : "cc"); - #else - #error Unsupported architecture. Please submit a feature request. - #endif - return result; - } - static MA_INLINE ma_uint32 ma_atomic_compare_and_swap_32(volatile ma_uint32* dst, ma_uint32 expected, ma_uint32 desired) - { - ma_uint32 result; - #if defined(MA_X86) || defined(MA_X64) - __asm__ __volatile__("lock; cmpxchg %3, %0" : "+m"(*dst), "=a"(result) : "a"(expected), "d"(desired) : "cc"); - #else - #error Unsupported architecture. Please submit a feature request. - #endif - return result; - } - static MA_INLINE ma_uint64 ma_atomic_compare_and_swap_64(volatile ma_uint64* dst, ma_uint64 expected, ma_uint64 desired) - { - volatile ma_uint64 result; - #if defined(MA_X86) - ma_uint32 resultEAX; - ma_uint32 resultEDX; - __asm__ __volatile__("push %%ebx; xchg %5, %%ebx; lock; cmpxchg8b %0; pop %%ebx" : "+m"(*dst), "=a"(resultEAX), "=d"(resultEDX) : "a"(expected & 0xFFFFFFFF), "d"(expected >> 32), "r"(desired & 0xFFFFFFFF), "c"(desired >> 32) : "cc"); - result = ((ma_uint64)resultEDX << 32) | resultEAX; - #elif defined(MA_X64) - __asm__ __volatile__("lock; cmpxchg %3, %0" : "+m"(*dst), "=a"(result) : "a"(expected), "d"(desired) : "cc"); - #else - #error Unsupported architecture. Please submit a feature request. - #endif - return result; + #if defined(MA_ATOMIC_IS_LOCK_FREE_64) + { + (void)order; + return ma_atomic_compare_and_swap_64((ma_uint64*)ptr, 0, 0); + } + #else + { + MA_ATOMIC_LOAD_EXPLICIT_LOCK(64, ptr, order); + } + #endif } static MA_INLINE ma_uint8 ma_atomic_exchange_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) { - ma_uint8 result = 0; - (void)order; - #if defined(MA_X86) || defined(MA_X64) - __asm__ __volatile__("lock; xchg %1, %0" : "+m"(*dst), "=a"(result) : "a"(src)); - #else - #error Unsupported architecture. Please submit a feature request. - #endif - return result; + #if defined(MA_ATOMIC_IS_LOCK_FREE_8) + { + if (order > ma_atomic_memory_order_acquire) { + __sync_synchronize(); + } + return __sync_lock_test_and_set(dst, src); + } + #else + { + MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(8, dst, src, order); + } + #endif } static MA_INLINE ma_uint16 ma_atomic_exchange_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) { - ma_uint16 result = 0; - (void)order; - #if defined(MA_X86) || defined(MA_X64) - __asm__ __volatile__("lock; xchg %1, %0" : "+m"(*dst), "=a"(result) : "a"(src)); - #else - #error Unsupported architecture. Please submit a feature request. - #endif - return result; + #if defined(MA_ATOMIC_IS_LOCK_FREE_16) + { + if (order > ma_atomic_memory_order_acquire) { + __sync_synchronize(); + } + return __sync_lock_test_and_set(dst, src); + } + #else + { + MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(16, dst, src, order); + } + #endif } static MA_INLINE ma_uint32 ma_atomic_exchange_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) { - ma_uint32 result; - (void)order; - #if defined(MA_X86) || defined(MA_X64) - __asm__ __volatile__("lock; xchg %1, %0" : "+m"(*dst), "=a"(result) : "a"(src)); - #else - #error Unsupported architecture. Please submit a feature request. - #endif - return result; + #if defined(MA_ATOMIC_IS_LOCK_FREE_32) + { + if (order > ma_atomic_memory_order_acquire) { + __sync_synchronize(); + } + return __sync_lock_test_and_set(dst, src); + } + #else + { + MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(32, dst, src, order); + } + #endif } static MA_INLINE ma_uint64 ma_atomic_exchange_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) { - ma_uint64 result; - (void)order; - #if defined(MA_X86) - do { - result = *dst; - } while (ma_atomic_compare_and_swap_64(dst, result, src) != result); - #elif defined(MA_X64) - __asm__ __volatile__("lock; xchg %1, %0" : "+m"(*dst), "=a"(result) : "a"(src)); - #else - #error Unsupported architecture. Please submit a feature request. - #endif - return result; + #if defined(MA_ATOMIC_IS_LOCK_FREE_64) + { + if (order > ma_atomic_memory_order_acquire) { + __sync_synchronize(); + } + return __sync_lock_test_and_set(dst, src); + } + #else + { + MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(64, dst, src, order); + } + #endif } + #define ma_atomic_store_explicit_8( dst, src, order) (void)ma_atomic_exchange_explicit_8 (dst, src, order) + #define ma_atomic_store_explicit_16(dst, src, order) (void)ma_atomic_exchange_explicit_16(dst, src, order) + #define ma_atomic_store_explicit_32(dst, src, order) (void)ma_atomic_exchange_explicit_32(dst, src, order) + #define ma_atomic_store_explicit_64(dst, src, order) (void)ma_atomic_exchange_explicit_64(dst, src, order) static MA_INLINE ma_uint8 ma_atomic_fetch_add_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) { - ma_uint8 result; - (void)order; - #if defined(MA_X86) || defined(MA_X64) - __asm__ __volatile__("lock; xadd %1, %0" : "+m"(*dst), "=a"(result) : "a"(src) : "cc"); - #else - #error Unsupported architecture. Please submit a feature request. - #endif - return result; + #if defined(MA_ATOMIC_IS_LOCK_FREE_8) + { + (void)order; + return __sync_fetch_and_add(dst, src); + } + #else + { + MA_ATOMIC_FETCH_ADD_LOCK(8, dst, src, order); + } + #endif } static MA_INLINE ma_uint16 ma_atomic_fetch_add_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) { - ma_uint16 result; - (void)order; - #if defined(MA_X86) || defined(MA_X64) - __asm__ __volatile__("lock; xadd %1, %0" : "+m"(*dst), "=a"(result) : "a"(src) : "cc"); - #else - #error Unsupported architecture. Please submit a feature request. - #endif - return result; + #if defined(MA_ATOMIC_IS_LOCK_FREE_16) + { + (void)order; + return __sync_fetch_and_add(dst, src); + } + #else + { + MA_ATOMIC_FETCH_ADD_LOCK(16, dst, src, order); + } + #endif } static MA_INLINE ma_uint32 ma_atomic_fetch_add_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) { - ma_uint32 result; - (void)order; - #if defined(MA_X86) || defined(MA_X64) - __asm__ __volatile__("lock; xadd %1, %0" : "+m"(*dst), "=a"(result) : "a"(src) : "cc"); - #else - #error Unsupported architecture. Please submit a feature request. - #endif - return result; + #if defined(MA_ATOMIC_IS_LOCK_FREE_32) + { + (void)order; + return __sync_fetch_and_add(dst, src); + } + #else + { + MA_ATOMIC_FETCH_ADD_LOCK(32, dst, src, order); + } + #endif } static MA_INLINE ma_uint64 ma_atomic_fetch_add_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) { - #if defined(MA_X86) - ma_uint64 oldValue; - ma_uint64 newValue; - (void)order; - do { - oldValue = *dst; - newValue = oldValue + src; - } while (ma_atomic_compare_and_swap_64(dst, oldValue, newValue) != oldValue); - return oldValue; - #elif defined(MA_X64) - ma_uint64 result; - (void)order; - __asm__ __volatile__("lock; xadd %1, %0" : "+m"(*dst), "=a"(result) : "a"(src) : "cc"); - return result; - #endif + #if defined(MA_ATOMIC_IS_LOCK_FREE_64) + { + (void)order; + return __sync_fetch_and_add(dst, src); + } + #else + { + MA_ATOMIC_FETCH_ADD_LOCK(64, dst, src, order); + } + #endif } static MA_INLINE ma_uint8 ma_atomic_fetch_sub_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) { - ma_uint8 oldValue; - ma_uint8 newValue; - do { - oldValue = *dst; - newValue = (ma_uint8)(oldValue - src); - } while (ma_atomic_compare_and_swap_8(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; + #if defined(MA_ATOMIC_IS_LOCK_FREE_8) + { + (void)order; + return __sync_fetch_and_sub(dst, src); + } + #else + { + MA_ATOMIC_FETCH_ADD_LOCK(8, dst, (ma_uint8)(-(ma_int8)src), order); + } + #endif } static MA_INLINE ma_uint16 ma_atomic_fetch_sub_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) { - ma_uint16 oldValue; - ma_uint16 newValue; - do { - oldValue = *dst; - newValue = (ma_uint16)(oldValue - src); - } while (ma_atomic_compare_and_swap_16(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; + #if defined(MA_ATOMIC_IS_LOCK_FREE_16) + { + (void)order; + return __sync_fetch_and_sub(dst, src); + } + #else + { + MA_ATOMIC_FETCH_ADD_LOCK(16, dst, (ma_uint16)(-(ma_int16)src), order); + } + #endif } static MA_INLINE ma_uint32 ma_atomic_fetch_sub_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) { - ma_uint32 oldValue; - ma_uint32 newValue; - do { - oldValue = *dst; - newValue = oldValue - src; - } while (ma_atomic_compare_and_swap_32(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; + #if defined(MA_ATOMIC_IS_LOCK_FREE_32) + { + (void)order; + return __sync_fetch_and_sub(dst, src); + } + #else + { + MA_ATOMIC_FETCH_ADD_LOCK(32, dst, (ma_uint32)(-(ma_int32)src), order); + } + #endif } static MA_INLINE ma_uint64 ma_atomic_fetch_sub_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) { - ma_uint64 oldValue; - ma_uint64 newValue; - do { - oldValue = *dst; - newValue = oldValue - src; - } while (ma_atomic_compare_and_swap_64(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; + #if defined(MA_ATOMIC_IS_LOCK_FREE_64) + { + (void)order; + return __sync_fetch_and_sub(dst, src); + } + #else + { + MA_ATOMIC_FETCH_ADD_LOCK(64, dst, (ma_uint64)(-(ma_int64)src), order); + } + #endif } static MA_INLINE ma_uint8 ma_atomic_fetch_and_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) { - ma_uint8 oldValue; - ma_uint8 newValue; - do { - oldValue = *dst; - newValue = (ma_uint8)(oldValue & src); - } while (ma_atomic_compare_and_swap_8(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; + #if defined(MA_ATOMIC_IS_LOCK_FREE_8) + { + (void)order; + return __sync_fetch_and_and(dst, src); + } + #else + { + MA_ATOMIC_FETCH_AND_CAS(8, dst, src, order); + } + #endif } static MA_INLINE ma_uint16 ma_atomic_fetch_and_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) { - ma_uint16 oldValue; - ma_uint16 newValue; - do { - oldValue = *dst; - newValue = (ma_uint16)(oldValue & src); - } while (ma_atomic_compare_and_swap_16(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; + #if defined(MA_ATOMIC_IS_LOCK_FREE_16) + { + (void)order; + return __sync_fetch_and_and(dst, src); + } + #else + { + MA_ATOMIC_FETCH_AND_CAS(16, dst, src, order); + } + #endif } static MA_INLINE ma_uint32 ma_atomic_fetch_and_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) { - ma_uint32 oldValue; - ma_uint32 newValue; - do { - oldValue = *dst; - newValue = oldValue & src; - } while (ma_atomic_compare_and_swap_32(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; + #if defined(MA_ATOMIC_IS_LOCK_FREE_32) + { + (void)order; + return __sync_fetch_and_and(dst, src); + } + #else + { + MA_ATOMIC_FETCH_AND_CAS(32, dst, src, order); + } + #endif } static MA_INLINE ma_uint64 ma_atomic_fetch_and_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) { - ma_uint64 oldValue; - ma_uint64 newValue; - do { - oldValue = *dst; - newValue = oldValue & src; - } while (ma_atomic_compare_and_swap_64(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; - } - static MA_INLINE ma_uint8 ma_atomic_fetch_xor_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - ma_uint8 oldValue; - ma_uint8 newValue; - do { - oldValue = *dst; - newValue = (ma_uint8)(oldValue ^ src); - } while (ma_atomic_compare_and_swap_8(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; - } - static MA_INLINE ma_uint16 ma_atomic_fetch_xor_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - ma_uint16 oldValue; - ma_uint16 newValue; - do { - oldValue = *dst; - newValue = (ma_uint16)(oldValue ^ src); - } while (ma_atomic_compare_and_swap_16(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; - } - static MA_INLINE ma_uint32 ma_atomic_fetch_xor_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - ma_uint32 oldValue; - ma_uint32 newValue; - do { - oldValue = *dst; - newValue = oldValue ^ src; - } while (ma_atomic_compare_and_swap_32(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; - } - static MA_INLINE ma_uint64 ma_atomic_fetch_xor_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - ma_uint64 oldValue; - ma_uint64 newValue; - do { - oldValue = *dst; - newValue = oldValue ^ src; - } while (ma_atomic_compare_and_swap_64(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; + #if defined(MA_ATOMIC_IS_LOCK_FREE_64) + { + (void)order; + return __sync_fetch_and_and(dst, src); + } + #else + { + MA_ATOMIC_FETCH_AND_CAS(64, dst, src, order); + } + #endif } static MA_INLINE ma_uint8 ma_atomic_fetch_or_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) { - ma_uint8 oldValue; - ma_uint8 newValue; - do { - oldValue = *dst; - newValue = (ma_uint8)(oldValue | src); - } while (ma_atomic_compare_and_swap_8(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; + #if defined(MA_ATOMIC_IS_LOCK_FREE_8) + { + (void)order; + return __sync_fetch_and_or(dst, src); + } + #else + { + MA_ATOMIC_FETCH_OR_CAS(8, dst, src, order); + } + #endif } static MA_INLINE ma_uint16 ma_atomic_fetch_or_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) { - ma_uint16 oldValue; - ma_uint16 newValue; - do { - oldValue = *dst; - newValue = (ma_uint16)(oldValue | src); - } while (ma_atomic_compare_and_swap_16(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; + #if defined(MA_ATOMIC_IS_LOCK_FREE_16) + { + (void)order; + return __sync_fetch_and_or(dst, src); + } + #else + { + MA_ATOMIC_FETCH_OR_CAS(16, dst, src, order); + } + #endif } static MA_INLINE ma_uint32 ma_atomic_fetch_or_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) { - ma_uint32 oldValue; - ma_uint32 newValue; - do { - oldValue = *dst; - newValue = oldValue | src; - } while (ma_atomic_compare_and_swap_32(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; + #if defined(MA_ATOMIC_IS_LOCK_FREE_32) + { + (void)order; + return __sync_fetch_and_or(dst, src); + } + #else + { + MA_ATOMIC_FETCH_OR_CAS(32, dst, src, order); + } + #endif } static MA_INLINE ma_uint64 ma_atomic_fetch_or_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) { - ma_uint64 oldValue; - ma_uint64 newValue; - do { - oldValue = *dst; - newValue = oldValue | src; - } while (ma_atomic_compare_and_swap_64(dst, oldValue, newValue) != oldValue); - (void)order; - return oldValue; + #if defined(MA_ATOMIC_IS_LOCK_FREE_64) + { + (void)order; + return __sync_fetch_and_or(dst, src); + } + #else + { + MA_ATOMIC_FETCH_OR_CAS(64, dst, src, order); + } + #endif } + static MA_INLINE ma_uint8 ma_atomic_fetch_xor_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_8) + { + (void)order; + return __sync_fetch_and_xor(dst, src); + } + #else + { + MA_ATOMIC_FETCH_XOR_CAS(8, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint16 ma_atomic_fetch_xor_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_16) + { + (void)order; + return __sync_fetch_and_xor(dst, src); + } + #else + { + MA_ATOMIC_FETCH_XOR_CAS(16, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint32 ma_atomic_fetch_xor_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_32) + { + (void)order; + return __sync_fetch_and_xor(dst, src); + } + #else + { + MA_ATOMIC_FETCH_XOR_CAS(32, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint64 ma_atomic_fetch_xor_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_64) + { + (void)order; + return __sync_fetch_and_xor(dst, src); + } + #else + { + MA_ATOMIC_FETCH_XOR_CAS(64, dst, src, order); + } + #endif + } + #elif defined(MA_ATOMIC_LEGACY_GCC_ASM) + #define MA_ATOMIC_CMPXCHG_GCC_X86(instructionSizeSuffix, result, dst, expected, replacement) \ + __asm__ __volatile__( \ + "lock; cmpxchg"instructionSizeSuffix" %2, %1" \ + : "=a"(result), \ + "=m"(*dst) \ + : "r"(replacement), \ + "0"(expected), \ + "m"(*dst) \ + : "cc", "memory") + #define MA_ATOMIC_XADD_GCC_X86(instructionSizeSuffix, result, dst, src) \ + __asm__ __volatile__( \ + "lock; xadd"instructionSizeSuffix" %0, %1" \ + : "=a"(result), \ + "=m"(*dst) \ + : "0"(src), \ + "m"(*dst) \ + : "cc", "memory") + static MA_INLINE ma_uint8 ma_atomic_compare_and_swap_8(volatile ma_uint8* dst, ma_uint8 expected, ma_uint8 replacement) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_8) && (defined(MA_X86) || defined(MA_X64)) + { + ma_uint8 result; + #if defined(MA_X86) || defined(MA_X64) + { + MA_ATOMIC_CMPXCHG_GCC_X86("b", result, dst, expected, replacement); + } + #else + { + #error Unsupported architecture. + } + #endif + return result; + } + #else + { + MA_ATOMIC_COMPARE_AND_SWAP_LOCK(8, dst, expected, replacement); + } + #endif + } + static MA_INLINE ma_uint16 ma_atomic_compare_and_swap_16(volatile ma_uint16* dst, ma_uint16 expected, ma_uint16 replacement) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_16) && (defined(MA_X86) || defined(MA_X64)) + { + ma_uint16 result; + #if defined(MA_X86) || defined(MA_X64) + { + MA_ATOMIC_CMPXCHG_GCC_X86("w", result, dst, expected, replacement); + } + #else + { + #error Unsupported architecture. + } + #endif + return result; + } + #else + { + MA_ATOMIC_COMPARE_AND_SWAP_LOCK(16, dst, expected, replacement); + } + #endif + } + static MA_INLINE ma_uint32 ma_atomic_compare_and_swap_32(volatile ma_uint32* dst, ma_uint32 expected, ma_uint32 replacement) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_32) && (defined(MA_X86) || defined(MA_X64)) + { + ma_uint32 result; + #if defined(MA_X86) || defined(MA_X64) + { + MA_ATOMIC_CMPXCHG_GCC_X86("l", result, dst, expected, replacement); + } + #else + { + #error Unsupported architecture. + } + #endif + return result; + } + #else + { + MA_ATOMIC_COMPARE_AND_SWAP_LOCK(32, dst, expected, replacement); + } + #endif + } + static MA_INLINE ma_uint64 ma_atomic_compare_and_swap_64(volatile ma_uint64* dst, ma_uint64 expected, ma_uint64 replacement) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_64) && (defined(MA_X86) || defined(MA_X64)) + { + ma_uint64 result; + #if defined(MA_X86) + { + ma_uint32 resultEAX; + ma_uint32 resultEDX; + __asm__ __volatile__( + "pushl %%ebx\n" + "movl %4, %%ebx\n" + "lock cmpxchg8b (%%edi)\n" + "popl %%ebx\n" + : "=a"(resultEAX), + "=d"(resultEDX) + : "a"((ma_uint32)(expected & 0xFFFFFFFF)), + "d"((ma_uint32)(expected >> 32)), + "r"((ma_uint32)(replacement & 0xFFFFFFFF)), + "c"((ma_uint32)(replacement >> 32)), + "D"(dst) + : "memory", "cc"); + result = ((ma_uint64)resultEDX << 32) | resultEAX; + } + #elif defined(MA_X64) + { + MA_ATOMIC_CMPXCHG_GCC_X86("q", result, dst, expected, replacement); + } + #else + { + #error Unsupported architecture. + } + #endif + return result; + } + #else + { + MA_ATOMIC_COMPARE_AND_SWAP_LOCK(64, dst, expected, replacement); + } + #endif + } + static MA_INLINE ma_uint8 ma_atomic_load_explicit_8(volatile const ma_uint8* dst, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_8) && (defined(MA_X86) || defined(MA_X64)) + { + ma_uint8 result; + #if defined(MA_X86) || defined(MA_X64) + { + if (order == ma_atomic_memory_order_relaxed) { + MA_ATOMIC_LOAD_RELAXED_GCC_X86("b", result, dst); + } else if (order <= ma_atomic_memory_order_release) { + MA_ATOMIC_LOAD_RELEASE_GCC_X86("b", result, dst); + } else { + MA_ATOMIC_LOAD_SEQ_CST_GCC_X86("b", result, dst); + } + } + #else + { + #error Unsupported architecture. + } + #endif + return result; + } + #else + { + MA_ATOMIC_LOAD_EXPLICIT_LOCK(8, dst, order); + } + #endif + } + static MA_INLINE ma_uint16 ma_atomic_load_explicit_16(volatile const ma_uint16* dst, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_16) && (defined(MA_X86) || defined(MA_X64)) + { + ma_uint16 result; + #if defined(MA_X86) || defined(MA_X64) + { + if (order == ma_atomic_memory_order_relaxed) { + MA_ATOMIC_LOAD_RELAXED_GCC_X86("w", result, dst); + } else if (order <= ma_atomic_memory_order_release) { + MA_ATOMIC_LOAD_RELEASE_GCC_X86("w", result, dst); + } else { + MA_ATOMIC_LOAD_SEQ_CST_GCC_X86("w", result, dst); + } + } + #else + { + #error Unsupported architecture. + } + #endif + return result; + } + #else + { + MA_ATOMIC_LOAD_EXPLICIT_LOCK(16, dst, order); + } + #endif + } + static MA_INLINE ma_uint32 ma_atomic_load_explicit_32(volatile const ma_uint32* dst, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_32) && (defined(MA_X86) || defined(MA_X64)) + { + ma_uint32 result; + #if defined(MA_X86) || defined(MA_X64) + { + if (order == ma_atomic_memory_order_relaxed) { + MA_ATOMIC_LOAD_RELAXED_GCC_X86("l", result, dst); + } else if (order <= ma_atomic_memory_order_release) { + MA_ATOMIC_LOAD_RELEASE_GCC_X86("l", result, dst); + } else { + MA_ATOMIC_LOAD_SEQ_CST_GCC_X86("l", result, dst); + } + } + #else + { + #error Unsupported architecture. + } + #endif + return result; + } + #else + { + MA_ATOMIC_LOAD_EXPLICIT_LOCK(32, dst, order); + } + #endif + } + static MA_INLINE ma_uint64 ma_atomic_load_explicit_64(volatile const ma_uint64* dst, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_64) && (defined(MA_X86) || defined(MA_X64)) + { + ma_uint64 result; + #if defined(MA_X64) + { + if (order == ma_atomic_memory_order_relaxed) { + MA_ATOMIC_LOAD_RELAXED_GCC_X86("q", result, dst); + } else if (order <= ma_atomic_memory_order_release) { + MA_ATOMIC_LOAD_RELEASE_GCC_X86("q", result, dst); + } else { + MA_ATOMIC_LOAD_SEQ_CST_GCC_X86("q", result, dst); + } + } + #elif defined(MA_X86) + { + (void)order; + return ma_atomic_compare_and_swap_64((volatile ma_uint64*)dst, 0, 0); + } + #else + { + #error Unsupported architecture. + } + #endif + return result; + } + #else + { + MA_ATOMIC_LOAD_EXPLICIT_LOCK(64, dst, order); + } + #endif + } + static MA_INLINE ma_uint8 ma_atomic_exchange_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_8) && (defined(MA_X86) || defined(MA_X64)) + { + ma_uint8 result; + (void)order; + #if defined(MA_X86) || defined(MA_X64) + { + MA_ATOMIC_XCHG_GCC_X86("b", result, dst, src); + } + #else + { + #error Unsupported architecture. + } + #endif + return result; + } + #else + { + MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(8, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint16 ma_atomic_exchange_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_16) && (defined(MA_X86) || defined(MA_X64)) + { + ma_uint16 result; + (void)order; + #if defined(MA_X86) || defined(MA_X64) + { + MA_ATOMIC_XCHG_GCC_X86("w", result, dst, src); + } + #else + { + #error Unsupported architecture. + } + #endif + return result; + } + #else + { + MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(16, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint32 ma_atomic_exchange_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_32) && (defined(MA_X86) || defined(MA_X64)) + { + ma_uint32 result; + (void)order; + #if defined(MA_X86) || defined(MA_X64) + { + MA_ATOMIC_XCHG_GCC_X86("l", result, dst, src); + } + #else + { + #error Unsupported architecture. + } + #endif + return result; + } + #else + { + MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(32, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint64 ma_atomic_exchange_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_64) && (defined(MA_X86) || defined(MA_X64)) + { + ma_uint64 result; + (void)order; + #if defined(MA_X86) + { + MA_ATOMIC_EXCHANGE_EXPLICIT_CAS(64, dst, src, order); + } + #elif defined(MA_X64) + { + MA_ATOMIC_XCHG_GCC_X86("q", result, dst, src); + } + #else + { + #error Unsupported architecture. + } + #endif + return result; + } + #else + { + MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(64, dst, src, order); + } + #endif + } + static MA_INLINE void ma_atomic_store_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_8) && (defined(MA_X86) || defined(MA_X64)) + { + #if defined(MA_X86) || defined(MA_X64) + { + if (order == ma_atomic_memory_order_relaxed) { + __asm__ __volatile__ ( + "movb %1, %0" + : "=m"(*dst) + : "r"(src) + ); + } else { + __asm__ __volatile__ ( + "xchgb %1, %0" + : "=m"(*dst) + : "r"(src) + : "memory" + ); + } + } + #else + { + #error Unsupported architecture. + } + #endif + } + #else + { + MA_ATOMIC_STORE_EXPLICIT_LOCK(8, dst, src, order); + } + #endif + } + static MA_INLINE void ma_atomic_store_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_16) && (defined(MA_X86) || defined(MA_X64)) + { + #if defined(MA_X86) || defined(MA_X64) + { + if (order == ma_atomic_memory_order_relaxed) { + __asm__ __volatile__ ( + "movw %1, %0" + : "=m"(*dst) + : "r"(src) + ); + } else { + __asm__ __volatile__ ( + "xchgw %1, %0" + : "=m"(*dst) + : "r"(src) + : "memory" + ); + } + } + #else + { + #error Unsupported architecture. + } + #endif + } + #else + { + MA_ATOMIC_STORE_EXPLICIT_LOCK(16, dst, src, order); + } + #endif + } + static MA_INLINE void ma_atomic_store_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_32) && (defined(MA_X86) || defined(MA_X64)) + { + #if defined(MA_X86) || defined(MA_X64) + { + if (order == ma_atomic_memory_order_relaxed) { + __asm__ __volatile__ ( + "movl %1, %0" + : "=m"(*dst) + : "r"(src) + ); + } else { + __asm__ __volatile__ ( + "xchgl %1, %0" + : "=m"(*dst) + : "r"(src) + : "memory" + ); + } + } + #else + { + #error Unsupported architecture. + } + #endif + } + #else + { + MA_ATOMIC_STORE_EXPLICIT_LOCK(32, dst, src, order); + } + #endif + } + static MA_INLINE void ma_atomic_store_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_64) && (defined(MA_X86) || defined(MA_X64)) + { + #if defined(MA_X64) + { + if (order == ma_atomic_memory_order_relaxed) { + __asm__ __volatile__ ( + "movq %1, %0" + : "=m"(*dst) + : "r"(src) + ); + } else { + __asm__ __volatile__ ( + "xchgq %1, %0" + : "=m"(*dst) + : "r"(src) + : "memory" + ); + } + } + #else + { + MA_ATOMIC_STORE_EXPLICIT_CAS(64, dst, src, order); + } + #endif + } + #else + { + MA_ATOMIC_STORE_EXPLICIT_LOCK(64, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint8 ma_atomic_fetch_add_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_8) && (defined(MA_X86) || defined(MA_X64)) + { + #if defined(MA_X86) || defined(MA_X64) + { + ma_uint8 result; + (void)order; + MA_ATOMIC_XADD_GCC_X86("b", result, dst, src); + return result; + } + #else + { + #error Unsupported architecture. + } + #endif + } + #else + { + MA_ATOMIC_FETCH_ADD_LOCK(8, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint16 ma_atomic_fetch_add_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_16) && (defined(MA_X86) || defined(MA_X64)) + { + #if defined(MA_X86) || defined(MA_X64) + { + ma_uint16 result; + (void)order; + MA_ATOMIC_XADD_GCC_X86("w", result, dst, src); + return result; + } + #else + { + #error Unsupported architecture. + } + #endif + } + #else + { + MA_ATOMIC_FETCH_ADD_LOCK(16, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint32 ma_atomic_fetch_add_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_32) && (defined(MA_X86) || defined(MA_X64)) + { + #if defined(MA_X86) || defined(MA_X64) + { + ma_uint32 result; + (void)order; + MA_ATOMIC_XADD_GCC_X86("l", result, dst, src); + return result; + } + #else + { + #error Unsupported architecture. + } + #endif + } + #else + { + MA_ATOMIC_FETCH_ADD_LOCK(32, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint64 ma_atomic_fetch_add_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + #if defined(MA_ATOMIC_IS_LOCK_FREE_64) && (defined(MA_X86) || defined(MA_X64)) + { + #if defined(MA_X86) + { + MA_ATOMIC_FETCH_ADD_CAS(64, dst, src, order); + } + #elif defined(MA_X64) + { + ma_uint64 result; + MA_ATOMIC_XADD_GCC_X86("q", result, dst, src); + (void)order; + return result; + } + #else + { + #error Unsupported architecture. + } + #endif + } + #else + { + MA_ATOMIC_FETCH_ADD_LOCK(64, dst, src, order); + } + #endif + } + static MA_INLINE ma_uint8 ma_atomic_fetch_sub_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + return ma_atomic_fetch_add_explicit_8(dst, (ma_uint8)(-(ma_int8)src), order); + } + static MA_INLINE ma_uint16 ma_atomic_fetch_sub_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + return ma_atomic_fetch_add_explicit_16(dst, (ma_uint16)(-(ma_int16)src), order); + } + static MA_INLINE ma_uint32 ma_atomic_fetch_sub_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + return ma_atomic_fetch_add_explicit_32(dst, (ma_uint32)(-(ma_int32)src), order); + } + static MA_INLINE ma_uint64 ma_atomic_fetch_sub_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + return ma_atomic_fetch_add_explicit_64(dst, (ma_uint64)(-(ma_int64)src), order); + } + static MA_INLINE ma_uint8 ma_atomic_fetch_and_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + MA_ATOMIC_FETCH_AND_CAS(8, dst, src, order); + } + static MA_INLINE ma_uint16 ma_atomic_fetch_and_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + MA_ATOMIC_FETCH_AND_CAS(16, dst, src, order); + } + static MA_INLINE ma_uint32 ma_atomic_fetch_and_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + MA_ATOMIC_FETCH_AND_CAS(32, dst, src, order); + } + static MA_INLINE ma_uint64 ma_atomic_fetch_and_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + MA_ATOMIC_FETCH_AND_CAS(64, dst, src, order); + } + static MA_INLINE ma_uint8 ma_atomic_fetch_or_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + MA_ATOMIC_FETCH_OR_CAS(8, dst, src, order); + } + static MA_INLINE ma_uint16 ma_atomic_fetch_or_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + MA_ATOMIC_FETCH_OR_CAS(16, dst, src, order); + } + static MA_INLINE ma_uint32 ma_atomic_fetch_or_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + MA_ATOMIC_FETCH_OR_CAS(32, dst, src, order); + } + static MA_INLINE ma_uint64 ma_atomic_fetch_or_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + MA_ATOMIC_FETCH_OR_CAS(64, dst, src, order); + } + static MA_INLINE ma_uint8 ma_atomic_fetch_xor_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + MA_ATOMIC_FETCH_XOR_CAS(8, dst, src, order); + } + static MA_INLINE ma_uint16 ma_atomic_fetch_xor_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + MA_ATOMIC_FETCH_XOR_CAS(16, dst, src, order); + } + static MA_INLINE ma_uint32 ma_atomic_fetch_xor_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + MA_ATOMIC_FETCH_XOR_CAS(32, dst, src, order); + } + static MA_INLINE ma_uint64 ma_atomic_fetch_xor_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + MA_ATOMIC_FETCH_XOR_CAS(64, dst, src, order); + } + #else + #error Unsupported compiler. #endif - #define ma_atomic_signal_fence(order) ma_atomic_thread_fence(order) - static MA_INLINE ma_uint8 ma_atomic_load_explicit_8(volatile const ma_uint8* ptr, ma_atomic_memory_order order) - { - (void)order; - return ma_atomic_compare_and_swap_8((ma_uint8*)ptr, 0, 0); - } - static MA_INLINE ma_uint16 ma_atomic_load_explicit_16(volatile const ma_uint16* ptr, ma_atomic_memory_order order) - { - (void)order; - return ma_atomic_compare_and_swap_16((ma_uint16*)ptr, 0, 0); - } - static MA_INLINE ma_uint32 ma_atomic_load_explicit_32(volatile const ma_uint32* ptr, ma_atomic_memory_order order) - { - (void)order; - return ma_atomic_compare_and_swap_32((ma_uint32*)ptr, 0, 0); - } - static MA_INLINE ma_uint64 ma_atomic_load_explicit_64(volatile const ma_uint64* ptr, ma_atomic_memory_order order) - { - (void)order; - return ma_atomic_compare_and_swap_64((ma_uint64*)ptr, 0, 0); - } - #define ma_atomic_store_explicit_8( dst, src, order) (void)ma_atomic_exchange_explicit_8 (dst, src, order) - #define ma_atomic_store_explicit_16(dst, src, order) (void)ma_atomic_exchange_explicit_16(dst, src, order) - #define ma_atomic_store_explicit_32(dst, src, order) (void)ma_atomic_exchange_explicit_32(dst, src, order) - #define ma_atomic_store_explicit_64(dst, src, order) (void)ma_atomic_exchange_explicit_64(dst, src, order) - #define ma_atomic_test_and_set_explicit_8( dst, order) ma_atomic_exchange_explicit_8 (dst, 1, order) - #define ma_atomic_test_and_set_explicit_16(dst, order) ma_atomic_exchange_explicit_16(dst, 1, order) - #define ma_atomic_test_and_set_explicit_32(dst, order) ma_atomic_exchange_explicit_32(dst, 1, order) - #define ma_atomic_test_and_set_explicit_64(dst, order) ma_atomic_exchange_explicit_64(dst, 1, order) - #define ma_atomic_clear_explicit_8( dst, order) ma_atomic_store_explicit_8 (dst, 0, order) - #define ma_atomic_clear_explicit_16(dst, order) ma_atomic_store_explicit_16(dst, 0, order) - #define ma_atomic_clear_explicit_32(dst, order) ma_atomic_store_explicit_32(dst, 0, order) - #define ma_atomic_clear_explicit_64(dst, order) ma_atomic_store_explicit_64(dst, 0, order) - typedef ma_uint8 ma_atomic_flag; - #define ma_atomic_flag_test_and_set_explicit(ptr, order) (ma_bool32)ma_atomic_test_and_set_explicit_8(ptr, order) - #define ma_atomic_flag_clear_explicit(ptr, order) ma_atomic_clear_explicit_8(ptr, order) - #define ma_atomic_flag_load_explicit(ptr, order) ma_atomic_load_explicit_8(ptr, order) #endif #if !defined(MA_ATOMIC_HAS_NATIVE_COMPARE_EXCHANGE) - #if defined(MA_ATOMIC_HAS_8) - static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_8(volatile ma_uint8* dst, ma_uint8* expected, ma_uint8 desired, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) - { - ma_uint8 expectedValue; - ma_uint8 result; - (void)successOrder; - (void)failureOrder; - expectedValue = ma_atomic_load_explicit_8(expected, ma_atomic_memory_order_seq_cst); - result = ma_atomic_compare_and_swap_8(dst, expectedValue, desired); - if (result == expectedValue) { - return 1; - } else { - ma_atomic_store_explicit_8(expected, result, failureOrder); - return 0; - } - } - #endif - #if defined(MA_ATOMIC_HAS_16) - static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_16(volatile ma_uint16* dst, ma_uint16* expected, ma_uint16 desired, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) - { - ma_uint16 expectedValue; - ma_uint16 result; - (void)successOrder; - (void)failureOrder; - expectedValue = ma_atomic_load_explicit_16(expected, ma_atomic_memory_order_seq_cst); - result = ma_atomic_compare_and_swap_16(dst, expectedValue, desired); - if (result == expectedValue) { - return 1; - } else { - ma_atomic_store_explicit_16(expected, result, failureOrder); - return 0; - } - } - #endif - #if defined(MA_ATOMIC_HAS_32) - static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_32(volatile ma_uint32* dst, ma_uint32* expected, ma_uint32 desired, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) - { - ma_uint32 expectedValue; - ma_uint32 result; - (void)successOrder; - (void)failureOrder; - expectedValue = ma_atomic_load_explicit_32(expected, ma_atomic_memory_order_seq_cst); - result = ma_atomic_compare_and_swap_32(dst, expectedValue, desired); - if (result == expectedValue) { - return 1; - } else { - ma_atomic_store_explicit_32(expected, result, failureOrder); - return 0; - } - } - #endif - #if defined(MA_ATOMIC_HAS_64) - static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_64(volatile ma_uint64* dst, volatile ma_uint64* expected, ma_uint64 desired, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) - { - ma_uint64 expectedValue; - ma_uint64 result; - (void)successOrder; - (void)failureOrder; - expectedValue = ma_atomic_load_explicit_64(expected, ma_atomic_memory_order_seq_cst); - result = ma_atomic_compare_and_swap_64(dst, expectedValue, desired); - if (result == expectedValue) { - return 1; - } else { - ma_atomic_store_explicit_64(expected, result, failureOrder); - return 0; - } - } - #endif - #define ma_atomic_compare_exchange_weak_explicit_8( dst, expected, desired, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_8 (dst, expected, desired, successOrder, failureOrder) - #define ma_atomic_compare_exchange_weak_explicit_16(dst, expected, desired, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_16(dst, expected, desired, successOrder, failureOrder) - #define ma_atomic_compare_exchange_weak_explicit_32(dst, expected, desired, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_32(dst, expected, desired, successOrder, failureOrder) - #define ma_atomic_compare_exchange_weak_explicit_64(dst, expected, desired, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_64(dst, expected, desired, successOrder, failureOrder) -#endif -#if !defined(MA_ATOMIC_HAS_NATIVE_IS_LOCK_FREE) - static MA_INLINE ma_bool32 ma_atomic_is_lock_free_8(volatile void* ptr) + static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_8(volatile ma_uint8* dst, ma_uint8* expected, ma_uint8 replacement, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) { - (void)ptr; - return 1; - } - static MA_INLINE ma_bool32 ma_atomic_is_lock_free_16(volatile void* ptr) - { - (void)ptr; - return 1; - } - static MA_INLINE ma_bool32 ma_atomic_is_lock_free_32(volatile void* ptr) - { - (void)ptr; - return 1; - } - static MA_INLINE ma_bool32 ma_atomic_is_lock_free_64(volatile void* ptr) - { - (void)ptr; - #if defined(MA_64BIT) - return 1; - #else - #if defined(MA_X86) || defined(MA_X64) + ma_uint8 result; + (void)successOrder; + (void)failureOrder; + result = ma_atomic_compare_and_swap_8(dst, *expected, replacement); + if (result == *expected) { return 1; - #else + } else { + *expected = result; return 0; - #endif - #endif + } } + static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_16(volatile ma_uint16* dst, ma_uint16* expected, ma_uint16 replacement, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) + { + ma_uint16 result; + (void)successOrder; + (void)failureOrder; + result = ma_atomic_compare_and_swap_16(dst, *expected, replacement); + if (result == *expected) { + return 1; + } else { + *expected = result; + return 0; + } + } + static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_32(volatile ma_uint32* dst, ma_uint32* expected, ma_uint32 replacement, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) + { + ma_uint32 result; + (void)successOrder; + (void)failureOrder; + result = ma_atomic_compare_and_swap_32(dst, *expected, replacement); + if (result == *expected) { + return 1; + } else { + *expected = result; + return 0; + } + } + static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_64(volatile ma_uint64* dst, volatile ma_uint64* expected, ma_uint64 replacement, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) + { + ma_uint64 result; + (void)successOrder; + (void)failureOrder; + result = ma_atomic_compare_and_swap_64(dst, *expected, replacement); + if (result == *expected) { + return 1; + } else { + *expected = result; + return 0; + } + } + #define ma_atomic_compare_exchange_weak_explicit_8( dst, expected, replacement, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_8 (dst, expected, replacement, successOrder, failureOrder) + #define ma_atomic_compare_exchange_weak_explicit_16(dst, expected, replacement, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_16(dst, expected, replacement, successOrder, failureOrder) + #define ma_atomic_compare_exchange_weak_explicit_32(dst, expected, replacement, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_32(dst, expected, replacement, successOrder, failureOrder) + #define ma_atomic_compare_exchange_weak_explicit_64(dst, expected, replacement, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_64(dst, expected, replacement, successOrder, failureOrder) #endif #if defined(MA_64BIT) static MA_INLINE ma_bool32 ma_atomic_is_lock_free_ptr(volatile void** ptr) @@ -15561,17 +16968,17 @@ typedef int ma_atomic_memory_order; { return (void*)ma_atomic_exchange_explicit_64((volatile ma_uint64*)dst, (ma_uint64)src, order); } - static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_ptr(volatile void** dst, void** expected, void* desired, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) + static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_ptr(volatile void** dst, void** expected, void* replacement, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) { - return ma_atomic_compare_exchange_strong_explicit_64((volatile ma_uint64*)dst, (ma_uint64*)expected, (ma_uint64)desired, successOrder, failureOrder); + return ma_atomic_compare_exchange_strong_explicit_64((volatile ma_uint64*)dst, (ma_uint64*)expected, (ma_uint64)replacement, successOrder, failureOrder); } - static MA_INLINE ma_bool32 ma_atomic_compare_exchange_weak_explicit_ptr(volatile void** dst, void** expected, void* desired, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) + static MA_INLINE ma_bool32 ma_atomic_compare_exchange_weak_explicit_ptr(volatile void** dst, void** expected, void* replacement, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) { - return ma_atomic_compare_exchange_weak_explicit_64((volatile ma_uint64*)dst, (ma_uint64*)expected, (ma_uint64)desired, successOrder, failureOrder); + return ma_atomic_compare_exchange_weak_explicit_64((volatile ma_uint64*)dst, (ma_uint64*)expected, (ma_uint64)replacement, successOrder, failureOrder); } - static MA_INLINE void* ma_atomic_compare_and_swap_ptr(volatile void** dst, void* expected, void* desired) + static MA_INLINE void* ma_atomic_compare_and_swap_ptr(volatile void** dst, void* expected, void* replacement) { - return (void*)ma_atomic_compare_and_swap_64((volatile ma_uint64*)dst, (ma_uint64)expected, (ma_uint64)desired); + return (void*)ma_atomic_compare_and_swap_64((volatile ma_uint64*)dst, (ma_uint64)expected, (ma_uint64)replacement); } #elif defined(MA_32BIT) static MA_INLINE ma_bool32 ma_atomic_is_lock_free_ptr(volatile void** ptr) @@ -15590,36 +16997,26 @@ typedef int ma_atomic_memory_order; { return (void*)ma_atomic_exchange_explicit_32((volatile ma_uint32*)dst, (ma_uint32)src, order); } - static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_ptr(volatile void** dst, void** expected, void* desired, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) + static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_ptr(volatile void** dst, void** expected, void* replacement, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) { - return ma_atomic_compare_exchange_strong_explicit_32((volatile ma_uint32*)dst, (ma_uint32*)expected, (ma_uint32)desired, successOrder, failureOrder); + return ma_atomic_compare_exchange_strong_explicit_32((volatile ma_uint32*)dst, (ma_uint32*)expected, (ma_uint32)replacement, successOrder, failureOrder); } - static MA_INLINE ma_bool32 ma_atomic_compare_exchange_weak_explicit_ptr(volatile void** dst, void** expected, void* desired, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) + static MA_INLINE ma_bool32 ma_atomic_compare_exchange_weak_explicit_ptr(volatile void** dst, void** expected, void* replacement, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) { - return ma_atomic_compare_exchange_weak_explicit_32((volatile ma_uint32*)dst, (ma_uint32*)expected, (ma_uint32)desired, successOrder, failureOrder); + return ma_atomic_compare_exchange_weak_explicit_32((volatile ma_uint32*)dst, (ma_uint32*)expected, (ma_uint32)replacement, successOrder, failureOrder); } - static MA_INLINE void* ma_atomic_compare_and_swap_ptr(volatile void** dst, void* expected, void* desired) + static MA_INLINE void* ma_atomic_compare_and_swap_ptr(volatile void** dst, void* expected, void* replacement) { - return (void*)ma_atomic_compare_and_swap_32((volatile ma_uint32*)dst, (ma_uint32)expected, (ma_uint32)desired); + return (void*)ma_atomic_compare_and_swap_32((volatile ma_uint32*)dst, (ma_uint32)expected, (ma_uint32)replacement); } #else #error Unsupported architecture. #endif -#define ma_atomic_flag_test_and_set(ptr) ma_atomic_flag_test_and_set_explicit(ptr, ma_atomic_memory_order_seq_cst) -#define ma_atomic_flag_clear(ptr) ma_atomic_flag_clear_explicit(ptr, ma_atomic_memory_order_seq_cst) -#define ma_atomic_store_ptr(dst, src) ma_atomic_store_explicit_ptr((volatile void**)dst, (void*)src, ma_atomic_memory_order_seq_cst) -#define ma_atomic_load_ptr(ptr) ma_atomic_load_explicit_ptr((volatile void**)ptr, ma_atomic_memory_order_seq_cst) -#define ma_atomic_exchange_ptr(dst, src) ma_atomic_exchange_explicit_ptr((volatile void**)dst, (void*)src, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_strong_ptr(dst, expected, desired) ma_atomic_compare_exchange_strong_explicit_ptr((volatile void**)dst, (void**)expected, (void*)desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_weak_ptr(dst, expected, desired) ma_atomic_compare_exchange_weak_explicit_ptr((volatile void**)dst, (void**)expected, (void*)desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_test_and_set_8( ptr) ma_atomic_test_and_set_explicit_8( ptr, ma_atomic_memory_order_seq_cst) -#define ma_atomic_test_and_set_16(ptr) ma_atomic_test_and_set_explicit_16(ptr, ma_atomic_memory_order_seq_cst) -#define ma_atomic_test_and_set_32(ptr) ma_atomic_test_and_set_explicit_32(ptr, ma_atomic_memory_order_seq_cst) -#define ma_atomic_test_and_set_64(ptr) ma_atomic_test_and_set_explicit_64(ptr, ma_atomic_memory_order_seq_cst) -#define ma_atomic_clear_8( ptr) ma_atomic_clear_explicit_8( ptr, ma_atomic_memory_order_seq_cst) -#define ma_atomic_clear_16(ptr) ma_atomic_clear_explicit_16(ptr, ma_atomic_memory_order_seq_cst) -#define ma_atomic_clear_32(ptr) ma_atomic_clear_explicit_32(ptr, ma_atomic_memory_order_seq_cst) -#define ma_atomic_clear_64(ptr) ma_atomic_clear_explicit_64(ptr, ma_atomic_memory_order_seq_cst) +#define ma_atomic_store_ptr(dst, src) ma_atomic_store_explicit_ptr((volatile void**)dst, (void*)src, ma_atomic_memory_order_seq_cst) +#define ma_atomic_load_ptr(ptr) ma_atomic_load_explicit_ptr((volatile void**)ptr, ma_atomic_memory_order_seq_cst) +#define ma_atomic_exchange_ptr(dst, src) ma_atomic_exchange_explicit_ptr((volatile void**)dst, (void*)src, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_strong_ptr(dst, expected, replacement) ma_atomic_compare_exchange_strong_explicit_ptr((volatile void**)dst, (void**)expected, (void*)replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_weak_ptr(dst, expected, replacement) ma_atomic_compare_exchange_weak_explicit_ptr((volatile void**)dst, (void**)expected, (void*)replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) #define ma_atomic_store_8( dst, src) ma_atomic_store_explicit_8( dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_store_16(dst, src) ma_atomic_store_explicit_16(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_store_32(dst, src) ma_atomic_store_explicit_32(dst, src, ma_atomic_memory_order_seq_cst) @@ -15632,14 +17029,14 @@ typedef int ma_atomic_memory_order; #define ma_atomic_exchange_16(dst, src) ma_atomic_exchange_explicit_16(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_exchange_32(dst, src) ma_atomic_exchange_explicit_32(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_exchange_64(dst, src) ma_atomic_exchange_explicit_64(dst, src, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_strong_8( dst, expected, desired) ma_atomic_compare_exchange_strong_explicit_8( dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_strong_16(dst, expected, desired) ma_atomic_compare_exchange_strong_explicit_16(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_strong_32(dst, expected, desired) ma_atomic_compare_exchange_strong_explicit_32(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_strong_64(dst, expected, desired) ma_atomic_compare_exchange_strong_explicit_64(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_weak_8( dst, expected, desired) ma_atomic_compare_exchange_weak_explicit_8( dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_weak_16( dst, expected, desired) ma_atomic_compare_exchange_weak_explicit_16(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_weak_32( dst, expected, desired) ma_atomic_compare_exchange_weak_explicit_32(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_weak_64( dst, expected, desired) ma_atomic_compare_exchange_weak_explicit_64(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_strong_8( dst, expected, replacement) ma_atomic_compare_exchange_strong_explicit_8( dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_strong_16(dst, expected, replacement) ma_atomic_compare_exchange_strong_explicit_16(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_strong_32(dst, expected, replacement) ma_atomic_compare_exchange_strong_explicit_32(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_strong_64(dst, expected, replacement) ma_atomic_compare_exchange_strong_explicit_64(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_weak_8( dst, expected, replacement) ma_atomic_compare_exchange_weak_explicit_8( dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_weak_16( dst, expected, replacement) ma_atomic_compare_exchange_weak_explicit_16(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_weak_32( dst, expected, replacement) ma_atomic_compare_exchange_weak_explicit_32(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_weak_64( dst, expected, replacement) ma_atomic_compare_exchange_weak_explicit_64(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) #define ma_atomic_fetch_add_8( dst, src) ma_atomic_fetch_add_explicit_8( dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_fetch_add_16(dst, src) ma_atomic_fetch_add_explicit_16(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_fetch_add_32(dst, src) ma_atomic_fetch_add_explicit_32(dst, src, ma_atomic_memory_order_seq_cst) @@ -15660,14 +17057,6 @@ typedef int ma_atomic_memory_order; #define ma_atomic_fetch_and_16(dst, src) ma_atomic_fetch_and_explicit_16(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_fetch_and_32(dst, src) ma_atomic_fetch_and_explicit_32(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_fetch_and_64(dst, src) ma_atomic_fetch_and_explicit_64(dst, src, ma_atomic_memory_order_seq_cst) -#define ma_atomic_test_and_set_explicit_i8( ptr, order) (ma_int8 )ma_atomic_test_and_set_explicit_8( (ma_uint8* )ptr, order) -#define ma_atomic_test_and_set_explicit_i16(ptr, order) (ma_int16)ma_atomic_test_and_set_explicit_16((ma_uint16*)ptr, order) -#define ma_atomic_test_and_set_explicit_i32(ptr, order) (ma_int32)ma_atomic_test_and_set_explicit_32((ma_uint32*)ptr, order) -#define ma_atomic_test_and_set_explicit_i64(ptr, order) (ma_int64)ma_atomic_test_and_set_explicit_64((ma_uint64*)ptr, order) -#define ma_atomic_clear_explicit_i8( ptr, order) ma_atomic_clear_explicit_8( (ma_uint8* )ptr, order) -#define ma_atomic_clear_explicit_i16(ptr, order) ma_atomic_clear_explicit_16((ma_uint16*)ptr, order) -#define ma_atomic_clear_explicit_i32(ptr, order) ma_atomic_clear_explicit_32((ma_uint32*)ptr, order) -#define ma_atomic_clear_explicit_i64(ptr, order) ma_atomic_clear_explicit_64((ma_uint64*)ptr, order) #define ma_atomic_store_explicit_i8( dst, src, order) ma_atomic_store_explicit_8( (ma_uint8* )dst, (ma_uint8 )src, order) #define ma_atomic_store_explicit_i16(dst, src, order) ma_atomic_store_explicit_16((ma_uint16*)dst, (ma_uint16)src, order) #define ma_atomic_store_explicit_i32(dst, src, order) ma_atomic_store_explicit_32((ma_uint32*)dst, (ma_uint32)src, order) @@ -15680,14 +17069,14 @@ typedef int ma_atomic_memory_order; #define ma_atomic_exchange_explicit_i16(dst, src, order) (ma_int16)ma_atomic_exchange_explicit_16((ma_uint16*)dst, (ma_uint16)src, order) #define ma_atomic_exchange_explicit_i32(dst, src, order) (ma_int32)ma_atomic_exchange_explicit_32((ma_uint32*)dst, (ma_uint32)src, order) #define ma_atomic_exchange_explicit_i64(dst, src, order) (ma_int64)ma_atomic_exchange_explicit_64((ma_uint64*)dst, (ma_uint64)src, order) -#define ma_atomic_compare_exchange_strong_explicit_i8( dst, expected, desired, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_8( (ma_uint8* )dst, (ma_uint8* )expected, (ma_uint8 )desired, successOrder, failureOrder) -#define ma_atomic_compare_exchange_strong_explicit_i16(dst, expected, desired, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_16((ma_uint16*)dst, (ma_uint16*)expected, (ma_uint16)desired, successOrder, failureOrder) -#define ma_atomic_compare_exchange_strong_explicit_i32(dst, expected, desired, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_32((ma_uint32*)dst, (ma_uint32*)expected, (ma_uint32)desired, successOrder, failureOrder) -#define ma_atomic_compare_exchange_strong_explicit_i64(dst, expected, desired, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_64((ma_uint64*)dst, (ma_uint64*)expected, (ma_uint64)desired, successOrder, failureOrder) -#define ma_atomic_compare_exchange_weak_explicit_i8( dst, expected, desired, successOrder, failureOrder) ma_atomic_compare_exchange_weak_explicit_8( (ma_uint8* )dst, (ma_uint8* )expected, (ma_uint8 )desired, successOrder, failureOrder) -#define ma_atomic_compare_exchange_weak_explicit_i16(dst, expected, desired, successOrder, failureOrder) ma_atomic_compare_exchange_weak_explicit_16((ma_uint16*)dst, (ma_uint16*)expected, (ma_uint16)desired, successOrder, failureOrder) -#define ma_atomic_compare_exchange_weak_explicit_i32(dst, expected, desired, successOrder, failureOrder) ma_atomic_compare_exchange_weak_explicit_32((ma_uint32*)dst, (ma_uint32*)expected, (ma_uint32)desired, successOrder, failureOrder) -#define ma_atomic_compare_exchange_weak_explicit_i64(dst, expected, desired, successOrder, failureOrder) ma_atomic_compare_exchange_weak_explicit_64((ma_uint64*)dst, (ma_uint64*)expected, (ma_uint64)desired, successOrder, failureOrder) +#define ma_atomic_compare_exchange_strong_explicit_i8( dst, expected, replacement, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_8( (ma_uint8* )dst, (ma_uint8* )expected, (ma_uint8 )replacement, successOrder, failureOrder) +#define ma_atomic_compare_exchange_strong_explicit_i16(dst, expected, replacement, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_16((ma_uint16*)dst, (ma_uint16*)expected, (ma_uint16)replacement, successOrder, failureOrder) +#define ma_atomic_compare_exchange_strong_explicit_i32(dst, expected, replacement, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_32((ma_uint32*)dst, (ma_uint32*)expected, (ma_uint32)replacement, successOrder, failureOrder) +#define ma_atomic_compare_exchange_strong_explicit_i64(dst, expected, replacement, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_64((ma_uint64*)dst, (ma_uint64*)expected, (ma_uint64)replacement, successOrder, failureOrder) +#define ma_atomic_compare_exchange_weak_explicit_i8( dst, expected, replacement, successOrder, failureOrder) ma_atomic_compare_exchange_weak_explicit_8( (ma_uint8* )dst, (ma_uint8* )expected, (ma_uint8 )replacement, successOrder, failureOrder) +#define ma_atomic_compare_exchange_weak_explicit_i16(dst, expected, replacement, successOrder, failureOrder) ma_atomic_compare_exchange_weak_explicit_16((ma_uint16*)dst, (ma_uint16*)expected, (ma_uint16)replacement, successOrder, failureOrder) +#define ma_atomic_compare_exchange_weak_explicit_i32(dst, expected, replacement, successOrder, failureOrder) ma_atomic_compare_exchange_weak_explicit_32((ma_uint32*)dst, (ma_uint32*)expected, (ma_uint32)replacement, successOrder, failureOrder) +#define ma_atomic_compare_exchange_weak_explicit_i64(dst, expected, replacement, successOrder, failureOrder) ma_atomic_compare_exchange_weak_explicit_64((ma_uint64*)dst, (ma_uint64*)expected, (ma_uint64)replacement, successOrder, failureOrder) #define ma_atomic_fetch_add_explicit_i8( dst, src, order) (ma_int8 )ma_atomic_fetch_add_explicit_8( (ma_uint8* )dst, (ma_uint8 )src, order) #define ma_atomic_fetch_add_explicit_i16(dst, src, order) (ma_int16)ma_atomic_fetch_add_explicit_16((ma_uint16*)dst, (ma_uint16)src, order) #define ma_atomic_fetch_add_explicit_i32(dst, src, order) (ma_int32)ma_atomic_fetch_add_explicit_32((ma_uint32*)dst, (ma_uint32)src, order) @@ -15708,14 +17097,6 @@ typedef int ma_atomic_memory_order; #define ma_atomic_fetch_and_explicit_i16(dst, src, order) (ma_int16)ma_atomic_fetch_and_explicit_16((ma_uint16*)dst, (ma_uint16)src, order) #define ma_atomic_fetch_and_explicit_i32(dst, src, order) (ma_int32)ma_atomic_fetch_and_explicit_32((ma_uint32*)dst, (ma_uint32)src, order) #define ma_atomic_fetch_and_explicit_i64(dst, src, order) (ma_int64)ma_atomic_fetch_and_explicit_64((ma_uint64*)dst, (ma_uint64)src, order) -#define ma_atomic_test_and_set_i8( ptr) ma_atomic_test_and_set_explicit_i8( ptr, ma_atomic_memory_order_seq_cst) -#define ma_atomic_test_and_set_i16(ptr) ma_atomic_test_and_set_explicit_i16(ptr, ma_atomic_memory_order_seq_cst) -#define ma_atomic_test_and_set_i32(ptr) ma_atomic_test_and_set_explicit_i32(ptr, ma_atomic_memory_order_seq_cst) -#define ma_atomic_test_and_set_i64(ptr) ma_atomic_test_and_set_explicit_i64(ptr, ma_atomic_memory_order_seq_cst) -#define ma_atomic_clear_i8( ptr) ma_atomic_clear_explicit_i8( ptr, ma_atomic_memory_order_seq_cst) -#define ma_atomic_clear_i16(ptr) ma_atomic_clear_explicit_i16(ptr, ma_atomic_memory_order_seq_cst) -#define ma_atomic_clear_i32(ptr) ma_atomic_clear_explicit_i32(ptr, ma_atomic_memory_order_seq_cst) -#define ma_atomic_clear_i64(ptr) ma_atomic_clear_explicit_i64(ptr, ma_atomic_memory_order_seq_cst) #define ma_atomic_store_i8( dst, src) ma_atomic_store_explicit_i8( dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_store_i16(dst, src) ma_atomic_store_explicit_i16(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_store_i32(dst, src) ma_atomic_store_explicit_i32(dst, src, ma_atomic_memory_order_seq_cst) @@ -15728,14 +17109,14 @@ typedef int ma_atomic_memory_order; #define ma_atomic_exchange_i16(dst, src) ma_atomic_exchange_explicit_i16(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_exchange_i32(dst, src) ma_atomic_exchange_explicit_i32(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_exchange_i64(dst, src) ma_atomic_exchange_explicit_i64(dst, src, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_strong_i8( dst, expected, desired) ma_atomic_compare_exchange_strong_explicit_i8( dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_strong_i16(dst, expected, desired) ma_atomic_compare_exchange_strong_explicit_i16(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_strong_i32(dst, expected, desired) ma_atomic_compare_exchange_strong_explicit_i32(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_strong_i64(dst, expected, desired) ma_atomic_compare_exchange_strong_explicit_i64(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_weak_i8( dst, expected, desired) ma_atomic_compare_exchange_weak_explicit_i8( dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_weak_i16(dst, expected, desired) ma_atomic_compare_exchange_weak_explicit_i16(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_weak_i32(dst, expected, desired) ma_atomic_compare_exchange_weak_explicit_i32(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_weak_i64(dst, expected, desired) ma_atomic_compare_exchange_weak_explicit_i64(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_strong_i8( dst, expected, replacement) ma_atomic_compare_exchange_strong_explicit_i8( dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_strong_i16(dst, expected, replacement) ma_atomic_compare_exchange_strong_explicit_i16(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_strong_i32(dst, expected, replacement) ma_atomic_compare_exchange_strong_explicit_i32(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_strong_i64(dst, expected, replacement) ma_atomic_compare_exchange_strong_explicit_i64(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_weak_i8( dst, expected, replacement) ma_atomic_compare_exchange_weak_explicit_i8( dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_weak_i16(dst, expected, replacement) ma_atomic_compare_exchange_weak_explicit_i16(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_weak_i32(dst, expected, replacement) ma_atomic_compare_exchange_weak_explicit_i32(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_weak_i64(dst, expected, replacement) ma_atomic_compare_exchange_weak_explicit_i64(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) #define ma_atomic_fetch_add_i8( dst, src) ma_atomic_fetch_add_explicit_i8( dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_fetch_add_i16(dst, src) ma_atomic_fetch_add_explicit_i16(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_fetch_add_i32(dst, src) ma_atomic_fetch_add_explicit_i32(dst, src, ma_atomic_memory_order_seq_cst) @@ -15812,28 +17193,28 @@ static MA_INLINE double ma_atomic_exchange_explicit_f64(volatile double* dst, do r.i = ma_atomic_exchange_explicit_64((volatile ma_uint64*)dst, x.i, order); return r.f; } -static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_f32(volatile float* dst, float* expected, float desired, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) +static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_f32(volatile float* dst, float* expected, float replacement, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) { ma_atomic_if32 d; - d.f = desired; + d.f = replacement; return ma_atomic_compare_exchange_strong_explicit_32((volatile ma_uint32*)dst, (ma_uint32*)expected, d.i, successOrder, failureOrder); } -static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_f64(volatile double* dst, double* expected, double desired, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) +static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_f64(volatile double* dst, double* expected, double replacement, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) { ma_atomic_if64 d; - d.f = desired; + d.f = replacement; return ma_atomic_compare_exchange_strong_explicit_64((volatile ma_uint64*)dst, (ma_uint64*)expected, d.i, successOrder, failureOrder); } -static MA_INLINE ma_bool32 ma_atomic_compare_exchange_weak_explicit_f32(volatile float* dst, float* expected, float desired, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) +static MA_INLINE ma_bool32 ma_atomic_compare_exchange_weak_explicit_f32(volatile float* dst, float* expected, float replacement, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) { ma_atomic_if32 d; - d.f = desired; + d.f = replacement; return ma_atomic_compare_exchange_weak_explicit_32((volatile ma_uint32*)dst, (ma_uint32*)expected, d.i, successOrder, failureOrder); } -static MA_INLINE ma_bool32 ma_atomic_compare_exchange_weak_explicit_f64(volatile double* dst, double* expected, double desired, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) +static MA_INLINE ma_bool32 ma_atomic_compare_exchange_weak_explicit_f64(volatile double* dst, double* expected, double replacement, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) { ma_atomic_if64 d; - d.f = desired; + d.f = replacement; return ma_atomic_compare_exchange_weak_explicit_64((volatile ma_uint64*)dst, (ma_uint64*)expected, d.i, successOrder, failureOrder); } static MA_INLINE float ma_atomic_fetch_add_explicit_f32(volatile float* dst, float src, ma_atomic_memory_order order) @@ -15924,10 +17305,10 @@ static MA_INLINE double ma_atomic_fetch_and_explicit_f64(volatile double* dst, d #define ma_atomic_load_f64(ptr) (double)ma_atomic_load_explicit_f64(ptr, ma_atomic_memory_order_seq_cst) #define ma_atomic_exchange_f32(dst, src) (float )ma_atomic_exchange_explicit_f32(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_exchange_f64(dst, src) (double)ma_atomic_exchange_explicit_f64(dst, src, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_strong_f32(dst, expected, desired) ma_atomic_compare_exchange_strong_explicit_f32(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_strong_f64(dst, expected, desired) ma_atomic_compare_exchange_strong_explicit_f64(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_weak_f32(dst, expected, desired) ma_atomic_compare_exchange_weak_explicit_f32(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_weak_f64(dst, expected, desired) ma_atomic_compare_exchange_weak_explicit_f64(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_strong_f32(dst, expected, replacement) ma_atomic_compare_exchange_strong_explicit_f32(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_strong_f64(dst, expected, replacement) ma_atomic_compare_exchange_strong_explicit_f64(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_weak_f32(dst, expected, replacement) ma_atomic_compare_exchange_weak_explicit_f32(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_weak_f64(dst, expected, replacement) ma_atomic_compare_exchange_weak_explicit_f64(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) #define ma_atomic_fetch_add_f32(dst, src) ma_atomic_fetch_add_explicit_f32(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_fetch_add_f64(dst, src) ma_atomic_fetch_add_explicit_f64(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_fetch_sub_f32(dst, src) ma_atomic_fetch_sub_explicit_f32(dst, src, ma_atomic_memory_order_seq_cst) @@ -15938,39 +17319,24 @@ static MA_INLINE double ma_atomic_fetch_and_explicit_f64(volatile double* dst, d #define ma_atomic_fetch_xor_f64(dst, src) ma_atomic_fetch_xor_explicit_f64(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_fetch_and_f32(dst, src) ma_atomic_fetch_and_explicit_f32(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_fetch_and_f64(dst, src) ma_atomic_fetch_and_explicit_f64(dst, src, ma_atomic_memory_order_seq_cst) -static MA_INLINE float ma_atomic_compare_and_swap_f32(volatile float* dst, float expected, float desired) +static MA_INLINE float ma_atomic_compare_and_swap_f32(volatile float* dst, float expected, float replacement) { ma_atomic_if32 r; ma_atomic_if32 e, d; e.f = expected; - d.f = desired; + d.f = replacement; r.i = ma_atomic_compare_and_swap_32((volatile ma_uint32*)dst, e.i, d.i); return r.f; } -static MA_INLINE double ma_atomic_compare_and_swap_f64(volatile double* dst, double expected, double desired) +static MA_INLINE double ma_atomic_compare_and_swap_f64(volatile double* dst, double expected, double replacement) { ma_atomic_if64 r; ma_atomic_if64 e, d; e.f = expected; - d.f = desired; + d.f = replacement; r.i = ma_atomic_compare_and_swap_64((volatile ma_uint64*)dst, e.i, d.i); return r.f; } -typedef ma_atomic_flag ma_atomic_spinlock; -static MA_INLINE void ma_atomic_spinlock_lock(volatile ma_atomic_spinlock* pSpinlock) -{ - for (;;) { - if (ma_atomic_flag_test_and_set_explicit(pSpinlock, ma_atomic_memory_order_acquire) == 0) { - break; - } - while (ma_atomic_flag_load_explicit(pSpinlock, ma_atomic_memory_order_relaxed) == 1) { - } - } -} -static MA_INLINE void ma_atomic_spinlock_unlock(volatile ma_atomic_spinlock* pSpinlock) -{ - ma_atomic_flag_clear_explicit(pSpinlock, ma_atomic_memory_order_release); -} #if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))) #pragma GCC diagnostic pop #endif @@ -16176,7 +17542,7 @@ static ma_result ma_thread_create__posix(ma_thread* pThread, ma_thread_priority int result; pthread_attr_t* pAttr = NULL; -#if !defined(__EMSCRIPTEN__) && !defined(__3DS__) +#if !defined(MA_EMSCRIPTEN) && !defined(MA_3DS) && !defined(MA_SWITCH) /* Try setting the thread priority. It's not critical if anything fails here. */ pthread_attr_t attr; if (pthread_attr_init(&attr) == 0) { @@ -16208,9 +17574,18 @@ static ma_result ma_thread_create__posix(ma_thread* pThread, ma_thread_priority } #endif - if (stackSize > 0) { - pthread_attr_setstacksize(&attr, stackSize); + #if defined(_POSIX_THREAD_ATTR_STACKSIZE) && _POSIX_THREAD_ATTR_STACKSIZE >= 0 + { + if (stackSize > 0) { + pthread_attr_setstacksize(&attr, stackSize); + } } + #else + { + (void)stackSize; /* Suppress unused parameter warning. */ + } + #endif + if (scheduler != -1) { int priorityMin = sched_get_priority_min(scheduler); @@ -16267,6 +17642,21 @@ static ma_result ma_thread_create__posix(ma_thread* pThread, ma_thread_priority } if (result != 0) { + /* + There have been reports that attempting to create a realtime thread can sometimes fail. In this case, + fall back to a normal priority thread. + + I'm including a compile-time option here to disable this functionality for those who have a hard + requirement on realtime threads and would rather an explicit failure. + */ + #ifndef MA_NO_PTHREAD_REALTIME_PRIORITY_FALLBACK + { + if(result == EPERM && priority == ma_thread_priority_realtime) { + return ma_thread_create__posix(pThread, ma_thread_priority_normal, stackSize, entryProc, pData); + } + } + #endif + return ma_result_from_errno(result); } @@ -16538,7 +17928,7 @@ static ma_result ma_event_signal__win32(ma_event* pEvent) static ma_result ma_semaphore_init__win32(int initialValue, ma_semaphore* pSemaphore) { - *pSemaphore = CreateSemaphoreW(NULL, (LONG)initialValue, LONG_MAX, NULL); + *pSemaphore = CreateSemaphore(NULL, (LONG)initialValue, LONG_MAX, NULL); if (*pSemaphore == NULL) { return ma_result_from_GetLastError(GetLastError()); } @@ -17432,10 +18822,12 @@ static MA_INLINE ma_uint16 ma_job_extract_slot(ma_uint64 toc) return (ma_uint16)(toc & 0x0000FFFF); } +#if 0 /* Currently unused, but might make use of this later. */ static MA_INLINE ma_uint16 ma_job_extract_code(ma_uint64 toc) { return (ma_uint16)((toc & 0xFFFF0000) >> 16); } +#endif static MA_INLINE ma_uint64 ma_job_toc_to_allocation(ma_uint64 toc) { @@ -17900,6 +19292,13 @@ MA_API ma_result ma_job_queue_next(ma_job_queue* pQueue, ma_job* pJob) Dynamic Linking *******************************************************************************/ +/* Disable run-time linking on certain backends and platforms. */ +#ifndef MA_NO_RUNTIME_LINKING + #if defined(MA_EMSCRIPTEN) || defined(MA_ORBIS) || defined(MA_PROSPERO) || defined(MA_SWITCH) || defined(MA_DOS) + #define MA_NO_RUNTIME_LINKING + #endif +#endif + #ifdef MA_POSIX /* No need for dlfcn.h if we're not using runtime linking. */ #ifndef MA_NO_RUNTIME_LINKING @@ -17909,104 +19308,124 @@ Dynamic Linking MA_API ma_handle ma_dlopen(ma_log* pLog, const char* filename) { -#ifndef MA_NO_RUNTIME_LINKING - ma_handle handle; + #ifndef MA_NO_RUNTIME_LINKING + { + ma_handle handle; - ma_log_postf(pLog, MA_LOG_LEVEL_DEBUG, "Loading library: %s\n", filename); + ma_log_postf(pLog, MA_LOG_LEVEL_DEBUG, "Loading library: %s\n", filename); - #ifdef MA_WIN32 - /* From MSDN: Desktop applications cannot use LoadPackagedLibrary; if a desktop application calls this function it fails with APPMODEL_ERROR_NO_PACKAGE.*/ - #if !defined(MA_WIN32_UWP) || !(defined(WINAPI_FAMILY) && ((defined(WINAPI_FAMILY_PHONE_APP) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP))) - handle = (ma_handle)LoadLibraryA(filename); + #ifdef MA_WIN32 + /* From MSDN: Desktop applications cannot use LoadPackagedLibrary; if a desktop application calls this function it fails with APPMODEL_ERROR_NO_PACKAGE.*/ + #if !defined(MA_WIN32_UWP) || !(defined(WINAPI_FAMILY) && ((defined(WINAPI_FAMILY_PHONE_APP) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP))) + handle = (ma_handle)LoadLibraryA(filename); + #else + /* *sigh* It appears there is no ANSI version of LoadPackagedLibrary()... */ + WCHAR filenameW[4096]; + if (MultiByteToWideChar(CP_UTF8, 0, filename, -1, filenameW, sizeof(filenameW)) == 0) { + handle = NULL; + } else { + handle = (ma_handle)LoadPackagedLibrary(filenameW, 0); + } + #endif #else - /* *sigh* It appears there is no ANSI version of LoadPackagedLibrary()... */ - WCHAR filenameW[4096]; - if (MultiByteToWideChar(CP_UTF8, 0, filename, -1, filenameW, sizeof(filenameW)) == 0) { - handle = NULL; - } else { - handle = (ma_handle)LoadPackagedLibrary(filenameW, 0); - } + handle = (ma_handle)dlopen(filename, RTLD_NOW); #endif - #else - handle = (ma_handle)dlopen(filename, RTLD_NOW); - #endif - /* - I'm not considering failure to load a library an error nor a warning because seamlessly falling through to a lower-priority - backend is a deliberate design choice. Instead I'm logging it as an informational message. - */ - if (handle == NULL) { - ma_log_postf(pLog, MA_LOG_LEVEL_INFO, "Failed to load library: %s\n", filename); + /* + I'm not considering failure to load a library an error nor a warning because seamlessly falling through to a lower-priority + backend is a deliberate design choice. Instead I'm logging it as an informational message. + */ + if (handle == NULL) { + ma_log_postf(pLog, MA_LOG_LEVEL_INFO, "Failed to load library: %s\n", filename); + } + + return handle; } - - return handle; -#else - /* Runtime linking is disabled. */ - (void)pLog; - (void)filename; - return NULL; -#endif + #else + { + /* Runtime linking is disabled. */ + (void)pLog; + (void)filename; + return NULL; + } + #endif } MA_API void ma_dlclose(ma_log* pLog, ma_handle handle) { -#ifndef MA_NO_RUNTIME_LINKING - #ifdef MA_WIN32 - FreeLibrary((HMODULE)handle); - #else - /* Hack for Android bug (see https://github.com/android/ndk/issues/360). Calling dlclose() pre-API 28 may segfault. */ - #if !defined(MA_ANDROID) || (defined(__ANDROID_API__) && __ANDROID_API__ >= 28) + #ifndef MA_NO_RUNTIME_LINKING + { + #ifdef MA_WIN32 { - dlclose((void*)handle); + FreeLibrary((HMODULE)handle); } #else { - (void)handle; + /* Hack for Android bug (see https://github.com/android/ndk/issues/360). Calling dlclose() pre-API 28 may segfault. */ + #if !defined(MA_ANDROID) || (defined(__ANDROID_API__) && __ANDROID_API__ >= 28) + { + dlclose((void*)handle); + } + #else + { + (void)handle; + } + #endif } #endif - #endif - (void)pLog; -#else - /* Runtime linking is disabled. */ - (void)pLog; - (void)handle; -#endif + (void)pLog; + } + #else + { + /* Runtime linking is disabled. */ + (void)pLog; + (void)handle; + } + #endif } MA_API ma_proc ma_dlsym(ma_log* pLog, ma_handle handle, const char* symbol) { -#ifndef MA_NO_RUNTIME_LINKING - ma_proc proc; + #ifndef MA_NO_RUNTIME_LINKING + { + ma_proc proc; - ma_log_postf(pLog, MA_LOG_LEVEL_DEBUG, "Loading symbol: %s\n", symbol); + ma_log_postf(pLog, MA_LOG_LEVEL_DEBUG, "Loading symbol: %s\n", symbol); -#ifdef _WIN32 - proc = (ma_proc)GetProcAddress((HMODULE)handle, symbol); -#else -#if (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))) || defined(__clang__) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wpedantic" -#endif - proc = (ma_proc)dlsym((void*)handle, symbol); -#if (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))) || defined(__clang__) - #pragma GCC diagnostic pop -#endif -#endif + #ifdef _WIN32 + { + proc = (ma_proc)GetProcAddress((HMODULE)handle, symbol); + } + #else + { + #if (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))) || defined(__clang__) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wpedantic" + #endif + proc = (ma_proc)dlsym((void*)handle, symbol); + #if (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))) || defined(__clang__) + #pragma GCC diagnostic pop + #endif + } + #endif - if (proc == NULL) { - ma_log_postf(pLog, MA_LOG_LEVEL_WARNING, "Failed to load symbol: %s\n", symbol); + if (proc == NULL) { + ma_log_postf(pLog, MA_LOG_LEVEL_WARNING, "Failed to load symbol: %s\n", symbol); + } + + (void)pLog; /* It's possible for pContext to be unused. */ + return proc; } - - (void)pLog; /* It's possible for pContext to be unused. */ - return proc; -#else - /* Runtime linking is disabled. */ - (void)pLog; - (void)handle; - (void)symbol; - return NULL; -#endif + #else + { + /* Runtime linking is disabled. */ + (void)pLog; + (void)handle; + (void)symbol; + return NULL; + } + #endif } @@ -18020,13 +19439,6 @@ DEVICE I/O ************************************************************************************************************************************************************* ************************************************************************************************************************************************************/ -/* Disable run-time linking on certain backends and platforms. */ -#ifndef MA_NO_RUNTIME_LINKING - #if defined(MA_EMSCRIPTEN) || defined(MA_ORBIS) || defined(MA_PROSPERO) - #define MA_NO_RUNTIME_LINKING - #endif -#endif - #ifdef MA_APPLE #include #endif @@ -18039,12 +19451,6 @@ DEVICE I/O #ifdef MA_POSIX #include - #include - - /* No need for dlfcn.h if we're not using runtime linking. */ - #ifndef MA_NO_RUNTIME_LINKING - #include - #endif #endif /* This must be set to at least 26. */ @@ -18299,7 +19705,7 @@ MA_API ma_bool32 ma_is_loopback_supported(ma_backend backend) -#if defined(MA_WIN32) +#if defined(MA_WIN32) && !defined(MA_XBOX) /* WASAPI error codes. */ #define MA_AUDCLNT_E_NOT_INITIALIZED ((HRESULT)0x88890001) #define MA_AUDCLNT_E_ALREADY_INITIALIZED ((HRESULT)0x88890002) @@ -18514,6 +19920,11 @@ typedef LONG (WINAPI * MA_PFN_RegCloseKey)(HKEY hKey); typedef LONG (WINAPI * MA_PFN_RegQueryValueExA)(HKEY hKey, const char* lpValueName, DWORD* lpReserved, DWORD* lpType, BYTE* lpData, DWORD* lpcbData); #endif /* MA_WIN32_DESKTOP */ +static GUID MA_GUID_KSDATAFORMAT_SUBTYPE_PCM = {0x00000001, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; +static GUID MA_GUID_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT = {0x00000003, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; +/*static GUID MA_GUID_KSDATAFORMAT_SUBTYPE_ALAW = {0x00000006, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};*/ +/*static GUID MA_GUID_KSDATAFORMAT_SUBTYPE_MULAW = {0x00000007, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};*/ + MA_API size_t ma_strlen_WCHAR(const WCHAR* str) { size_t len = 0; @@ -18577,7 +19988,7 @@ Timing *******************************************************************************/ #if defined(MA_WIN32) && !defined(MA_POSIX) static LARGE_INTEGER g_ma_TimerFrequency; /* <-- Initialized to zero since it's static. */ - static void ma_timer_init(ma_timer* pTimer) + static MA_INLINE void ma_timer_init(ma_timer* pTimer) { LARGE_INTEGER counter; @@ -18589,7 +20000,7 @@ Timing pTimer->counter = counter.QuadPart; } - static double ma_timer_get_time_in_seconds(ma_timer* pTimer) + static MA_INLINE double ma_timer_get_time_in_seconds(ma_timer* pTimer) { LARGE_INTEGER counter; if (!QueryPerformanceCounter(&counter)) { @@ -18600,7 +20011,7 @@ Timing } #elif defined(MA_APPLE) && (MAC_OS_X_VERSION_MIN_REQUIRED < 101200) static ma_uint64 g_ma_TimerFrequency = 0; - static void ma_timer_init(ma_timer* pTimer) + static MA_INLINE void ma_timer_init(ma_timer* pTimer) { mach_timebase_info_data_t baseTime; mach_timebase_info(&baseTime); @@ -18609,7 +20020,7 @@ Timing pTimer->counter = mach_absolute_time(); } - static double ma_timer_get_time_in_seconds(ma_timer* pTimer) + static MA_INLINE double ma_timer_get_time_in_seconds(ma_timer* pTimer) { ma_uint64 newTimeCounter = mach_absolute_time(); ma_uint64 oldTimeCounter = pTimer->counter; @@ -18634,7 +20045,7 @@ Timing #define MA_CLOCK_ID CLOCK_REALTIME #endif - static void ma_timer_init(ma_timer* pTimer) + static MA_INLINE void ma_timer_init(ma_timer* pTimer) { struct timespec newTime; clock_gettime(MA_CLOCK_ID, &newTime); @@ -18642,7 +20053,7 @@ Timing pTimer->counter = (newTime.tv_sec * 1000000000) + newTime.tv_nsec; } - static double ma_timer_get_time_in_seconds(ma_timer* pTimer) + static MA_INLINE double ma_timer_get_time_in_seconds(ma_timer* pTimer) { ma_uint64 newTimeCounter; ma_uint64 oldTimeCounter; @@ -18656,7 +20067,7 @@ Timing return (newTimeCounter - oldTimeCounter) / 1000000000.0; } #else - static void ma_timer_init(ma_timer* pTimer) + static MA_INLINE void ma_timer_init(ma_timer* pTimer) { struct timeval newTime; gettimeofday(&newTime, NULL); @@ -18664,7 +20075,7 @@ Timing pTimer->counter = (newTime.tv_sec * 1000000) + newTime.tv_usec; } - static double ma_timer_get_time_in_seconds(ma_timer* pTimer) + static MA_INLINE double ma_timer_get_time_in_seconds(ma_timer* pTimer) { ma_uint64 newTimeCounter; ma_uint64 oldTimeCounter; @@ -19248,14 +20659,6 @@ static MA_INLINE void ma_device__set_state(ma_device* pDevice, ma_device_state n } -#if defined(MA_WIN32) - static GUID MA_GUID_KSDATAFORMAT_SUBTYPE_PCM = {0x00000001, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; - static GUID MA_GUID_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT = {0x00000003, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; - /*static GUID MA_GUID_KSDATAFORMAT_SUBTYPE_ALAW = {0x00000006, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};*/ - /*static GUID MA_GUID_KSDATAFORMAT_SUBTYPE_MULAW = {0x00000007, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};*/ -#endif - - MA_API ma_uint32 ma_get_format_priority_index(ma_format format) /* Lower = better. */ { @@ -19967,7 +21370,7 @@ static ma_result ma_context_init__null(ma_context* pContext, const ma_context_co WIN32 COMMON *******************************************************************************/ -#if defined(MA_WIN32) +#if defined(MA_WIN32) && !defined(MA_XBOX) #if defined(MA_WIN32_DESKTOP) || defined(MA_WIN32_GDK) #define ma_CoInitializeEx(pContext, pvReserved, dwCoInit) ((pContext->win32.CoInitializeEx) ? ((MA_PFN_CoInitializeEx)pContext->win32.CoInitializeEx)(pvReserved, dwCoInit) : ((MA_PFN_CoInitialize)pContext->win32.CoInitialize)(pvReserved)) #define ma_CoUninitialize(pContext) ((MA_PFN_CoUninitialize)pContext->win32.CoUninitialize)() @@ -19982,7 +21385,7 @@ WIN32 COMMON #define ma_PropVariantClear(pContext, pvar) PropVariantClear(pvar) #endif -#if !defined(MAXULONG_PTR) && !defined(__WATCOMC__) +#if !defined(MAXULONG_PTR) && !defined(__WATCOMC__) && !defined(MA_XBOX_NXDK) typedef size_t DWORD_PTR; #endif @@ -20409,11 +21812,21 @@ typedef enum MA_AudioCategory_Other = 0 /* <-- miniaudio is only caring about Other. */ } MA_AUDIO_STREAM_CATEGORY; +typedef enum +{ + MA_AUDCLNT_STREAMOPTIONS_NONE, + MA_AUDCLNT_STREAMOPTIONS_RAW, + MA_AUDCLNT_STREAMOPTIONS_MATCH_FORMAT, + MA_AUDCLNT_STREAMOPTIONS_AMBISONICS, + MA_AUDCLNT_STREAMOPTIONS_POST_VOLUME_LOOPBACK +} MA_AUDCLNT_STREAMOPTIONS; + typedef struct { ma_uint32 cbSize; BOOL bIsOffload; MA_AUDIO_STREAM_CATEGORY eCategory; + MA_AUDCLNT_STREAMOPTIONS Options; } ma_AudioClientProperties; /* IUnknown */ @@ -21588,6 +23001,7 @@ static ma_result ma_context_get_MMDevice__wasapi(ma_context* pContext, ma_device { ma_IMMDeviceEnumerator* pDeviceEnumerator; HRESULT hr; + HRESULT CoInitializeResult; MA_ASSERT(pContext != NULL); MA_ASSERT(ppMMDevice != NULL); @@ -21601,12 +23015,17 @@ static ma_result ma_context_get_MMDevice__wasapi(ma_context* pContext, ma_device The community has reported that this seems to fix the crash. There are future plans to move all WASAPI operation over to a single thread to make everything safer, but in the meantime while we wait for that to come online I'm happy enough to use this hack instead. + + CoUninitialize should only be called if we successfully initialized. S_OK and S_FALSE both mean that we need to + call CoUninitialize since the internal ref count was increased. RPC_E_CHANGED_MODE means that CoInitializeEx was + called with a different COINIT value, and we don't call CoUninitialize in that case. Other errors are possible, + so we check for S_OK and S_FALSE specifically. */ - ma_CoInitializeEx(pContext, NULL, MA_COINIT_VALUE); + CoInitializeResult = ma_CoInitializeEx(pContext, NULL, MA_COINIT_VALUE); { hr = ma_CoCreateInstance(pContext, &MA_CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL, &MA_IID_IMMDeviceEnumerator, (void**)&pDeviceEnumerator); - } - ma_CoUninitialize(pContext); + } + if (CoInitializeResult == S_OK || CoInitializeResult == S_FALSE) { ma_CoUninitialize(pContext); } if (FAILED(hr)) { /* <-- This is checking the call above to ma_CoCreateInstance(). */ ma_log_postf(ma_context_get_log(pContext), MA_LOG_LEVEL_ERROR, "[WASAPI] Failed to create IMMDeviceEnumerator.\n"); @@ -21950,7 +23369,7 @@ static ma_result ma_context_get_IAudioClient__wasapi(ma_context* pContext, ma_de pActivationParams = &activationParams; /* When requesting a specific device ID we need to use a special device ID. */ - MA_COPY_MEMORY(virtualDeviceID.wasapi, MA_VIRTUAL_AUDIO_DEVICE_PROCESS_LOOPBACK, (wcslen(MA_VIRTUAL_AUDIO_DEVICE_PROCESS_LOOPBACK) + 1) * sizeof(wchar_t)); /* +1 for the null terminator. */ + MA_COPY_MEMORY(virtualDeviceID.wasapi, MA_VIRTUAL_AUDIO_DEVICE_PROCESS_LOOPBACK, (ma_wcslen(MA_VIRTUAL_AUDIO_DEVICE_PROCESS_LOOPBACK) + 1) * sizeof(wchar_t)); /* +1 for the null terminator. */ pDeviceID = &virtualDeviceID; } else { pActivationParams = NULL; /* No activation parameters required. */ @@ -26679,6 +28098,9 @@ typedef snd_pcm_channel_area_t ma_snd_pcm_channel_area_t; typedef snd_pcm_chmap_t ma_snd_pcm_chmap_t; typedef snd_pcm_state_t ma_snd_pcm_state_t; +/* snd_pcm_state_t */ +#define MA_SND_PCM_STATE_XRUN SND_PCM_STATE_XRUN + /* snd_pcm_stream_t */ #define MA_SND_PCM_STREAM_PLAYBACK SND_PCM_STREAM_PLAYBACK #define MA_SND_PCM_STREAM_CAPTURE SND_PCM_STREAM_CAPTURE @@ -26874,6 +28296,7 @@ typedef int (* ma_snd_pcm_hw_params_set_channels_minmax_proc) ( typedef int (* ma_snd_pcm_hw_params_set_rate_resample_proc) (ma_snd_pcm_t *pcm, ma_snd_pcm_hw_params_t *params, unsigned int val); typedef int (* ma_snd_pcm_hw_params_set_rate_proc) (ma_snd_pcm_t *pcm, ma_snd_pcm_hw_params_t *params, unsigned int val, int dir); typedef int (* ma_snd_pcm_hw_params_set_rate_near_proc) (ma_snd_pcm_t *pcm, ma_snd_pcm_hw_params_t *params, unsigned int *val, int *dir); +typedef int (* ma_snd_pcm_hw_params_set_rate_minmax_proc) (ma_snd_pcm_t *pcm, ma_snd_pcm_hw_params_t *params, unsigned int *min, int *mindir, unsigned int *max, int *maxdir); typedef int (* ma_snd_pcm_hw_params_set_buffer_size_near_proc)(ma_snd_pcm_t *pcm, ma_snd_pcm_hw_params_t *params, ma_snd_pcm_uframes_t *val); typedef int (* ma_snd_pcm_hw_params_set_periods_near_proc) (ma_snd_pcm_t *pcm, ma_snd_pcm_hw_params_t *params, unsigned int *val, int *dir); typedef int (* ma_snd_pcm_hw_params_set_access_proc) (ma_snd_pcm_t *pcm, ma_snd_pcm_hw_params_t *params, ma_snd_pcm_access_t _access); @@ -28640,8 +30063,9 @@ static ma_result ma_context_init__alsa(ma_context* pContext, const ma_context_co ma_snd_pcm_hw_params_get_format_mask_proc _snd_pcm_hw_params_get_format_mask = snd_pcm_hw_params_get_format_mask; ma_snd_pcm_hw_params_set_channels_proc _snd_pcm_hw_params_set_channels = snd_pcm_hw_params_set_channels; ma_snd_pcm_hw_params_set_channels_near_proc _snd_pcm_hw_params_set_channels_near = snd_pcm_hw_params_set_channels_near; + ma_snd_pcm_hw_params_set_channels_minmax_proc _snd_pcm_hw_params_set_channels_minmax = snd_pcm_hw_params_set_channels_minmax; ma_snd_pcm_hw_params_set_rate_resample_proc _snd_pcm_hw_params_set_rate_resample = snd_pcm_hw_params_set_rate_resample; - ma_snd_pcm_hw_params_set_rate_near _snd_pcm_hw_params_set_rate = snd_pcm_hw_params_set_rate; + ma_snd_pcm_hw_params_set_rate_proc _snd_pcm_hw_params_set_rate = snd_pcm_hw_params_set_rate; ma_snd_pcm_hw_params_set_rate_near_proc _snd_pcm_hw_params_set_rate_near = snd_pcm_hw_params_set_rate_near; ma_snd_pcm_hw_params_set_rate_minmax_proc _snd_pcm_hw_params_set_rate_minmax = snd_pcm_hw_params_set_rate_minmax; ma_snd_pcm_hw_params_set_buffer_size_near_proc _snd_pcm_hw_params_set_buffer_size_near = snd_pcm_hw_params_set_buffer_size_near; @@ -28693,9 +30117,9 @@ static ma_result ma_context_init__alsa(ma_context* pContext, const ma_context_co ma_snd_pcm_info_proc _snd_pcm_info = snd_pcm_info; ma_snd_pcm_info_sizeof_proc _snd_pcm_info_sizeof = snd_pcm_info_sizeof; ma_snd_pcm_info_get_name_proc _snd_pcm_info_get_name = snd_pcm_info_get_name; - ma_snd_pcm_poll_descriptors _snd_pcm_poll_descriptors = snd_pcm_poll_descriptors; - ma_snd_pcm_poll_descriptors_count _snd_pcm_poll_descriptors_count = snd_pcm_poll_descriptors_count; - ma_snd_pcm_poll_descriptors_revents _snd_pcm_poll_descriptors_revents = snd_pcm_poll_descriptors_revents; + ma_snd_pcm_poll_descriptors_proc _snd_pcm_poll_descriptors = snd_pcm_poll_descriptors; + ma_snd_pcm_poll_descriptors_count_proc _snd_pcm_poll_descriptors_count = snd_pcm_poll_descriptors_count; + ma_snd_pcm_poll_descriptors_revents_proc _snd_pcm_poll_descriptors_revents = snd_pcm_poll_descriptors_revents; ma_snd_config_update_free_global_proc _snd_config_update_free_global = snd_config_update_free_global; pContext->alsa.snd_pcm_open = (ma_proc)_snd_pcm_open; @@ -28711,6 +30135,7 @@ static ma_result ma_context_init__alsa(ma_context* pContext, const ma_context_co pContext->alsa.snd_pcm_hw_params_set_rate_resample = (ma_proc)_snd_pcm_hw_params_set_rate_resample; pContext->alsa.snd_pcm_hw_params_set_rate = (ma_proc)_snd_pcm_hw_params_set_rate; pContext->alsa.snd_pcm_hw_params_set_rate_near = (ma_proc)_snd_pcm_hw_params_set_rate_near; + pContext->alsa.snd_pcm_hw_params_set_rate_minmax = (ma_proc)_snd_pcm_hw_params_set_rate_minmax; pContext->alsa.snd_pcm_hw_params_set_buffer_size_near = (ma_proc)_snd_pcm_hw_params_set_buffer_size_near; pContext->alsa.snd_pcm_hw_params_set_periods_near = (ma_proc)_snd_pcm_hw_params_set_periods_near; pContext->alsa.snd_pcm_hw_params_set_access = (ma_proc)_snd_pcm_hw_params_set_access; @@ -29436,7 +30861,7 @@ typedef void (* ma_pa_threaded_mainloop_unlock_proc) ( typedef void (* ma_pa_threaded_mainloop_wait_proc) (ma_pa_threaded_mainloop* m); typedef void (* ma_pa_threaded_mainloop_signal_proc) (ma_pa_threaded_mainloop* m, int wait_for_accept); typedef void (* ma_pa_threaded_mainloop_accept_proc) (ma_pa_threaded_mainloop* m); -typedef int (* ma_pa_threaded_mainloop_get_retval_proc) (ma_pa_threaded_mainloop* m); +typedef int (* ma_pa_threaded_mainloop_get_retval_proc) (const ma_pa_threaded_mainloop* m); typedef ma_pa_mainloop_api* (* ma_pa_threaded_mainloop_get_api_proc) (ma_pa_threaded_mainloop* m); typedef int (* ma_pa_threaded_mainloop_in_thread_proc) (ma_pa_threaded_mainloop* m); typedef void (* ma_pa_threaded_mainloop_set_name_proc) (ma_pa_threaded_mainloop* m, const char* name); @@ -29445,13 +30870,13 @@ typedef void (* ma_pa_context_unref_proc) ( typedef int (* ma_pa_context_connect_proc) (ma_pa_context* c, const char* server, ma_pa_context_flags_t flags, const ma_pa_spawn_api* api); typedef void (* ma_pa_context_disconnect_proc) (ma_pa_context* c); typedef void (* ma_pa_context_set_state_callback_proc) (ma_pa_context* c, ma_pa_context_notify_cb_t cb, void* userdata); -typedef ma_pa_context_state_t (* ma_pa_context_get_state_proc) (ma_pa_context* c); +typedef ma_pa_context_state_t (* ma_pa_context_get_state_proc) (const ma_pa_context* c); typedef ma_pa_operation* (* ma_pa_context_get_sink_info_list_proc) (ma_pa_context* c, ma_pa_sink_info_cb_t cb, void* userdata); typedef ma_pa_operation* (* ma_pa_context_get_source_info_list_proc) (ma_pa_context* c, ma_pa_source_info_cb_t cb, void* userdata); typedef ma_pa_operation* (* ma_pa_context_get_sink_info_by_name_proc) (ma_pa_context* c, const char* name, ma_pa_sink_info_cb_t cb, void* userdata); typedef ma_pa_operation* (* ma_pa_context_get_source_info_by_name_proc)(ma_pa_context* c, const char* name, ma_pa_source_info_cb_t cb, void* userdata); typedef void (* ma_pa_operation_unref_proc) (ma_pa_operation* o); -typedef ma_pa_operation_state_t (* ma_pa_operation_get_state_proc) (ma_pa_operation* o); +typedef ma_pa_operation_state_t (* ma_pa_operation_get_state_proc) (const ma_pa_operation* o); typedef ma_pa_channel_map* (* ma_pa_channel_map_init_extend_proc) (ma_pa_channel_map* m, unsigned channels, ma_pa_channel_map_def_t def); typedef int (* ma_pa_channel_map_valid_proc) (const ma_pa_channel_map* m); typedef int (* ma_pa_channel_map_compatible_proc) (const ma_pa_channel_map* m, const ma_pa_sample_spec* ss); @@ -29460,12 +30885,12 @@ typedef void (* ma_pa_stream_unref_proc) ( typedef int (* ma_pa_stream_connect_playback_proc) (ma_pa_stream* s, const char* dev, const ma_pa_buffer_attr* attr, ma_pa_stream_flags_t flags, const ma_pa_cvolume* volume, ma_pa_stream* sync_stream); typedef int (* ma_pa_stream_connect_record_proc) (ma_pa_stream* s, const char* dev, const ma_pa_buffer_attr* attr, ma_pa_stream_flags_t flags); typedef int (* ma_pa_stream_disconnect_proc) (ma_pa_stream* s); -typedef ma_pa_stream_state_t (* ma_pa_stream_get_state_proc) (ma_pa_stream* s); +typedef ma_pa_stream_state_t (* ma_pa_stream_get_state_proc) (const ma_pa_stream* s); typedef const ma_pa_sample_spec* (* ma_pa_stream_get_sample_spec_proc) (ma_pa_stream* s); typedef const ma_pa_channel_map* (* ma_pa_stream_get_channel_map_proc) (ma_pa_stream* s); typedef const ma_pa_buffer_attr* (* ma_pa_stream_get_buffer_attr_proc) (ma_pa_stream* s); typedef ma_pa_operation* (* ma_pa_stream_set_buffer_attr_proc) (ma_pa_stream* s, const ma_pa_buffer_attr* attr, ma_pa_stream_success_cb_t cb, void* userdata); -typedef const char* (* ma_pa_stream_get_device_name_proc) (ma_pa_stream* s); +typedef const char* (* ma_pa_stream_get_device_name_proc) (const ma_pa_stream* s); typedef void (* ma_pa_stream_set_write_callback_proc) (ma_pa_stream* s, ma_pa_stream_request_cb_t cb, void* userdata); typedef void (* ma_pa_stream_set_read_callback_proc) (ma_pa_stream* s, ma_pa_stream_request_cb_t cb, void* userdata); typedef void (* ma_pa_stream_set_suspended_callback_proc) (ma_pa_stream* s, ma_pa_stream_notify_cb_t cb, void* userdata); @@ -29473,15 +30898,15 @@ typedef void (* ma_pa_stream_set_moved_callback_proc) ( typedef int (* ma_pa_stream_is_suspended_proc) (const ma_pa_stream* s); typedef ma_pa_operation* (* ma_pa_stream_flush_proc) (ma_pa_stream* s, ma_pa_stream_success_cb_t cb, void* userdata); typedef ma_pa_operation* (* ma_pa_stream_drain_proc) (ma_pa_stream* s, ma_pa_stream_success_cb_t cb, void* userdata); -typedef int (* ma_pa_stream_is_corked_proc) (ma_pa_stream* s); +typedef int (* ma_pa_stream_is_corked_proc) (const ma_pa_stream* s); typedef ma_pa_operation* (* ma_pa_stream_cork_proc) (ma_pa_stream* s, int b, ma_pa_stream_success_cb_t cb, void* userdata); typedef ma_pa_operation* (* ma_pa_stream_trigger_proc) (ma_pa_stream* s, ma_pa_stream_success_cb_t cb, void* userdata); typedef int (* ma_pa_stream_begin_write_proc) (ma_pa_stream* s, void** data, size_t* nbytes); typedef int (* ma_pa_stream_write_proc) (ma_pa_stream* s, const void* data, size_t nbytes, ma_pa_free_cb_t free_cb, int64_t offset, ma_pa_seek_mode_t seek); typedef int (* ma_pa_stream_peek_proc) (ma_pa_stream* s, const void** data, size_t* nbytes); typedef int (* ma_pa_stream_drop_proc) (ma_pa_stream* s); -typedef size_t (* ma_pa_stream_writable_size_proc) (ma_pa_stream* s); -typedef size_t (* ma_pa_stream_readable_size_proc) (ma_pa_stream* s); +typedef size_t (* ma_pa_stream_writable_size_proc) (const ma_pa_stream* s); +typedef size_t (* ma_pa_stream_readable_size_proc) (const ma_pa_stream* s); typedef struct { @@ -29777,7 +31202,7 @@ static ma_result ma_init_pa_mainloop_and_pa_context__pulse(ma_context* pContext, } /* Now we need to connect to the context. Everything is asynchronous so we need to wait for it to connect before returning. */ - result = ma_result_from_pulse(((ma_pa_context_connect_proc)pContext->pulse.pa_context_connect)((ma_pa_context*)pPulseContext, pServerName, (tryAutoSpawn) ? 0 : MA_PA_CONTEXT_NOAUTOSPAWN, NULL)); + result = ma_result_from_pulse(((ma_pa_context_connect_proc)pContext->pulse.pa_context_connect)((ma_pa_context*)pPulseContext, pServerName, (tryAutoSpawn) ? MA_PA_CONTEXT_NOFLAGS : MA_PA_CONTEXT_NOAUTOSPAWN, NULL)); if (result != MA_SUCCESS) { ma_log_postf(ma_context_get_log(pContext), MA_LOG_LEVEL_ERROR, "[PulseAudio] Failed to connect PulseAudio context."); ((ma_pa_mainloop_free_proc)pContext->pulse.pa_mainloop_free)((ma_pa_mainloop*)(pMainLoop)); @@ -30510,7 +31935,7 @@ static ma_result ma_device_init__pulse(ma_device* pDevice, const ma_device_confi const ma_pa_buffer_attr* pActualAttr = NULL; const ma_pa_channel_map* pActualChannelMap = NULL; ma_uint32 iChannel; - ma_pa_stream_flags_t streamFlags; + int streamFlags; MA_ASSERT(pDevice != NULL); MA_ZERO_OBJECT(&pDevice->pulse); @@ -30568,8 +31993,13 @@ static ma_result ma_device_init__pulse(ma_device* pDevice, const ma_device_confi ss.channels = pDescriptorCapture->channels; } + /* PulseAudio has a maximum channel count of 32. We'll get a crash if this is exceeded. */ + if (ss.channels > 32) { + ss.channels = 32; + } + /* Use a default channel map. */ - ((ma_pa_channel_map_init_extend_proc)pDevice->pContext->pulse.pa_channel_map_init_extend)(&cmap, ss.channels, pConfig->pulse.channelMap); + ((ma_pa_channel_map_init_extend_proc)pDevice->pContext->pulse.pa_channel_map_init_extend)(&cmap, ss.channels, (ma_pa_channel_map_def_t)pConfig->pulse.channelMap); /* Use the requested sample rate if one was specified. */ if (pDescriptorCapture->sampleRate != 0) { @@ -30626,7 +32056,7 @@ static ma_result ma_device_init__pulse(ma_device* pDevice, const ma_device_confi streamFlags |= MA_PA_STREAM_DONT_MOVE; } - error = ((ma_pa_stream_connect_record_proc)pDevice->pContext->pulse.pa_stream_connect_record)((ma_pa_stream*)pDevice->pulse.pStreamCapture, devCapture, &attr, streamFlags); + error = ((ma_pa_stream_connect_record_proc)pDevice->pContext->pulse.pa_stream_connect_record)((ma_pa_stream*)pDevice->pulse.pStreamCapture, devCapture, &attr, (ma_pa_stream_flags_t)streamFlags); if (error != MA_PA_OK) { ma_log_post(ma_device_get_log(pDevice), MA_LOG_LEVEL_ERROR, "[PulseAudio] Failed to connect PulseAudio capture stream."); result = ma_result_from_pulse(error); @@ -30720,8 +32150,13 @@ static ma_result ma_device_init__pulse(ma_device* pDevice, const ma_device_confi ss.channels = pDescriptorPlayback->channels; } + /* PulseAudio has a maximum channel count of 32. We'll get a crash if this is exceeded. */ + if (ss.channels > 32) { + ss.channels = 32; + } + /* Use a default channel map. */ - ((ma_pa_channel_map_init_extend_proc)pDevice->pContext->pulse.pa_channel_map_init_extend)(&cmap, ss.channels, pConfig->pulse.channelMap); + ((ma_pa_channel_map_init_extend_proc)pDevice->pContext->pulse.pa_channel_map_init_extend)(&cmap, ss.channels, (ma_pa_channel_map_def_t)pConfig->pulse.channelMap); /* Use the requested sample rate if one was specified. */ @@ -30783,7 +32218,7 @@ static ma_result ma_device_init__pulse(ma_device* pDevice, const ma_device_confi streamFlags |= MA_PA_STREAM_DONT_MOVE; } - error = ((ma_pa_stream_connect_playback_proc)pDevice->pContext->pulse.pa_stream_connect_playback)((ma_pa_stream*)pDevice->pulse.pStreamPlayback, devPlayback, &attr, streamFlags, NULL, NULL); + error = ((ma_pa_stream_connect_playback_proc)pDevice->pContext->pulse.pa_stream_connect_playback)((ma_pa_stream*)pDevice->pulse.pStreamPlayback, devPlayback, &attr, (ma_pa_stream_flags_t)streamFlags, NULL, NULL); if (error != MA_PA_OK) { ma_log_post(ma_device_get_log(pDevice), MA_LOG_LEVEL_ERROR, "[PulseAudio] Failed to connect PulseAudio playback stream."); result = ma_result_from_pulse(error); @@ -31338,6 +32773,7 @@ typedef JackProcessCallback ma_JackProcessCallback; typedef JackBufferSizeCallback ma_JackBufferSizeCallback; typedef JackShutdownCallback ma_JackShutdownCallback; #define MA_JACK_DEFAULT_AUDIO_TYPE JACK_DEFAULT_AUDIO_TYPE +#define ma_JackNullOption JackNullOption #define ma_JackNoStartServer JackNoStartServer #define ma_JackPortIsInput JackPortIsInput #define ma_JackPortIsOutput JackPortIsOutput @@ -31352,6 +32788,7 @@ typedef int (* ma_JackProcessCallback) (ma_jack_nframes_t nframes, void* arg) typedef int (* ma_JackBufferSizeCallback)(ma_jack_nframes_t nframes, void* arg); typedef void (* ma_JackShutdownCallback) (void* arg); #define MA_JACK_DEFAULT_AUDIO_TYPE "32 bit float mono audio" +#define ma_JackNullOption 0 #define ma_JackNoStartServer 1 #define ma_JackPortIsInput 1 #define ma_JackPortIsOutput 2 @@ -31392,7 +32829,7 @@ static ma_result ma_context_open_client__jack(ma_context* pContext, ma_jack_clie maxClientNameSize = ((ma_jack_client_name_size_proc)pContext->jack.jack_client_name_size)(); /* Includes null terminator. */ ma_strncpy_s(clientName, ma_min(sizeof(clientName), maxClientNameSize), (pContext->jack.pClientName != NULL) ? pContext->jack.pClientName : "miniaudio", (size_t)-1); - pClient = ((ma_jack_client_open_proc)pContext->jack.jack_client_open)(clientName, (pContext->jack.tryStartServer) ? 0 : ma_JackNoStartServer, &status, NULL); + pClient = ((ma_jack_client_open_proc)pContext->jack.jack_client_open)(clientName, (pContext->jack.tryStartServer) ? ma_JackNullOption : ma_JackNoStartServer, &status, NULL); if (pClient == NULL) { return MA_FAILED_TO_OPEN_BACKEND_DEVICE; } @@ -36994,7 +38431,7 @@ OSS Backend #define MA_OSS_DEFAULT_DEVICE_NAME "/dev/dsp" -static int ma_open_temp_device__oss() +static int ma_open_temp_device__oss(void) { /* The OSS sample code uses "/dev/mixer" as the device for getting system properties so I'm going to do the same. */ int fd = open("/dev/mixer", O_RDONLY, 0); @@ -37834,25 +39271,30 @@ static void ma_stream_error_callback__aaudio(ma_AAudioStream* pStream, void* pUs (void)error; ma_log_postf(ma_device_get_log(pDevice), MA_LOG_LEVEL_INFO, "[AAudio] ERROR CALLBACK: error=%d, AAudioStream_getState()=%d\n", error, ((MA_PFN_AAudioStream_getState)pDevice->pContext->aaudio.AAudioStream_getState)(pStream)); + /* When we get an error, we'll assume that the stream is in an erroneous state and needs to be restarted. From the documentation, we cannot do this from the error callback. Therefore we are going to use an event thread for the AAudio backend to do this cleanly and safely. */ - job = ma_job_init(MA_JOB_TYPE_DEVICE_AAUDIO_REROUTE); - job.data.device.aaudio.reroute.pDevice = pDevice; - - if (pStream == pDevice->aaudio.pStreamCapture) { - job.data.device.aaudio.reroute.deviceType = ma_device_type_capture; + if (ma_atomic_bool32_get(&pDevice->aaudio.isTearingDown)) { + ma_log_postf(ma_device_get_log(pDevice), MA_LOG_LEVEL_INFO, "[AAudio] Device Disconnected. Tearing down device.\n"); } else { - job.data.device.aaudio.reroute.deviceType = ma_device_type_playback; - } - - result = ma_device_job_thread_post(&pDevice->pContext->aaudio.jobThread, &job); - if (result != MA_SUCCESS) { - ma_log_postf(ma_device_get_log(pDevice), MA_LOG_LEVEL_INFO, "[AAudio] Device Disconnected. Failed to post job for rerouting.\n"); - return; + job = ma_job_init(MA_JOB_TYPE_DEVICE_AAUDIO_REROUTE); + job.data.device.aaudio.reroute.pDevice = pDevice; + + if (pStream == pDevice->aaudio.pStreamCapture) { + job.data.device.aaudio.reroute.deviceType = ma_device_type_capture; + } else { + job.data.device.aaudio.reroute.deviceType = ma_device_type_playback; + } + + result = ma_device_job_thread_post(&pDevice->pContext->aaudio.jobThread, &job); + if (result != MA_SUCCESS) { + ma_log_postf(ma_device_get_log(pDevice), MA_LOG_LEVEL_INFO, "[AAudio] Device Disconnected. Failed to post job for rerouting.\n"); + return; + } } } @@ -38169,7 +39611,7 @@ static ma_result ma_close_streams__aaudio(ma_device* pDevice) { MA_ASSERT(pDevice != NULL); - /* When re-routing, streams may have been closed and never re-opened. Hence the extra checks below. */ + /* When rerouting, streams may have been closed and never re-opened. Hence the extra checks below. */ if (pDevice->type == ma_device_type_capture || pDevice->type == ma_device_type_duplex) { ma_close_stream__aaudio(pDevice->pContext, (ma_AAudioStream*)pDevice->aaudio.pStreamCapture); pDevice->aaudio.pStreamCapture = NULL; @@ -38186,6 +39628,12 @@ static ma_result ma_device_uninit__aaudio(ma_device* pDevice) { MA_ASSERT(pDevice != NULL); + /* + Note: Closing the streams may cause a timeout error, which would then trigger rerouting in our error callback. + We must not schedule a reroute when device is getting destroyed. + */ + ma_atomic_bool32_set(&pDevice->aaudio.isTearingDown, MA_TRUE); + /* Wait for any rerouting to finish before attempting to close the streams. */ ma_mutex_lock(&pDevice->aaudio.rerouteLock); { @@ -38193,7 +39641,7 @@ static ma_result ma_device_uninit__aaudio(ma_device* pDevice) } ma_mutex_unlock(&pDevice->aaudio.rerouteLock); - /* Destroy re-routing lock. */ + /* Destroy rerouting lock. */ ma_mutex_uninit(&pDevice->aaudio.rerouteLock); return MA_SUCCESS; @@ -38429,17 +39877,22 @@ static ma_result ma_device_stop__aaudio(ma_device* pDevice) static ma_result ma_device_reinit__aaudio(ma_device* pDevice, ma_device_type deviceType) { + const ma_int32 maxAttempts = 4; /* Reasonable retry limit. */ + ma_result result; - int32_t retries = 0; + ma_int32 iAttempt; MA_ASSERT(pDevice != NULL); - /* - TODO: Stop retrying if main thread is about to uninit device. - */ - ma_mutex_lock(&pDevice->aaudio.rerouteLock); - { -error_disconnected: + /* We got disconnected! Retry a few times, until we find a connected device! */ + iAttempt = 0; + while (iAttempt++ < maxAttempts) { + /* Device tearing down? No need to reroute! */ + if (ma_atomic_bool32_get(&pDevice->aaudio.isTearingDown)) { + result = MA_SUCCESS; /* Caller should continue as normal. */ + break; + } + /* The first thing to do is close the streams. */ ma_close_streams__aaudio(pDevice); @@ -38495,14 +39948,16 @@ error_disconnected: result = ma_device_init_streams__aaudio(pDevice, &deviceConfig, &descriptorPlayback, &descriptorCapture); if (result != MA_SUCCESS) { ma_log_post(ma_device_get_log(pDevice), MA_LOG_LEVEL_WARNING, "[AAudio] Failed to create stream after route change."); - goto done; + /* Reroute failed! */ + break; } result = ma_device_post_init(pDevice, deviceType, &descriptorPlayback, &descriptorCapture); if (result != MA_SUCCESS) { ma_log_post(ma_device_get_log(pDevice), MA_LOG_LEVEL_WARNING, "[AAudio] Failed to initialize device after route change."); ma_close_streams__aaudio(pDevice); - goto done; + /* Reroute failed! */ + break; } /* We'll only ever do this in response to a reroute. */ @@ -38513,26 +39968,23 @@ error_disconnected: if (pDevice->aaudio.noAutoStartAfterReroute == MA_FALSE) { result = ma_device_start__aaudio(pDevice); if (result != MA_SUCCESS) { - /* We got disconnected! Retry a few times, until we find a connected device! */ - retries += 1; - if (retries <= 3) { - ma_log_postf(ma_device_get_log(pDevice), MA_LOG_LEVEL_INFO, "[AAudio] Failed to start stream after route change, retrying(%d)", retries); - goto error_disconnected; + if (iAttempt < maxAttempts) { + ma_log_postf(ma_device_get_log(pDevice), MA_LOG_LEVEL_INFO, "[AAudio] Failed to start stream after route change, retrying(%d)", iAttempt); + } else { + ma_log_post(ma_device_get_log(pDevice), MA_LOG_LEVEL_INFO, "[AAudio] Failed to start stream after route change, giving up."); } - ma_log_post(ma_device_get_log(pDevice), MA_LOG_LEVEL_INFO, "[AAudio] Failed to start stream after route change."); - goto done; } } else { - ma_device_stop(pDevice); /* Do a full device stop so we set internal state correctly. */ + ma_device_stop(pDevice); /* Do a full device stop so we set internal state correctly. */ } } - - result = MA_SUCCESS; - } -done: - /* Re-routing done */ - ma_mutex_unlock(&pDevice->aaudio.rerouteLock); + if (result == MA_SUCCESS) { + /* Reroute successful! */ + break; + } + } + return result; } @@ -38698,7 +40150,7 @@ static ma_result ma_context_init__aaudio(ma_context* pContext, const ma_context_ static ma_result ma_job_process__device__aaudio_reroute(ma_job* pJob) { - ma_result result; + ma_result result = MA_SUCCESS; ma_device* pDevice; MA_ASSERT(pJob != NULL); @@ -38706,19 +40158,22 @@ static ma_result ma_job_process__device__aaudio_reroute(ma_job* pJob) pDevice = (ma_device*)pJob->data.device.aaudio.reroute.pDevice; MA_ASSERT(pDevice != NULL); - /* Here is where we need to reroute the device. To do this we need to uninitialize the stream and reinitialize it. */ - result = ma_device_reinit__aaudio(pDevice, (ma_device_type)pJob->data.device.aaudio.reroute.deviceType); - if (result != MA_SUCCESS) { - /* - Getting here means we failed to reroute the device. The best thing I can think of here is to - just stop the device. - */ - ma_log_post(ma_device_get_log(pDevice), MA_LOG_LEVEL_ERROR, "[AAudio] Stopping device due to reroute failure."); - ma_device_stop(pDevice); - return result; + ma_mutex_lock(&pDevice->aaudio.rerouteLock); + { + /* Here is where we need to reroute the device. To do this we need to uninitialize the stream and reinitialize it. */ + result = ma_device_reinit__aaudio(pDevice, (ma_device_type)pJob->data.device.aaudio.reroute.deviceType); + if (result != MA_SUCCESS) { + /* + Getting here means we failed to reroute the device. The best thing I can think of here is to + just stop the device. + */ + ma_log_post(ma_device_get_log(pDevice), MA_LOG_LEVEL_ERROR, "[AAudio] Stopping device due to reroute failure."); + ma_device_stop(pDevice); + } } + ma_mutex_unlock(&pDevice->aaudio.rerouteLock); - return MA_SUCCESS; + return result; } #else /* Getting here means there is no AAudio backend so we need a no-op job implementation. */ @@ -41236,13 +42691,13 @@ MA_API ma_result ma_device_post_init(ma_device* pDevice, ma_device_type deviceTy static ma_thread_result MA_THREADCALL ma_worker_thread(void* pData) { ma_device* pDevice = (ma_device*)pData; -#ifdef MA_WIN32 +#if defined(MA_WIN32) && !defined(MA_XBOX) HRESULT CoInitializeResult; #endif MA_ASSERT(pDevice != NULL); -#ifdef MA_WIN32 +#if defined(MA_WIN32) && !defined(MA_XBOX) CoInitializeResult = ma_CoInitializeEx(pDevice->pContext, NULL, MA_COINIT_VALUE); #endif @@ -41333,8 +42788,8 @@ static ma_thread_result MA_THREADCALL ma_worker_thread(void* pData) ma_event_signal(&pDevice->stopEvent); } -#ifdef MA_WIN32 - if (CoInitializeResult == S_OK) { +#if defined(MA_WIN32) && !defined(MA_XBOX) + if (CoInitializeResult == S_OK || CoInitializeResult == S_FALSE) { ma_CoUninitialize(pDevice->pContext); } #endif @@ -41358,67 +42813,92 @@ static ma_bool32 ma_device__is_initialized(ma_device* pDevice) static ma_result ma_context_uninit_backend_apis__win32(ma_context* pContext) { /* For some reason UWP complains when CoUninitialize() is called. I'm just not going to call it on UWP. */ -#if defined(MA_WIN32_DESKTOP) || defined(MA_WIN32_GDK) - if (pContext->win32.CoInitializeResult == S_OK) { - ma_CoUninitialize(pContext); + #if defined(MA_WIN32_DESKTOP) || defined(MA_WIN32_GDK) + { + /* TODO: Remove this once the new single threaded backend system is in place in 0.12. */ + #if !defined(MA_XBOX) + { + if (pContext->win32.CoInitializeResult == S_OK || pContext->win32.CoInitializeResult == S_FALSE) { + ma_CoUninitialize(pContext); /* TODO: Remove this once the new single threaded backend system is in place in 0.12. */ + } + } + #endif + + #if defined(MA_WIN32_DESKTOP) + ma_dlclose(ma_context_get_log(pContext), pContext->win32.hUser32DLL); + ma_dlclose(ma_context_get_log(pContext), pContext->win32.hAdvapi32DLL); + #endif + + ma_dlclose(ma_context_get_log(pContext), pContext->win32.hOle32DLL); + } + #else + { + (void)pContext; } - - #if defined(MA_WIN32_DESKTOP) - ma_dlclose(ma_context_get_log(pContext), pContext->win32.hUser32DLL); - ma_dlclose(ma_context_get_log(pContext), pContext->win32.hAdvapi32DLL); #endif - ma_dlclose(ma_context_get_log(pContext), pContext->win32.hOle32DLL); -#else - (void)pContext; -#endif - return MA_SUCCESS; } static ma_result ma_context_init_backend_apis__win32(ma_context* pContext) { -#if defined(MA_WIN32_DESKTOP) || defined(MA_WIN32_GDK) - #if defined(MA_WIN32_DESKTOP) - /* User32.dll */ - pContext->win32.hUser32DLL = ma_dlopen(ma_context_get_log(pContext), "user32.dll"); - if (pContext->win32.hUser32DLL == NULL) { + /* + TODO: Reassess all of this stuff and move everything to the relevant backends. For example, I think + GetForegroundWindow() and GetDesktopWindow() are only used by the DirectSound backend. + */ + #if (defined(MA_WIN32_DESKTOP) || defined(MA_WIN32_GDK)) && !defined(MA_XBOX) + { + #if defined(MA_WIN32_DESKTOP) + { + /* User32.dll */ + pContext->win32.hUser32DLL = ma_dlopen(ma_context_get_log(pContext), "user32.dll"); + if (pContext->win32.hUser32DLL == NULL) { + return MA_FAILED_TO_INIT_BACKEND; + } + + pContext->win32.GetForegroundWindow = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hUser32DLL, "GetForegroundWindow"); + pContext->win32.GetDesktopWindow = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hUser32DLL, "GetDesktopWindow"); + + + /* Advapi32.dll */ + pContext->win32.hAdvapi32DLL = ma_dlopen(ma_context_get_log(pContext), "advapi32.dll"); + if (pContext->win32.hAdvapi32DLL == NULL) { + return MA_FAILED_TO_INIT_BACKEND; + } + + pContext->win32.RegOpenKeyExA = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hAdvapi32DLL, "RegOpenKeyExA"); + pContext->win32.RegCloseKey = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hAdvapi32DLL, "RegCloseKey"); + pContext->win32.RegQueryValueExA = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hAdvapi32DLL, "RegQueryValueExA"); + } + #endif + + /* Ole32.dll */ + pContext->win32.hOle32DLL = ma_dlopen(ma_context_get_log(pContext), "ole32.dll"); + if (pContext->win32.hOle32DLL == NULL) { return MA_FAILED_TO_INIT_BACKEND; } - pContext->win32.GetForegroundWindow = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hUser32DLL, "GetForegroundWindow"); - pContext->win32.GetDesktopWindow = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hUser32DLL, "GetDesktopWindow"); - - - /* Advapi32.dll */ - pContext->win32.hAdvapi32DLL = ma_dlopen(ma_context_get_log(pContext), "advapi32.dll"); - if (pContext->win32.hAdvapi32DLL == NULL) { - return MA_FAILED_TO_INIT_BACKEND; - } - - pContext->win32.RegOpenKeyExA = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hAdvapi32DLL, "RegOpenKeyExA"); - pContext->win32.RegCloseKey = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hAdvapi32DLL, "RegCloseKey"); - pContext->win32.RegQueryValueExA = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hAdvapi32DLL, "RegQueryValueExA"); + pContext->win32.CoInitialize = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "CoInitialize"); + pContext->win32.CoInitializeEx = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "CoInitializeEx"); + pContext->win32.CoUninitialize = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "CoUninitialize"); + pContext->win32.CoCreateInstance = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "CoCreateInstance"); + pContext->win32.CoTaskMemFree = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "CoTaskMemFree"); + pContext->win32.PropVariantClear = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "PropVariantClear"); + pContext->win32.StringFromGUID2 = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "StringFromGUID2"); + } + #else + { + (void)pContext; /* Unused. */ + } #endif - /* Ole32.dll */ - pContext->win32.hOle32DLL = ma_dlopen(ma_context_get_log(pContext), "ole32.dll"); - if (pContext->win32.hOle32DLL == NULL) { - return MA_FAILED_TO_INIT_BACKEND; + /* TODO: Remove this once the new single threaded backend system is in place in 0.12. */ + #if !defined(MA_XBOX) + { + pContext->win32.CoInitializeResult = ma_CoInitializeEx(pContext, NULL, MA_COINIT_VALUE); } + #endif - pContext->win32.CoInitialize = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "CoInitialize"); - pContext->win32.CoInitializeEx = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "CoInitializeEx"); - pContext->win32.CoUninitialize = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "CoUninitialize"); - pContext->win32.CoCreateInstance = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "CoCreateInstance"); - pContext->win32.CoTaskMemFree = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "CoTaskMemFree"); - pContext->win32.PropVariantClear = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "PropVariantClear"); - pContext->win32.StringFromGUID2 = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "StringFromGUID2"); -#else - (void)pContext; /* Unused. */ -#endif - - pContext->win32.CoInitializeResult = ma_CoInitializeEx(pContext, NULL, MA_COINIT_VALUE); return MA_SUCCESS; } #else @@ -44016,7 +45496,7 @@ static MA_INLINE void ma_pcm_s16_to_s32__reference(void* dst, const void* src, m ma_uint64 i; for (i = 0; i < count; i += 1) { - dst_s32[i] = src_s16[i] << 16; + dst_s32[i] = (ma_int32)src_s16[i] << 16; } (void)ditherMode; @@ -56408,8 +57888,12 @@ MA_API size_t ma_channel_map_to_string(const ma_channel* pChannelMap, ma_uint32 } /* Null terminate. Don't increment the length here. */ - if (pBufferOut != NULL && bufferCap > len + 1) { - pBufferOut[len] = '\0'; + if (pBufferOut != NULL) { + if (bufferCap > len) { + pBufferOut[len] = '\0'; + } else if (bufferCap > 0) { + pBufferOut[bufferCap - 1] = '\0'; + } } return len; @@ -56620,7 +58104,7 @@ MA_API ma_result ma_rb_init_ex(size_t subbufferSizeInBytes, size_t subbufferCoun Here is where we allocate our own buffer. We always want to align this to MA_SIMD_ALIGNMENT for future SIMD optimization opportunity. To do this we need to make sure the stride is a multiple of MA_SIMD_ALIGNMENT. */ - pRB->subbufferStrideInBytes = (pRB->subbufferSizeInBytes + (MA_SIMD_ALIGNMENT-1)) & ~MA_SIMD_ALIGNMENT; + pRB->subbufferStrideInBytes = ma_align(pRB->subbufferSizeInBytes, MA_SIMD_ALIGNMENT); bufferSizeInBytes = (size_t)pRB->subbufferCount*pRB->subbufferStrideInBytes; pRB->pBuffer = ma_aligned_malloc(bufferSizeInBytes, MA_SIMD_ALIGNMENT, &pRB->allocationCallbacks); @@ -59515,7 +60999,7 @@ MA_API ma_result ma_vfs_info(ma_vfs* pVFS, ma_vfs_file file, ma_file_info* pInfo } -#if !defined(MA_USE_WIN32_FILEIO) && (defined(MA_WIN32) && defined(MA_WIN32_DESKTOP) && !defined(MA_NO_WIN32_FILEIO) && !defined(MA_POSIX)) +#if !defined(MA_USE_WIN32_FILEIO) && (defined(MA_WIN32) && (defined(MA_WIN32_DESKTOP) || defined(MA_WIN32_NXDK)) && !defined(MA_NO_WIN32_FILEIO) && !defined(MA_POSIX)) #define MA_USE_WIN32_FILEIO #endif @@ -59592,25 +61076,34 @@ static ma_result ma_default_vfs_open__win32(ma_vfs* pVFS, const char* pFilePath, static ma_result ma_default_vfs_open_w__win32(ma_vfs* pVFS, const wchar_t* pFilePath, ma_uint32 openMode, ma_vfs_file* pFile) { - HANDLE hFile; - DWORD dwDesiredAccess; - DWORD dwShareMode; - DWORD dwCreationDisposition; + #if !defined(MA_XBOX_NXDK) + { + HANDLE hFile; + DWORD dwDesiredAccess; + DWORD dwShareMode; + DWORD dwCreationDisposition; - (void)pVFS; + (void)pVFS; - /* Load some Win32 symbols dynamically so we can dynamically check for the existence of SetFilePointerEx. */ - ma_win32_fileio_init(); + /* Load some Win32 symbols dynamically so we can dynamically check for the existence of SetFilePointerEx. */ + ma_win32_fileio_init(); - ma_default_vfs__get_open_settings_win32(openMode, &dwDesiredAccess, &dwShareMode, &dwCreationDisposition); + ma_default_vfs__get_open_settings_win32(openMode, &dwDesiredAccess, &dwShareMode, &dwCreationDisposition); - hFile = CreateFileW(pFilePath, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, FILE_ATTRIBUTE_NORMAL, NULL); - if (hFile == INVALID_HANDLE_VALUE) { - return ma_result_from_GetLastError(GetLastError()); + hFile = CreateFileW(pFilePath, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile == INVALID_HANDLE_VALUE) { + return ma_result_from_GetLastError(GetLastError()); + } + + *pFile = hFile; + return MA_SUCCESS; } - - *pFile = hFile; - return MA_SUCCESS; + #else + { + /* No CreateFileW() available. */ + return MA_NOT_IMPLEMENTED; + } + #endif } static ma_result ma_default_vfs_close__win32(ma_vfs* pVFS, ma_vfs_file file) @@ -59781,19 +61274,28 @@ static ma_result ma_default_vfs_tell__win32(ma_vfs* pVFS, ma_vfs_file file, ma_i static ma_result ma_default_vfs_info__win32(ma_vfs* pVFS, ma_vfs_file file, ma_file_info* pInfo) { - BY_HANDLE_FILE_INFORMATION fi; - BOOL result; - (void)pVFS; - result = GetFileInformationByHandle((HANDLE)file, &fi); - if (result == 0) { - return ma_result_from_GetLastError(GetLastError()); + #if !defined(MA_XBOX_NXDK) + { + BY_HANDLE_FILE_INFORMATION fi; + BOOL result; + + result = GetFileInformationByHandle((HANDLE)file, &fi); + if (result == 0) { + return ma_result_from_GetLastError(GetLastError()); + } + + pInfo->sizeInBytes = ((ma_uint64)fi.nFileSizeHigh << 32) | ((ma_uint64)fi.nFileSizeLow); + + return MA_SUCCESS; } - - pInfo->sizeInBytes = ((ma_uint64)fi.nFileSizeHigh << 32) | ((ma_uint64)fi.nFileSizeLow); - - return MA_SUCCESS; + #else + { + /* GetFileInformationByHandle() is unavailable. */ + return MA_NOT_IMPLEMENTED; + } + #endif } #else static ma_result ma_default_vfs_open__stdio(ma_vfs* pVFS, const char* pFilePath, ma_uint32 openMode, ma_vfs_file* pFile) @@ -60131,6 +61633,8 @@ static ma_result ma_default_vfs_tell(ma_vfs* pVFS, ma_vfs_file file, ma_int64* p static ma_result ma_default_vfs_info(ma_vfs* pVFS, ma_vfs_file file, ma_file_info* pInfo) { + ma_result result; + if (pInfo == NULL) { return MA_INVALID_ARGS; } @@ -60142,10 +61646,43 @@ static ma_result ma_default_vfs_info(ma_vfs* pVFS, ma_vfs_file file, ma_file_inf } #if defined(MA_USE_WIN32_FILEIO) - return ma_default_vfs_info__win32(pVFS, file, pInfo); + result = ma_default_vfs_info__win32(pVFS, file, pInfo); #else - return ma_default_vfs_info__stdio(pVFS, file, pInfo); + result = ma_default_vfs_info__stdio(pVFS, file, pInfo); #endif + + if (result == MA_NOT_IMPLEMENTED) { + /* Not implemented. Fall back to seek/tell/seek. */ + ma_result result; + ma_int64 cursor; + ma_int64 sizeInBytes; + + result = ma_default_vfs_tell(pVFS, file, &cursor); + if (result != MA_SUCCESS) { + return result; + } + + result = ma_default_vfs_seek(pVFS, file, 0, ma_seek_origin_end); + if (result != MA_SUCCESS) { + return result; + } + + result = ma_default_vfs_tell(pVFS, file, &sizeInBytes); + if (result != MA_SUCCESS) { + return result; + } + + pInfo->sizeInBytes = sizeInBytes; + + result = ma_default_vfs_seek(pVFS, file, cursor, ma_seek_origin_start); + if (result != MA_SUCCESS) { + return result; + } + + MA_ASSERT(result == MA_SUCCESS); + } + + return result; } @@ -60333,8 +61870,8 @@ extern "C" { #define MA_DR_WAV_STRINGIFY(x) #x #define MA_DR_WAV_XSTRINGIFY(x) MA_DR_WAV_STRINGIFY(x) #define MA_DR_WAV_VERSION_MAJOR 0 -#define MA_DR_WAV_VERSION_MINOR 13 -#define MA_DR_WAV_VERSION_REVISION 18 +#define MA_DR_WAV_VERSION_MINOR 14 +#define MA_DR_WAV_VERSION_REVISION 1 #define MA_DR_WAV_VERSION_STRING MA_DR_WAV_XSTRINGIFY(MA_DR_WAV_VERSION_MAJOR) "." MA_DR_WAV_XSTRINGIFY(MA_DR_WAV_VERSION_MINOR) "." MA_DR_WAV_XSTRINGIFY(MA_DR_WAV_VERSION_REVISION) #include #define MA_DR_WAVE_FORMAT_PCM 0x1 @@ -60350,8 +61887,9 @@ MA_API void ma_dr_wav_version(ma_uint32* pMajor, ma_uint32* pMinor, ma_uint32* p MA_API const char* ma_dr_wav_version_string(void); typedef enum { - ma_dr_wav_seek_origin_start, - ma_dr_wav_seek_origin_current + MA_DR_WAV_SEEK_SET, + MA_DR_WAV_SEEK_CUR, + MA_DR_WAV_SEEK_END } ma_dr_wav_seek_origin; typedef enum { @@ -60388,6 +61926,7 @@ MA_API ma_uint16 ma_dr_wav_fmt_get_format(const ma_dr_wav_fmt* pFMT); typedef size_t (* ma_dr_wav_read_proc)(void* pUserData, void* pBufferOut, size_t bytesToRead); typedef size_t (* ma_dr_wav_write_proc)(void* pUserData, const void* pData, size_t bytesToWrite); typedef ma_bool32 (* ma_dr_wav_seek_proc)(void* pUserData, int offset, ma_dr_wav_seek_origin origin); +typedef ma_bool32 (* ma_dr_wav_tell_proc)(void* pUserData, ma_int64* pCursor); typedef ma_uint64 (* ma_dr_wav_chunk_proc)(void* pChunkUserData, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, void* pReadSeekUserData, const ma_dr_wav_chunk_header* pChunkHeader, ma_dr_wav_container container, const ma_dr_wav_fmt* pFMT); typedef struct { @@ -60432,6 +61971,11 @@ typedef enum ma_dr_wav_metadata_type_list_info_genre = 1 << 15, ma_dr_wav_metadata_type_list_info_album = 1 << 16, ma_dr_wav_metadata_type_list_info_tracknumber = 1 << 17, + ma_dr_wav_metadata_type_list_info_location = 1 << 18, + ma_dr_wav_metadata_type_list_info_organization = 1 << 19, + ma_dr_wav_metadata_type_list_info_keywords = 1 << 20, + ma_dr_wav_metadata_type_list_info_medium = 1 << 21, + ma_dr_wav_metadata_type_list_info_description = 1 << 22, ma_dr_wav_metadata_type_list_all_info_strings = ma_dr_wav_metadata_type_list_info_software | ma_dr_wav_metadata_type_list_info_copyright | ma_dr_wav_metadata_type_list_info_title @@ -60440,7 +61984,12 @@ typedef enum | ma_dr_wav_metadata_type_list_info_date | ma_dr_wav_metadata_type_list_info_genre | ma_dr_wav_metadata_type_list_info_album - | ma_dr_wav_metadata_type_list_info_tracknumber, + | ma_dr_wav_metadata_type_list_info_tracknumber + | ma_dr_wav_metadata_type_list_info_location + | ma_dr_wav_metadata_type_list_info_organization + | ma_dr_wav_metadata_type_list_info_keywords + | ma_dr_wav_metadata_type_list_info_medium + | ma_dr_wav_metadata_type_list_info_description, ma_dr_wav_metadata_type_list_all_adtl = ma_dr_wav_metadata_type_list_label | ma_dr_wav_metadata_type_list_note | ma_dr_wav_metadata_type_list_labelled_cue_region, @@ -60457,8 +62006,8 @@ typedef struct { ma_uint32 cuePointId; ma_uint32 type; - ma_uint32 firstSampleByteOffset; - ma_uint32 lastSampleByteOffset; + ma_uint32 firstSampleOffset; + ma_uint32 lastSampleOffset; ma_uint32 sampleFraction; ma_uint32 playCount; } ma_dr_wav_smpl_loop; @@ -60493,7 +62042,7 @@ typedef struct ma_uint8 dataChunkId[4]; ma_uint32 chunkStart; ma_uint32 blockStart; - ma_uint32 sampleByteOffset; + ma_uint32 sampleOffset; } ma_dr_wav_cue_point; typedef struct { @@ -60595,6 +62144,7 @@ typedef struct ma_dr_wav_read_proc onRead; ma_dr_wav_write_proc onWrite; ma_dr_wav_seek_proc onSeek; + ma_dr_wav_tell_proc onTell; void* pUserData; ma_allocation_callbacks allocationCallbacks; ma_dr_wav_container container; @@ -60637,9 +62187,9 @@ typedef struct ma_bool8 isUnsigned; } aiff; } ma_dr_wav; -MA_API ma_bool32 ma_dr_wav_init(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); -MA_API ma_bool32 ma_dr_wav_init_ex(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_chunk_proc onChunk, void* pReadSeekUserData, void* pChunkUserData, ma_uint32 flags, const ma_allocation_callbacks* pAllocationCallbacks); -MA_API ma_bool32 ma_dr_wav_init_with_metadata(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, void* pUserData, ma_uint32 flags, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_bool32 ma_dr_wav_init(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_tell_proc onTell, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_bool32 ma_dr_wav_init_ex(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_tell_proc onTell, ma_dr_wav_chunk_proc onChunk, void* pReadSeekTellUserData, void* pChunkUserData, ma_uint32 flags, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_bool32 ma_dr_wav_init_with_metadata(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_tell_proc onTell, void* pUserData, ma_uint32 flags, const ma_allocation_callbacks* pAllocationCallbacks); MA_API ma_bool32 ma_dr_wav_init_write(ma_dr_wav* pWav, const ma_dr_wav_data_format* pFormat, ma_dr_wav_write_proc onWrite, ma_dr_wav_seek_proc onSeek, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); MA_API ma_bool32 ma_dr_wav_init_write_sequential(ma_dr_wav* pWav, const ma_dr_wav_data_format* pFormat, ma_uint64 totalSampleCount, ma_dr_wav_write_proc onWrite, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); MA_API ma_bool32 ma_dr_wav_init_write_sequential_pcm_frames(ma_dr_wav* pWav, const ma_dr_wav_data_format* pFormat, ma_uint64 totalPCMFrameCount, ma_dr_wav_write_proc onWrite, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); @@ -60711,9 +62261,9 @@ MA_API ma_bool32 ma_dr_wav_init_memory_write(ma_dr_wav* pWav, void** ppData, siz MA_API ma_bool32 ma_dr_wav_init_memory_write_sequential(ma_dr_wav* pWav, void** ppData, size_t* pDataSize, const ma_dr_wav_data_format* pFormat, ma_uint64 totalSampleCount, const ma_allocation_callbacks* pAllocationCallbacks); MA_API ma_bool32 ma_dr_wav_init_memory_write_sequential_pcm_frames(ma_dr_wav* pWav, void** ppData, size_t* pDataSize, const ma_dr_wav_data_format* pFormat, ma_uint64 totalPCMFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); #ifndef MA_DR_WAV_NO_CONVERSION_API -MA_API ma_int16* ma_dr_wav_open_and_read_pcm_frames_s16(ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks); -MA_API float* ma_dr_wav_open_and_read_pcm_frames_f32(ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks); -MA_API ma_int32* ma_dr_wav_open_and_read_pcm_frames_s32(ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_int16* ma_dr_wav_open_and_read_pcm_frames_s16(ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_tell_proc onTell, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API float* ma_dr_wav_open_and_read_pcm_frames_f32(ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_tell_proc onTell, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_int32* ma_dr_wav_open_and_read_pcm_frames_s32(ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_tell_proc onTell, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks); #ifndef MA_DR_WAV_NO_STDIO MA_API ma_int16* ma_dr_wav_open_file_and_read_pcm_frames_s16(const char* filename, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks); MA_API float* ma_dr_wav_open_file_and_read_pcm_frames_f32(const char* filename, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks); @@ -60753,8 +62303,8 @@ extern "C" { #define MA_DR_FLAC_STRINGIFY(x) #x #define MA_DR_FLAC_XSTRINGIFY(x) MA_DR_FLAC_STRINGIFY(x) #define MA_DR_FLAC_VERSION_MAJOR 0 -#define MA_DR_FLAC_VERSION_MINOR 12 -#define MA_DR_FLAC_VERSION_REVISION 43 +#define MA_DR_FLAC_VERSION_MINOR 13 +#define MA_DR_FLAC_VERSION_REVISION 1 #define MA_DR_FLAC_VERSION_STRING MA_DR_FLAC_XSTRINGIFY(MA_DR_FLAC_VERSION_MAJOR) "." MA_DR_FLAC_XSTRINGIFY(MA_DR_FLAC_VERSION_MINOR) "." MA_DR_FLAC_XSTRINGIFY(MA_DR_FLAC_VERSION_REVISION) #include #if defined(_MSC_VER) && _MSC_VER >= 1700 @@ -60817,8 +62367,9 @@ typedef enum } ma_dr_flac_container; typedef enum { - ma_dr_flac_seek_origin_start, - ma_dr_flac_seek_origin_current + MA_DR_FLAC_SEEK_SET, + MA_DR_FLAC_SEEK_CUR, + MA_DR_FLAC_SEEK_END } ma_dr_flac_seek_origin; typedef struct { @@ -60894,6 +62445,7 @@ typedef struct } ma_dr_flac_metadata; typedef size_t (* ma_dr_flac_read_proc)(void* pUserData, void* pBufferOut, size_t bytesToRead); typedef ma_bool32 (* ma_dr_flac_seek_proc)(void* pUserData, int offset, ma_dr_flac_seek_origin origin); +typedef ma_bool32 (* ma_dr_flac_tell_proc)(void* pUserData, ma_int64* pCursor); typedef void (* ma_dr_flac_meta_proc)(void* pUserData, ma_dr_flac_metadata* pMetadata); typedef struct { @@ -60905,6 +62457,7 @@ typedef struct { ma_dr_flac_read_proc onRead; ma_dr_flac_seek_proc onSeek; + ma_dr_flac_tell_proc onTell; void* pUserData; size_t unalignedByteCount; ma_dr_flac_cache_t unalignedCache; @@ -60964,10 +62517,10 @@ typedef struct ma_dr_flac_bs bs; ma_uint8 pExtraData[1]; } ma_dr_flac; -MA_API ma_dr_flac* ma_dr_flac_open(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); -MA_API ma_dr_flac* ma_dr_flac_open_relaxed(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_container container, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); -MA_API ma_dr_flac* ma_dr_flac_open_with_metadata(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_meta_proc onMeta, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); -MA_API ma_dr_flac* ma_dr_flac_open_with_metadata_relaxed(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_meta_proc onMeta, ma_dr_flac_container container, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_dr_flac* ma_dr_flac_open(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_dr_flac* ma_dr_flac_open_relaxed(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, ma_dr_flac_container container, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_dr_flac* ma_dr_flac_open_with_metadata(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, ma_dr_flac_meta_proc onMeta, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_dr_flac* ma_dr_flac_open_with_metadata_relaxed(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, ma_dr_flac_meta_proc onMeta, ma_dr_flac_container container, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); MA_API void ma_dr_flac_close(ma_dr_flac* pFlac); MA_API ma_uint64 ma_dr_flac_read_pcm_frames_s32(ma_dr_flac* pFlac, ma_uint64 framesToRead, ma_int32* pBufferOut); MA_API ma_uint64 ma_dr_flac_read_pcm_frames_s16(ma_dr_flac* pFlac, ma_uint64 framesToRead, ma_int16* pBufferOut); @@ -60981,9 +62534,9 @@ MA_API ma_dr_flac* ma_dr_flac_open_file_with_metadata_w(const wchar_t* pFileName #endif MA_API ma_dr_flac* ma_dr_flac_open_memory(const void* pData, size_t dataSize, const ma_allocation_callbacks* pAllocationCallbacks); MA_API ma_dr_flac* ma_dr_flac_open_memory_with_metadata(const void* pData, size_t dataSize, ma_dr_flac_meta_proc onMeta, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); -MA_API ma_int32* ma_dr_flac_open_and_read_pcm_frames_s32(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, void* pUserData, unsigned int* channels, unsigned int* sampleRate, ma_uint64* totalPCMFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); -MA_API ma_int16* ma_dr_flac_open_and_read_pcm_frames_s16(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, void* pUserData, unsigned int* channels, unsigned int* sampleRate, ma_uint64* totalPCMFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); -MA_API float* ma_dr_flac_open_and_read_pcm_frames_f32(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, void* pUserData, unsigned int* channels, unsigned int* sampleRate, ma_uint64* totalPCMFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_int32* ma_dr_flac_open_and_read_pcm_frames_s32(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, void* pUserData, unsigned int* channels, unsigned int* sampleRate, ma_uint64* totalPCMFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_int16* ma_dr_flac_open_and_read_pcm_frames_s16(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, void* pUserData, unsigned int* channels, unsigned int* sampleRate, ma_uint64* totalPCMFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API float* ma_dr_flac_open_and_read_pcm_frames_f32(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, void* pUserData, unsigned int* channels, unsigned int* sampleRate, ma_uint64* totalPCMFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); #ifndef MA_DR_FLAC_NO_STDIO MA_API ma_int32* ma_dr_flac_open_file_and_read_pcm_frames_s32(const char* filename, unsigned int* channels, unsigned int* sampleRate, ma_uint64* totalPCMFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); MA_API ma_int16* ma_dr_flac_open_file_and_read_pcm_frames_s16(const char* filename, unsigned int* channels, unsigned int* sampleRate, ma_uint64* totalPCMFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); @@ -61031,6 +62584,12 @@ MA_API ma_bool32 ma_dr_flac_next_cuesheet_track(ma_dr_flac_cuesheet_track_iterat #endif /* MA_NO_FLAC */ #if !defined(MA_NO_MP3) && !defined(MA_NO_DECODING) +#ifndef MA_DR_MP3_NO_SIMD + #if (defined(MA_NO_NEON) && defined(MA_ARM)) || (defined(MA_NO_SSE2) && (defined(MA_X86) || defined(MA_X64))) + #define MA_DR_MP3_NO_SIMD + #endif +#endif + /* dr_mp3_h begin */ #ifndef ma_dr_mp3_h #define ma_dr_mp3_h @@ -61040,8 +62599,8 @@ extern "C" { #define MA_DR_MP3_STRINGIFY(x) #x #define MA_DR_MP3_XSTRINGIFY(x) MA_DR_MP3_STRINGIFY(x) #define MA_DR_MP3_VERSION_MAJOR 0 -#define MA_DR_MP3_VERSION_MINOR 6 -#define MA_DR_MP3_VERSION_REVISION 40 +#define MA_DR_MP3_VERSION_MINOR 7 +#define MA_DR_MP3_VERSION_REVISION 1 #define MA_DR_MP3_VERSION_STRING MA_DR_MP3_XSTRINGIFY(MA_DR_MP3_VERSION_MAJOR) "." MA_DR_MP3_XSTRINGIFY(MA_DR_MP3_VERSION_MINOR) "." MA_DR_MP3_XSTRINGIFY(MA_DR_MP3_VERSION_REVISION) #include #define MA_DR_MP3_MAX_PCM_FRAMES_PER_MP3_FRAME 1152 @@ -61050,7 +62609,7 @@ MA_API void ma_dr_mp3_version(ma_uint32* pMajor, ma_uint32* pMinor, ma_uint32* p MA_API const char* ma_dr_mp3_version_string(void); typedef struct { - int frame_bytes, channels, hz, layer, bitrate_kbps; + int frame_bytes, channels, sample_rate, layer, bitrate_kbps; } ma_dr_mp3dec_frame_info; typedef struct { @@ -61063,8 +62622,9 @@ MA_API int ma_dr_mp3dec_decode_frame(ma_dr_mp3dec *dec, const ma_uint8 *mp3, int MA_API void ma_dr_mp3dec_f32_to_s16(const float *in, ma_int16 *out, size_t num_samples); typedef enum { - ma_dr_mp3_seek_origin_start, - ma_dr_mp3_seek_origin_current + MA_DR_MP3_SEEK_SET, + MA_DR_MP3_SEEK_CUR, + MA_DR_MP3_SEEK_END } ma_dr_mp3_seek_origin; typedef struct { @@ -61073,8 +62633,24 @@ typedef struct ma_uint16 mp3FramesToDiscard; ma_uint16 pcmFramesToDiscard; } ma_dr_mp3_seek_point; +typedef enum +{ + MA_DR_MP3_METADATA_TYPE_ID3V1, + MA_DR_MP3_METADATA_TYPE_ID3V2, + MA_DR_MP3_METADATA_TYPE_APE, + MA_DR_MP3_METADATA_TYPE_XING, + MA_DR_MP3_METADATA_TYPE_VBRI +} ma_dr_mp3_metadata_type; +typedef struct +{ + ma_dr_mp3_metadata_type type; + const void* pRawData; + size_t rawDataSize; +} ma_dr_mp3_metadata; typedef size_t (* ma_dr_mp3_read_proc)(void* pUserData, void* pBufferOut, size_t bytesToRead); typedef ma_bool32 (* ma_dr_mp3_seek_proc)(void* pUserData, int offset, ma_dr_mp3_seek_origin origin); +typedef ma_bool32 (* ma_dr_mp3_tell_proc)(void* pUserData, ma_int64* pCursor); +typedef void (* ma_dr_mp3_meta_proc)(void* pUserData, const ma_dr_mp3_metadata* pMetadata); typedef struct { ma_uint32 channels; @@ -61087,7 +62663,9 @@ typedef struct ma_uint32 sampleRate; ma_dr_mp3_read_proc onRead; ma_dr_mp3_seek_proc onSeek; + ma_dr_mp3_meta_proc onMeta; void* pUserData; + void* pUserDataMeta; ma_allocation_callbacks allocationCallbacks; ma_uint32 mp3FrameChannels; ma_uint32 mp3FrameSampleRate; @@ -61096,13 +62674,20 @@ typedef struct ma_uint8 pcmFrames[sizeof(float)*MA_DR_MP3_MAX_SAMPLES_PER_FRAME]; ma_uint64 currentPCMFrame; ma_uint64 streamCursor; + ma_uint64 streamLength; + ma_uint64 streamStartOffset; ma_dr_mp3_seek_point* pSeekPoints; ma_uint32 seekPointCount; + ma_uint32 delayInPCMFrames; + ma_uint32 paddingInPCMFrames; + ma_uint64 totalPCMFrameCount; + ma_bool32 isVBR; + ma_bool32 isCBR; size_t dataSize; size_t dataCapacity; size_t dataConsumed; ma_uint8* pData; - ma_bool32 atEnd : 1; + ma_bool32 atEnd; struct { const ma_uint8* pData; @@ -61110,9 +62695,12 @@ typedef struct size_t currentReadPos; } memory; } ma_dr_mp3; -MA_API ma_bool32 ma_dr_mp3_init(ma_dr_mp3* pMP3, ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_bool32 ma_dr_mp3_init(ma_dr_mp3* pMP3, ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, ma_dr_mp3_tell_proc onTell, ma_dr_mp3_meta_proc onMeta, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_bool32 ma_dr_mp3_init_memory_with_metadata(ma_dr_mp3* pMP3, const void* pData, size_t dataSize, ma_dr_mp3_meta_proc onMeta, void* pUserDataMeta, const ma_allocation_callbacks* pAllocationCallbacks); MA_API ma_bool32 ma_dr_mp3_init_memory(ma_dr_mp3* pMP3, const void* pData, size_t dataSize, const ma_allocation_callbacks* pAllocationCallbacks); #ifndef MA_DR_MP3_NO_STDIO +MA_API ma_bool32 ma_dr_mp3_init_file_with_metadata(ma_dr_mp3* pMP3, const char* pFilePath, ma_dr_mp3_meta_proc onMeta, void* pUserDataMeta, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_bool32 ma_dr_mp3_init_file_with_metadata_w(ma_dr_mp3* pMP3, const wchar_t* pFilePath, ma_dr_mp3_meta_proc onMeta, void* pUserDataMeta, const ma_allocation_callbacks* pAllocationCallbacks); MA_API ma_bool32 ma_dr_mp3_init_file(ma_dr_mp3* pMP3, const char* pFilePath, const ma_allocation_callbacks* pAllocationCallbacks); MA_API ma_bool32 ma_dr_mp3_init_file_w(ma_dr_mp3* pMP3, const wchar_t* pFilePath, const ma_allocation_callbacks* pAllocationCallbacks); #endif @@ -61125,8 +62713,8 @@ MA_API ma_uint64 ma_dr_mp3_get_mp3_frame_count(ma_dr_mp3* pMP3); MA_API ma_bool32 ma_dr_mp3_get_mp3_and_pcm_frame_count(ma_dr_mp3* pMP3, ma_uint64* pMP3FrameCount, ma_uint64* pPCMFrameCount); MA_API ma_bool32 ma_dr_mp3_calculate_seek_points(ma_dr_mp3* pMP3, ma_uint32* pSeekPointCount, ma_dr_mp3_seek_point* pSeekPoints); MA_API ma_bool32 ma_dr_mp3_bind_seek_table(ma_dr_mp3* pMP3, ma_uint32 seekPointCount, ma_dr_mp3_seek_point* pSeekPoints); -MA_API float* ma_dr_mp3_open_and_read_pcm_frames_f32(ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, void* pUserData, ma_dr_mp3_config* pConfig, ma_uint64* pTotalFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); -MA_API ma_int16* ma_dr_mp3_open_and_read_pcm_frames_s16(ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, void* pUserData, ma_dr_mp3_config* pConfig, ma_uint64* pTotalFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API float* ma_dr_mp3_open_and_read_pcm_frames_f32(ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, ma_dr_mp3_tell_proc onTell, void* pUserData, ma_dr_mp3_config* pConfig, ma_uint64* pTotalFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_int16* ma_dr_mp3_open_and_read_pcm_frames_s16(ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, ma_dr_mp3_tell_proc onTell, void* pUserData, ma_dr_mp3_config* pConfig, ma_uint64* pTotalFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); MA_API float* ma_dr_mp3_open_memory_and_read_pcm_frames_f32(const void* pData, size_t dataSize, ma_dr_mp3_config* pConfig, ma_uint64* pTotalFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); MA_API ma_int16* ma_dr_mp3_open_memory_and_read_pcm_frames_s16(const void* pData, size_t dataSize, ma_dr_mp3_config* pConfig, ma_uint64* pTotalFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); #ifndef MA_DR_MP3_NO_STDIO @@ -61679,8 +63267,10 @@ static ma_bool32 ma_wav_dr_callback__seek(void* pUserData, int offset, ma_dr_wav MA_ASSERT(pWav != NULL); maSeekOrigin = ma_seek_origin_start; - if (origin == ma_dr_wav_seek_origin_current) { - maSeekOrigin = ma_seek_origin_current; + if (origin == MA_DR_WAV_SEEK_CUR) { + maSeekOrigin = ma_seek_origin_current; + } else if (origin == MA_DR_WAV_SEEK_END) { + maSeekOrigin = ma_seek_origin_end; } result = pWav->onSeek(pWav->pReadSeekTellUserData, offset, maSeekOrigin); @@ -61690,6 +63280,26 @@ static ma_bool32 ma_wav_dr_callback__seek(void* pUserData, int offset, ma_dr_wav return MA_TRUE; } + +static ma_bool32 ma_wav_dr_callback__tell(void* pUserData, ma_int64* pCursor) +{ + ma_wav* pWav = (ma_wav*)pUserData; + ma_result result; + + MA_ASSERT(pWav != NULL); + MA_ASSERT(pCursor != NULL); + + if (pWav->onTell == NULL) { + return MA_FALSE; /* Not implemented. */ + } + + result = pWav->onTell(pWav->pReadSeekTellUserData, pCursor); + if (result != MA_SUCCESS) { + return MA_FALSE; /* Failed to tell. */ + } + + return MA_TRUE; +} #endif static ma_result ma_wav_init_internal(const ma_decoding_backend_config* pConfig, ma_wav* pWav) @@ -61784,7 +63394,7 @@ MA_API ma_result ma_wav_init(ma_read_proc onRead, ma_seek_proc onSeek, ma_tell_p { ma_bool32 wavResult; - wavResult = ma_dr_wav_init(&pWav->dr, ma_wav_dr_callback__read, ma_wav_dr_callback__seek, pWav, pAllocationCallbacks); + wavResult = ma_dr_wav_init(&pWav->dr, ma_wav_dr_callback__read, ma_wav_dr_callback__seek, ma_wav_dr_callback__tell, pWav, pAllocationCallbacks); if (wavResult != MA_TRUE) { return MA_INVALID_FILE; } @@ -62363,8 +63973,10 @@ static ma_bool32 ma_flac_dr_callback__seek(void* pUserData, int offset, ma_dr_fl MA_ASSERT(pFlac != NULL); maSeekOrigin = ma_seek_origin_start; - if (origin == ma_dr_flac_seek_origin_current) { - maSeekOrigin = ma_seek_origin_current; + if (origin == MA_DR_FLAC_SEEK_CUR) { + maSeekOrigin = ma_seek_origin_current; + } else if (origin == MA_DR_FLAC_SEEK_END) { + maSeekOrigin = ma_seek_origin_end; } result = pFlac->onSeek(pFlac->pReadSeekTellUserData, offset, maSeekOrigin); @@ -62374,6 +63986,26 @@ static ma_bool32 ma_flac_dr_callback__seek(void* pUserData, int offset, ma_dr_fl return MA_TRUE; } + +static ma_bool32 ma_flac_dr_callback__tell(void* pUserData, ma_int64* pCursor) +{ + ma_flac* pFlac = (ma_flac*)pUserData; + ma_result result; + + MA_ASSERT(pFlac != NULL); + MA_ASSERT(pCursor != NULL); + + if (pFlac->onTell == NULL) { + return MA_FALSE; /* Not implemented. */ + } + + result = pFlac->onTell(pFlac->pReadSeekTellUserData, pCursor); + if (result != MA_SUCCESS) { + return MA_FALSE; /* Failed to tell. */ + } + + return MA_TRUE; +} #endif static ma_result ma_flac_init_internal(const ma_decoding_backend_config* pConfig, ma_flac* pFlac) @@ -62425,7 +64057,7 @@ MA_API ma_result ma_flac_init(ma_read_proc onRead, ma_seek_proc onSeek, ma_tell_ #if !defined(MA_NO_FLAC) { - pFlac->dr = ma_dr_flac_open(ma_flac_dr_callback__read, ma_flac_dr_callback__seek, pFlac, pAllocationCallbacks); + pFlac->dr = ma_dr_flac_open(ma_flac_dr_callback__read, ma_flac_dr_callback__seek, ma_flac_dr_callback__tell, pFlac, pAllocationCallbacks); if (pFlac->dr == NULL) { return MA_INVALID_FILE; } @@ -62986,9 +64618,12 @@ static ma_bool32 ma_mp3_dr_callback__seek(void* pUserData, int offset, ma_dr_mp3 MA_ASSERT(pMP3 != NULL); - maSeekOrigin = ma_seek_origin_start; - if (origin == ma_dr_mp3_seek_origin_current) { - maSeekOrigin = ma_seek_origin_current; + if (origin == MA_DR_MP3_SEEK_SET) { + maSeekOrigin = ma_seek_origin_start; + } else if (origin == MA_DR_MP3_SEEK_END) { + maSeekOrigin = ma_seek_origin_end; + } else { + maSeekOrigin = ma_seek_origin_current; } result = pMP3->onSeek(pMP3->pReadSeekTellUserData, offset, maSeekOrigin); @@ -62998,6 +64633,21 @@ static ma_bool32 ma_mp3_dr_callback__seek(void* pUserData, int offset, ma_dr_mp3 return MA_TRUE; } + +static ma_bool32 ma_mp3_dr_callback__tell(void* pUserData, ma_int64* pCursor) +{ + ma_mp3* pMP3 = (ma_mp3*)pUserData; + ma_result result; + + MA_ASSERT(pMP3 != NULL); + + result = pMP3->onTell(pMP3->pReadSeekTellUserData, pCursor); + if (result != MA_SUCCESS) { + return MA_FALSE; + } + + return MA_TRUE; +} #endif static ma_result ma_mp3_init_internal(const ma_decoding_backend_config* pConfig, ma_mp3* pMP3) @@ -63098,7 +64748,7 @@ MA_API ma_result ma_mp3_init(ma_read_proc onRead, ma_seek_proc onSeek, ma_tell_p { ma_bool32 mp3Result; - mp3Result = ma_dr_mp3_init(&pMP3->dr, ma_mp3_dr_callback__read, ma_mp3_dr_callback__seek, pMP3, pAllocationCallbacks); + mp3Result = ma_dr_mp3_init(&pMP3->dr, ma_mp3_dr_callback__read, ma_mp3_dr_callback__seek, ma_mp3_dr_callback__tell, NULL, pMP3, pAllocationCallbacks); if (mp3Result != MA_TRUE) { return MA_INVALID_FILE; } @@ -64997,14 +66647,16 @@ static ma_bool32 ma_path_extension_equal_w(const wchar_t* path, const wchar_t* e ext1 = extension; ext2 = ma_path_extension_w(path); -#if defined(_MSC_VER) || defined(__WATCOMC__) || defined(__DMC__) - return _wcsicmp(ext1, ext2) == 0; -#else - /* - I'm not aware of a wide character version of strcasecmp(). I'm therefore converting the extensions to multibyte strings and comparing those. This - isn't the most efficient way to do it, but it should work OK. - */ + #if (defined(_MSC_VER) || defined(__WATCOMC__) || defined(__DMC__)) && !defined(MA_XBOX_NXDK) { + return _wcsicmp(ext1, ext2) == 0; + } + #elif !defined(MA_XBOX_NXDK) && !defined(MA_DOS) + { + /* + I'm not aware of a wide character version of strcasecmp(). I'm therefore converting the extensions to multibyte strings and comparing those. This + isn't the most efficient way to do it, but it should work OK. + */ char ext1MB[4096]; char ext2MB[4096]; const wchar_t* pext1 = ext1; @@ -65024,7 +66676,13 @@ static ma_bool32 ma_path_extension_equal_w(const wchar_t* path, const wchar_t* e return strcasecmp(ext1MB, ext2MB) == 0; } -#endif + #else + { + /* Getting here means we don't have a way to do a case-sensitive comparison for wide strings. Fall back to a simple case-sensitive comparison. */ + /* TODO: Implement our own wchar_t-to-char conversion routine and then use the char* version for comparing. */ + return ma_wcscmp(ext1, ext2) == 0; + } + #endif } #endif /* MA_HAS_PATH_API */ @@ -66119,10 +67777,18 @@ static ma_bool32 ma_encoder__internal_on_seek_wav(void* pUserData, int offset, m { ma_encoder* pEncoder = (ma_encoder*)pUserData; ma_result result; + ma_seek_origin maSeekOrigin; MA_ASSERT(pEncoder != NULL); - result = pEncoder->onSeek(pEncoder, offset, (origin == ma_dr_wav_seek_origin_start) ? ma_seek_origin_start : ma_seek_origin_current); + maSeekOrigin = ma_seek_origin_start; + if (origin == MA_DR_WAV_SEEK_CUR) { + maSeekOrigin = ma_seek_origin_current; + } else if (origin == MA_DR_WAV_SEEK_END) { + maSeekOrigin = ma_seek_origin_end; + } + + result = pEncoder->onSeek(pEncoder, offset, maSeekOrigin); if (result != MA_SUCCESS) { return MA_FALSE; } else { @@ -67644,7 +69310,7 @@ static MA_INLINE ma_uint32 ma_hash_getblock(const ma_uint32* blocks, int i) ma_uint32 block; /* Try silencing a sanitization warning about unaligned access by doing a memcpy() instead of assignment. */ - MA_COPY_MEMORY(&block, ma_offset_ptr(blocks, i * sizeof(block)), sizeof(block)); + MA_COPY_MEMORY(&block, ma_offset_ptr(blocks, i * (int) sizeof(block)), sizeof(block)); if (ma_is_little_endian()) { return block; @@ -67720,7 +69386,7 @@ static ma_uint32 ma_hash_string_32(const char* str) static ma_uint32 ma_hash_string_w_32(const wchar_t* str) { - return ma_hash_32(str, (int)wcslen(str) * sizeof(*str), MA_DEFAULT_HASH_SEED); + return ma_hash_32(str, (int)ma_wcslen(str) * sizeof(*str), MA_DEFAULT_HASH_SEED); } @@ -67880,6 +69546,7 @@ static MA_INLINE ma_resource_manager_data_buffer_node* ma_resource_manager_data_ return ma_resource_manager_data_buffer_node_find_min(pDataBufferNode->pChildHi); } +#if 0 /* Currently unused, but might make use of this later. */ static MA_INLINE ma_resource_manager_data_buffer_node* ma_resource_manager_data_buffer_node_find_inorder_predecessor(ma_resource_manager_data_buffer_node* pDataBufferNode) { MA_ASSERT(pDataBufferNode != NULL); @@ -67887,6 +69554,7 @@ static MA_INLINE ma_resource_manager_data_buffer_node* ma_resource_manager_data_ return ma_resource_manager_data_buffer_node_find_max(pDataBufferNode->pChildLo); } +#endif static ma_result ma_resource_manager_data_buffer_node_remove(ma_resource_manager* pResourceManager, ma_resource_manager_data_buffer_node* pDataBufferNode) { @@ -69009,16 +70677,19 @@ static ma_result ma_resource_manager_data_buffer_node_acquire_critical_section(m /* Failed to post job. Probably ran out of memory. */ ma_log_postf(ma_resource_manager_get_log(pResourceManager), MA_LOG_LEVEL_ERROR, "Failed to post MA_JOB_TYPE_RESOURCE_MANAGER_LOAD_DATA_BUFFER_NODE job. %s.\n", ma_result_description(result)); - /* - Fences were acquired before posting the job, but since the job was not able to - be posted, we need to make sure we release them so nothing gets stuck waiting. - */ - if (pInitFence != NULL) { ma_fence_release(pInitFence); } - if (pDoneFence != NULL) { ma_fence_release(pDoneFence); } - if ((flags & MA_RESOURCE_MANAGER_DATA_SOURCE_FLAG_WAIT_INIT) != 0) { ma_resource_manager_inline_notification_uninit(pInitNotification); } else { + /* + Fences were acquired before posting the job, but since the job was not able to + be posted, we need to make sure we release them so nothing gets stuck waiting. + + In the WAIT_INIT case, these will have already been released in ma_job_process() + so we should only release fences in this branch. + */ + if (pInitFence != NULL) { ma_fence_release(pInitFence); } + if (pDoneFence != NULL) { ma_fence_release(pDoneFence); } + /* These will have been freed by the job thread, but with WAIT_INIT they will already have happened since the job has already been handled. */ ma_free(pFilePathCopy, &pResourceManager->config.allocationCallbacks); ma_free(pFilePathWCopy, &pResourceManager->config.allocationCallbacks); @@ -76674,7 +78345,7 @@ static ma_result ma_sound_init_from_data_source_internal(ma_engine* pEngine, con } if (pConfig->loopPointBegInPCMFrames != 0 || pConfig->loopPointEndInPCMFrames != ~((ma_uint64)0)) { - ma_data_source_set_range_in_pcm_frames(ma_sound_get_data_source(pSound), pConfig->loopPointBegInPCMFrames, pConfig->loopPointEndInPCMFrames); + ma_data_source_set_loop_point_in_pcm_frames(ma_sound_get_data_source(pSound), pConfig->loopPointBegInPCMFrames, pConfig->loopPointEndInPCMFrames); } ma_sound_set_looping(pSound, pConfig->isLooping || ((pConfig->flags & MA_SOUND_FLAG_LOOPING) != 0)); @@ -76736,6 +78407,7 @@ MA_API ma_result ma_sound_init_from_file_internal(ma_engine* pEngine, const ma_s result = ma_resource_manager_data_source_init_ex(pEngine->pResourceManager, &resourceManagerDataSourceConfig, pSound->pResourceManagerDataSource); if (result != MA_SUCCESS) { + ma_free(pSound->pResourceManagerDataSource, &pEngine->allocationCallbacks); goto done; } @@ -77541,7 +79213,12 @@ MA_API ma_uint64 ma_sound_get_time_in_pcm_frames(const ma_sound* pSound) MA_API ma_uint64 ma_sound_get_time_in_milliseconds(const ma_sound* pSound) { - return ma_sound_get_time_in_pcm_frames(pSound) * 1000 / ma_engine_get_sample_rate(ma_sound_get_engine(pSound)); + ma_uint32 sampleRate = ma_engine_get_sample_rate(ma_sound_get_engine(pSound)); + if (sampleRate == 0) { + return 0; /* Prevent a division by zero. */ + } + + return ma_sound_get_time_in_pcm_frames(pSound) * 1000 / sampleRate; } MA_API void ma_sound_set_looping(ma_sound* pSound, ma_bool32 isLooping) @@ -77625,7 +79302,7 @@ MA_API ma_result ma_sound_seek_to_second(ma_sound* pSound, float seekPointInSeco return ma_sound_seek_to_pcm_frame(pSound, frameIndex); } -MA_API ma_result ma_sound_get_data_format(ma_sound* pSound, ma_format* pFormat, ma_uint32* pChannels, ma_uint32* pSampleRate, ma_channel* pChannelMap, size_t channelMapCap) +MA_API ma_result ma_sound_get_data_format(const ma_sound* pSound, ma_format* pFormat, ma_uint32* pChannels, ma_uint32* pSampleRate, ma_channel* pChannelMap, size_t channelMapCap) { if (pSound == NULL) { return MA_INVALID_ARGS; @@ -77658,7 +79335,7 @@ MA_API ma_result ma_sound_get_data_format(ma_sound* pSound, ma_format* pFormat, } } -MA_API ma_result ma_sound_get_cursor_in_pcm_frames(ma_sound* pSound, ma_uint64* pCursor) +MA_API ma_result ma_sound_get_cursor_in_pcm_frames(const ma_sound* pSound, ma_uint64* pCursor) { ma_uint64 seekTarget; @@ -77680,7 +79357,7 @@ MA_API ma_result ma_sound_get_cursor_in_pcm_frames(ma_sound* pSound, ma_uint64* } } -MA_API ma_result ma_sound_get_length_in_pcm_frames(ma_sound* pSound, ma_uint64* pLength) +MA_API ma_result ma_sound_get_length_in_pcm_frames(const ma_sound* pSound, ma_uint64* pLength) { if (pSound == NULL) { return MA_INVALID_ARGS; @@ -77694,7 +79371,7 @@ MA_API ma_result ma_sound_get_length_in_pcm_frames(ma_sound* pSound, ma_uint64* return ma_data_source_get_length_in_pcm_frames(pSound->pDataSource, pLength); } -MA_API ma_result ma_sound_get_cursor_in_seconds(ma_sound* pSound, float* pCursor) +MA_API ma_result ma_sound_get_cursor_in_seconds(const ma_sound* pSound, float* pCursor) { ma_result result; ma_uint64 cursorInPCMFrames; @@ -77720,7 +79397,7 @@ MA_API ma_result ma_sound_get_cursor_in_seconds(ma_sound* pSound, float* pCursor return MA_SUCCESS; } -MA_API ma_result ma_sound_get_length_in_seconds(ma_sound* pSound, float* pLength) +MA_API ma_result ma_sound_get_length_in_seconds(const ma_sound* pSound, float* pLength) { if (pSound == NULL) { return MA_INVALID_ARGS; @@ -78539,12 +80216,12 @@ MA_PRIVATE ma_bool32 ma_dr_wav__seek_forward(ma_dr_wav_seek_proc onSeek, ma_uint ma_uint64 bytesRemainingToSeek = offset; while (bytesRemainingToSeek > 0) { if (bytesRemainingToSeek > 0x7FFFFFFF) { - if (!onSeek(pUserData, 0x7FFFFFFF, ma_dr_wav_seek_origin_current)) { + if (!onSeek(pUserData, 0x7FFFFFFF, MA_DR_WAV_SEEK_CUR)) { return MA_FALSE; } bytesRemainingToSeek -= 0x7FFFFFFF; } else { - if (!onSeek(pUserData, (int)bytesRemainingToSeek, ma_dr_wav_seek_origin_current)) { + if (!onSeek(pUserData, (int)bytesRemainingToSeek, MA_DR_WAV_SEEK_CUR)) { return MA_FALSE; } bytesRemainingToSeek = 0; @@ -78555,17 +80232,17 @@ MA_PRIVATE ma_bool32 ma_dr_wav__seek_forward(ma_dr_wav_seek_proc onSeek, ma_uint MA_PRIVATE ma_bool32 ma_dr_wav__seek_from_start(ma_dr_wav_seek_proc onSeek, ma_uint64 offset, void* pUserData) { if (offset <= 0x7FFFFFFF) { - return onSeek(pUserData, (int)offset, ma_dr_wav_seek_origin_start); + return onSeek(pUserData, (int)offset, MA_DR_WAV_SEEK_SET); } - if (!onSeek(pUserData, 0x7FFFFFFF, ma_dr_wav_seek_origin_start)) { + if (!onSeek(pUserData, 0x7FFFFFFF, MA_DR_WAV_SEEK_SET)) { return MA_FALSE; } offset -= 0x7FFFFFFF; for (;;) { if (offset <= 0x7FFFFFFF) { - return onSeek(pUserData, (int)offset, ma_dr_wav_seek_origin_current); + return onSeek(pUserData, (int)offset, MA_DR_WAV_SEEK_CUR); } - if (!onSeek(pUserData, 0x7FFFFFFF, ma_dr_wav_seek_origin_current)) { + if (!onSeek(pUserData, 0x7FFFFFFF, MA_DR_WAV_SEEK_CUR)) { return MA_FALSE; } offset -= 0x7FFFFFFF; @@ -78588,7 +80265,7 @@ MA_PRIVATE ma_bool32 ma_dr_wav__on_seek(ma_dr_wav_seek_proc onSeek, void* pUserD if (!onSeek(pUserData, offset, origin)) { return MA_FALSE; } - if (origin == ma_dr_wav_seek_origin_start) { + if (origin == MA_DR_WAV_SEEK_SET) { *pCursor = offset; } else { *pCursor += offset; @@ -78707,12 +80384,12 @@ MA_PRIVATE ma_uint64 ma_dr_wav__read_smpl_to_metadata_obj(ma_dr_wav__metadata_pa ma_uint8 smplLoopData[MA_DR_WAV_SMPL_LOOP_BYTES]; bytesJustRead = ma_dr_wav__metadata_parser_read(pParser, smplLoopData, sizeof(smplLoopData), &totalBytesRead); if (bytesJustRead == sizeof(smplLoopData)) { - pMetadata->data.smpl.pLoops[iSampleLoop].cuePointId = ma_dr_wav_bytes_to_u32(smplLoopData + 0); - pMetadata->data.smpl.pLoops[iSampleLoop].type = ma_dr_wav_bytes_to_u32(smplLoopData + 4); - pMetadata->data.smpl.pLoops[iSampleLoop].firstSampleByteOffset = ma_dr_wav_bytes_to_u32(smplLoopData + 8); - pMetadata->data.smpl.pLoops[iSampleLoop].lastSampleByteOffset = ma_dr_wav_bytes_to_u32(smplLoopData + 12); - pMetadata->data.smpl.pLoops[iSampleLoop].sampleFraction = ma_dr_wav_bytes_to_u32(smplLoopData + 16); - pMetadata->data.smpl.pLoops[iSampleLoop].playCount = ma_dr_wav_bytes_to_u32(smplLoopData + 20); + pMetadata->data.smpl.pLoops[iSampleLoop].cuePointId = ma_dr_wav_bytes_to_u32(smplLoopData + 0); + pMetadata->data.smpl.pLoops[iSampleLoop].type = ma_dr_wav_bytes_to_u32(smplLoopData + 4); + pMetadata->data.smpl.pLoops[iSampleLoop].firstSampleOffset = ma_dr_wav_bytes_to_u32(smplLoopData + 8); + pMetadata->data.smpl.pLoops[iSampleLoop].lastSampleOffset = ma_dr_wav_bytes_to_u32(smplLoopData + 12); + pMetadata->data.smpl.pLoops[iSampleLoop].sampleFraction = ma_dr_wav_bytes_to_u32(smplLoopData + 16); + pMetadata->data.smpl.pLoops[iSampleLoop].playCount = ma_dr_wav_bytes_to_u32(smplLoopData + 20); } else { break; } @@ -78756,7 +80433,7 @@ MA_PRIVATE ma_uint64 ma_dr_wav__read_cue_to_metadata_obj(ma_dr_wav__metadata_par pMetadata->data.cue.pCuePoints[iCuePoint].dataChunkId[3] = cuePointData[11]; pMetadata->data.cue.pCuePoints[iCuePoint].chunkStart = ma_dr_wav_bytes_to_u32(cuePointData + 12); pMetadata->data.cue.pCuePoints[iCuePoint].blockStart = ma_dr_wav_bytes_to_u32(cuePointData + 16); - pMetadata->data.cue.pCuePoints[iCuePoint].sampleByteOffset = ma_dr_wav_bytes_to_u32(cuePointData + 20); + pMetadata->data.cue.pCuePoints[iCuePoint].sampleOffset = ma_dr_wav_bytes_to_u32(cuePointData + 20); } else { break; } @@ -79096,7 +80773,7 @@ MA_PRIVATE ma_uint64 ma_dr_wav__metadata_process_chunk(ma_dr_wav__metadata_parse if (pParser->stage == ma_dr_wav__metadata_parser_stage_count) { ma_uint8 buffer[4]; size_t bytesJustRead; - if (!pParser->onSeek(pParser->pReadSeekUserData, 28, ma_dr_wav_seek_origin_current)) { + if (!pParser->onSeek(pParser->pReadSeekUserData, 28, MA_DR_WAV_SEEK_CUR)) { return bytesRead; } bytesRead += 28; @@ -79191,7 +80868,7 @@ MA_PRIVATE ma_uint64 ma_dr_wav__metadata_process_chunk(ma_dr_wav__metadata_parse return bytesRead; } allocSizeNeeded += ma_dr_wav__strlen(buffer) + 1; - allocSizeNeeded += (size_t)pChunkHeader->sizeInBytes - MA_DR_WAV_BEXT_BYTES; + allocSizeNeeded += (size_t)pChunkHeader->sizeInBytes - MA_DR_WAV_BEXT_BYTES + 1; ma_dr_wav__metadata_request_extra_memory_for_stage_2(pParser, allocSizeNeeded, 1); pParser->metadataCount += 1; } else { @@ -79274,6 +80951,16 @@ MA_PRIVATE ma_uint64 ma_dr_wav__metadata_process_chunk(ma_dr_wav__metadata_parse subchunkBytesRead = ma_dr_wav__metadata_process_info_text_chunk(pParser, subchunkDataSize, ma_dr_wav_metadata_type_list_info_album); } else if (ma_dr_wav__chunk_matches(allowedMetadataTypes, subchunkId, ma_dr_wav_metadata_type_list_info_tracknumber, "ITRK")) { subchunkBytesRead = ma_dr_wav__metadata_process_info_text_chunk(pParser, subchunkDataSize, ma_dr_wav_metadata_type_list_info_tracknumber); + } else if (ma_dr_wav__chunk_matches(allowedMetadataTypes, subchunkId, ma_dr_wav_metadata_type_list_info_location, "IARL")) { + subchunkBytesRead = ma_dr_wav__metadata_process_info_text_chunk(pParser, subchunkDataSize, ma_dr_wav_metadata_type_list_info_location); + } else if (ma_dr_wav__chunk_matches(allowedMetadataTypes, subchunkId, ma_dr_wav_metadata_type_list_info_organization, "ICMS")) { + subchunkBytesRead = ma_dr_wav__metadata_process_info_text_chunk(pParser, subchunkDataSize, ma_dr_wav_metadata_type_list_info_organization); + } else if (ma_dr_wav__chunk_matches(allowedMetadataTypes, subchunkId, ma_dr_wav_metadata_type_list_info_keywords, "IKEY")) { + subchunkBytesRead = ma_dr_wav__metadata_process_info_text_chunk(pParser, subchunkDataSize, ma_dr_wav_metadata_type_list_info_keywords); + } else if (ma_dr_wav__chunk_matches(allowedMetadataTypes, subchunkId, ma_dr_wav_metadata_type_list_info_medium, "IMED")) { + subchunkBytesRead = ma_dr_wav__metadata_process_info_text_chunk(pParser, subchunkDataSize, ma_dr_wav_metadata_type_list_info_medium); + } else if (ma_dr_wav__chunk_matches(allowedMetadataTypes, subchunkId, ma_dr_wav_metadata_type_list_info_description, "ISBJ")) { + subchunkBytesRead = ma_dr_wav__metadata_process_info_text_chunk(pParser, subchunkDataSize, ma_dr_wav_metadata_type_list_info_description); } else if ((allowedMetadataTypes & ma_dr_wav_metadata_type_unknown) != 0) { subchunkBytesRead = ma_dr_wav__metadata_process_unknown_chunk(pParser, subchunkId, subchunkDataSize, listType); } @@ -79281,13 +80968,13 @@ MA_PRIVATE ma_uint64 ma_dr_wav__metadata_process_chunk(ma_dr_wav__metadata_parse MA_DR_WAV_ASSERT(subchunkBytesRead <= subchunkDataSize); if (subchunkBytesRead < subchunkDataSize) { ma_uint64 bytesToSeek = subchunkDataSize - subchunkBytesRead; - if (!pParser->onSeek(pParser->pReadSeekUserData, (int)bytesToSeek, ma_dr_wav_seek_origin_current)) { + if (!pParser->onSeek(pParser->pReadSeekUserData, (int)bytesToSeek, MA_DR_WAV_SEEK_CUR)) { break; } bytesRead += bytesToSeek; } if ((subchunkDataSize % 2) == 1) { - if (!pParser->onSeek(pParser->pReadSeekUserData, 1, ma_dr_wav_seek_origin_current)) { + if (!pParser->onSeek(pParser->pReadSeekUserData, 1, MA_DR_WAV_SEEK_CUR)) { break; } bytesRead += 1; @@ -79324,7 +81011,7 @@ MA_API ma_uint16 ma_dr_wav_fmt_get_format(const ma_dr_wav_fmt* pFMT) return ma_dr_wav_bytes_to_u16(pFMT->subFormat); } } -MA_PRIVATE ma_bool32 ma_dr_wav_preinit(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, void* pReadSeekUserData, const ma_allocation_callbacks* pAllocationCallbacks) +MA_PRIVATE ma_bool32 ma_dr_wav_preinit(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_tell_proc onTell, void* pReadSeekTellUserData, const ma_allocation_callbacks* pAllocationCallbacks) { if (pWav == NULL || onRead == NULL || onSeek == NULL) { return MA_FALSE; @@ -79332,7 +81019,8 @@ MA_PRIVATE ma_bool32 ma_dr_wav_preinit(ma_dr_wav* pWav, ma_dr_wav_read_proc onRe MA_DR_WAV_ZERO_MEMORY(pWav, sizeof(*pWav)); pWav->onRead = onRead; pWav->onSeek = onSeek; - pWav->pUserData = pReadSeekUserData; + pWav->onTell = onTell; + pWav->pUserData = pReadSeekTellUserData; pWav->allocationCallbacks = ma_dr_wav_copy_allocation_callbacks_or_defaults(pAllocationCallbacks); if (pWav->allocationCallbacks.onFree == NULL || (pWav->allocationCallbacks.onMalloc == NULL && pWav->allocationCallbacks.onRealloc == NULL)) { return MA_FALSE; @@ -79546,14 +81234,14 @@ MA_PRIVATE ma_bool32 ma_dr_wav_init__internal(ma_dr_wav* pWav, ma_dr_wav_chunk_p fmt.channelMask = ma_dr_wav_bytes_to_u32_ex(fmtext + 2, pWav->container); ma_dr_wav_bytes_to_guid(fmtext + 6, fmt.subFormat); } else { - if (pWav->onSeek(pWav->pUserData, fmt.extendedSize, ma_dr_wav_seek_origin_current) == MA_FALSE) { + if (pWav->onSeek(pWav->pUserData, fmt.extendedSize, MA_DR_WAV_SEEK_CUR) == MA_FALSE) { return MA_FALSE; } } cursor += fmt.extendedSize; bytesReadSoFar += fmt.extendedSize; } - if (pWav->onSeek(pWav->pUserData, (int)(header.sizeInBytes - bytesReadSoFar), ma_dr_wav_seek_origin_current) == MA_FALSE) { + if (pWav->onSeek(pWav->pUserData, (int)(header.sizeInBytes - bytesReadSoFar), MA_DR_WAV_SEEK_CUR) == MA_FALSE) { return MA_FALSE; } cursor += (header.sizeInBytes - bytesReadSoFar); @@ -79704,15 +81392,26 @@ MA_PRIVATE ma_bool32 ma_dr_wav_init__internal(ma_dr_wav* pWav, ma_dr_wav_chunk_p return MA_FALSE; } offset = ma_dr_wav_bytes_to_u32_ex(offsetAndBlockSizeData + 0, pWav->container); - if (ma_dr_wav__seek_forward(pWav->onSeek, offset, pWav->pUserData) == MA_FALSE) { - return MA_FALSE; - } - cursor += offset; - pWav->dataChunkDataPos = cursor; + pWav->dataChunkDataPos = cursor + offset; dataChunkSize = chunkSize; - if (sequential || !isProcessingMetadata) { - break; + if (dataChunkSize > offset) { + dataChunkSize -= offset; } else { + dataChunkSize = 0; + } + if (sequential) { + if (foundChunk_fmt) { + if (ma_dr_wav__seek_forward(pWav->onSeek, offset, pWav->pUserData) == MA_FALSE) { + return MA_FALSE; + } + cursor += offset; + break; + } else { + return MA_FALSE; + } + } else { + chunkSize += header.paddingSize; + chunkSize -= sizeof(offsetAndBlockSizeData); if (ma_dr_wav__seek_forward(pWav->onSeek, chunkSize, pWav->pUserData) == MA_FALSE) { break; } @@ -79776,6 +81475,17 @@ MA_PRIVATE ma_bool32 ma_dr_wav_init__internal(ma_dr_wav* pWav, ma_dr_wav_chunk_p pWav->pMetadata = metadataParser.pMetadata; pWav->metadataCount = metadataParser.metadataCount; } + if (pWav->onTell != NULL && pWav->onSeek != NULL) { + if (pWav->onSeek(pWav->pUserData, 0, MA_DR_WAV_SEEK_END) == MA_TRUE) { + ma_int64 fileSize; + if (pWav->onTell(pWav->pUserData, &fileSize)) { + if (dataChunkSize + pWav->dataChunkDataPos > (ma_uint64)fileSize) { + dataChunkSize = (ma_uint64)fileSize - pWav->dataChunkDataPos; + } + } + } else { + } + } if (dataChunkSize == 0xFFFFFFFF && (pWav->container == ma_dr_wav_container_riff || pWav->container == ma_dr_wav_container_rifx) && pWav->isSequentialWrite == MA_FALSE) { dataChunkSize = 0; for (;;) { @@ -79795,8 +81505,14 @@ MA_PRIVATE ma_bool32 ma_dr_wav_init__internal(ma_dr_wav* pWav, ma_dr_wav_chunk_p pWav->sampleRate = fmt.sampleRate; pWav->channels = fmt.channels; pWav->bitsPerSample = fmt.bitsPerSample; - pWav->bytesRemaining = dataChunkSize; pWav->translatedFormatTag = translatedFormatTag; + if (!ma_dr_wav__is_compressed_format_tag(translatedFormatTag)) { + ma_uint32 bytesPerFrame = ma_dr_wav_get_bytes_per_pcm_frame(pWav); + if (bytesPerFrame > 0) { + dataChunkSize -= (dataChunkSize % bytesPerFrame); + } + } + pWav->bytesRemaining = dataChunkSize; pWav->dataChunkDataSize = dataChunkSize; if (sampleCountFromFactChunk != 0) { pWav->totalPCMFrameCount = sampleCountFromFactChunk; @@ -79851,20 +81567,20 @@ MA_PRIVATE ma_bool32 ma_dr_wav_init__internal(ma_dr_wav* pWav, ma_dr_wav_chunk_p #endif return MA_TRUE; } -MA_API ma_bool32 ma_dr_wav_init(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_bool32 ma_dr_wav_init(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_tell_proc onTell, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks) { - return ma_dr_wav_init_ex(pWav, onRead, onSeek, NULL, pUserData, NULL, 0, pAllocationCallbacks); + return ma_dr_wav_init_ex(pWav, onRead, onSeek, onTell, NULL, pUserData, NULL, 0, pAllocationCallbacks); } -MA_API ma_bool32 ma_dr_wav_init_ex(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_chunk_proc onChunk, void* pReadSeekUserData, void* pChunkUserData, ma_uint32 flags, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_bool32 ma_dr_wav_init_ex(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_tell_proc onTell, ma_dr_wav_chunk_proc onChunk, void* pReadSeekTellUserData, void* pChunkUserData, ma_uint32 flags, const ma_allocation_callbacks* pAllocationCallbacks) { - if (!ma_dr_wav_preinit(pWav, onRead, onSeek, pReadSeekUserData, pAllocationCallbacks)) { + if (!ma_dr_wav_preinit(pWav, onRead, onSeek, onTell, pReadSeekTellUserData, pAllocationCallbacks)) { return MA_FALSE; } return ma_dr_wav_init__internal(pWav, onChunk, pChunkUserData, flags); } -MA_API ma_bool32 ma_dr_wav_init_with_metadata(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, void* pUserData, ma_uint32 flags, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_bool32 ma_dr_wav_init_with_metadata(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_tell_proc onTell, void* pUserData, ma_uint32 flags, const ma_allocation_callbacks* pAllocationCallbacks) { - if (!ma_dr_wav_preinit(pWav, onRead, onSeek, pUserData, pAllocationCallbacks)) { + if (!ma_dr_wav_preinit(pWav, onRead, onSeek, onTell, pUserData, pAllocationCallbacks)) { return MA_FALSE; } return ma_dr_wav_init__internal(pWav, NULL, NULL, flags | MA_DR_WAV_WITH_METADATA); @@ -80026,8 +81742,8 @@ MA_PRIVATE size_t ma_dr_wav__write_or_count_metadata(ma_dr_wav* pWav, ma_dr_wav_ for (iLoop = 0; iLoop < pMetadata->data.smpl.sampleLoopCount; ++iLoop) { bytesWritten += ma_dr_wav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.pLoops[iLoop].cuePointId); bytesWritten += ma_dr_wav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.pLoops[iLoop].type); - bytesWritten += ma_dr_wav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.pLoops[iLoop].firstSampleByteOffset); - bytesWritten += ma_dr_wav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.pLoops[iLoop].lastSampleByteOffset); + bytesWritten += ma_dr_wav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.pLoops[iLoop].firstSampleOffset); + bytesWritten += ma_dr_wav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.pLoops[iLoop].lastSampleOffset); bytesWritten += ma_dr_wav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.pLoops[iLoop].sampleFraction); bytesWritten += ma_dr_wav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.pLoops[iLoop].playCount); } @@ -80061,7 +81777,7 @@ MA_PRIVATE size_t ma_dr_wav__write_or_count_metadata(ma_dr_wav* pWav, ma_dr_wav_ bytesWritten += ma_dr_wav__write_or_count(pWav, pMetadata->data.cue.pCuePoints[iCuePoint].dataChunkId, 4); bytesWritten += ma_dr_wav__write_or_count_u32ne_to_le(pWav, pMetadata->data.cue.pCuePoints[iCuePoint].chunkStart); bytesWritten += ma_dr_wav__write_or_count_u32ne_to_le(pWav, pMetadata->data.cue.pCuePoints[iCuePoint].blockStart); - bytesWritten += ma_dr_wav__write_or_count_u32ne_to_le(pWav, pMetadata->data.cue.pCuePoints[iCuePoint].sampleByteOffset); + bytesWritten += ma_dr_wav__write_or_count_u32ne_to_le(pWav, pMetadata->data.cue.pCuePoints[iCuePoint].sampleOffset); } } break; case ma_dr_wav_metadata_type_acid: @@ -80147,15 +81863,20 @@ MA_PRIVATE size_t ma_dr_wav__write_or_count_metadata(ma_dr_wav* pWav, ma_dr_wav_ if (pMetadata->type & ma_dr_wav_metadata_type_list_all_info_strings) { const char* pID = NULL; switch (pMetadata->type) { - case ma_dr_wav_metadata_type_list_info_software: pID = "ISFT"; break; - case ma_dr_wav_metadata_type_list_info_copyright: pID = "ICOP"; break; - case ma_dr_wav_metadata_type_list_info_title: pID = "INAM"; break; - case ma_dr_wav_metadata_type_list_info_artist: pID = "IART"; break; - case ma_dr_wav_metadata_type_list_info_comment: pID = "ICMT"; break; - case ma_dr_wav_metadata_type_list_info_date: pID = "ICRD"; break; - case ma_dr_wav_metadata_type_list_info_genre: pID = "IGNR"; break; - case ma_dr_wav_metadata_type_list_info_album: pID = "IPRD"; break; - case ma_dr_wav_metadata_type_list_info_tracknumber: pID = "ITRK"; break; + case ma_dr_wav_metadata_type_list_info_software: pID = "ISFT"; break; + case ma_dr_wav_metadata_type_list_info_copyright: pID = "ICOP"; break; + case ma_dr_wav_metadata_type_list_info_title: pID = "INAM"; break; + case ma_dr_wav_metadata_type_list_info_artist: pID = "IART"; break; + case ma_dr_wav_metadata_type_list_info_comment: pID = "ICMT"; break; + case ma_dr_wav_metadata_type_list_info_date: pID = "ICRD"; break; + case ma_dr_wav_metadata_type_list_info_genre: pID = "IGNR"; break; + case ma_dr_wav_metadata_type_list_info_album: pID = "IPRD"; break; + case ma_dr_wav_metadata_type_list_info_tracknumber: pID = "ITRK"; break; + case ma_dr_wav_metadata_type_list_info_location: pID = "IARL"; break; + case ma_dr_wav_metadata_type_list_info_organization: pID = "ICMS"; break; + case ma_dr_wav_metadata_type_list_info_keywords: pID = "IKEY"; break; + case ma_dr_wav_metadata_type_list_info_medium: pID = "IMED"; break; + case ma_dr_wav_metadata_type_list_info_description: pID = "ISBJ"; break; default: break; } MA_DR_WAV_ASSERT(pID != NULL); @@ -80370,7 +82091,7 @@ MA_PRIVATE ma_bool32 ma_dr_wav_init_write__internal(ma_dr_wav* pWav, const ma_dr } pWav->dataChunkDataSizeTargetWrite = initialDataChunkSize; if (pFormat->container == ma_dr_wav_container_riff) { - ma_uint32 chunkSizeRIFF = 28 + (ma_uint32)initialDataChunkSize; + ma_uint32 chunkSizeRIFF = 36 + (ma_uint32)initialDataChunkSize; runningPos += ma_dr_wav__write(pWav, "RIFF", 4); runningPos += ma_dr_wav__write_u32ne_to_le(pWav, chunkSizeRIFF); runningPos += ma_dr_wav__write(pWav, "WAVE", 4); @@ -80493,7 +82214,31 @@ MA_PRIVATE size_t ma_dr_wav__on_write_stdio(void* pUserData, const void* pData, } MA_PRIVATE ma_bool32 ma_dr_wav__on_seek_stdio(void* pUserData, int offset, ma_dr_wav_seek_origin origin) { - return fseek((FILE*)pUserData, offset, (origin == ma_dr_wav_seek_origin_current) ? SEEK_CUR : SEEK_SET) == 0; + int whence = SEEK_SET; + if (origin == MA_DR_WAV_SEEK_CUR) { + whence = SEEK_CUR; + } else if (origin == MA_DR_WAV_SEEK_END) { + whence = SEEK_END; + } + return fseek((FILE*)pUserData, offset, whence) == 0; +} +MA_PRIVATE ma_bool32 ma_dr_wav__on_tell_stdio(void* pUserData, ma_int64* pCursor) +{ + FILE* pFileStdio = (FILE*)pUserData; + ma_int64 result; + MA_DR_WAV_ASSERT(pFileStdio != NULL); + MA_DR_WAV_ASSERT(pCursor != NULL); +#if defined(_WIN32) && !defined(NXDK) + #if defined(_MSC_VER) && _MSC_VER > 1200 + result = _ftelli64(pFileStdio); + #else + result = ftell(pFileStdio); + #endif +#else + result = ftell(pFileStdio); +#endif + *pCursor = result; + return MA_TRUE; } MA_API ma_bool32 ma_dr_wav_init_file(ma_dr_wav* pWav, const char* filename, const ma_allocation_callbacks* pAllocationCallbacks) { @@ -80502,7 +82247,7 @@ MA_API ma_bool32 ma_dr_wav_init_file(ma_dr_wav* pWav, const char* filename, cons MA_PRIVATE ma_bool32 ma_dr_wav_init_file__internal_FILE(ma_dr_wav* pWav, FILE* pFile, ma_dr_wav_chunk_proc onChunk, void* pChunkUserData, ma_uint32 flags, const ma_allocation_callbacks* pAllocationCallbacks) { ma_bool32 result; - result = ma_dr_wav_preinit(pWav, ma_dr_wav__on_read_stdio, ma_dr_wav__on_seek_stdio, (void*)pFile, pAllocationCallbacks); + result = ma_dr_wav_preinit(pWav, ma_dr_wav__on_read_stdio, ma_dr_wav__on_seek_stdio, ma_dr_wav__on_tell_stdio, (void*)pFile, pAllocationCallbacks); if (result != MA_TRUE) { fclose(pFile); return result; @@ -80639,25 +82384,27 @@ MA_PRIVATE size_t ma_dr_wav__on_read_memory(void* pUserData, void* pBufferOut, s MA_PRIVATE ma_bool32 ma_dr_wav__on_seek_memory(void* pUserData, int offset, ma_dr_wav_seek_origin origin) { ma_dr_wav* pWav = (ma_dr_wav*)pUserData; + ma_int64 newCursor; MA_DR_WAV_ASSERT(pWav != NULL); - if (origin == ma_dr_wav_seek_origin_current) { - if (offset > 0) { - if (pWav->memoryStream.currentReadPos + offset > pWav->memoryStream.dataSize) { - return MA_FALSE; - } - } else { - if (pWav->memoryStream.currentReadPos < (size_t)-offset) { - return MA_FALSE; - } - } - pWav->memoryStream.currentReadPos += offset; + newCursor = pWav->memoryStream.currentReadPos; + if (origin == MA_DR_WAV_SEEK_SET) { + newCursor = 0; + } else if (origin == MA_DR_WAV_SEEK_CUR) { + newCursor = (ma_int64)pWav->memoryStream.currentReadPos; + } else if (origin == MA_DR_WAV_SEEK_END) { + newCursor = (ma_int64)pWav->memoryStream.dataSize; } else { - if ((ma_uint32)offset <= pWav->memoryStream.dataSize) { - pWav->memoryStream.currentReadPos = offset; - } else { - return MA_FALSE; - } + MA_DR_WAV_ASSERT(!"Invalid seek origin"); + return MA_FALSE; } + newCursor += offset; + if (newCursor < 0) { + return MA_FALSE; + } + if ((size_t)newCursor > pWav->memoryStream.dataSize) { + return MA_FALSE; + } + pWav->memoryStream.currentReadPos = (size_t)newCursor; return MA_TRUE; } MA_PRIVATE size_t ma_dr_wav__on_write_memory(void* pUserData, const void* pDataIn, size_t bytesToWrite) @@ -80691,25 +82438,35 @@ MA_PRIVATE size_t ma_dr_wav__on_write_memory(void* pUserData, const void* pDataI MA_PRIVATE ma_bool32 ma_dr_wav__on_seek_memory_write(void* pUserData, int offset, ma_dr_wav_seek_origin origin) { ma_dr_wav* pWav = (ma_dr_wav*)pUserData; + ma_int64 newCursor; MA_DR_WAV_ASSERT(pWav != NULL); - if (origin == ma_dr_wav_seek_origin_current) { - if (offset > 0) { - if (pWav->memoryStreamWrite.currentWritePos + offset > pWav->memoryStreamWrite.dataSize) { - offset = (int)(pWav->memoryStreamWrite.dataSize - pWav->memoryStreamWrite.currentWritePos); - } - } else { - if (pWav->memoryStreamWrite.currentWritePos < (size_t)-offset) { - offset = -(int)pWav->memoryStreamWrite.currentWritePos; - } - } - pWav->memoryStreamWrite.currentWritePos += offset; + newCursor = pWav->memoryStreamWrite.currentWritePos; + if (origin == MA_DR_WAV_SEEK_SET) { + newCursor = 0; + } else if (origin == MA_DR_WAV_SEEK_CUR) { + newCursor = (ma_int64)pWav->memoryStreamWrite.currentWritePos; + } else if (origin == MA_DR_WAV_SEEK_END) { + newCursor = (ma_int64)pWav->memoryStreamWrite.dataSize; } else { - if ((ma_uint32)offset <= pWav->memoryStreamWrite.dataSize) { - pWav->memoryStreamWrite.currentWritePos = offset; - } else { - pWav->memoryStreamWrite.currentWritePos = pWav->memoryStreamWrite.dataSize; - } + MA_DR_WAV_ASSERT(!"Invalid seek origin"); + return MA_INVALID_ARGS; } + newCursor += offset; + if (newCursor < 0) { + return MA_FALSE; + } + if ((size_t)newCursor > pWav->memoryStreamWrite.dataSize) { + return MA_FALSE; + } + pWav->memoryStreamWrite.currentWritePos = (size_t)newCursor; + return MA_TRUE; +} +MA_PRIVATE ma_bool32 ma_dr_wav__on_tell_memory(void* pUserData, ma_int64* pCursor) +{ + ma_dr_wav* pWav = (ma_dr_wav*)pUserData; + MA_DR_WAV_ASSERT(pWav != NULL); + MA_DR_WAV_ASSERT(pCursor != NULL); + *pCursor = (ma_int64)pWav->memoryStream.currentReadPos; return MA_TRUE; } MA_API ma_bool32 ma_dr_wav_init_memory(ma_dr_wav* pWav, const void* data, size_t dataSize, const ma_allocation_callbacks* pAllocationCallbacks) @@ -80721,7 +82478,7 @@ MA_API ma_bool32 ma_dr_wav_init_memory_ex(ma_dr_wav* pWav, const void* data, siz if (data == NULL || dataSize == 0) { return MA_FALSE; } - if (!ma_dr_wav_preinit(pWav, ma_dr_wav__on_read_memory, ma_dr_wav__on_seek_memory, pWav, pAllocationCallbacks)) { + if (!ma_dr_wav_preinit(pWav, ma_dr_wav__on_read_memory, ma_dr_wav__on_seek_memory, ma_dr_wav__on_tell_memory, pWav, pAllocationCallbacks)) { return MA_FALSE; } pWav->memoryStream.data = (const ma_uint8*)data; @@ -80734,7 +82491,7 @@ MA_API ma_bool32 ma_dr_wav_init_memory_with_metadata(ma_dr_wav* pWav, const void if (data == NULL || dataSize == 0) { return MA_FALSE; } - if (!ma_dr_wav_preinit(pWav, ma_dr_wav__on_read_memory, ma_dr_wav__on_seek_memory, pWav, pAllocationCallbacks)) { + if (!ma_dr_wav_preinit(pWav, ma_dr_wav__on_read_memory, ma_dr_wav__on_seek_memory, ma_dr_wav__on_tell_memory, pWav, pAllocationCallbacks)) { return MA_FALSE; } pWav->memoryStream.data = (const ma_uint8*)data; @@ -80793,30 +82550,30 @@ MA_API ma_result ma_dr_wav_uninit(ma_dr_wav* pWav) } if (pWav->onSeek && !pWav->isSequentialWrite) { if (pWav->container == ma_dr_wav_container_riff) { - if (pWav->onSeek(pWav->pUserData, 4, ma_dr_wav_seek_origin_start)) { + if (pWav->onSeek(pWav->pUserData, 4, MA_DR_WAV_SEEK_SET)) { ma_uint32 riffChunkSize = ma_dr_wav__riff_chunk_size_riff(pWav->dataChunkDataSize, pWav->pMetadata, pWav->metadataCount); ma_dr_wav__write_u32ne_to_le(pWav, riffChunkSize); } - if (pWav->onSeek(pWav->pUserData, (int)pWav->dataChunkDataPos - 4, ma_dr_wav_seek_origin_start)) { + if (pWav->onSeek(pWav->pUserData, (int)pWav->dataChunkDataPos - 4, MA_DR_WAV_SEEK_SET)) { ma_uint32 dataChunkSize = ma_dr_wav__data_chunk_size_riff(pWav->dataChunkDataSize); ma_dr_wav__write_u32ne_to_le(pWav, dataChunkSize); } } else if (pWav->container == ma_dr_wav_container_w64) { - if (pWav->onSeek(pWav->pUserData, 16, ma_dr_wav_seek_origin_start)) { + if (pWav->onSeek(pWav->pUserData, 16, MA_DR_WAV_SEEK_SET)) { ma_uint64 riffChunkSize = ma_dr_wav__riff_chunk_size_w64(pWav->dataChunkDataSize); ma_dr_wav__write_u64ne_to_le(pWav, riffChunkSize); } - if (pWav->onSeek(pWav->pUserData, (int)pWav->dataChunkDataPos - 8, ma_dr_wav_seek_origin_start)) { + if (pWav->onSeek(pWav->pUserData, (int)pWav->dataChunkDataPos - 8, MA_DR_WAV_SEEK_SET)) { ma_uint64 dataChunkSize = ma_dr_wav__data_chunk_size_w64(pWav->dataChunkDataSize); ma_dr_wav__write_u64ne_to_le(pWav, dataChunkSize); } } else if (pWav->container == ma_dr_wav_container_rf64) { int ds64BodyPos = 12 + 8; - if (pWav->onSeek(pWav->pUserData, ds64BodyPos + 0, ma_dr_wav_seek_origin_start)) { + if (pWav->onSeek(pWav->pUserData, ds64BodyPos + 0, MA_DR_WAV_SEEK_SET)) { ma_uint64 riffChunkSize = ma_dr_wav__riff_chunk_size_rf64(pWav->dataChunkDataSize, pWav->pMetadata, pWav->metadataCount); ma_dr_wav__write_u64ne_to_le(pWav, riffChunkSize); } - if (pWav->onSeek(pWav->pUserData, ds64BodyPos + 8, ma_dr_wav_seek_origin_start)) { + if (pWav->onSeek(pWav->pUserData, ds64BodyPos + 8, MA_DR_WAV_SEEK_SET)) { ma_uint64 dataChunkSize = ma_dr_wav__data_chunk_size_rf64(pWav->dataChunkDataSize); ma_dr_wav__write_u64ne_to_le(pWav, dataChunkSize); } @@ -80863,7 +82620,7 @@ MA_API size_t ma_dr_wav_read_raw(ma_dr_wav* pWav, size_t bytesToRead, void* pBuf if (bytesToSeek > 0x7FFFFFFF) { bytesToSeek = 0x7FFFFFFF; } - if (pWav->onSeek(pWav->pUserData, (int)bytesToSeek, ma_dr_wav_seek_origin_current) == MA_FALSE) { + if (pWav->onSeek(pWav->pUserData, (int)bytesToSeek, MA_DR_WAV_SEEK_CUR) == MA_FALSE) { break; } bytesRead += bytesToSeek; @@ -80962,7 +82719,7 @@ MA_PRIVATE ma_bool32 ma_dr_wav_seek_to_first_pcm_frame(ma_dr_wav* pWav) if (pWav->onWrite != NULL) { return MA_FALSE; } - if (!pWav->onSeek(pWav->pUserData, (int)pWav->dataChunkDataPos, ma_dr_wav_seek_origin_start)) { + if (!pWav->onSeek(pWav->pUserData, (int)pWav->dataChunkDataPos, MA_DR_WAV_SEEK_SET)) { return MA_FALSE; } if (ma_dr_wav__is_compressed_format_tag(pWav->translatedFormatTag)) { @@ -81043,7 +82800,7 @@ MA_API ma_bool32 ma_dr_wav_seek_to_pcm_frame(ma_dr_wav* pWav, ma_uint64 targetFr } while (offset > 0) { int offset32 = ((offset > INT_MAX) ? INT_MAX : (int)offset); - if (!pWav->onSeek(pWav->pUserData, offset32, ma_dr_wav_seek_origin_current)) { + if (!pWav->onSeek(pWav->pUserData, offset32, MA_DR_WAV_SEEK_CUR)) { return MA_FALSE; } pWav->readCursorInPCMFrames += offset32 / bytesPerFrame; @@ -81169,12 +82926,12 @@ MA_API ma_uint64 ma_dr_wav_write_pcm_frames(ma_dr_wav* pWav, ma_uint64 framesToW MA_PRIVATE ma_uint64 ma_dr_wav_read_pcm_frames_s16__msadpcm(ma_dr_wav* pWav, ma_uint64 framesToRead, ma_int16* pBufferOut) { ma_uint64 totalFramesRead = 0; - static ma_int32 adaptationTable[] = { + static const ma_int32 adaptationTable[] = { 230, 230, 230, 230, 307, 409, 512, 614, 768, 614, 512, 409, 307, 230, 230, 230 }; - static ma_int32 coeff1Table[] = { 256, 512, 0, 192, 240, 460, 392 }; - static ma_int32 coeff2Table[] = { 0, -256, 0, 64, 0, -208, -232 }; + static const ma_int32 coeff1Table[] = { 256, 512, 0, 192, 240, 460, 392 }; + static const ma_int32 coeff2Table[] = { 0, -256, 0, 64, 0, -208, -232 }; MA_DR_WAV_ASSERT(pWav != NULL); MA_DR_WAV_ASSERT(framesToRead > 0); while (pWav->readCursorInPCMFrames < pWav->totalPCMFrameCount) { @@ -81307,11 +83064,11 @@ MA_PRIVATE ma_uint64 ma_dr_wav_read_pcm_frames_s16__ima(ma_dr_wav* pWav, ma_uint { ma_uint64 totalFramesRead = 0; ma_uint32 iChannel; - static ma_int32 indexTable[16] = { + static const ma_int32 indexTable[16] = { -1, -1, -1, -1, 2, 4, 6, 8, -1, -1, -1, -1, 2, 4, 6, 8 }; - static ma_int32 stepTable[89] = { + static const ma_int32 stepTable[89] = { 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, 19, 21, 23, 25, 28, 31, 34, 37, 41, 45, 50, 55, 60, 66, 73, 80, 88, 97, 107, 118, @@ -81334,7 +83091,7 @@ MA_PRIVATE ma_uint64 ma_dr_wav_read_pcm_frames_s16__ima(ma_dr_wav* pWav, ma_uint } pWav->ima.bytesRemainingInBlock = pWav->fmt.blockAlign - sizeof(header); if (header[2] >= ma_dr_wav_countof(stepTable)) { - pWav->onSeek(pWav->pUserData, pWav->ima.bytesRemainingInBlock, ma_dr_wav_seek_origin_current); + pWav->onSeek(pWav->pUserData, pWav->ima.bytesRemainingInBlock, MA_DR_WAV_SEEK_CUR); pWav->ima.bytesRemainingInBlock = 0; return totalFramesRead; } @@ -81349,7 +83106,7 @@ MA_PRIVATE ma_uint64 ma_dr_wav_read_pcm_frames_s16__ima(ma_dr_wav* pWav, ma_uint } pWav->ima.bytesRemainingInBlock = pWav->fmt.blockAlign - sizeof(header); if (header[2] >= ma_dr_wav_countof(stepTable) || header[6] >= ma_dr_wav_countof(stepTable)) { - pWav->onSeek(pWav->pUserData, pWav->ima.bytesRemainingInBlock, ma_dr_wav_seek_origin_current); + pWav->onSeek(pWav->pUserData, pWav->ima.bytesRemainingInBlock, MA_DR_WAV_SEEK_CUR); pWav->ima.bytesRemainingInBlock = 0; return totalFramesRead; } @@ -81424,7 +83181,7 @@ MA_PRIVATE ma_uint64 ma_dr_wav_read_pcm_frames_s16__ima(ma_dr_wav* pWav, ma_uint return totalFramesRead; } #ifndef MA_DR_WAV_NO_CONVERSION_API -static unsigned short g_ma_dr_wavAlawTable[256] = { +static const unsigned short ma_dr_wav_gAlawTable[256] = { 0xEA80, 0xEB80, 0xE880, 0xE980, 0xEE80, 0xEF80, 0xEC80, 0xED80, 0xE280, 0xE380, 0xE080, 0xE180, 0xE680, 0xE780, 0xE480, 0xE580, 0xF540, 0xF5C0, 0xF440, 0xF4C0, 0xF740, 0xF7C0, 0xF640, 0xF6C0, 0xF140, 0xF1C0, 0xF040, 0xF0C0, 0xF340, 0xF3C0, 0xF240, 0xF2C0, 0xAA00, 0xAE00, 0xA200, 0xA600, 0xBA00, 0xBE00, 0xB200, 0xB600, 0x8A00, 0x8E00, 0x8200, 0x8600, 0x9A00, 0x9E00, 0x9200, 0x9600, @@ -81442,7 +83199,7 @@ static unsigned short g_ma_dr_wavAlawTable[256] = { 0x0560, 0x0520, 0x05E0, 0x05A0, 0x0460, 0x0420, 0x04E0, 0x04A0, 0x0760, 0x0720, 0x07E0, 0x07A0, 0x0660, 0x0620, 0x06E0, 0x06A0, 0x02B0, 0x0290, 0x02F0, 0x02D0, 0x0230, 0x0210, 0x0270, 0x0250, 0x03B0, 0x0390, 0x03F0, 0x03D0, 0x0330, 0x0310, 0x0370, 0x0350 }; -static unsigned short g_ma_dr_wavMulawTable[256] = { +static const unsigned short ma_dr_wav_gMulawTable[256] = { 0x8284, 0x8684, 0x8A84, 0x8E84, 0x9284, 0x9684, 0x9A84, 0x9E84, 0xA284, 0xA684, 0xAA84, 0xAE84, 0xB284, 0xB684, 0xBA84, 0xBE84, 0xC184, 0xC384, 0xC584, 0xC784, 0xC984, 0xCB84, 0xCD84, 0xCF84, 0xD184, 0xD384, 0xD584, 0xD784, 0xD984, 0xDB84, 0xDD84, 0xDF84, 0xE104, 0xE204, 0xE304, 0xE404, 0xE504, 0xE604, 0xE704, 0xE804, 0xE904, 0xEA04, 0xEB04, 0xEC04, 0xED04, 0xEE04, 0xEF04, 0xF004, @@ -81462,11 +83219,11 @@ static unsigned short g_ma_dr_wavMulawTable[256] = { }; static MA_INLINE ma_int16 ma_dr_wav__alaw_to_s16(ma_uint8 sampleIn) { - return (short)g_ma_dr_wavAlawTable[sampleIn]; + return (short)ma_dr_wav_gAlawTable[sampleIn]; } static MA_INLINE ma_int16 ma_dr_wav__mulaw_to_s16(ma_uint8 sampleIn) { - return (short)g_ma_dr_wavMulawTable[sampleIn]; + return (short)ma_dr_wav_gMulawTable[sampleIn]; } MA_PRIVATE void ma_dr_wav__pcm_to_s16(ma_int16* pOut, const ma_uint8* pIn, size_t totalSampleCount, unsigned int bytesPerSample) { @@ -82625,7 +84382,7 @@ MA_PRIVATE ma_int32* ma_dr_wav__read_pcm_frames_and_close_s32(ma_dr_wav* pWav, u } return pSampleData; } -MA_API ma_int16* ma_dr_wav_open_and_read_pcm_frames_s16(ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_int16* ma_dr_wav_open_and_read_pcm_frames_s16(ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_tell_proc onTell, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks) { ma_dr_wav wav; if (channelsOut) { @@ -82637,12 +84394,12 @@ MA_API ma_int16* ma_dr_wav_open_and_read_pcm_frames_s16(ma_dr_wav_read_proc onRe if (totalFrameCountOut) { *totalFrameCountOut = 0; } - if (!ma_dr_wav_init(&wav, onRead, onSeek, pUserData, pAllocationCallbacks)) { + if (!ma_dr_wav_init(&wav, onRead, onSeek, onTell, pUserData, pAllocationCallbacks)) { return NULL; } return ma_dr_wav__read_pcm_frames_and_close_s16(&wav, channelsOut, sampleRateOut, totalFrameCountOut); } -MA_API float* ma_dr_wav_open_and_read_pcm_frames_f32(ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API float* ma_dr_wav_open_and_read_pcm_frames_f32(ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_tell_proc onTell, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks) { ma_dr_wav wav; if (channelsOut) { @@ -82654,12 +84411,12 @@ MA_API float* ma_dr_wav_open_and_read_pcm_frames_f32(ma_dr_wav_read_proc onRead, if (totalFrameCountOut) { *totalFrameCountOut = 0; } - if (!ma_dr_wav_init(&wav, onRead, onSeek, pUserData, pAllocationCallbacks)) { + if (!ma_dr_wav_init(&wav, onRead, onSeek, onTell, pUserData, pAllocationCallbacks)) { return NULL; } return ma_dr_wav__read_pcm_frames_and_close_f32(&wav, channelsOut, sampleRateOut, totalFrameCountOut); } -MA_API ma_int32* ma_dr_wav_open_and_read_pcm_frames_s32(ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_int32* ma_dr_wav_open_and_read_pcm_frames_s32(ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_tell_proc onTell, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks) { ma_dr_wav wav; if (channelsOut) { @@ -82671,7 +84428,7 @@ MA_API ma_int32* ma_dr_wav_open_and_read_pcm_frames_s32(ma_dr_wav_read_proc onRe if (totalFrameCountOut) { *totalFrameCountOut = 0; } - if (!ma_dr_wav_init(&wav, onRead, onSeek, pUserData, pAllocationCallbacks)) { + if (!ma_dr_wav_init(&wav, onRead, onSeek, onTell, pUserData, pAllocationCallbacks)) { return NULL; } return ma_dr_wav__read_pcm_frames_and_close_s32(&wav, channelsOut, sampleRateOut, totalFrameCountOut); @@ -84106,23 +85863,23 @@ static ma_bool32 ma_dr_flac__seek_to_byte(ma_dr_flac_bs* bs, ma_uint64 offsetFro MA_DR_FLAC_ASSERT(offsetFromStart > 0); if (offsetFromStart > 0x7FFFFFFF) { ma_uint64 bytesRemaining = offsetFromStart; - if (!bs->onSeek(bs->pUserData, 0x7FFFFFFF, ma_dr_flac_seek_origin_start)) { + if (!bs->onSeek(bs->pUserData, 0x7FFFFFFF, MA_DR_FLAC_SEEK_SET)) { return MA_FALSE; } bytesRemaining -= 0x7FFFFFFF; while (bytesRemaining > 0x7FFFFFFF) { - if (!bs->onSeek(bs->pUserData, 0x7FFFFFFF, ma_dr_flac_seek_origin_current)) { + if (!bs->onSeek(bs->pUserData, 0x7FFFFFFF, MA_DR_FLAC_SEEK_CUR)) { return MA_FALSE; } bytesRemaining -= 0x7FFFFFFF; } if (bytesRemaining > 0) { - if (!bs->onSeek(bs->pUserData, (int)bytesRemaining, ma_dr_flac_seek_origin_current)) { + if (!bs->onSeek(bs->pUserData, (int)bytesRemaining, MA_DR_FLAC_SEEK_CUR)) { return MA_FALSE; } } } else { - if (!bs->onSeek(bs->pUserData, (int)offsetFromStart, ma_dr_flac_seek_origin_start)) { + if (!bs->onSeek(bs->pUserData, (int)offsetFromStart, MA_DR_FLAC_SEEK_SET)) { return MA_FALSE; } } @@ -86600,6 +88357,7 @@ typedef struct { ma_dr_flac_read_proc onRead; ma_dr_flac_seek_proc onSeek; + ma_dr_flac_tell_proc onTell; ma_dr_flac_meta_proc onMeta; ma_dr_flac_container container; void* pUserData; @@ -86728,11 +88486,12 @@ static void ma_dr_flac__free_from_callbacks(void* p, const ma_allocation_callbac pAllocationCallbacks->onFree(p, pAllocationCallbacks->pUserData); } } -static ma_bool32 ma_dr_flac__read_and_decode_metadata(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_meta_proc onMeta, void* pUserData, void* pUserDataMD, ma_uint64* pFirstFramePos, ma_uint64* pSeektablePos, ma_uint32* pSeekpointCount, ma_allocation_callbacks* pAllocationCallbacks) +static ma_bool32 ma_dr_flac__read_and_decode_metadata(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, ma_dr_flac_meta_proc onMeta, void* pUserData, void* pUserDataMD, ma_uint64* pFirstFramePos, ma_uint64* pSeektablePos, ma_uint32* pSeekpointCount, ma_allocation_callbacks* pAllocationCallbacks) { ma_uint64 runningFilePos = 42; ma_uint64 seektablePos = 0; ma_uint32 seektableSize = 0; + (void)onTell; for (;;) { ma_dr_flac_metadata metadata; ma_uint8 isLastBlock = 0; @@ -86990,7 +88749,7 @@ static ma_bool32 ma_dr_flac__read_and_decode_metadata(ma_dr_flac_read_proc onRea { if (onMeta) { metadata.data.padding.unused = 0; - if (!onSeek(pUserData, blockSize, ma_dr_flac_seek_origin_current)) { + if (!onSeek(pUserData, blockSize, MA_DR_FLAC_SEEK_CUR)) { isLastBlock = MA_TRUE; } else { onMeta(pUserDataMD, &metadata); @@ -87000,7 +88759,7 @@ static ma_bool32 ma_dr_flac__read_and_decode_metadata(ma_dr_flac_read_proc onRea case MA_DR_FLAC_METADATA_BLOCK_TYPE_INVALID: { if (onMeta) { - if (!onSeek(pUserData, blockSize, ma_dr_flac_seek_origin_current)) { + if (!onSeek(pUserData, blockSize, MA_DR_FLAC_SEEK_CUR)) { isLastBlock = MA_TRUE; } } @@ -87024,7 +88783,7 @@ static ma_bool32 ma_dr_flac__read_and_decode_metadata(ma_dr_flac_read_proc onRea } break; } if (onMeta == NULL && blockSize > 0) { - if (!onSeek(pUserData, blockSize, ma_dr_flac_seek_origin_current)) { + if (!onSeek(pUserData, blockSize, MA_DR_FLAC_SEEK_CUR)) { isLastBlock = MA_TRUE; } } @@ -87288,6 +89047,7 @@ typedef struct { ma_dr_flac_read_proc onRead; ma_dr_flac_seek_proc onSeek; + ma_dr_flac_tell_proc onTell; void* pUserData; ma_uint64 currentBytePos; ma_uint64 firstBytePos; @@ -87306,29 +89066,29 @@ static size_t ma_dr_flac_oggbs__read_physical(ma_dr_flac_oggbs* oggbs, void* buf } static ma_bool32 ma_dr_flac_oggbs__seek_physical(ma_dr_flac_oggbs* oggbs, ma_uint64 offset, ma_dr_flac_seek_origin origin) { - if (origin == ma_dr_flac_seek_origin_start) { + if (origin == MA_DR_FLAC_SEEK_SET) { if (offset <= 0x7FFFFFFF) { - if (!oggbs->onSeek(oggbs->pUserData, (int)offset, ma_dr_flac_seek_origin_start)) { + if (!oggbs->onSeek(oggbs->pUserData, (int)offset, MA_DR_FLAC_SEEK_SET)) { return MA_FALSE; } oggbs->currentBytePos = offset; return MA_TRUE; } else { - if (!oggbs->onSeek(oggbs->pUserData, 0x7FFFFFFF, ma_dr_flac_seek_origin_start)) { + if (!oggbs->onSeek(oggbs->pUserData, 0x7FFFFFFF, MA_DR_FLAC_SEEK_SET)) { return MA_FALSE; } oggbs->currentBytePos = offset; - return ma_dr_flac_oggbs__seek_physical(oggbs, offset - 0x7FFFFFFF, ma_dr_flac_seek_origin_current); + return ma_dr_flac_oggbs__seek_physical(oggbs, offset - 0x7FFFFFFF, MA_DR_FLAC_SEEK_CUR); } } else { while (offset > 0x7FFFFFFF) { - if (!oggbs->onSeek(oggbs->pUserData, 0x7FFFFFFF, ma_dr_flac_seek_origin_current)) { + if (!oggbs->onSeek(oggbs->pUserData, 0x7FFFFFFF, MA_DR_FLAC_SEEK_CUR)) { return MA_FALSE; } oggbs->currentBytePos += 0x7FFFFFFF; offset -= 0x7FFFFFFF; } - if (!oggbs->onSeek(oggbs->pUserData, (int)offset, ma_dr_flac_seek_origin_current)) { + if (!oggbs->onSeek(oggbs->pUserData, (int)offset, MA_DR_FLAC_SEEK_CUR)) { return MA_FALSE; } oggbs->currentBytePos += offset; @@ -87354,7 +89114,7 @@ static ma_bool32 ma_dr_flac_oggbs__goto_next_page(ma_dr_flac_oggbs* oggbs, ma_dr continue; } if (header.serialNumber != oggbs->serialNumber) { - if (pageBodySize > 0 && !ma_dr_flac_oggbs__seek_physical(oggbs, pageBodySize, ma_dr_flac_seek_origin_current)) { + if (pageBodySize > 0 && !ma_dr_flac_oggbs__seek_physical(oggbs, pageBodySize, MA_DR_FLAC_SEEK_CUR)) { return MA_FALSE; } continue; @@ -87416,7 +89176,7 @@ static ma_bool32 ma_dr_flac_oggbs__seek_to_next_packet(ma_dr_flac_oggbs* oggbs) } bytesToEndOfPacketOrPage += segmentSize; } - ma_dr_flac_oggbs__seek_physical(oggbs, bytesToEndOfPacketOrPage, ma_dr_flac_seek_origin_current); + ma_dr_flac_oggbs__seek_physical(oggbs, bytesToEndOfPacketOrPage, MA_DR_FLAC_SEEK_CUR); oggbs->bytesRemainingInPage -= bytesToEndOfPacketOrPage; if (atEndOfPage) { if (!ma_dr_flac_oggbs__goto_next_page(oggbs)) { @@ -87469,36 +89229,44 @@ static ma_bool32 ma_dr_flac__on_seek_ogg(void* pUserData, int offset, ma_dr_flac int bytesSeeked = 0; MA_DR_FLAC_ASSERT(oggbs != NULL); MA_DR_FLAC_ASSERT(offset >= 0); - if (origin == ma_dr_flac_seek_origin_start) { - if (!ma_dr_flac_oggbs__seek_physical(oggbs, (int)oggbs->firstBytePos, ma_dr_flac_seek_origin_start)) { + if (origin == MA_DR_FLAC_SEEK_SET) { + if (!ma_dr_flac_oggbs__seek_physical(oggbs, (int)oggbs->firstBytePos, MA_DR_FLAC_SEEK_SET)) { return MA_FALSE; } if (!ma_dr_flac_oggbs__goto_next_page(oggbs, ma_dr_flac_ogg_fail_on_crc_mismatch)) { return MA_FALSE; } - return ma_dr_flac__on_seek_ogg(pUserData, offset, ma_dr_flac_seek_origin_current); - } - MA_DR_FLAC_ASSERT(origin == ma_dr_flac_seek_origin_current); - while (bytesSeeked < offset) { - int bytesRemainingToSeek = offset - bytesSeeked; - MA_DR_FLAC_ASSERT(bytesRemainingToSeek >= 0); - if (oggbs->bytesRemainingInPage >= (size_t)bytesRemainingToSeek) { - bytesSeeked += bytesRemainingToSeek; - (void)bytesSeeked; - oggbs->bytesRemainingInPage -= bytesRemainingToSeek; - break; - } - if (oggbs->bytesRemainingInPage > 0) { - bytesSeeked += (int)oggbs->bytesRemainingInPage; - oggbs->bytesRemainingInPage = 0; - } - MA_DR_FLAC_ASSERT(bytesRemainingToSeek > 0); - if (!ma_dr_flac_oggbs__goto_next_page(oggbs, ma_dr_flac_ogg_fail_on_crc_mismatch)) { - return MA_FALSE; + return ma_dr_flac__on_seek_ogg(pUserData, offset, MA_DR_FLAC_SEEK_CUR); + } else if (origin == MA_DR_FLAC_SEEK_CUR) { + while (bytesSeeked < offset) { + int bytesRemainingToSeek = offset - bytesSeeked; + MA_DR_FLAC_ASSERT(bytesRemainingToSeek >= 0); + if (oggbs->bytesRemainingInPage >= (size_t)bytesRemainingToSeek) { + bytesSeeked += bytesRemainingToSeek; + (void)bytesSeeked; + oggbs->bytesRemainingInPage -= bytesRemainingToSeek; + break; + } + if (oggbs->bytesRemainingInPage > 0) { + bytesSeeked += (int)oggbs->bytesRemainingInPage; + oggbs->bytesRemainingInPage = 0; + } + MA_DR_FLAC_ASSERT(bytesRemainingToSeek > 0); + if (!ma_dr_flac_oggbs__goto_next_page(oggbs, ma_dr_flac_ogg_fail_on_crc_mismatch)) { + return MA_FALSE; + } } + } else if (origin == MA_DR_FLAC_SEEK_END) { + return MA_FALSE; } return MA_TRUE; } +static ma_bool32 ma_dr_flac__on_tell_ogg(void* pUserData, ma_int64* pCursor) +{ + (void)pUserData; + (void)pCursor; + return MA_FALSE; +} static ma_bool32 ma_dr_flac_ogg__seek_to_pcm_frame(ma_dr_flac* pFlac, ma_uint64 pcmFrameIndex) { ma_dr_flac_oggbs* oggbs = (ma_dr_flac_oggbs*)pFlac->_oggbs; @@ -87515,7 +89283,7 @@ static ma_bool32 ma_dr_flac_ogg__seek_to_pcm_frame(ma_dr_flac* pFlac, ma_uint64 runningGranulePosition = 0; for (;;) { if (!ma_dr_flac_oggbs__goto_next_page(oggbs, ma_dr_flac_ogg_recover_on_crc_mismatch)) { - ma_dr_flac_oggbs__seek_physical(oggbs, originalBytePos, ma_dr_flac_seek_origin_start); + ma_dr_flac_oggbs__seek_physical(oggbs, originalBytePos, MA_DR_FLAC_SEEK_SET); return MA_FALSE; } runningFrameBytePos = oggbs->currentBytePos - ma_dr_flac_ogg__get_page_header_size(&oggbs->currentPageHeader) - oggbs->pageDataSize; @@ -87534,7 +89302,7 @@ static ma_bool32 ma_dr_flac_ogg__seek_to_pcm_frame(ma_dr_flac* pFlac, ma_uint64 } } } - if (!ma_dr_flac_oggbs__seek_physical(oggbs, runningFrameBytePos, ma_dr_flac_seek_origin_start)) { + if (!ma_dr_flac_oggbs__seek_physical(oggbs, runningFrameBytePos, MA_DR_FLAC_SEEK_SET)) { return MA_FALSE; } if (!ma_dr_flac_oggbs__goto_next_page(oggbs, ma_dr_flac_ogg_recover_on_crc_mismatch)) { @@ -87629,7 +89397,7 @@ static ma_bool32 ma_dr_flac__init_private__ogg(ma_dr_flac_init_info* pInit, ma_d if (mappingVersion[0] != 1) { return MA_FALSE; } - if (!onSeek(pUserData, 2, ma_dr_flac_seek_origin_current)) { + if (!onSeek(pUserData, 2, MA_DR_FLAC_SEEK_CUR)) { return MA_FALSE; } if (onRead(pUserData, sig, 4) != 4) { @@ -87674,17 +89442,17 @@ static ma_bool32 ma_dr_flac__init_private__ogg(ma_dr_flac_init_info* pInit, ma_d return MA_FALSE; } } else { - if (!onSeek(pUserData, bytesRemainingInPage, ma_dr_flac_seek_origin_current)) { + if (!onSeek(pUserData, bytesRemainingInPage, MA_DR_FLAC_SEEK_CUR)) { return MA_FALSE; } } } else { - if (!onSeek(pUserData, bytesRemainingInPage, ma_dr_flac_seek_origin_current)) { + if (!onSeek(pUserData, bytesRemainingInPage, MA_DR_FLAC_SEEK_CUR)) { return MA_FALSE; } } } else { - if (!onSeek(pUserData, pageBodySize, ma_dr_flac_seek_origin_current)) { + if (!onSeek(pUserData, pageBodySize, MA_DR_FLAC_SEEK_CUR)) { return MA_FALSE; } } @@ -87698,7 +89466,7 @@ static ma_bool32 ma_dr_flac__init_private__ogg(ma_dr_flac_init_info* pInit, ma_d return MA_TRUE; } #endif -static ma_bool32 ma_dr_flac__init_private(ma_dr_flac_init_info* pInit, ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_meta_proc onMeta, ma_dr_flac_container container, void* pUserData, void* pUserDataMD) +static ma_bool32 ma_dr_flac__init_private(ma_dr_flac_init_info* pInit, ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, ma_dr_flac_meta_proc onMeta, ma_dr_flac_container container, void* pUserData, void* pUserDataMD) { ma_bool32 relaxed; ma_uint8 id[4]; @@ -87708,12 +89476,14 @@ static ma_bool32 ma_dr_flac__init_private(ma_dr_flac_init_info* pInit, ma_dr_fla MA_DR_FLAC_ZERO_MEMORY(pInit, sizeof(*pInit)); pInit->onRead = onRead; pInit->onSeek = onSeek; + pInit->onTell = onTell; pInit->onMeta = onMeta; pInit->container = container; pInit->pUserData = pUserData; pInit->pUserDataMD = pUserDataMD; pInit->bs.onRead = onRead; pInit->bs.onSeek = onSeek; + pInit->bs.onTell = onTell; pInit->bs.pUserData = pUserData; ma_dr_flac__reset_cache(&pInit->bs); relaxed = container != ma_dr_flac_container_unknown; @@ -87736,7 +89506,7 @@ static ma_bool32 ma_dr_flac__init_private(ma_dr_flac_init_info* pInit, ma_dr_fla if (flags & 0x10) { headerSize += 10; } - if (!onSeek(pUserData, headerSize, ma_dr_flac_seek_origin_current)) { + if (!onSeek(pUserData, headerSize, MA_DR_FLAC_SEEK_CUR)) { return MA_FALSE; } pInit->runningFilePos += headerSize; @@ -87779,7 +89549,7 @@ static void ma_dr_flac__init_from_info(ma_dr_flac* pFlac, const ma_dr_flac_init_ pFlac->totalPCMFrameCount = pInit->totalPCMFrameCount; pFlac->container = pInit->container; } -static ma_dr_flac* ma_dr_flac_open_with_metadata_private(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_meta_proc onMeta, ma_dr_flac_container container, void* pUserData, void* pUserDataMD, const ma_allocation_callbacks* pAllocationCallbacks) +static ma_dr_flac* ma_dr_flac_open_with_metadata_private(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, ma_dr_flac_meta_proc onMeta, ma_dr_flac_container container, void* pUserData, void* pUserDataMD, const ma_allocation_callbacks* pAllocationCallbacks) { ma_dr_flac_init_info init; ma_uint32 allocationSize; @@ -87794,7 +89564,7 @@ static ma_dr_flac* ma_dr_flac_open_with_metadata_private(ma_dr_flac_read_proc on ma_allocation_callbacks allocationCallbacks; ma_dr_flac* pFlac; ma_dr_flac__init_cpu_caps(); - if (!ma_dr_flac__init_private(&init, onRead, onSeek, onMeta, container, pUserData, pUserDataMD)) { + if (!ma_dr_flac__init_private(&init, onRead, onSeek, onTell, onMeta, container, pUserData, pUserDataMD)) { return NULL; } if (pAllocationCallbacks != NULL) { @@ -87827,6 +89597,7 @@ static ma_dr_flac* ma_dr_flac_open_with_metadata_private(ma_dr_flac_read_proc on MA_DR_FLAC_ZERO_MEMORY(pOggbs, sizeof(*pOggbs)); pOggbs->onRead = onRead; pOggbs->onSeek = onSeek; + pOggbs->onTell = onTell; pOggbs->pUserData = pUserData; pOggbs->currentBytePos = init.oggFirstBytePos; pOggbs->firstBytePos = init.oggFirstBytePos; @@ -87841,15 +89612,17 @@ static ma_dr_flac* ma_dr_flac_open_with_metadata_private(ma_dr_flac_read_proc on if (init.hasMetadataBlocks) { ma_dr_flac_read_proc onReadOverride = onRead; ma_dr_flac_seek_proc onSeekOverride = onSeek; + ma_dr_flac_tell_proc onTellOverride = onTell; void* pUserDataOverride = pUserData; #ifndef MA_DR_FLAC_NO_OGG if (init.container == ma_dr_flac_container_ogg) { onReadOverride = ma_dr_flac__on_read_ogg; onSeekOverride = ma_dr_flac__on_seek_ogg; + onTellOverride = ma_dr_flac__on_tell_ogg; pUserDataOverride = (void*)pOggbs; } #endif - if (!ma_dr_flac__read_and_decode_metadata(onReadOverride, onSeekOverride, onMeta, pUserDataOverride, pUserDataMD, &firstFramePos, &seektablePos, &seekpointCount, &allocationCallbacks)) { + if (!ma_dr_flac__read_and_decode_metadata(onReadOverride, onSeekOverride, onTellOverride, onMeta, pUserDataOverride, pUserDataMD, &firstFramePos, &seektablePos, &seekpointCount, &allocationCallbacks)) { #ifndef MA_DR_FLAC_NO_OGG ma_dr_flac__free_from_callbacks(pOggbs, &allocationCallbacks); #endif @@ -87875,6 +89648,7 @@ static ma_dr_flac* ma_dr_flac_open_with_metadata_private(ma_dr_flac_read_proc on pOggbs = NULL; pFlac->bs.onRead = ma_dr_flac__on_read_ogg; pFlac->bs.onSeek = ma_dr_flac__on_seek_ogg; + pFlac->bs.onTell = ma_dr_flac__on_tell_ogg; pFlac->bs.pUserData = (void*)pInternalOggbs; pFlac->_oggbs = (void*)pInternalOggbs; } @@ -87894,7 +89668,7 @@ static ma_dr_flac* ma_dr_flac_open_with_metadata_private(ma_dr_flac_read_proc on pFlac->pSeekpoints = (ma_dr_flac_seekpoint*)((ma_uint8*)pFlac->pDecodedSamples + decodedSamplesAllocationSize); MA_DR_FLAC_ASSERT(pFlac->bs.onSeek != NULL); MA_DR_FLAC_ASSERT(pFlac->bs.onRead != NULL); - if (pFlac->bs.onSeek(pFlac->bs.pUserData, (int)seektablePos, ma_dr_flac_seek_origin_start)) { + if (pFlac->bs.onSeek(pFlac->bs.pUserData, (int)seektablePos, MA_DR_FLAC_SEEK_SET)) { ma_uint32 iSeekpoint; for (iSeekpoint = 0; iSeekpoint < seekpointCount; iSeekpoint += 1) { if (pFlac->bs.onRead(pFlac->bs.pUserData, pFlac->pSeekpoints + iSeekpoint, MA_DR_FLAC_SEEKPOINT_SIZE_IN_BYTES) == MA_DR_FLAC_SEEKPOINT_SIZE_IN_BYTES) { @@ -87907,7 +89681,7 @@ static ma_dr_flac* ma_dr_flac_open_with_metadata_private(ma_dr_flac_read_proc on break; } } - if (!pFlac->bs.onSeek(pFlac->bs.pUserData, (int)pFlac->firstFLACFramePosInBytes, ma_dr_flac_seek_origin_start)) { + if (!pFlac->bs.onSeek(pFlac->bs.pUserData, (int)pFlac->firstFLACFramePosInBytes, MA_DR_FLAC_SEEK_SET)) { ma_dr_flac__free_from_callbacks(pFlac, &allocationCallbacks); return NULL; } @@ -87950,8 +89724,31 @@ static size_t ma_dr_flac__on_read_stdio(void* pUserData, void* bufferOut, size_t } static ma_bool32 ma_dr_flac__on_seek_stdio(void* pUserData, int offset, ma_dr_flac_seek_origin origin) { - MA_DR_FLAC_ASSERT(offset >= 0); - return fseek((FILE*)pUserData, offset, (origin == ma_dr_flac_seek_origin_current) ? SEEK_CUR : SEEK_SET) == 0; + int whence = SEEK_SET; + if (origin == MA_DR_FLAC_SEEK_CUR) { + whence = SEEK_CUR; + } else if (origin == MA_DR_FLAC_SEEK_END) { + whence = SEEK_END; + } + return fseek((FILE*)pUserData, offset, whence) == 0; +} +static ma_bool32 ma_dr_flac__on_tell_stdio(void* pUserData, ma_int64* pCursor) +{ + FILE* pFileStdio = (FILE*)pUserData; + ma_int64 result; + MA_DR_FLAC_ASSERT(pFileStdio != NULL); + MA_DR_FLAC_ASSERT(pCursor != NULL); +#if defined(_WIN32) && !defined(NXDK) + #if defined(_MSC_VER) && _MSC_VER > 1200 + result = _ftelli64(pFileStdio); + #else + result = ftell(pFileStdio); + #endif +#else + result = ftell(pFileStdio); +#endif + *pCursor = result; + return MA_TRUE; } MA_API ma_dr_flac* ma_dr_flac_open_file(const char* pFileName, const ma_allocation_callbacks* pAllocationCallbacks) { @@ -87960,7 +89757,7 @@ MA_API ma_dr_flac* ma_dr_flac_open_file(const char* pFileName, const ma_allocati if (ma_fopen(&pFile, pFileName, "rb") != MA_SUCCESS) { return NULL; } - pFlac = ma_dr_flac_open(ma_dr_flac__on_read_stdio, ma_dr_flac__on_seek_stdio, (void*)pFile, pAllocationCallbacks); + pFlac = ma_dr_flac_open(ma_dr_flac__on_read_stdio, ma_dr_flac__on_seek_stdio, ma_dr_flac__on_tell_stdio, (void*)pFile, pAllocationCallbacks); if (pFlac == NULL) { fclose(pFile); return NULL; @@ -87975,7 +89772,7 @@ MA_API ma_dr_flac* ma_dr_flac_open_file_w(const wchar_t* pFileName, const ma_all if (ma_wfopen(&pFile, pFileName, L"rb", pAllocationCallbacks) != MA_SUCCESS) { return NULL; } - pFlac = ma_dr_flac_open(ma_dr_flac__on_read_stdio, ma_dr_flac__on_seek_stdio, (void*)pFile, pAllocationCallbacks); + pFlac = ma_dr_flac_open(ma_dr_flac__on_read_stdio, ma_dr_flac__on_seek_stdio, ma_dr_flac__on_tell_stdio, (void*)pFile, pAllocationCallbacks); if (pFlac == NULL) { fclose(pFile); return NULL; @@ -87990,7 +89787,7 @@ MA_API ma_dr_flac* ma_dr_flac_open_file_with_metadata(const char* pFileName, ma_ if (ma_fopen(&pFile, pFileName, "rb") != MA_SUCCESS) { return NULL; } - pFlac = ma_dr_flac_open_with_metadata_private(ma_dr_flac__on_read_stdio, ma_dr_flac__on_seek_stdio, onMeta, ma_dr_flac_container_unknown, (void*)pFile, pUserData, pAllocationCallbacks); + pFlac = ma_dr_flac_open_with_metadata_private(ma_dr_flac__on_read_stdio, ma_dr_flac__on_seek_stdio, ma_dr_flac__on_tell_stdio, onMeta, ma_dr_flac_container_unknown, (void*)pFile, pUserData, pAllocationCallbacks); if (pFlac == NULL) { fclose(pFile); return pFlac; @@ -88005,7 +89802,7 @@ MA_API ma_dr_flac* ma_dr_flac_open_file_with_metadata_w(const wchar_t* pFileName if (ma_wfopen(&pFile, pFileName, L"rb", pAllocationCallbacks) != MA_SUCCESS) { return NULL; } - pFlac = ma_dr_flac_open_with_metadata_private(ma_dr_flac__on_read_stdio, ma_dr_flac__on_seek_stdio, onMeta, ma_dr_flac_container_unknown, (void*)pFile, pUserData, pAllocationCallbacks); + pFlac = ma_dr_flac_open_with_metadata_private(ma_dr_flac__on_read_stdio, ma_dr_flac__on_seek_stdio, ma_dr_flac__on_tell_stdio, onMeta, ma_dr_flac_container_unknown, (void*)pFile, pUserData, pAllocationCallbacks); if (pFlac == NULL) { fclose(pFile); return pFlac; @@ -88033,24 +89830,35 @@ static size_t ma_dr_flac__on_read_memory(void* pUserData, void* bufferOut, size_ static ma_bool32 ma_dr_flac__on_seek_memory(void* pUserData, int offset, ma_dr_flac_seek_origin origin) { ma_dr_flac__memory_stream* memoryStream = (ma_dr_flac__memory_stream*)pUserData; + ma_int64 newCursor; MA_DR_FLAC_ASSERT(memoryStream != NULL); - MA_DR_FLAC_ASSERT(offset >= 0); - if (offset > (ma_int64)memoryStream->dataSize) { + newCursor = memoryStream->currentReadPos; + if (origin == MA_DR_FLAC_SEEK_SET) { + newCursor = 0; + } else if (origin == MA_DR_FLAC_SEEK_CUR) { + newCursor = (ma_int64)memoryStream->currentReadPos; + } else if (origin == MA_DR_FLAC_SEEK_END) { + newCursor = (ma_int64)memoryStream->dataSize; + } else { + MA_DR_FLAC_ASSERT(!"Invalid seek origin"); return MA_FALSE; } - if (origin == ma_dr_flac_seek_origin_current) { - if (memoryStream->currentReadPos + offset <= memoryStream->dataSize) { - memoryStream->currentReadPos += offset; - } else { - return MA_FALSE; - } - } else { - if ((ma_uint32)offset <= memoryStream->dataSize) { - memoryStream->currentReadPos = offset; - } else { - return MA_FALSE; - } + newCursor += offset; + if (newCursor < 0) { + return MA_FALSE; } + if ((size_t)newCursor > memoryStream->dataSize) { + return MA_FALSE; + } + memoryStream->currentReadPos = (size_t)newCursor; + return MA_TRUE; +} +static ma_bool32 ma_dr_flac__on_tell_memory(void* pUserData, ma_int64* pCursor) +{ + ma_dr_flac__memory_stream* memoryStream = (ma_dr_flac__memory_stream*)pUserData; + MA_DR_FLAC_ASSERT(memoryStream != NULL); + MA_DR_FLAC_ASSERT(pCursor != NULL); + *pCursor = (ma_int64)memoryStream->currentReadPos; return MA_TRUE; } MA_API ma_dr_flac* ma_dr_flac_open_memory(const void* pData, size_t dataSize, const ma_allocation_callbacks* pAllocationCallbacks) @@ -88060,7 +89868,7 @@ MA_API ma_dr_flac* ma_dr_flac_open_memory(const void* pData, size_t dataSize, co memoryStream.data = (const ma_uint8*)pData; memoryStream.dataSize = dataSize; memoryStream.currentReadPos = 0; - pFlac = ma_dr_flac_open(ma_dr_flac__on_read_memory, ma_dr_flac__on_seek_memory, &memoryStream, pAllocationCallbacks); + pFlac = ma_dr_flac_open(ma_dr_flac__on_read_memory, ma_dr_flac__on_seek_memory, ma_dr_flac__on_tell_memory, &memoryStream, pAllocationCallbacks); if (pFlac == NULL) { return NULL; } @@ -88085,7 +89893,7 @@ MA_API ma_dr_flac* ma_dr_flac_open_memory_with_metadata(const void* pData, size_ memoryStream.data = (const ma_uint8*)pData; memoryStream.dataSize = dataSize; memoryStream.currentReadPos = 0; - pFlac = ma_dr_flac_open_with_metadata_private(ma_dr_flac__on_read_memory, ma_dr_flac__on_seek_memory, onMeta, ma_dr_flac_container_unknown, &memoryStream, pUserData, pAllocationCallbacks); + pFlac = ma_dr_flac_open_with_metadata_private(ma_dr_flac__on_read_memory, ma_dr_flac__on_seek_memory, ma_dr_flac__on_tell_memory, onMeta, ma_dr_flac_container_unknown, &memoryStream, pUserData, pAllocationCallbacks); if (pFlac == NULL) { return NULL; } @@ -88103,21 +89911,21 @@ MA_API ma_dr_flac* ma_dr_flac_open_memory_with_metadata(const void* pData, size_ } return pFlac; } -MA_API ma_dr_flac* ma_dr_flac_open(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_dr_flac* ma_dr_flac_open(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks) { - return ma_dr_flac_open_with_metadata_private(onRead, onSeek, NULL, ma_dr_flac_container_unknown, pUserData, pUserData, pAllocationCallbacks); + return ma_dr_flac_open_with_metadata_private(onRead, onSeek, onTell, NULL, ma_dr_flac_container_unknown, pUserData, pUserData, pAllocationCallbacks); } -MA_API ma_dr_flac* ma_dr_flac_open_relaxed(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_container container, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_dr_flac* ma_dr_flac_open_relaxed(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, ma_dr_flac_container container, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks) { - return ma_dr_flac_open_with_metadata_private(onRead, onSeek, NULL, container, pUserData, pUserData, pAllocationCallbacks); + return ma_dr_flac_open_with_metadata_private(onRead, onSeek, onTell, NULL, container, pUserData, pUserData, pAllocationCallbacks); } -MA_API ma_dr_flac* ma_dr_flac_open_with_metadata(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_meta_proc onMeta, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_dr_flac* ma_dr_flac_open_with_metadata(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, ma_dr_flac_meta_proc onMeta, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks) { - return ma_dr_flac_open_with_metadata_private(onRead, onSeek, onMeta, ma_dr_flac_container_unknown, pUserData, pUserData, pAllocationCallbacks); + return ma_dr_flac_open_with_metadata_private(onRead, onSeek, onTell, onMeta, ma_dr_flac_container_unknown, pUserData, pUserData, pAllocationCallbacks); } -MA_API ma_dr_flac* ma_dr_flac_open_with_metadata_relaxed(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_meta_proc onMeta, ma_dr_flac_container container, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_dr_flac* ma_dr_flac_open_with_metadata_relaxed(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, ma_dr_flac_meta_proc onMeta, ma_dr_flac_container container, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks) { - return ma_dr_flac_open_with_metadata_private(onRead, onSeek, onMeta, container, pUserData, pUserData, pAllocationCallbacks); + return ma_dr_flac_open_with_metadata_private(onRead, onSeek, onTell, onMeta, container, pUserData, pUserData, pAllocationCallbacks); } MA_API void ma_dr_flac_close(ma_dr_flac* pFlac) { @@ -90410,7 +92218,7 @@ on_error: MA_DR_FLAC_DEFINE_FULL_READ_AND_CLOSE(s32, ma_int32) MA_DR_FLAC_DEFINE_FULL_READ_AND_CLOSE(s16, ma_int16) MA_DR_FLAC_DEFINE_FULL_READ_AND_CLOSE(f32, float) -MA_API ma_int32* ma_dr_flac_open_and_read_pcm_frames_s32(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalPCMFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_int32* ma_dr_flac_open_and_read_pcm_frames_s32(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalPCMFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks) { ma_dr_flac* pFlac; if (channelsOut) { @@ -90422,13 +92230,13 @@ MA_API ma_int32* ma_dr_flac_open_and_read_pcm_frames_s32(ma_dr_flac_read_proc on if (totalPCMFrameCountOut) { *totalPCMFrameCountOut = 0; } - pFlac = ma_dr_flac_open(onRead, onSeek, pUserData, pAllocationCallbacks); + pFlac = ma_dr_flac_open(onRead, onSeek, onTell, pUserData, pAllocationCallbacks); if (pFlac == NULL) { return NULL; } return ma_dr_flac__full_read_and_close_s32(pFlac, channelsOut, sampleRateOut, totalPCMFrameCountOut); } -MA_API ma_int16* ma_dr_flac_open_and_read_pcm_frames_s16(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalPCMFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_int16* ma_dr_flac_open_and_read_pcm_frames_s16(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalPCMFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks) { ma_dr_flac* pFlac; if (channelsOut) { @@ -90440,13 +92248,13 @@ MA_API ma_int16* ma_dr_flac_open_and_read_pcm_frames_s16(ma_dr_flac_read_proc on if (totalPCMFrameCountOut) { *totalPCMFrameCountOut = 0; } - pFlac = ma_dr_flac_open(onRead, onSeek, pUserData, pAllocationCallbacks); + pFlac = ma_dr_flac_open(onRead, onSeek, onTell, pUserData, pAllocationCallbacks); if (pFlac == NULL) { return NULL; } return ma_dr_flac__full_read_and_close_s16(pFlac, channelsOut, sampleRateOut, totalPCMFrameCountOut); } -MA_API float* ma_dr_flac_open_and_read_pcm_frames_f32(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalPCMFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API float* ma_dr_flac_open_and_read_pcm_frames_f32(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalPCMFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks) { ma_dr_flac* pFlac; if (channelsOut) { @@ -90458,7 +92266,7 @@ MA_API float* ma_dr_flac_open_and_read_pcm_frames_f32(ma_dr_flac_read_proc onRea if (totalPCMFrameCountOut) { *totalPCMFrameCountOut = 0; } - pFlac = ma_dr_flac_open(onRead, onSeek, pUserData, pAllocationCallbacks); + pFlac = ma_dr_flac_open(onRead, onSeek, onTell, pUserData, pAllocationCallbacks); if (pFlac == NULL) { return NULL; } @@ -91262,6 +93070,10 @@ static float ma_dr_mp3_L3_ldexp_q2(float y, int exp_q2) } while ((exp_q2 -= e) > 0); return y; } +#if (defined(__GNUC__) && (__GNUC__ >= 14)) && !defined(__clang__) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wstringop-overflow" +#endif static void ma_dr_mp3_L3_decode_scalefactors(const ma_uint8 *hdr, ma_uint8 *ist_pos, ma_dr_mp3_bs *bs, const ma_dr_mp3_L3_gr_info *gr, float *scf, int ch) { static const ma_uint8 g_scf_partitions[3][28] = { @@ -91320,7 +93132,10 @@ static void ma_dr_mp3_L3_decode_scalefactors(const ma_uint8 *hdr, ma_uint8 *ist_ scf[i] = ma_dr_mp3_L3_ldexp_q2(gain, iscf[i] << scf_shift); } } -static const float g_ma_dr_mp3_pow43[129 + 16] = { +#if (defined(__GNUC__) && (__GNUC__ >= 14)) && !defined(__clang__) + #pragma GCC diagnostic pop +#endif +static const float ma_dr_mp3_g_pow43[129 + 16] = { 0,-1,-2.519842f,-4.326749f,-6.349604f,-8.549880f,-10.902724f,-13.390518f,-16.000000f,-18.720754f,-21.544347f,-24.463781f,-27.473142f,-30.567351f,-33.741992f,-36.993181f, 0,1,2.519842f,4.326749f,6.349604f,8.549880f,10.902724f,13.390518f,16.000000f,18.720754f,21.544347f,24.463781f,27.473142f,30.567351f,33.741992f,36.993181f,40.317474f,43.711787f,47.173345f,50.699631f,54.288352f,57.937408f,61.644865f,65.408941f,69.227979f,73.100443f,77.024898f,81.000000f,85.024491f,89.097188f,93.216975f,97.382800f,101.593667f,105.848633f,110.146801f,114.487321f,118.869381f,123.292209f,127.755065f,132.257246f,136.798076f,141.376907f,145.993119f,150.646117f,155.335327f,160.060199f,164.820202f,169.614826f,174.443577f,179.305980f,184.201575f,189.129918f,194.090580f,199.083145f,204.107210f,209.162385f,214.248292f,219.364564f,224.510845f,229.686789f,234.892058f,240.126328f,245.389280f,250.680604f,256.000000f,261.347174f,266.721841f,272.123723f,277.552547f,283.008049f,288.489971f,293.998060f,299.532071f,305.091761f,310.676898f,316.287249f,321.922592f,327.582707f,333.267377f,338.976394f,344.709550f,350.466646f,356.247482f,362.051866f,367.879608f,373.730522f,379.604427f,385.501143f,391.420496f,397.362314f,403.326427f,409.312672f,415.320884f,421.350905f,427.402579f,433.475750f,439.570269f,445.685987f,451.822757f,457.980436f,464.158883f,470.357960f,476.577530f,482.817459f,489.077615f,495.357868f,501.658090f,507.978156f,514.317941f,520.677324f,527.056184f,533.454404f,539.871867f,546.308458f,552.764065f,559.238575f,565.731879f,572.243870f,578.774440f,585.323483f,591.890898f,598.476581f,605.080431f,611.702349f,618.342238f,625.000000f,631.675540f,638.368763f,645.079578f }; @@ -91330,7 +93145,7 @@ static float ma_dr_mp3_L3_pow_43(int x) int sign, mult = 256; if (x < 129) { - return g_ma_dr_mp3_pow43[16 + x]; + return ma_dr_mp3_g_pow43[16 + x]; } if (x < 1024) { @@ -91339,7 +93154,7 @@ static float ma_dr_mp3_L3_pow_43(int x) } sign = 2*x & 64; frac = (float)((x & 63) - sign) / ((x & ~63) + sign); - return g_ma_dr_mp3_pow43[16 + ((x + sign) >> 6)]*(1.f + frac*((4.f/3) + frac*(2.f/9)))*mult; + return ma_dr_mp3_g_pow43[16 + ((x + sign) >> 6)]*(1.f + frac*((4.f/3) + frac*(2.f/9)))*mult; } static void ma_dr_mp3_L3_huffman(float *dst, ma_dr_mp3_bs *bs, const ma_dr_mp3_L3_gr_info *gr_info, const float *scf, int layer3gr_limit) { @@ -91409,7 +93224,7 @@ static void ma_dr_mp3_L3_huffman(float *dst, ma_dr_mp3_bs *bs, const ma_dr_mp3_L *dst = one*ma_dr_mp3_L3_pow_43(lsb)*((ma_int32)bs_cache < 0 ? -1: 1); } else { - *dst = g_ma_dr_mp3_pow43[16 + lsb - 16*(bs_cache >> 31)]*one; + *dst = ma_dr_mp3_g_pow43[16 + lsb - 16*(bs_cache >> 31)]*one; } MA_DR_MP3_FLUSH_BITS(lsb ? 1 : 0); } @@ -91437,7 +93252,7 @@ static void ma_dr_mp3_L3_huffman(float *dst, ma_dr_mp3_bs *bs, const ma_dr_mp3_L for (j = 0; j < 2; j++, dst++, leaf >>= 4) { int lsb = leaf & 0x0F; - *dst = g_ma_dr_mp3_pow43[16 + lsb - 16*(bs_cache >> 31)]*one; + *dst = ma_dr_mp3_g_pow43[16 + lsb - 16*(bs_cache >> 31)]*one; MA_DR_MP3_FLUSH_BITS(lsb ? 1 : 0); } MA_DR_MP3_CHECK_BITS; @@ -92268,7 +94083,7 @@ MA_API int ma_dr_mp3dec_decode_frame(ma_dr_mp3dec *dec, const ma_uint8 *mp3, int MA_DR_MP3_COPY_MEMORY(dec->header, hdr, MA_DR_MP3_HDR_SIZE); info->frame_bytes = i + frame_size; info->channels = MA_DR_MP3_HDR_IS_MONO(hdr) ? 1 : 2; - info->hz = ma_dr_mp3_hdr_sample_rate_hz(hdr); + info->sample_rate = ma_dr_mp3_hdr_sample_rate_hz(hdr); info->layer = 4 - MA_DR_MP3_HDR_GET_LAYER(hdr); info->bitrate_kbps = ma_dr_mp3_hdr_bitrate_kbps(hdr); ma_dr_mp3_bs_init(bs_frame, hdr + MA_DR_MP3_HDR_SIZE, frame_size - MA_DR_MP3_HDR_SIZE); @@ -92491,19 +94306,41 @@ static ma_allocation_callbacks ma_dr_mp3_copy_allocation_callbacks_or_defaults(c } static size_t ma_dr_mp3__on_read(ma_dr_mp3* pMP3, void* pBufferOut, size_t bytesToRead) { - size_t bytesRead = pMP3->onRead(pMP3->pUserData, pBufferOut, bytesToRead); + size_t bytesRead; + MA_DR_MP3_ASSERT(pMP3 != NULL); + MA_DR_MP3_ASSERT(pMP3->onRead != NULL); + if (bytesToRead == 0) { + return 0; + } + bytesRead = pMP3->onRead(pMP3->pUserData, pBufferOut, bytesToRead); pMP3->streamCursor += bytesRead; return bytesRead; } +static size_t ma_dr_mp3__on_read_clamped(ma_dr_mp3* pMP3, void* pBufferOut, size_t bytesToRead) +{ + MA_DR_MP3_ASSERT(pMP3 != NULL); + MA_DR_MP3_ASSERT(pMP3->onRead != NULL); + if (pMP3->streamLength == MA_UINT64_MAX) { + return ma_dr_mp3__on_read(pMP3, pBufferOut, bytesToRead); + } else { + ma_uint64 bytesRemaining; + bytesRemaining = (pMP3->streamLength - pMP3->streamCursor); + if (bytesToRead > bytesRemaining) { + bytesToRead = (size_t)bytesRemaining; + } + return ma_dr_mp3__on_read(pMP3, pBufferOut, bytesToRead); + } +} static ma_bool32 ma_dr_mp3__on_seek(ma_dr_mp3* pMP3, int offset, ma_dr_mp3_seek_origin origin) { MA_DR_MP3_ASSERT(offset >= 0); + MA_DR_MP3_ASSERT(origin == MA_DR_MP3_SEEK_SET || origin == MA_DR_MP3_SEEK_CUR); if (!pMP3->onSeek(pMP3->pUserData, offset, origin)) { return MA_FALSE; } - if (origin == ma_dr_mp3_seek_origin_start) { + if (origin == MA_DR_MP3_SEEK_SET) { pMP3->streamCursor = (ma_uint64)offset; - } else { + } else{ pMP3->streamCursor += offset; } return MA_TRUE; @@ -92513,18 +94350,18 @@ static ma_bool32 ma_dr_mp3__on_seek_64(ma_dr_mp3* pMP3, ma_uint64 offset, ma_dr_ if (offset <= 0x7FFFFFFF) { return ma_dr_mp3__on_seek(pMP3, (int)offset, origin); } - if (!ma_dr_mp3__on_seek(pMP3, 0x7FFFFFFF, ma_dr_mp3_seek_origin_start)) { + if (!ma_dr_mp3__on_seek(pMP3, 0x7FFFFFFF, MA_DR_MP3_SEEK_SET)) { return MA_FALSE; } offset -= 0x7FFFFFFF; while (offset > 0) { if (offset <= 0x7FFFFFFF) { - if (!ma_dr_mp3__on_seek(pMP3, (int)offset, ma_dr_mp3_seek_origin_current)) { + if (!ma_dr_mp3__on_seek(pMP3, (int)offset, MA_DR_MP3_SEEK_CUR)) { return MA_FALSE; } offset = 0; } else { - if (!ma_dr_mp3__on_seek(pMP3, 0x7FFFFFFF, ma_dr_mp3_seek_origin_current)) { + if (!ma_dr_mp3__on_seek(pMP3, 0x7FFFFFFF, MA_DR_MP3_SEEK_CUR)) { return MA_FALSE; } offset -= 0x7FFFFFFF; @@ -92532,7 +94369,18 @@ static ma_bool32 ma_dr_mp3__on_seek_64(ma_dr_mp3* pMP3, ma_uint64 offset, ma_dr_ } return MA_TRUE; } -static ma_uint32 ma_dr_mp3_decode_next_frame_ex__callbacks(ma_dr_mp3* pMP3, ma_dr_mp3d_sample_t* pPCMFrames) +static void ma_dr_mp3__on_meta(ma_dr_mp3* pMP3, ma_dr_mp3_metadata_type type, const void* pRawData, size_t rawDataSize) +{ + if (pMP3->onMeta) { + ma_dr_mp3_metadata metadata; + MA_DR_MP3_ZERO_OBJECT(&metadata); + metadata.type = type; + metadata.pRawData = pRawData; + metadata.rawDataSize = rawDataSize; + pMP3->onMeta(pMP3->pUserDataMeta, &metadata); + } +} +static ma_uint32 ma_dr_mp3_decode_next_frame_ex__callbacks(ma_dr_mp3* pMP3, ma_dr_mp3d_sample_t* pPCMFrames, ma_dr_mp3dec_frame_info* pMP3FrameInfo, const ma_uint8** ppMP3FrameData) { ma_uint32 pcmFramesRead = 0; MA_DR_MP3_ASSERT(pMP3 != NULL); @@ -92559,7 +94407,7 @@ static ma_uint32 ma_dr_mp3_decode_next_frame_ex__callbacks(ma_dr_mp3* pMP3, ma_d pMP3->pData = pNewData; pMP3->dataCapacity = newDataCap; } - bytesRead = ma_dr_mp3__on_read(pMP3, pMP3->pData + pMP3->dataSize, (pMP3->dataCapacity - pMP3->dataSize)); + bytesRead = ma_dr_mp3__on_read_clamped(pMP3, pMP3->pData + pMP3->dataSize, (pMP3->dataCapacity - pMP3->dataSize)); if (bytesRead == 0) { if (pMP3->dataSize == 0) { pMP3->atEnd = MA_TRUE; @@ -92578,16 +94426,20 @@ static ma_uint32 ma_dr_mp3_decode_next_frame_ex__callbacks(ma_dr_mp3* pMP3, ma_d return 0; } pcmFramesRead = ma_dr_mp3dec_decode_frame(&pMP3->decoder, pMP3->pData + pMP3->dataConsumed, (int)pMP3->dataSize, pPCMFrames, &info); - if (info.frame_bytes > 0) { - pMP3->dataConsumed += (size_t)info.frame_bytes; - pMP3->dataSize -= (size_t)info.frame_bytes; - } + pMP3->dataConsumed += (size_t)info.frame_bytes; + pMP3->dataSize -= (size_t)info.frame_bytes; if (pcmFramesRead > 0) { pcmFramesRead = ma_dr_mp3_hdr_frame_samples(pMP3->decoder.header); pMP3->pcmFramesConsumedInMP3Frame = 0; pMP3->pcmFramesRemainingInMP3Frame = pcmFramesRead; pMP3->mp3FrameChannels = info.channels; - pMP3->mp3FrameSampleRate = info.hz; + pMP3->mp3FrameSampleRate = info.sample_rate; + if (pMP3FrameInfo != NULL) { + *pMP3FrameInfo = info; + } + if (ppMP3FrameData != NULL) { + *ppMP3FrameData = pMP3->pData + pMP3->dataConsumed - (size_t)info.frame_bytes; + } break; } else if (info.frame_bytes == 0) { size_t bytesRead; @@ -92604,7 +94456,7 @@ static ma_uint32 ma_dr_mp3_decode_next_frame_ex__callbacks(ma_dr_mp3* pMP3, ma_d pMP3->pData = pNewData; pMP3->dataCapacity = newDataCap; } - bytesRead = ma_dr_mp3__on_read(pMP3, pMP3->pData + pMP3->dataSize, (pMP3->dataCapacity - pMP3->dataSize)); + bytesRead = ma_dr_mp3__on_read_clamped(pMP3, pMP3->pData + pMP3->dataSize, (pMP3->dataCapacity - pMP3->dataSize)); if (bytesRead == 0) { pMP3->atEnd = MA_TRUE; return 0; @@ -92614,7 +94466,7 @@ static ma_uint32 ma_dr_mp3_decode_next_frame_ex__callbacks(ma_dr_mp3* pMP3, ma_d }; return pcmFramesRead; } -static ma_uint32 ma_dr_mp3_decode_next_frame_ex__memory(ma_dr_mp3* pMP3, ma_dr_mp3d_sample_t* pPCMFrames) +static ma_uint32 ma_dr_mp3_decode_next_frame_ex__memory(ma_dr_mp3* pMP3, ma_dr_mp3d_sample_t* pPCMFrames, ma_dr_mp3dec_frame_info* pMP3FrameInfo, const ma_uint8** ppMP3FrameData) { ma_uint32 pcmFramesRead = 0; ma_dr_mp3dec_frame_info info; @@ -92630,36 +94482,44 @@ static ma_uint32 ma_dr_mp3_decode_next_frame_ex__memory(ma_dr_mp3* pMP3, ma_dr_m pMP3->pcmFramesConsumedInMP3Frame = 0; pMP3->pcmFramesRemainingInMP3Frame = pcmFramesRead; pMP3->mp3FrameChannels = info.channels; - pMP3->mp3FrameSampleRate = info.hz; + pMP3->mp3FrameSampleRate = info.sample_rate; + if (pMP3FrameInfo != NULL) { + *pMP3FrameInfo = info; + } + if (ppMP3FrameData != NULL) { + *ppMP3FrameData = pMP3->memory.pData + pMP3->memory.currentReadPos; + } break; } else if (info.frame_bytes > 0) { pMP3->memory.currentReadPos += (size_t)info.frame_bytes; + pMP3->streamCursor += (size_t)info.frame_bytes; } else { break; } } pMP3->memory.currentReadPos += (size_t)info.frame_bytes; + pMP3->streamCursor += (size_t)info.frame_bytes; return pcmFramesRead; } -static ma_uint32 ma_dr_mp3_decode_next_frame_ex(ma_dr_mp3* pMP3, ma_dr_mp3d_sample_t* pPCMFrames) +static ma_uint32 ma_dr_mp3_decode_next_frame_ex(ma_dr_mp3* pMP3, ma_dr_mp3d_sample_t* pPCMFrames, ma_dr_mp3dec_frame_info* pMP3FrameInfo, const ma_uint8** ppMP3FrameData) { if (pMP3->memory.pData != NULL && pMP3->memory.dataSize > 0) { - return ma_dr_mp3_decode_next_frame_ex__memory(pMP3, pPCMFrames); + return ma_dr_mp3_decode_next_frame_ex__memory(pMP3, pPCMFrames, pMP3FrameInfo, ppMP3FrameData); } else { - return ma_dr_mp3_decode_next_frame_ex__callbacks(pMP3, pPCMFrames); + return ma_dr_mp3_decode_next_frame_ex__callbacks(pMP3, pPCMFrames, pMP3FrameInfo, ppMP3FrameData); } } static ma_uint32 ma_dr_mp3_decode_next_frame(ma_dr_mp3* pMP3) { MA_DR_MP3_ASSERT(pMP3 != NULL); - return ma_dr_mp3_decode_next_frame_ex(pMP3, (ma_dr_mp3d_sample_t*)pMP3->pcmFrames); + return ma_dr_mp3_decode_next_frame_ex(pMP3, (ma_dr_mp3d_sample_t*)pMP3->pcmFrames, NULL, NULL); } #if 0 static ma_uint32 ma_dr_mp3_seek_next_frame(ma_dr_mp3* pMP3) { ma_uint32 pcmFrameCount; MA_DR_MP3_ASSERT(pMP3 != NULL); - pcmFrameCount = ma_dr_mp3_decode_next_frame_ex(pMP3, NULL); + pcmFrameCount = ma_dr_mp3_decode_next_frame_ex(pMP3, NULL, NULL, NULL); if (pcmFrameCount == 0) { return 0; } @@ -92669,33 +94529,249 @@ static ma_uint32 ma_dr_mp3_seek_next_frame(ma_dr_mp3* pMP3) return pcmFrameCount; } #endif -static ma_bool32 ma_dr_mp3_init_internal(ma_dr_mp3* pMP3, ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks) +static ma_bool32 ma_dr_mp3_init_internal(ma_dr_mp3* pMP3, ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, ma_dr_mp3_tell_proc onTell, ma_dr_mp3_meta_proc onMeta, void* pUserData, void* pUserDataMeta, const ma_allocation_callbacks* pAllocationCallbacks) { + ma_dr_mp3dec_frame_info firstFrameInfo; + const ma_uint8* pFirstFrameData; + ma_uint32 firstFramePCMFrameCount; + ma_uint32 detectedMP3FrameCount = 0xFFFFFFFF; MA_DR_MP3_ASSERT(pMP3 != NULL); MA_DR_MP3_ASSERT(onRead != NULL); ma_dr_mp3dec_init(&pMP3->decoder); pMP3->onRead = onRead; pMP3->onSeek = onSeek; + pMP3->onMeta = onMeta; pMP3->pUserData = pUserData; + pMP3->pUserDataMeta = pUserDataMeta; pMP3->allocationCallbacks = ma_dr_mp3_copy_allocation_callbacks_or_defaults(pAllocationCallbacks); if (pMP3->allocationCallbacks.onFree == NULL || (pMP3->allocationCallbacks.onMalloc == NULL && pMP3->allocationCallbacks.onRealloc == NULL)) { return MA_FALSE; } - if (ma_dr_mp3_decode_next_frame(pMP3) == 0) { + pMP3->streamCursor = 0; + pMP3->streamLength = MA_UINT64_MAX; + pMP3->streamStartOffset = 0; + pMP3->delayInPCMFrames = 0; + pMP3->paddingInPCMFrames = 0; + pMP3->totalPCMFrameCount = MA_UINT64_MAX; + #if 1 + if (onSeek != NULL && onTell != NULL) { + if (onSeek(pUserData, 0, MA_DR_MP3_SEEK_END)) { + ma_int64 streamLen; + int streamEndOffset = 0; + if (onTell(pUserData, &streamLen)) { + if (streamLen > 128) { + char id3[3]; + if (onSeek(pUserData, streamEndOffset - 128, MA_DR_MP3_SEEK_END)) { + if (onRead(pUserData, id3, 3) == 3 && id3[0] == 'T' && id3[1] == 'A' && id3[2] == 'G') { + streamEndOffset -= 128; + streamLen -= 128; + if (onMeta != NULL) { + ma_uint8 tag[128]; + tag[0] = 'T'; tag[1] = 'A'; tag[2] = 'G'; + if (onRead(pUserData, tag + 3, 125) == 125) { + ma_dr_mp3__on_meta(pMP3, MA_DR_MP3_METADATA_TYPE_ID3V1, tag, 128); + } + } + } else { + } + } else { + } + } else { + } + if (streamLen > 32) { + char ape[32]; + if (onSeek(pUserData, streamEndOffset - 32, MA_DR_MP3_SEEK_END)) { + if (onRead(pUserData, ape, 32) == 32 && ape[0] == 'A' && ape[1] == 'P' && ape[2] == 'E' && ape[3] == 'T' && ape[4] == 'A' && ape[5] == 'G' && ape[6] == 'E' && ape[7] == 'X') { + ma_uint32 tagSize = + ((ma_uint32)ape[24] << 0) | + ((ma_uint32)ape[25] << 8) | + ((ma_uint32)ape[26] << 16) | + ((ma_uint32)ape[27] << 24); + streamEndOffset -= 32 + tagSize; + streamLen -= 32 + tagSize; + if (onMeta != NULL) { + if (onSeek(pUserData, streamEndOffset, MA_DR_MP3_SEEK_END)) { + size_t apeTagSize = (size_t)tagSize + 32; + ma_uint8* pTagData = (ma_uint8*)ma_dr_mp3_malloc(apeTagSize, pAllocationCallbacks); + if (pTagData != NULL) { + if (onRead(pUserData, pTagData, apeTagSize) == apeTagSize) { + ma_dr_mp3__on_meta(pMP3, MA_DR_MP3_METADATA_TYPE_APE, pTagData, apeTagSize); + } + ma_dr_mp3_free(pTagData, pAllocationCallbacks); + } + } + } + } + } + } else { + } + if (!onSeek(pUserData, 0, MA_DR_MP3_SEEK_SET)) { + return MA_FALSE; + } + pMP3->streamLength = (ma_uint64)streamLen; + if (pMP3->memory.pData != NULL) { + pMP3->memory.dataSize = (size_t)pMP3->streamLength; + } + } else { + if (!onSeek(pUserData, 0, MA_DR_MP3_SEEK_SET)) { + return MA_FALSE; + } + } + } else { + } + } else { + } + #endif + #if 1 + { + char header[10]; + if (onRead(pUserData, header, 10) == 10) { + if (header[0] == 'I' && header[1] == 'D' && header[2] == '3') { + ma_uint32 tagSize = + (((ma_uint32)header[6] & 0x7F) << 21) | + (((ma_uint32)header[7] & 0x7F) << 14) | + (((ma_uint32)header[8] & 0x7F) << 7) | + (((ma_uint32)header[9] & 0x7F) << 0); + if (header[5] & 0x10) { + tagSize += 10; + } + if (onMeta != NULL) { + size_t tagSizeWithHeader = 10 + tagSize; + ma_uint8* pTagData = (ma_uint8*)ma_dr_mp3_malloc(tagSizeWithHeader, pAllocationCallbacks); + if (pTagData != NULL) { + MA_DR_MP3_COPY_MEMORY(pTagData, header, 10); + if (onRead(pUserData, pTagData + 10, tagSize) == tagSize) { + ma_dr_mp3__on_meta(pMP3, MA_DR_MP3_METADATA_TYPE_ID3V2, pTagData, tagSizeWithHeader); + } + ma_dr_mp3_free(pTagData, pAllocationCallbacks); + } + } else { + if (onSeek != NULL) { + if (!onSeek(pUserData, tagSize, MA_DR_MP3_SEEK_CUR)) { + return MA_FALSE; + } + } else { + char discard[1024]; + while (tagSize > 0) { + size_t bytesToRead = tagSize; + if (bytesToRead > sizeof(discard)) { + bytesToRead = sizeof(discard); + } + if (onRead(pUserData, discard, bytesToRead) != bytesToRead) { + return MA_FALSE; + } + tagSize -= (ma_uint32)bytesToRead; + } + } + } + pMP3->streamStartOffset += 10 + tagSize; + pMP3->streamCursor = pMP3->streamStartOffset; + } else { + if (onSeek != NULL) { + if (!onSeek(pUserData, 0, MA_DR_MP3_SEEK_SET)) { + return MA_FALSE; + } + } else { + } + } + } else { + return MA_FALSE; + } + } + #endif + firstFramePCMFrameCount = ma_dr_mp3_decode_next_frame_ex(pMP3, (ma_dr_mp3d_sample_t*)pMP3->pcmFrames, &firstFrameInfo, &pFirstFrameData); + if (firstFramePCMFrameCount > 0) { + MA_DR_MP3_ASSERT(pFirstFrameData != NULL); + #if 1 + MA_DR_MP3_ASSERT(firstFrameInfo.frame_bytes > 0); + { + ma_dr_mp3_bs bs; + ma_dr_mp3_L3_gr_info grInfo[4]; + const ma_uint8* pTagData = pFirstFrameData; + ma_dr_mp3_bs_init(&bs, pFirstFrameData + MA_DR_MP3_HDR_SIZE, firstFrameInfo.frame_bytes - MA_DR_MP3_HDR_SIZE); + if (MA_DR_MP3_HDR_IS_CRC(pFirstFrameData)) { + ma_dr_mp3_bs_get_bits(&bs, 16); + } + if (ma_dr_mp3_L3_read_side_info(&bs, grInfo, pFirstFrameData) >= 0) { + ma_bool32 isXing = MA_FALSE; + ma_bool32 isInfo = MA_FALSE; + const ma_uint8* pTagDataBeg; + pTagDataBeg = pFirstFrameData + MA_DR_MP3_HDR_SIZE + (bs.pos/8); + pTagData = pTagDataBeg; + isXing = (pTagData[0] == 'X' && pTagData[1] == 'i' && pTagData[2] == 'n' && pTagData[3] == 'g'); + isInfo = (pTagData[0] == 'I' && pTagData[1] == 'n' && pTagData[2] == 'f' && pTagData[3] == 'o'); + if (isXing || isInfo) { + ma_uint32 bytes = 0; + ma_uint32 flags = pTagData[7]; + pTagData += 8; + if (flags & 0x01) { + detectedMP3FrameCount = (ma_uint32)pTagData[0] << 24 | (ma_uint32)pTagData[1] << 16 | (ma_uint32)pTagData[2] << 8 | (ma_uint32)pTagData[3]; + pTagData += 4; + } + if (flags & 0x02) { + bytes = (ma_uint32)pTagData[0] << 24 | (ma_uint32)pTagData[1] << 16 | (ma_uint32)pTagData[2] << 8 | (ma_uint32)pTagData[3]; + (void)bytes; + pTagData += 4; + } + if (flags & 0x04) { + pTagData += 100; + } + if (flags & 0x08) { + pTagData += 4; + } + if (pTagData[0]) { + pTagData += 21; + if (pTagData - pFirstFrameData + 14 < firstFrameInfo.frame_bytes) { + int delayInPCMFrames; + int paddingInPCMFrames; + delayInPCMFrames = (( (ma_uint32)pTagData[0] << 4) | ((ma_uint32)pTagData[1] >> 4)) + (528 + 1); + paddingInPCMFrames = ((((ma_uint32)pTagData[1] & 0xF) << 8) | ((ma_uint32)pTagData[2] )) - (528 + 1); + if (paddingInPCMFrames < 0) { + paddingInPCMFrames = 0; + } + pMP3->delayInPCMFrames = (ma_uint32)delayInPCMFrames; + pMP3->paddingInPCMFrames = (ma_uint32)paddingInPCMFrames; + } + } + if (isXing) { + pMP3->isVBR = MA_TRUE; + } else if (isInfo) { + pMP3->isCBR = MA_TRUE; + } + if (onMeta != NULL) { + ma_dr_mp3_metadata_type metadataType = isXing ? MA_DR_MP3_METADATA_TYPE_XING : MA_DR_MP3_METADATA_TYPE_VBRI; + size_t tagDataSize; + tagDataSize = (size_t)firstFrameInfo.frame_bytes; + tagDataSize -= (size_t)(pTagDataBeg - pFirstFrameData); + ma_dr_mp3__on_meta(pMP3, metadataType, pTagDataBeg, tagDataSize); + } + pMP3->pcmFramesRemainingInMP3Frame = 0; + pMP3->streamStartOffset += (ma_uint32)(firstFrameInfo.frame_bytes); + pMP3->streamCursor = pMP3->streamStartOffset; + ma_dr_mp3dec_init(&pMP3->decoder); + } + } else { + } + } + #endif + } else { ma_dr_mp3__free_from_callbacks(pMP3->pData, &pMP3->allocationCallbacks); return MA_FALSE; } + if (detectedMP3FrameCount != 0xFFFFFFFF) { + pMP3->totalPCMFrameCount = detectedMP3FrameCount * firstFramePCMFrameCount; + } pMP3->channels = pMP3->mp3FrameChannels; pMP3->sampleRate = pMP3->mp3FrameSampleRate; return MA_TRUE; } -MA_API ma_bool32 ma_dr_mp3_init(ma_dr_mp3* pMP3, ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_bool32 ma_dr_mp3_init(ma_dr_mp3* pMP3, ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, ma_dr_mp3_tell_proc onTell, ma_dr_mp3_meta_proc onMeta, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks) { if (pMP3 == NULL || onRead == NULL) { return MA_FALSE; } MA_DR_MP3_ZERO_OBJECT(pMP3); - return ma_dr_mp3_init_internal(pMP3, onRead, onSeek, pUserData, pAllocationCallbacks); + return ma_dr_mp3_init_internal(pMP3, onRead, onSeek, onTell, onMeta, pUserData, pUserData, pAllocationCallbacks); } static size_t ma_dr_mp3__on_read_memory(void* pUserData, void* pBufferOut, size_t bytesToRead) { @@ -92716,29 +94792,40 @@ static size_t ma_dr_mp3__on_read_memory(void* pUserData, void* pBufferOut, size_ static ma_bool32 ma_dr_mp3__on_seek_memory(void* pUserData, int byteOffset, ma_dr_mp3_seek_origin origin) { ma_dr_mp3* pMP3 = (ma_dr_mp3*)pUserData; + ma_int64 newCursor; MA_DR_MP3_ASSERT(pMP3 != NULL); - if (origin == ma_dr_mp3_seek_origin_current) { - if (byteOffset > 0) { - if (pMP3->memory.currentReadPos + byteOffset > pMP3->memory.dataSize) { - byteOffset = (int)(pMP3->memory.dataSize - pMP3->memory.currentReadPos); - } - } else { - if (pMP3->memory.currentReadPos < (size_t)-byteOffset) { - byteOffset = -(int)pMP3->memory.currentReadPos; - } - } - pMP3->memory.currentReadPos += byteOffset; + newCursor = pMP3->memory.currentReadPos; + if (origin == MA_DR_MP3_SEEK_SET) { + newCursor = 0; + } else if (origin == MA_DR_MP3_SEEK_CUR) { + newCursor = (ma_int64)pMP3->memory.currentReadPos; + } else if (origin == MA_DR_MP3_SEEK_END) { + newCursor = (ma_int64)pMP3->memory.dataSize; } else { - if ((ma_uint32)byteOffset <= pMP3->memory.dataSize) { - pMP3->memory.currentReadPos = byteOffset; - } else { - pMP3->memory.currentReadPos = pMP3->memory.dataSize; - } + MA_DR_MP3_ASSERT(!"Invalid seek origin"); + return MA_FALSE; } + newCursor += byteOffset; + if (newCursor < 0) { + return MA_FALSE; + } + if ((size_t)newCursor > pMP3->memory.dataSize) { + return MA_FALSE; + } + pMP3->memory.currentReadPos = (size_t)newCursor; return MA_TRUE; } -MA_API ma_bool32 ma_dr_mp3_init_memory(ma_dr_mp3* pMP3, const void* pData, size_t dataSize, const ma_allocation_callbacks* pAllocationCallbacks) +static ma_bool32 ma_dr_mp3__on_tell_memory(void* pUserData, ma_int64* pCursor) { + ma_dr_mp3* pMP3 = (ma_dr_mp3*)pUserData; + MA_DR_MP3_ASSERT(pMP3 != NULL); + MA_DR_MP3_ASSERT(pCursor != NULL); + *pCursor = (ma_int64)pMP3->memory.currentReadPos; + return MA_TRUE; +} +MA_API ma_bool32 ma_dr_mp3_init_memory_with_metadata(ma_dr_mp3* pMP3, const void* pData, size_t dataSize, ma_dr_mp3_meta_proc onMeta, void* pUserDataMeta, const ma_allocation_callbacks* pAllocationCallbacks) +{ + ma_bool32 result; if (pMP3 == NULL) { return MA_FALSE; } @@ -92749,7 +94836,21 @@ MA_API ma_bool32 ma_dr_mp3_init_memory(ma_dr_mp3* pMP3, const void* pData, size_ pMP3->memory.pData = (const ma_uint8*)pData; pMP3->memory.dataSize = dataSize; pMP3->memory.currentReadPos = 0; - return ma_dr_mp3_init_internal(pMP3, ma_dr_mp3__on_read_memory, ma_dr_mp3__on_seek_memory, pMP3, pAllocationCallbacks); + result = ma_dr_mp3_init_internal(pMP3, ma_dr_mp3__on_read_memory, ma_dr_mp3__on_seek_memory, ma_dr_mp3__on_tell_memory, onMeta, pMP3, pUserDataMeta, pAllocationCallbacks); + if (result == MA_FALSE) { + return MA_FALSE; + } + if (pMP3->streamLength <= (ma_uint64)MA_SIZE_MAX) { + pMP3->memory.dataSize = (size_t)pMP3->streamLength; + } + if (pMP3->streamStartOffset > (ma_uint64)MA_SIZE_MAX) { + return MA_FALSE; + } + return MA_TRUE; +} +MA_API ma_bool32 ma_dr_mp3_init_memory(ma_dr_mp3* pMP3, const void* pData, size_t dataSize, const ma_allocation_callbacks* pAllocationCallbacks) +{ + return ma_dr_mp3_init_memory_with_metadata(pMP3, pData, dataSize, NULL, NULL, pAllocationCallbacks); } #ifndef MA_DR_MP3_NO_STDIO #include @@ -92760,36 +94861,76 @@ static size_t ma_dr_mp3__on_read_stdio(void* pUserData, void* pBufferOut, size_t } static ma_bool32 ma_dr_mp3__on_seek_stdio(void* pUserData, int offset, ma_dr_mp3_seek_origin origin) { - return fseek((FILE*)pUserData, offset, (origin == ma_dr_mp3_seek_origin_current) ? SEEK_CUR : SEEK_SET) == 0; + int whence = SEEK_SET; + if (origin == MA_DR_MP3_SEEK_CUR) { + whence = SEEK_CUR; + } else if (origin == MA_DR_MP3_SEEK_END) { + whence = SEEK_END; + } + return fseek((FILE*)pUserData, offset, whence) == 0; } -MA_API ma_bool32 ma_dr_mp3_init_file(ma_dr_mp3* pMP3, const char* pFilePath, const ma_allocation_callbacks* pAllocationCallbacks) +static ma_bool32 ma_dr_mp3__on_tell_stdio(void* pUserData, ma_int64* pCursor) +{ + FILE* pFileStdio = (FILE*)pUserData; + ma_int64 result; + MA_DR_MP3_ASSERT(pFileStdio != NULL); + MA_DR_MP3_ASSERT(pCursor != NULL); +#if defined(_WIN32) && !defined(NXDK) + #if defined(_MSC_VER) && _MSC_VER > 1200 + result = _ftelli64(pFileStdio); + #else + result = ftell(pFileStdio); + #endif +#else + result = ftell(pFileStdio); +#endif + *pCursor = result; + return MA_TRUE; +} +MA_API ma_bool32 ma_dr_mp3_init_file_with_metadata(ma_dr_mp3* pMP3, const char* pFilePath, ma_dr_mp3_meta_proc onMeta, void* pUserDataMeta, const ma_allocation_callbacks* pAllocationCallbacks) { ma_bool32 result; FILE* pFile; + if (pMP3 == NULL) { + return MA_FALSE; + } + MA_DR_MP3_ZERO_OBJECT(pMP3); if (ma_fopen(&pFile, pFilePath, "rb") != MA_SUCCESS) { return MA_FALSE; } - result = ma_dr_mp3_init(pMP3, ma_dr_mp3__on_read_stdio, ma_dr_mp3__on_seek_stdio, (void*)pFile, pAllocationCallbacks); + result = ma_dr_mp3_init_internal(pMP3, ma_dr_mp3__on_read_stdio, ma_dr_mp3__on_seek_stdio, ma_dr_mp3__on_tell_stdio, onMeta, (void*)pFile, pUserDataMeta, pAllocationCallbacks); if (result != MA_TRUE) { fclose(pFile); return result; } return MA_TRUE; } -MA_API ma_bool32 ma_dr_mp3_init_file_w(ma_dr_mp3* pMP3, const wchar_t* pFilePath, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_bool32 ma_dr_mp3_init_file_with_metadata_w(ma_dr_mp3* pMP3, const wchar_t* pFilePath, ma_dr_mp3_meta_proc onMeta, void* pUserDataMeta, const ma_allocation_callbacks* pAllocationCallbacks) { ma_bool32 result; FILE* pFile; + if (pMP3 == NULL) { + return MA_FALSE; + } + MA_DR_MP3_ZERO_OBJECT(pMP3); if (ma_wfopen(&pFile, pFilePath, L"rb", pAllocationCallbacks) != MA_SUCCESS) { return MA_FALSE; } - result = ma_dr_mp3_init(pMP3, ma_dr_mp3__on_read_stdio, ma_dr_mp3__on_seek_stdio, (void*)pFile, pAllocationCallbacks); + result = ma_dr_mp3_init_internal(pMP3, ma_dr_mp3__on_read_stdio, ma_dr_mp3__on_seek_stdio, ma_dr_mp3__on_tell_stdio, onMeta, (void*)pFile, pUserDataMeta, pAllocationCallbacks); if (result != MA_TRUE) { fclose(pFile); return result; } return MA_TRUE; } +MA_API ma_bool32 ma_dr_mp3_init_file(ma_dr_mp3* pMP3, const char* pFilePath, const ma_allocation_callbacks* pAllocationCallbacks) +{ + return ma_dr_mp3_init_file_with_metadata(pMP3, pFilePath, NULL, NULL, pAllocationCallbacks); +} +MA_API ma_bool32 ma_dr_mp3_init_file_w(ma_dr_mp3* pMP3, const wchar_t* pFilePath, const ma_allocation_callbacks* pAllocationCallbacks) +{ + return ma_dr_mp3_init_file_with_metadata_w(pMP3, pFilePath, NULL, NULL, pAllocationCallbacks); +} #endif MA_API void ma_dr_mp3_uninit(ma_dr_mp3* pMP3) { @@ -92859,17 +95000,38 @@ static ma_uint64 ma_dr_mp3_read_pcm_frames_raw(ma_dr_mp3* pMP3, ma_uint64 frames MA_DR_MP3_ASSERT(pMP3 != NULL); MA_DR_MP3_ASSERT(pMP3->onRead != NULL); while (framesToRead > 0) { - ma_uint32 framesToConsume = (ma_uint32)MA_DR_MP3_MIN(pMP3->pcmFramesRemainingInMP3Frame, framesToRead); + ma_uint32 framesToConsume; + if (pMP3->currentPCMFrame < pMP3->delayInPCMFrames) { + ma_uint32 framesToSkip = (ma_uint32)MA_DR_MP3_MIN(pMP3->pcmFramesRemainingInMP3Frame, pMP3->delayInPCMFrames - pMP3->currentPCMFrame); + pMP3->currentPCMFrame += framesToSkip; + pMP3->pcmFramesConsumedInMP3Frame += framesToSkip; + pMP3->pcmFramesRemainingInMP3Frame -= framesToSkip; + } + framesToConsume = (ma_uint32)MA_DR_MP3_MIN(pMP3->pcmFramesRemainingInMP3Frame, framesToRead); + if (pMP3->totalPCMFrameCount != MA_UINT64_MAX && pMP3->totalPCMFrameCount > pMP3->paddingInPCMFrames) { + if (pMP3->currentPCMFrame < (pMP3->totalPCMFrameCount - pMP3->paddingInPCMFrames)) { + ma_uint64 framesRemainigToPadding = (pMP3->totalPCMFrameCount - pMP3->paddingInPCMFrames) - pMP3->currentPCMFrame; + if (framesToConsume > framesRemainigToPadding) { + framesToConsume = (ma_uint32)framesRemainigToPadding; + } + } else { + break; + } + } if (pBufferOut != NULL) { - #if defined(MA_DR_MP3_FLOAT_OUTPUT) - float* pFramesOutF32 = (float*)MA_DR_MP3_OFFSET_PTR(pBufferOut, sizeof(float) * totalFramesRead * pMP3->channels); - float* pFramesInF32 = (float*)MA_DR_MP3_OFFSET_PTR(&pMP3->pcmFrames[0], sizeof(float) * pMP3->pcmFramesConsumedInMP3Frame * pMP3->mp3FrameChannels); - MA_DR_MP3_COPY_MEMORY(pFramesOutF32, pFramesInF32, sizeof(float) * framesToConsume * pMP3->channels); - #else - ma_int16* pFramesOutS16 = (ma_int16*)MA_DR_MP3_OFFSET_PTR(pBufferOut, sizeof(ma_int16) * totalFramesRead * pMP3->channels); - ma_int16* pFramesInS16 = (ma_int16*)MA_DR_MP3_OFFSET_PTR(&pMP3->pcmFrames[0], sizeof(ma_int16) * pMP3->pcmFramesConsumedInMP3Frame * pMP3->mp3FrameChannels); - MA_DR_MP3_COPY_MEMORY(pFramesOutS16, pFramesInS16, sizeof(ma_int16) * framesToConsume * pMP3->channels); - #endif + #if defined(MA_DR_MP3_FLOAT_OUTPUT) + { + float* pFramesOutF32 = (float*)MA_DR_MP3_OFFSET_PTR(pBufferOut, sizeof(float) * totalFramesRead * pMP3->channels); + float* pFramesInF32 = (float*)MA_DR_MP3_OFFSET_PTR(&pMP3->pcmFrames[0], sizeof(float) * pMP3->pcmFramesConsumedInMP3Frame * pMP3->mp3FrameChannels); + MA_DR_MP3_COPY_MEMORY(pFramesOutF32, pFramesInF32, sizeof(float) * framesToConsume * pMP3->channels); + } + #else + { + ma_int16* pFramesOutS16 = (ma_int16*)MA_DR_MP3_OFFSET_PTR(pBufferOut, sizeof(ma_int16) * totalFramesRead * pMP3->channels); + ma_int16* pFramesInS16 = (ma_int16*)MA_DR_MP3_OFFSET_PTR(&pMP3->pcmFrames[0], sizeof(ma_int16) * pMP3->pcmFramesConsumedInMP3Frame * pMP3->mp3FrameChannels); + MA_DR_MP3_COPY_MEMORY(pFramesOutS16, pFramesInS16, sizeof(ma_int16) * framesToConsume * pMP3->channels); + } + #endif } pMP3->currentPCMFrame += framesToConsume; pMP3->pcmFramesConsumedInMP3Frame += framesToConsume; @@ -92879,6 +95041,9 @@ static ma_uint64 ma_dr_mp3_read_pcm_frames_raw(ma_dr_mp3* pMP3, ma_uint64 frames if (framesToRead == 0) { break; } + if (pMP3->totalPCMFrameCount != MA_UINT64_MAX && pMP3->totalPCMFrameCount > pMP3->paddingInPCMFrames && pMP3->currentPCMFrame >= (pMP3->totalPCMFrameCount - pMP3->paddingInPCMFrames)) { + break; + } MA_DR_MP3_ASSERT(pMP3->pcmFramesRemainingInMP3Frame == 0); if (ma_dr_mp3_decode_next_frame(pMP3) == 0) { break; @@ -92958,7 +95123,7 @@ static ma_bool32 ma_dr_mp3_seek_to_start_of_stream(ma_dr_mp3* pMP3) { MA_DR_MP3_ASSERT(pMP3 != NULL); MA_DR_MP3_ASSERT(pMP3->onSeek != NULL); - if (!ma_dr_mp3__on_seek(pMP3, 0, ma_dr_mp3_seek_origin_start)) { + if (!ma_dr_mp3__on_seek_64(pMP3, pMP3->streamStartOffset, MA_DR_MP3_SEEK_SET)) { return MA_FALSE; } ma_dr_mp3_reset(pMP3); @@ -93024,7 +95189,7 @@ static ma_bool32 ma_dr_mp3_seek_to_pcm_frame__seek_table(ma_dr_mp3* pMP3, ma_uin seekPoint.mp3FramesToDiscard = 0; seekPoint.pcmFramesToDiscard = 0; } - if (!ma_dr_mp3__on_seek_64(pMP3, seekPoint.seekPosInBytes, ma_dr_mp3_seek_origin_start)) { + if (!ma_dr_mp3__on_seek_64(pMP3, seekPoint.seekPosInBytes, MA_DR_MP3_SEEK_SET)) { return MA_FALSE; } ma_dr_mp3_reset(pMP3); @@ -93035,7 +95200,7 @@ static ma_bool32 ma_dr_mp3_seek_to_pcm_frame__seek_table(ma_dr_mp3* pMP3, ma_uin if (iMP3Frame == seekPoint.mp3FramesToDiscard-1) { pPCMFrames = (ma_dr_mp3d_sample_t*)pMP3->pcmFrames; } - pcmFramesRead = ma_dr_mp3_decode_next_frame_ex(pMP3, pPCMFrames); + pcmFramesRead = ma_dr_mp3_decode_next_frame_ex(pMP3, pPCMFrames, NULL, NULL); if (pcmFramesRead == 0) { return MA_FALSE; } @@ -93077,7 +95242,7 @@ MA_API ma_bool32 ma_dr_mp3_get_mp3_and_pcm_frame_count(ma_dr_mp3* pMP3, ma_uint6 totalMP3FrameCount = 0; for (;;) { ma_uint32 pcmFramesInCurrentMP3Frame; - pcmFramesInCurrentMP3Frame = ma_dr_mp3_decode_next_frame_ex(pMP3, NULL); + pcmFramesInCurrentMP3Frame = ma_dr_mp3_decode_next_frame_ex(pMP3, NULL, NULL, NULL); if (pcmFramesInCurrentMP3Frame == 0) { break; } @@ -93101,10 +95266,26 @@ MA_API ma_bool32 ma_dr_mp3_get_mp3_and_pcm_frame_count(ma_dr_mp3* pMP3, ma_uint6 MA_API ma_uint64 ma_dr_mp3_get_pcm_frame_count(ma_dr_mp3* pMP3) { ma_uint64 totalPCMFrameCount; - if (!ma_dr_mp3_get_mp3_and_pcm_frame_count(pMP3, NULL, &totalPCMFrameCount)) { + if (pMP3 == NULL) { return 0; } - return totalPCMFrameCount; + if (pMP3->totalPCMFrameCount != MA_UINT64_MAX) { + totalPCMFrameCount = pMP3->totalPCMFrameCount; + if (totalPCMFrameCount >= pMP3->delayInPCMFrames) { + totalPCMFrameCount -= pMP3->delayInPCMFrames; + } else { + } + if (totalPCMFrameCount >= pMP3->paddingInPCMFrames) { + totalPCMFrameCount -= pMP3->paddingInPCMFrames; + } else { + } + return totalPCMFrameCount; + } else { + if (!ma_dr_mp3_get_mp3_and_pcm_frame_count(pMP3, NULL, &totalPCMFrameCount)) { + return 0; + } + return totalPCMFrameCount; + } } MA_API ma_uint64 ma_dr_mp3_get_mp3_frame_count(ma_dr_mp3* pMP3) { @@ -93174,7 +95355,7 @@ MA_API ma_bool32 ma_dr_mp3_calculate_seek_points(ma_dr_mp3* pMP3, ma_uint32* pSe MA_DR_MP3_ASSERT(pMP3->streamCursor >= pMP3->dataSize); mp3FrameInfo[iMP3Frame].bytePos = pMP3->streamCursor - pMP3->dataSize; mp3FrameInfo[iMP3Frame].pcmFrameIndex = runningPCMFrameCount; - pcmFramesInCurrentMP3FrameIn = ma_dr_mp3_decode_next_frame_ex(pMP3, NULL); + pcmFramesInCurrentMP3FrameIn = ma_dr_mp3_decode_next_frame_ex(pMP3, NULL, NULL, NULL); if (pcmFramesInCurrentMP3FrameIn == 0) { return MA_FALSE; } @@ -93198,7 +95379,7 @@ MA_API ma_bool32 ma_dr_mp3_calculate_seek_points(ma_dr_mp3* pMP3, ma_uint32* pSe } mp3FrameInfo[MA_DR_MP3_COUNTOF(mp3FrameInfo)-1].bytePos = pMP3->streamCursor - pMP3->dataSize; mp3FrameInfo[MA_DR_MP3_COUNTOF(mp3FrameInfo)-1].pcmFrameIndex = runningPCMFrameCount; - pcmFramesInCurrentMP3FrameIn = ma_dr_mp3_decode_next_frame_ex(pMP3, NULL); + pcmFramesInCurrentMP3FrameIn = ma_dr_mp3_decode_next_frame_ex(pMP3, NULL, NULL, NULL); if (pcmFramesInCurrentMP3FrameIn == 0) { pSeekPoints[iSeekPoint].seekPosInBytes = mp3FrameInfo[0].bytePos; pSeekPoints[iSeekPoint].pcmFrameIndex = nextTargetPCMFrame; @@ -93336,18 +95517,18 @@ static ma_int16* ma_dr_mp3__full_read_and_close_s16(ma_dr_mp3* pMP3, ma_dr_mp3_c } return pFrames; } -MA_API float* ma_dr_mp3_open_and_read_pcm_frames_f32(ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, void* pUserData, ma_dr_mp3_config* pConfig, ma_uint64* pTotalFrameCount, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API float* ma_dr_mp3_open_and_read_pcm_frames_f32(ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, ma_dr_mp3_tell_proc onTell, void* pUserData, ma_dr_mp3_config* pConfig, ma_uint64* pTotalFrameCount, const ma_allocation_callbacks* pAllocationCallbacks) { ma_dr_mp3 mp3; - if (!ma_dr_mp3_init(&mp3, onRead, onSeek, pUserData, pAllocationCallbacks)) { + if (!ma_dr_mp3_init(&mp3, onRead, onSeek, onTell, NULL, pUserData, pAllocationCallbacks)) { return NULL; } return ma_dr_mp3__full_read_and_close_f32(&mp3, pConfig, pTotalFrameCount); } -MA_API ma_int16* ma_dr_mp3_open_and_read_pcm_frames_s16(ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, void* pUserData, ma_dr_mp3_config* pConfig, ma_uint64* pTotalFrameCount, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_int16* ma_dr_mp3_open_and_read_pcm_frames_s16(ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, ma_dr_mp3_tell_proc onTell, void* pUserData, ma_dr_mp3_config* pConfig, ma_uint64* pTotalFrameCount, const ma_allocation_callbacks* pAllocationCallbacks) { ma_dr_mp3 mp3; - if (!ma_dr_mp3_init(&mp3, onRead, onSeek, pUserData, pAllocationCallbacks)) { + if (!ma_dr_mp3_init(&mp3, onRead, onSeek, onTell, NULL, pUserData, pAllocationCallbacks)) { return NULL; } return ma_dr_mp3__full_read_and_close_s16(&mp3, pConfig, pTotalFrameCount); From f36c8ddc56fa177b055e0fef44fe531fe59535d1 Mon Sep 17 00:00:00 2001 From: iann Date: Mon, 29 Sep 2025 02:34:38 +0900 Subject: [PATCH 09/23] [rlgl] Allow tint colors in GL_LINE (wires) and GL_POINT (points) draw modes on OpenGL 1.1 clean (#5207) * gate with OPENGL_11 prototype and definition for rlSetPointSize and rlGetPointSize * gate with OPENGL_11 prototype and definition for rlSetPointSize and rlGetPointSize * more coverage for fixing expected texcoords, normals, and colors * fix guard styling * fix guard issue, and remove fallback unneccessary else clause (default shader ill work) * opengl3.3 and es2 need the color array allocated in order to allow for updates later (unlike opengl11) --- src/rlgl.h | 29 +++++++++++++++++++++++++---- src/rmodels.c | 44 +++++++++++++++++++++++++++++++++----------- 2 files changed, 58 insertions(+), 15 deletions(-) diff --git a/src/rlgl.h b/src/rlgl.h index 7db05251d..2a1a5d5f8 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -644,10 +644,8 @@ RLAPI void rlEnableVertexBufferElement(unsigned int id); // Enable vertex buffer RLAPI void rlDisableVertexBufferElement(void); // Disable vertex buffer element (VBO element) RLAPI void rlEnableVertexAttribute(unsigned int index); // Enable vertex attribute index RLAPI void rlDisableVertexAttribute(unsigned int index); // Disable vertex attribute index -#if defined(GRAPHICS_API_OPENGL_11) RLAPI void rlEnableStatePointer(int vertexAttribType, void *buffer); // Enable attribute state pointer RLAPI void rlDisableStatePointer(int vertexAttribType); // Disable attribute state pointer -#endif // Textures state RLAPI void rlActiveTextureSlot(int slot); // Select and active a texture slot @@ -686,6 +684,8 @@ RLAPI void rlDisableScissorTest(void); // Disable scissor test RLAPI void rlScissor(int x, int y, int width, int height); // Scissor test RLAPI void rlEnablePointMode(void); // Enable point mode RLAPI void rlDisablePointMode(void); // Disable point mode +RLAPI void rlSetPointSize(float size); // Set the point drawing size +RLAPI float rlGetPointSize(void); // Get the point drawing size RLAPI void rlEnableWireMode(void); // Enable wire mode RLAPI void rlDisableWireMode(void); // Disable wire mode RLAPI void rlSetLineWidth(float width); // Set the line drawing width @@ -2016,6 +2016,25 @@ float rlGetLineWidth(void) return width; } +// Set the point drawing size +void rlSetPointSize(float size) +{ +#if defined(GRAPHICS_API_OPENGL_11) + glPointSize(size); +#endif +} + +// Get the point drawing size +float rlGetPointSize(void) +{ + float size = 1; +#if defined(GRAPHICS_API_OPENGL_11) + glGetFloatv(GL_POINT_SIZE, &size); +#endif + return size; + +} + // Enable line aliasing void rlEnableSmoothLines(void) { @@ -4003,10 +4022,10 @@ void rlDrawVertexArrayElementsInstanced(int offset, int count, const void *buffe #endif } -#if defined(GRAPHICS_API_OPENGL_11) // Enable vertex state pointer void rlEnableStatePointer(int vertexAttribType, void *buffer) { +#if defined(GRAPHICS_API_OPENGL_11) if (buffer != NULL) glEnableClientState(vertexAttribType); switch (vertexAttribType) { @@ -4017,14 +4036,16 @@ void rlEnableStatePointer(int vertexAttribType, void *buffer) //case GL_INDEX_ARRAY: if (buffer != NULL) glIndexPointer(GL_SHORT, 0, buffer); break; // Indexed colors default: break; } +#endif } // Disable vertex state pointer void rlDisableStatePointer(int vertexAttribType) { +#if defined(GRAPHICS_API_OPENGL_11) glDisableClientState(vertexAttribType); -} #endif +} // Load vertex array object (VAO) unsigned int rlLoadVertexArray(void) diff --git a/src/rmodels.c b/src/rmodels.c index 9aca37a24..01e85475c 100644 --- a/src/rmodels.c +++ b/src/rmodels.c @@ -1293,10 +1293,19 @@ void UploadMesh(Mesh *mesh, bool dynamic) rlEnableVertexAttribute(RL_DEFAULT_SHADER_ATTRIB_LOCATION_POSITION); // Enable vertex attributes: texcoords (shader-location = 1) - mesh->vboId[RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD] = rlLoadVertexBuffer(mesh->texcoords, mesh->vertexCount*2*sizeof(float), dynamic); - rlSetVertexAttribute(RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD, 2, RL_FLOAT, 0, 0, 0); - rlEnableVertexAttribute(RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD); + if (mesh->texcoords != NULL) + { + mesh->vboId[RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD] = rlLoadVertexBuffer(mesh->texcoords, mesh->vertexCount*2*sizeof(float), dynamic); + rlSetVertexAttribute(RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD, 2, RL_FLOAT, 0, 0, 0); + rlEnableVertexAttribute(RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD); + } + else + { + float value[2] = { 0.0f, 0.0f }; + rlSetVertexAttributeDefault(RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD, value, SHADER_ATTRIB_VEC2, 2); + rlDisableVertexAttribute(RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD); + } // WARNING: When setting default vertex attribute values, the values for each generic vertex attribute // is part of current state, and it is maintained even if a different program object is used @@ -1431,12 +1440,12 @@ void DrawMesh(Mesh mesh, Material material, Matrix transform) if (mesh.animVertices) rlEnableStatePointer(GL_VERTEX_ARRAY, mesh.animVertices); else rlEnableStatePointer(GL_VERTEX_ARRAY, mesh.vertices); - rlEnableStatePointer(GL_TEXTURE_COORD_ARRAY, mesh.texcoords); + if (mesh.texcoords) rlEnableStatePointer(GL_TEXTURE_COORD_ARRAY, mesh.texcoords); if (mesh.animNormals) rlEnableStatePointer(GL_NORMAL_ARRAY, mesh.animNormals); - else rlEnableStatePointer(GL_NORMAL_ARRAY, mesh.normals); + else if (mesh.normals) rlEnableStatePointer(GL_NORMAL_ARRAY, mesh.normals); - rlEnableStatePointer(GL_COLOR_ARRAY, mesh.colors); + if (mesh.colors) rlEnableStatePointer(GL_COLOR_ARRAY, mesh.colors); rlPushMatrix(); rlMultMatrixf(MatrixToFloat(transform)); @@ -3836,6 +3845,7 @@ void DrawModelWiresEx(Model model, Vector3 position, Vector3 rotationAxis, float // Draw a model points // WARNING: OpenGL ES 2.0 does not support point mode drawing +// TODO: gate these properly for non es 2.0 versions only void DrawModelPoints(Model model, Vector3 position, float scale, Color tint) { rlEnablePointMode(); @@ -4420,7 +4430,11 @@ static Model LoadOBJ(const char *fileName) model.meshes[i].vertices = (float *)MemAlloc(sizeof(float)*vertexCount*3); model.meshes[i].normals = (float *)MemAlloc(sizeof(float)*vertexCount*3); model.meshes[i].texcoords = (float *)MemAlloc(sizeof(float)*vertexCount*2); + #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) model.meshes[i].colors = (unsigned char *)MemAlloc(sizeof(unsigned char)*vertexCount*4); + #else + model.meshes[i].colors = NULL; + #endif } MemFree(localMeshVertexCounts); @@ -4474,7 +4488,17 @@ static Model LoadOBJ(const char *fileName) for (int i = 0; i < 3; i++) model.meshes[meshIndex].vertices[localMeshVertexCount*3 + i] = objAttributes.vertices[vertIndex*3 + i]; - for (int i = 0; i < 2; i++) model.meshes[meshIndex].texcoords[localMeshVertexCount*2 + i] = objAttributes.texcoords[texcordIndex*2 + i]; + if (objAttributes.texcoords != NULL && texcordIndex != TINYOBJ_INVALID_INDEX && texcordIndex >= 0) + { + for (int i = 0; i < 2; i++) model.meshes[meshIndex].texcoords[localMeshVertexCount*2 + i] = objAttributes.texcoords[texcordIndex*2 + i]; + model.meshes[meshIndex].texcoords[localMeshVertexCount*2 + 1] = 1.0f - model.meshes[meshIndex].texcoords[localMeshVertexCount*2 + 1]; + } + else + { + model.meshes[meshIndex].texcoords[localMeshVertexCount*2 + 0] = 0.0f; + model.meshes[meshIndex].texcoords[localMeshVertexCount*2 + 1] = 0.0f; + } + if (objAttributes.normals != NULL && normalIndex != TINYOBJ_INVALID_INDEX && normalIndex >= 0) { for (int i = 0; i < 3; i++) model.meshes[meshIndex].normals[localMeshVertexCount*3 + i] = objAttributes.normals[normalIndex*3 + i]; @@ -4485,11 +4509,9 @@ static Model LoadOBJ(const char *fileName) model.meshes[meshIndex].normals[localMeshVertexCount*3 + 1] = 1.0f; model.meshes[meshIndex].normals[localMeshVertexCount*3 + 2] = 0.0f; } - - model.meshes[meshIndex].texcoords[localMeshVertexCount*2 + 1] = 1.0f - model.meshes[meshIndex].texcoords[localMeshVertexCount*2 + 1]; - + #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) for (int i = 0; i < 4; i++) model.meshes[meshIndex].colors[localMeshVertexCount*4 + i] = 255; - + #endif faceVertIndex++; localMeshVertexCount++; } From 4767841b7119396f129eceeab0c7e90e8198e48d Mon Sep 17 00:00:00 2001 From: Ray Date: Sun, 28 Sep 2025 19:45:52 +0200 Subject: [PATCH 10/23] Code format review --- src/rmodels.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rmodels.c b/src/rmodels.c index 01e85475c..c54ef03fa 100644 --- a/src/rmodels.c +++ b/src/rmodels.c @@ -4488,7 +4488,7 @@ static Model LoadOBJ(const char *fileName) for (int i = 0; i < 3; i++) model.meshes[meshIndex].vertices[localMeshVertexCount*3 + i] = objAttributes.vertices[vertIndex*3 + i]; - if (objAttributes.texcoords != NULL && texcordIndex != TINYOBJ_INVALID_INDEX && texcordIndex >= 0) + if ((objAttributes.texcoords != NULL) && (texcordIndex != TINYOBJ_INVALID_INDEX) && (texcordIndex >= 0)) { for (int i = 0; i < 2; i++) model.meshes[meshIndex].texcoords[localMeshVertexCount*2 + i] = objAttributes.texcoords[texcordIndex*2 + i]; model.meshes[meshIndex].texcoords[localMeshVertexCount*2 + 1] = 1.0f - model.meshes[meshIndex].texcoords[localMeshVertexCount*2 + 1]; @@ -4499,7 +4499,7 @@ static Model LoadOBJ(const char *fileName) model.meshes[meshIndex].texcoords[localMeshVertexCount*2 + 1] = 0.0f; } - if (objAttributes.normals != NULL && normalIndex != TINYOBJ_INVALID_INDEX && normalIndex >= 0) + if ((objAttributes.normals != NULL) && (normalIndex != TINYOBJ_INVALID_INDEX) && (normalIndex >= 0)) { for (int i = 0; i < 3; i++) model.meshes[meshIndex].normals[localMeshVertexCount*3 + i] = objAttributes.normals[normalIndex*3 + i]; } From a2a22e5e4873111d45c0b9a09d482407d22a89ce Mon Sep 17 00:00:00 2001 From: Jett <30197659+JettMonstersGoBoom@users.noreply.github.com> Date: Sun, 28 Sep 2025 17:02:53 -0400 Subject: [PATCH 11/23] ADDED: example: `core_input_actions` (#5211) * adding core_input_actions action based input API vs direct input, allows remapping of buttons or keys to an action. * adjusted formatting. * updates for struct name and fixed a typo --- examples/Makefile | 1 + examples/core/core_input_actions.c | 174 +++++++++++++++++++++++++++++ 2 files changed, 175 insertions(+) create mode 100644 examples/core/core_input_actions.c diff --git a/examples/Makefile b/examples/Makefile index ee17bb350..6d409b511 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -524,6 +524,7 @@ CORE = \ core/core_input_mouse_wheel \ core/core_input_multitouch \ core/core_input_virtual_controls \ + core/core_input_actions \ core/core_random_sequence \ core/core_random_values \ core/core_render_texture \ diff --git a/examples/core/core_input_actions.c b/examples/core/core_input_actions.c new file mode 100644 index 000000000..b8266a8f4 --- /dev/null +++ b/examples/core/core_input_actions.c @@ -0,0 +1,174 @@ + +/******************************************************************************************* +* +* raylib [core_inputactionInputs] example - presents a simple API for remapping input to actions +* +* Example complexity rating: [★☆☆☆] 1/4 +* +* Example originally created with raylib 5.5, last time updated with raylib 5.6 +* +* Example contributed by MonstersGoBoom and reviewed by Ramon Santamaria (@raysan5) +* +* Example licensed under an unmodified zlib/libpng license, which is an OSI-certified, +* BSD-like license that allows static linking with closed source software +* +* Copyright (c) 2025 MonstersGoBoom +* +********************************************************************************************/ + +/* + Simple example for decoding input as actions, allowing remapping of input to different keys or gamepad buttons. + for example instead of + IsKeyDown(KEY_LEFT) + you'd use + IsActionDown(ACTION_LEFT) + which can be reassigned to e.g. KEY_A and also assigned to a gamepad button. the action will trigger with either gamepad or keys + */ + + +#include +#include +#include +#include "raylib.h" + +// add your own action types here + +typedef enum ActionType +{ + NO_ACTION, + ACTION_UP, + ACTION_DOWN, + ACTION_LEFT, + ACTION_RIGHT, + ACTION_FIRE, + MAX_ACTION +} ActionType; + +// struct for key and button inputs +typedef struct ActionInput +{ + int key; + int button; +} ActionInput; + +// gamepad index, change this if you have multiple gamepads. +int gamepadIndex = 0; +static ActionInput actionInputs[MAX_ACTION] = {0}; + +// combines IsKeyPressed and IsGameButtonPressed to one action +bool isActionPressed(int action) +{ + if (action Date: Sun, 28 Sep 2025 23:31:07 +0200 Subject: [PATCH 12/23] REVIEWED: New example format and requirements: `core_input_actions` #5211 --- examples/Makefile | 2 +- examples/Makefile.Web | 4 + examples/README.md | 5 +- examples/core/core_input_actions.c | 243 ++++---- examples/core/core_input_actions.png | Bin 0 -> 15477 bytes examples/examples_list.txt | 1 + .../examples/core_input_actions.vcxproj | 569 ++++++++++++++++++ projects/VS2022/raylib.sln | 27 + 8 files changed, 738 insertions(+), 113 deletions(-) create mode 100644 examples/core/core_input_actions.png create mode 100644 projects/VS2022/examples/core_input_actions.vcxproj diff --git a/examples/Makefile b/examples/Makefile index 6d409b511..8fb92ac2b 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -516,6 +516,7 @@ CORE = \ core/core_custom_logging \ core/core_drop_files \ core/core_high_dpi \ + core/core_input_actions \ core/core_input_gamepad \ core/core_input_gestures \ core/core_input_gestures_testbed \ @@ -524,7 +525,6 @@ CORE = \ core/core_input_mouse_wheel \ core/core_input_multitouch \ core/core_input_virtual_controls \ - core/core_input_actions \ core/core_random_sequence \ core/core_random_values \ core/core_render_texture \ diff --git a/examples/Makefile.Web b/examples/Makefile.Web index a16d57853..87c2866c6 100644 --- a/examples/Makefile.Web +++ b/examples/Makefile.Web @@ -516,6 +516,7 @@ CORE = \ core/core_custom_logging \ core/core_drop_files \ core/core_high_dpi \ + core/core_input_actions \ core/core_input_gamepad \ core/core_input_gestures \ core/core_input_gestures_testbed \ @@ -732,6 +733,9 @@ core/core_drop_files: core/core_drop_files.c core/core_high_dpi: core/core_high_dpi.c $(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) +core/core_input_actions: core/core_input_actions.c + $(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) + core/core_input_gamepad: core/core_input_gamepad.c $(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \ --preload-file core/resources/ps3.png@resources/ps3.png \ diff --git a/examples/README.md b/examples/README.md index 1753a31bc..d7f56d8d4 100644 --- a/examples/README.md +++ b/examples/README.md @@ -17,9 +17,9 @@ You may find it easier to use than other toolchains, especially when it comes to - `zig build [module]` to compile all examples for a module (e.g. `zig build core`) - `zig build [example]` to compile _and run_ a particular example (e.g. `zig build core_basic_window`) -## EXAMPLES COLLECTION [TOTAL: 163] +## EXAMPLES COLLECTION [TOTAL: 164] -### category: core [37] +### category: core [38] Examples using raylib[core](../src/rcore.c) platform functionality like window creation, inputs, drawing modes and system functionality. @@ -62,6 +62,7 @@ Examples using raylib[core](../src/rcore.c) platform functionality like window c | [core_high_dpi](core/core_high_dpi.c) | core_high_dpi | ⭐⭐☆☆ | 5.0 | 5.5 | [Jonathan Marler](https://github.com/marler8997) | | [core_render_texture](core/core_render_texture.c) | core_render_texture | ⭐☆☆☆ | 5.6-dev | 5.6-dev | [Ramon Santamaria](https://github.com/raysan5) | | [core_undo_redo](core/core_undo_redo.c) | core_undo_redo | ⭐⭐⭐☆ | 5.5 | 5.6 | [Ramon Santamaria](https://github.com/raysan5) | +| [core_input_actions](core/core_input_actions.c) | core_input_actions | ⭐⭐☆☆ | 5.5 | 5.6 | [Jett](https://github.com/JettMonstersGoBoom) | ### category: shapes [20] diff --git a/examples/core/core_input_actions.c b/examples/core/core_input_actions.c index b8266a8f4..aff356087 100644 --- a/examples/core/core_input_actions.c +++ b/examples/core/core_input_actions.c @@ -1,41 +1,31 @@ - /******************************************************************************************* * -* raylib [core_inputactionInputs] example - presents a simple API for remapping input to actions +* raylib [core] example - input actions * -* Example complexity rating: [★☆☆☆] 1/4 +* Example complexity rating: [★★☆☆] 2/4 * * Example originally created with raylib 5.5, last time updated with raylib 5.6 * -* Example contributed by MonstersGoBoom and reviewed by Ramon Santamaria (@raysan5) +* Example contributed by Jett (@JettMonstersGoBoom) and reviewed by Ramon Santamaria (@raysan5) * * Example licensed under an unmodified zlib/libpng license, which is an OSI-certified, * BSD-like license that allows static linking with closed source software * -* Copyright (c) 2025 MonstersGoBoom +* Copyright (c) 2025 Jett (@JettMonstersGoBoom) * ********************************************************************************************/ -/* - Simple example for decoding input as actions, allowing remapping of input to different keys or gamepad buttons. - for example instead of - IsKeyDown(KEY_LEFT) - you'd use - IsActionDown(ACTION_LEFT) - which can be reassigned to e.g. KEY_A and also assigned to a gamepad button. the action will trigger with either gamepad or keys - */ +// Simple example for decoding input as actions, allowing remapping of input to different keys or gamepad buttons +// For example instead of using `IsKeyDown(KEY_LEFT)`, you can use `IsActionDown(ACTION_LEFT)` +// which can be reassigned to e.g. KEY_A and also assigned to a gamepad button. the action will trigger with either gamepad or keys - -#include -#include -#include #include "raylib.h" -// add your own action types here - -typedef enum ActionType -{ - NO_ACTION, +//---------------------------------------------------------------------------------- +// Types and Structures Definition +//---------------------------------------------------------------------------------- +typedef enum ActionType { + NO_ACTION = 0, ACTION_UP, ACTION_DOWN, ACTION_LEFT, @@ -44,42 +34,137 @@ typedef enum ActionType MAX_ACTION } ActionType; -// struct for key and button inputs -typedef struct ActionInput -{ +// Key and button inputs +typedef struct ActionInput { int key; int button; } ActionInput; -// gamepad index, change this if you have multiple gamepads. -int gamepadIndex = 0; -static ActionInput actionInputs[MAX_ACTION] = {0}; +//---------------------------------------------------------------------------------- +// Global Variables Definition +//---------------------------------------------------------------------------------- +static int gamepadIndex = 0; // Gamepad default index +static ActionInput actionInputs[MAX_ACTION] = { 0 }; -// combines IsKeyPressed and IsGameButtonPressed to one action -bool isActionPressed(int action) +//---------------------------------------------------------------------------------- +// Module Functions Declaration +//---------------------------------------------------------------------------------- +static bool IsActionPressed(int action); // Check action key/button pressed +static bool IsActionReleased(int action); // Check action key/button released +static bool IsActionDown(int action); // Check action key/button down + +static void SetActionsDefault(void); // Set the "default" keyset +static void SetActionsCursor(void); // Set the "alternate" keyset + +//------------------------------------------------------------------------------------ +// Program main entry point +//------------------------------------------------------------------------------------ +int main(void) { - if (actionXuTP$-N4-`yy&EL8&skMg@Ra+GKaOku zUpQR5qvdo)EQ;wjoDxddQcPlDP5`?DnYf_K;&G4JDWhe|6~S862M^{m7y*P2U;RPu|_$5YVM={;#9A|Dx&lEtG{Sk`-nZJ{1^6$J~_s`)0mYxbQ@pEE>)5JS5EQoIJCX; zOWYJPELHxdRua`;(YGw|l2b!K&4PXf{^>uIOH=0EnD}L(oZXanvXbjwrf!LmL=Me| z0^rbmS%K_DWUn=VLQ`_W!lGFhUd(!PaN_9`v9tZ({*bn1%`TX_>&h+RmUr4g-xu{< zb4AOuSNOr{F2odHx~pVsxwG|YbFQz|%4$B3Ucs1Wm#d$(UfTMl<&W=5`^>5HI_@$v z1iR<$c~E4(_LB9|XP2z*KK9bT;@5tqPd{t->?>c)qn`IdQ#v?>5tG~#K!uUL)V;&{ zENT>@BL=d3Hn_zo>C221E2uRZ zDAlDqxCO&f3^?SG35L5)37~Mkfis*zk(7xN@+eAwK$7e#IXp=g6wbo8u>~hCi)!f#geXGJl$^aeL|M}nfXgzEf0}b zEa%(yL3YhM*{p{w+{X{T$}9TJxbkP-ifP7MK0Pm3$=#k+CzIQaaKZ&O7B^6^U4ys} zUcbS)40oLxQg^hQu9K7wa(~h>_opMjf6>?8XP{cSN6{eSlCffW&$4-FN%NpIxBy&P zjF!;hTu=e{SyCYBdf((-X;{qQ_HjR48x1Bk|^;=ldF;^&b>O)-Nvo4|nK+6CB_~JO!oFL=H-a?E(vK%LxRf z>u~fQxNO}kVC~fLPS5Gr3e(BK?hmGHYUJ}z`svs$Yg|-QwJKgvS>Og8i&n3il*hS_1ibyQDx+I@1Z+ z%%!0xOa&|dbME@ zpPovhRi7mVqRz_nd@*T~TlZw0to+$*XKj{_SZDi7=~^pfS8w4ue{fR2`{|b#Cl$b5 z+%OMP58p#c`EY4SJ*;xRA)uPqN^gEp_1dovOEs(B?rrEzcr=Ss^2OG>JKh{OW%613 zW6{*TTh6ghIi|e#lI+HhE^EJ-2N+u)ww0g!+P>=O>x|h*VN(IgSY7xsmVue6>0f!? z_ZI~e%vd8f!=NTkl&PPs6DD^=JcjHA{d?kEC9wc0G z7d`}=$h0s2Mx6lazl?^$Xehu6r_r=9nifXW0-|08cf;|IDL>e?^zYH`|i(SD(=%im2a&|!;`2!7Gfm*Vo zb0Zf+P_hp4NZ@E@a84K$b0ZXI2A#zdt&mH*CoKo&c)Y*ZfSkV=CpjmSa9+z;gfiia z7@EH*uppWP|1{7bn28#70;skd4TaHAfX#T0riIb8Fq#$+3j=!EMsvhyju_1mqd5Y) zMhui0z{{0J%LPzSjE2H!D2$elqow0$=?JbA(1_8}akO+CEgeTo$I;RetzZOmM@z@i l(s8tO94#FOq;zCp*mtBM``UWxR0akH22WQ%mvv4FO#p`!2$lc< literal 0 HcmV?d00001 diff --git a/examples/examples_list.txt b/examples/examples_list.txt index ead1bf220..adaa12390 100644 --- a/examples/examples_list.txt +++ b/examples/examples_list.txt @@ -44,6 +44,7 @@ core;core_automation_events;★★★☆;5.0;5.0;2023;2025;"Ramon Santamaria";@r core;core_high_dpi;★★☆☆;5.0;5.5;2025;2025;"Jonathan Marler";@marler8997 core;core_render_texture;★☆☆☆;5.6-dev;5.6-dev;2025;2025;"Ramon Santamaria";@raysan5 core;core_undo_redo;★★★☆;5.5;5.6;2025;2025;"Ramon Santamaria";@raysan5 +core;core_input_actions;★★☆☆;5.5;5.6;2025;2025;"Jett";@JettMonstersGoBoom shapes;shapes_basic_shapes;★☆☆☆;1.0;4.2;2014;2025;"Ramon Santamaria";@raysan5 shapes;shapes_bouncing_ball;★☆☆☆;2.5;2.5;2013;2025;"Ramon Santamaria";@raysan5 shapes;shapes_colors_palette;★★☆☆;1.0;2.5;2014;2025;"Ramon Santamaria";@raysan5 diff --git a/projects/VS2022/examples/core_input_actions.vcxproj b/projects/VS2022/examples/core_input_actions.vcxproj new file mode 100644 index 000000000..8b64adc77 --- /dev/null +++ b/projects/VS2022/examples/core_input_actions.vcxproj @@ -0,0 +1,569 @@ + + + + + Debug.DLL + ARM64 + + + Debug.DLL + Win32 + + + Debug.DLL + x64 + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release.DLL + ARM64 + + + Release.DLL + Win32 + + + Release.DLL + x64 + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + {6B1A933E-71B8-4C1F-9E79-02D98830E671} + Win32Proj + core_input_actions + 10.0 + core_input_actions + + + + Application + true + $(DefaultPlatformToolset) + Unicode + + + Application + true + $(DefaultPlatformToolset) + Unicode + + + Application + true + $(DefaultPlatformToolset) + Unicode + + + Application + true + $(DefaultPlatformToolset) + Unicode + + + Application + true + $(DefaultPlatformToolset) + Unicode + + + Application + true + $(DefaultPlatformToolset) + Unicode + + + Application + false + $(DefaultPlatformToolset) + true + Unicode + + + Application + false + $(DefaultPlatformToolset) + true + Unicode + + + Application + false + $(DefaultPlatformToolset) + true + Unicode + + + Application + false + $(DefaultPlatformToolset) + true + Unicode + + + Application + false + $(DefaultPlatformToolset) + true + Unicode + + + Application + false + $(DefaultPlatformToolset) + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\ + + + true + $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\ + + + true + $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\ + + + true + $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\ + + + true + $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\ + + + true + $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\ + + + $(SolutionDir)..\..\examples\core + WindowsLocalDebugger + + + $(SolutionDir)..\..\examples\core + WindowsLocalDebugger + + + $(SolutionDir)..\..\examples\core + WindowsLocalDebugger + + + $(SolutionDir)..\..\examples\core + WindowsLocalDebugger + + + $(SolutionDir)..\..\examples\core + WindowsLocalDebugger + + + $(SolutionDir)..\..\examples\core + WindowsLocalDebugger + + + $(SolutionDir)..\..\examples\core + WindowsLocalDebugger + + + $(SolutionDir)..\..\examples\core + WindowsLocalDebugger + + + $(SolutionDir)..\..\examples\core + WindowsLocalDebugger + + + $(SolutionDir)..\..\examples\core + WindowsLocalDebugger + + + $(SolutionDir)..\..\examples\core + WindowsLocalDebugger + + + $(SolutionDir)..\..\examples\core + WindowsLocalDebugger + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;PLATFORM_DESKTOP;%(PreprocessorDefinitions) + CompileAsC + $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories) + + + Console + true + $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;PLATFORM_DESKTOP;%(PreprocessorDefinitions) + CompileAsC + $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories) + /FS %(AdditionalOptions) + + + Console + true + $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;shcore.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;PLATFORM_DESKTOP;%(PreprocessorDefinitions) + CompileAsC + $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories) + /FS %(AdditionalOptions) + + + Console + true + $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;PLATFORM_DESKTOP;%(PreprocessorDefinitions) + CompileAsC + $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories) + + + Console + true + $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" + Copy Debug DLL to output directory + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;PLATFORM_DESKTOP;%(PreprocessorDefinitions) + CompileAsC + $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories) + + + Console + true + $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" + Copy Debug DLL to output directory + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;PLATFORM_DESKTOP;%(PreprocessorDefinitions) + CompileAsC + $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories) + + + Console + true + $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" + Copy Debug DLL to output directory + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);PLATFORM_DESKTOP + $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories) + CompileAsC + true + + + Console + true + true + true + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);PLATFORM_DESKTOP + $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories) + CompileAsC + true + + + Console + true + true + true + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);PLATFORM_DESKTOP + $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories) + CompileAsC + true + + + Console + true + true + true + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);PLATFORM_DESKTOP + $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories) + CompileAsC + true + + + Console + true + true + true + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ + + + xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" + + + Copy Release DLL to output directory + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);PLATFORM_DESKTOP + $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories) + CompileAsC + true + + + Console + true + true + true + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ + + + xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" + + + Copy Release DLL to output directory + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);PLATFORM_DESKTOP + $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories) + CompileAsC + true + + + Console + true + true + true + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ + + + xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" + + + Copy Release DLL to output directory + + + + + + + + + + + {e89d61ac-55de-4482-afd4-df7242ebc859} + + + + + + \ No newline at end of file diff --git a/projects/VS2022/raylib.sln b/projects/VS2022/raylib.sln index fe2241434..faca55fa0 100644 --- a/projects/VS2022/raylib.sln +++ b/projects/VS2022/raylib.sln @@ -345,6 +345,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "text_inline_styling", "exam EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_undo_redo", "examples\core_undo_redo.vcxproj", "{3B27F358-2679-4F38-B297-17B536F580BB}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_input_actions", "examples\core_input_actions.vcxproj", "{6B1A933E-71B8-4C1F-9E79-02D98830E671}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug.DLL|ARM64 = Debug.DLL|ARM64 @@ -4247,6 +4249,30 @@ Global {3B27F358-2679-4F38-B297-17B536F580BB}.Release|x64.Build.0 = Release|x64 {3B27F358-2679-4F38-B297-17B536F580BB}.Release|x86.ActiveCfg = Release|Win32 {3B27F358-2679-4F38-B297-17B536F580BB}.Release|x86.Build.0 = Release|Win32 + {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Debug.DLL|ARM64.ActiveCfg = Debug.DLL|ARM64 + {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Debug.DLL|ARM64.Build.0 = Debug.DLL|ARM64 + {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Debug.DLL|x64.ActiveCfg = Debug.DLL|x64 + {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Debug.DLL|x64.Build.0 = Debug.DLL|x64 + {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Debug.DLL|x86.ActiveCfg = Debug.DLL|Win32 + {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Debug.DLL|x86.Build.0 = Debug.DLL|Win32 + {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Debug|ARM64.Build.0 = Debug|ARM64 + {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Debug|x64.ActiveCfg = Debug|x64 + {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Debug|x64.Build.0 = Debug|x64 + {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Debug|x86.ActiveCfg = Debug|Win32 + {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Debug|x86.Build.0 = Debug|Win32 + {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Release.DLL|ARM64.ActiveCfg = Release.DLL|ARM64 + {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Release.DLL|ARM64.Build.0 = Release.DLL|ARM64 + {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Release.DLL|x64.ActiveCfg = Release.DLL|x64 + {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Release.DLL|x64.Build.0 = Release.DLL|x64 + {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Release.DLL|x86.ActiveCfg = Release.DLL|Win32 + {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Release.DLL|x86.Build.0 = Release.DLL|Win32 + {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Release|ARM64.ActiveCfg = Release|ARM64 + {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Release|ARM64.Build.0 = Release|ARM64 + {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Release|x64.ActiveCfg = Release|x64 + {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Release|x64.Build.0 = Release|x64 + {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Release|x86.ActiveCfg = Release|Win32 + {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -4421,6 +4447,7 @@ Global {49C67F03-1A56-4F96-B278-39B66EC93678} = {6C82BAAE-BDDF-457D-8FA8-7E2490B07035} {D496308F-3C3C-40B3-A3ED-EA327D244B3E} = {8D3C83B7-F1E0-4C2E-9E34-EE5F6AB2502A} {3B27F358-2679-4F38-B297-17B536F580BB} = {6C82BAAE-BDDF-457D-8FA8-7E2490B07035} + {6B1A933E-71B8-4C1F-9E79-02D98830E671} = {6C82BAAE-BDDF-457D-8FA8-7E2490B07035} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E926C768-6307-4423-A1EC-57E95B1FAB29} From c551fb7118268193414f427da2b478cf2141fb2c Mon Sep 17 00:00:00 2001 From: Tim Little Date: Sun, 28 Sep 2025 22:40:09 +0100 Subject: [PATCH 13/23] Add models_basic_voxel example (#5212) --- examples/Makefile | 1 + examples/Makefile.Web | 4 + examples/README.md | 3 +- examples/examples_list.txt | 1 + examples/models/models_basic_voxel.c | 152 +++++++++++++++++++++++++ examples/models/models_basic_voxel.png | Bin 0 -> 349583 bytes 6 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 examples/models/models_basic_voxel.c create mode 100644 examples/models/models_basic_voxel.png diff --git a/examples/Makefile b/examples/Makefile index 8fb92ac2b..36faed3b3 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -607,6 +607,7 @@ TEXT = \ MODELS = \ models/models_animation_gpu_skinning \ models/models_animation_playing \ + models/models_basic_voxel \ models/models_billboard_rendering \ models/models_bone_socket \ models/models_box_collisions \ diff --git a/examples/Makefile.Web b/examples/Makefile.Web index 87c2866c6..b1b1f0779 100644 --- a/examples/Makefile.Web +++ b/examples/Makefile.Web @@ -607,6 +607,7 @@ TEXT = \ MODELS = \ models/models_animation_gpu_skinning \ models/models_animation_playing \ + models/models_basic_voxel \ models/models_billboard_rendering \ models/models_bone_socket \ models/models_box_collisions \ @@ -1049,6 +1050,9 @@ models/models_animation_playing: models/models_animation_playing.c --preload-file models/resources/models/iqm/guytex.png@resources/models/iqm/guytex.png \ --preload-file models/resources/models/iqm/guyanim.iqm@resources/models/iqm/guyanim.iqm +models/models_basic_voxel: models/models_basic_voxel.c + $(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) + models/models_billboard_rendering: models/models_billboard_rendering.c $(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \ --preload-file models/resources/billboard.png@resources/billboard.png diff --git a/examples/README.md b/examples/README.md index d7f56d8d4..48e83c852 100644 --- a/examples/README.md +++ b/examples/README.md @@ -145,7 +145,7 @@ Examples using raylib text functionality, including sprite fonts loading/generat | [text_codepoints_loading](text/text_codepoints_loading.c) | text_codepoints_loading | ⭐⭐⭐☆ | 4.2 | 4.2 | [Ramon Santamaria](https://github.com/raysan5) | | [text_inline_styling](text/text_inline_styling.c) | text_inline_styling | ⭐⭐⭐☆ | 5.6-dev | 5.6-dev | [Wagner Barongello](https://github.com/SultansOfCode) | -### category: models [23] +### category: models [24] Examples using raylib models functionality, including models loading/generation and drawing, provided by raylib [models](../src/rmodels.c) module. @@ -174,6 +174,7 @@ Examples using raylib models functionality, including models loading/generation | [models_animation_gpu_skinning](models/models_animation_gpu_skinning.c) | models_animation_gpu_skinning | ⭐⭐⭐☆ | 4.5 | 4.5 | [Daniel Holden](https://github.com/orangeduck) | | [models_bone_socket](models/models_bone_socket.c) | models_bone_socket | ⭐⭐⭐⭐️ | 4.5 | 4.5 | [iP](https://github.com/ipzaur) | | [models_tesseract_view](models/models_tesseract_view.c) | models_tesseract_view | ⭐⭐☆☆ | 5.6-dev | 5.6-dev | [Timothy van der Valk](https://github.com/arceryz) | +| [models_basic_voxel](models/models_basic_voxel.c) | models_basic_voxel | ⭐⭐☆☆ | 5.5 | 5.5 | [Tim Little](https://github.com/timlittle) | ### category: shaders [29] diff --git a/examples/examples_list.txt b/examples/examples_list.txt index adaa12390..b5682123f 100644 --- a/examples/examples_list.txt +++ b/examples/examples_list.txt @@ -128,6 +128,7 @@ models;models_textured_cube;★★☆☆;4.5;4.5;2022;2025;"Ramon Santamaria";@r models;models_animation_gpu_skinning;★★★☆;4.5;4.5;2024;2025;"Daniel Holden";@orangeduck models;models_bone_socket;★★★★;4.5;4.5;2024;2025;"iP";@ipzaur models;models_tesseract_view;★★☆☆;5.6-dev;5.6-dev;2024;2025;"Timothy van der Valk";@arceryz +models;models_basic_voxel;★★☆☆;5.5;5.5;2025;2025;"Tim Little";@timlittle shaders;shaders_basic_lighting;★★★★;3.0;4.2;2019;2025;"Chris Camacho";@chriscamacho shaders;shaders_model_shader;★★☆☆;1.3;3.7;2014;2025;"Ramon Santamaria";@raysan5 shaders;shaders_shapes_textures;★★☆☆;1.7;3.7;2015;2025;"Ramon Santamaria";@raysan5 diff --git a/examples/models/models_basic_voxel.c b/examples/models/models_basic_voxel.c new file mode 100644 index 000000000..8df15d73d --- /dev/null +++ b/examples/models/models_basic_voxel.c @@ -0,0 +1,152 @@ +/******************************************************************************************* +* +* raylib [models] example - basic voxel +* +* Example complexity rating: [★★☆☆] 2/4 +* +* Example originally created with raylib 5.5, last time updated with raylib 5.5 +* +* Example contributed by Tim Little (@timlittle) and reviewed by Ramon Santamaria (@raysan5) +* +* Example licensed under an unmodified zlib/libpng license, which is an OSI-certified, +* BSD-like license that allows static linking with closed source software +* +* Copyright (c) 2025 Tim Little (@timlittle) +* +********************************************************************************************/ + +#include "raylib.h" +#include "raymath.h" + +#define WORLD_SIZE 8 // Size of our voxel world (8x8x8 cubes) + +//------------------------------------------------------------------------------------ +// Program main entry point +//------------------------------------------------------------------------------------ +int main(void) +{ + // Initialization + //-------------------------------------------------------------------------------------- + const int screenWidth = 800; + const int screenHeight = 450; + + InitWindow(screenWidth, screenHeight, "raylib [models] example - basic voxel"); + + DisableCursor(); // Lock mouse to window center + + // Define the camera to look into our 3d world (first person) + Camera3D camera = { 0 }; + camera.position = (Vector3){ -2.0f, 0.0f, -2.0f }; // Camera position at ground level + camera.target = (Vector3){ 0.0f, 0.0f, 0.0f }; // Camera looking at point + camera.up = (Vector3){ 0.0f, 1.0f, 0.0f }; // Camera up vector + camera.fovy = 45.0f; // Camera field-of-view Y + camera.projection = CAMERA_PERSPECTIVE; // Camera projection type + + // Create a cube model + Mesh cubeMesh = GenMeshCube(1.0f, 1.0f, 1.0f); // Create a unit cube mesh + Model cubeModel = LoadModelFromMesh(cubeMesh); // Convert mesh to a model + cubeModel.materials[0].maps[MATERIAL_MAP_DIFFUSE].color = BEIGE; + + // Initialize voxel world - fill with voxels + bool voxels[WORLD_SIZE][WORLD_SIZE][WORLD_SIZE] = { false }; + for (int x = 0; x < WORLD_SIZE; x++) + { + for (int y = 0; y < WORLD_SIZE; y++) + { + for (int z = 0; z < WORLD_SIZE; z++) + { + voxels[x][y][z] = true; + } + } + } + + SetTargetFPS(60); + //-------------------------------------------------------------------------------------- + + // Main game loop + while (!WindowShouldClose()) // Detect window close button or ESC key + { + // Update + //---------------------------------------------------------------------------------- + UpdateCamera(&camera, CAMERA_FIRST_PERSON); + + // Handle voxel removal with mouse click + if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) + { + // Cast a ray from the screen center (where crosshair would be) + Vector2 screenCenter = { screenWidth/2.0f, screenHeight/2.0f }; + Ray ray = GetMouseRay(screenCenter, camera); + + // Check ray collision with all voxels + bool voxelRemoved = false; + for (int x = 0; (x < WORLD_SIZE) && !voxelRemoved; x++) + { + for (int y = 0; (y < WORLD_SIZE) && !voxelRemoved; y++) + { + for (int z = 0; (z < WORLD_SIZE) && !voxelRemoved; z++) + { + if (!voxels[x][y][z]) continue; // Skip empty voxels + + // Build a bounding box for this voxel + Vector3 position = { x, y, z }; + BoundingBox box = { + (Vector3){ position.x - 0.5f, position.y - 0.5f, position.z - 0.5f }, + (Vector3){ position.x + 0.5f, position.y + 0.5f, position.z + 0.5f } + }; + + // Check ray-box collision + RayCollision collision = GetRayCollisionBox(ray, box); + if (collision.hit) + { + voxels[x][y][z] = false; // Remove this voxel + voxelRemoved = true; // Exit all loops + } + } + } + } + } + //---------------------------------------------------------------------------------- + + // Draw + //---------------------------------------------------------------------------------- + BeginDrawing(); + + ClearBackground(RAYWHITE); + + BeginMode3D(camera); + + DrawGrid(10, 1.0f); + + // Draw all voxels + for (int x = 0; x < WORLD_SIZE; x++) + { + for (int y = 0; y < WORLD_SIZE; y++) + { + for (int z = 0; z < WORLD_SIZE; z++) + { + if (!voxels[x][y][z]) continue; + + Vector3 position = { x, y, z }; + DrawModel(cubeModel, position, 1.0f, BEIGE); + DrawCubeWires(position, 1.0f, 1.0f, 1.0f, BLACK); + } + } + } + + EndMode3D(); + + DrawText("Left-click a voxel to remove it!", 10, 10, 20, DARKGRAY); + DrawText("WASD to move, mouse to look around", 10, 35, 10, GRAY); + + EndDrawing(); + //---------------------------------------------------------------------------------- + } + + // De-Initialization + //-------------------------------------------------------------------------------------- + UnloadModel(cubeModel); + CloseWindow(); + //-------------------------------------------------------------------------------------- + + return 0; +} diff --git a/examples/models/models_basic_voxel.png b/examples/models/models_basic_voxel.png new file mode 100644 index 0000000000000000000000000000000000000000..8bbcaf8dae98aa01624392f07822e36f2f44a53d GIT binary patch literal 349583 zcmeAS@N?(olHy`uVBq!ia0y~yU{_#ZV41_g#=yXEm~BQD0|R4lrn7T^r?ay{Kv8~L zW=<*tgT}<%2?xEH5=C0=&rUkDX2sIR(+1s}mModt>2kqIXW=5(#~E5Hdlv`pbIG!wV*WS9Tz*4^b@cF;|5xHHj;x8@MKK<_O+T87X zz3lbeJ{m4x;i@aqxyG|4|LweA!eYUvgP%n|y`J%CO;iC}+WTKxFAIL=@5^QrI=M*e zm*VR{)4eRyI3Jz}^fdk%QQX+NpFOiT!{bL_MTD<5=fkcI=Jy^h zx3ZXS8?ryoV12pD=Z&R-%hzsd^Q;1t4=6Y$~iOatm@(OA-|- za&z*EttxDlz$&crimgDx`br95B_-LmN)f&R3eNdOsS0L#26_fcc3cVy3N}S4X;wil zZcyz-DQUJ!86_nJR{Hwo<>h+i#(Mch>H3D2mX`VkM*2oZxVRW z4>ucRJV?|kAhRMhC(_AEE?qEX2)ft4~`O0^w@EAJ-qOjfq_9L z)5Sl8fq{Vu9IXsYpaiDD0H&Gz7??Kg{k7?)6a#|;gQtsQNCo4Yy_pkAJWH2JZmroW z9_kRd<|tp3LjV(_la{Bhp+X`@OT^VnGsGtJrd*zM^4PERX#evw*3^Idb0H#`Njlr` z0LRA6WaBGQY|V**;sFlax&aQ3ihbD+>AmWnwRLwl zy^6lLS+B5U!Ybkaw~Lj`Kkomy{|xKAANPO6KWntRQt{sKQT;>K!o3sLRdc5nxy#rt zd6n}2rR7BFACu1inEylmSyT3j3j5?o^$);`_O%-ARPK`tDt%O6<@bbb-xK41>i^nz zK9DlHcYekX`3lDv{UxjO7y7*GSlk{m_s9Hs!aE!Ff8OE$e|hoqbP07I)4U26W!E4m#{an^8|IhgUrhkv> zAJuREpK~|)uJ-2t&;C5LTy>81e9Rf)$CmX^|IGZneO~c1^P2k`j+ET9|MYL-_x?Tg zPyQ;um#_SP;Th&NYDGy^Zd`;&)==i-=7yex0~}YD5tQWVwk<4|6CvQ zmO}Huk~7lX!EUyvIRsw|nET6q_PD<1!TAdA|F@r~&(%H#aY{Wr&Jrj!3}e?H)Ec`<#4`>toH|L2~a z4U%eqy?CAIq)Wwx3;={0dwK4BQV&bvzr+qb*lihbJ z%l_N`i7npaX~4ZF69f1zp8eC@y4L29B)?MrCynwY#{ai{x+YlGWNbObyz1J;<1XW6dXK+nkbpd1n9GJ*6#kANcS+^_2sKZ;bPq>5E_0&w0&x*x@)s zpI*@`qX%urudnHp{#9CMX7|Zw`->HFr57FVTPQm1d(@UCXJzw9s!ROOhxtFJe_d{W zpg*KO(XR5yec3N|o%%QXuleu%Z}EQ_?=Akt{rRNw zyuaqZ*B3VmB*tmntglvk!qQi9r<^x791=Tc|E;z^Pz^B>6kDZw0!nANRe$H7Z<%vI zu>beEg|D@KzyJ4ke}TN^QHcwlbCd4cE#0+Rc<%EIU3q2Kui9IM)C)|DVXXfYSzqR9>;%9wMKR4g9{@d?mua%## zpJQMA@7;Bl?1Ot3wOQ8dm;ZYgdFH%<02`kv^FEEs9&_#a&acmzd_H`quCZ^&f^5se zBkSv=yAmtcZ{0gj;voP3nf2=?-Lx`1Ug~P~I{#SzKi4{*$MwG|mF!F9PV!cM+;3}q zvwqY6l>ZmK&-__!`789&&HA)IFXEpb50KBUe0tI7)1&(8v`6)i>mS#D6*B&x)K}M9 z^5=bz{NL4oBwi)!uD6MDi~Ey*-seyLpZq`T;s~3%%~!ZuKf^nQzIK z)VQnaai4vo-S4h)mf@^B&uo9V{(Nik;h&R0X+poy@5)!FJ)RFDZXxvl^5+BR zf6Sl9{k-k7>Ob{=?(vW2ta#m8an?LnwsbXLp~}DI&l~4|w6_&M$NSv-kN=J~tgyNY-{1FIp%5$n^e}(kpANj!gV9e;#|? zvHxFUEX?QVf3*K-|4Zn(ORWBp?0uQ9S45X~D1WrK<^N-I=3n}?Q%4RtNZgQMwqP`m znfv5I;iBNvC5xW?oEjyw{9w*75?+~j?N?9KgP|!ET{Z5f7~STnzL}N z?kxAn`j7S>_k-f(+#l6_!t-~Y$WQyt()b~{xp7m z9+W=L{4{><|J}Rn{G9!t|4sb9{^riA9cG{YSw2qNe{X-)kv}}li3$EZFU}MsSyW!? z@ax@DIpzH6<$Osy+uL>(X2{Ft3T0jYl%@W|c-<4uy0$$N+FSn5W8d*f@wmmF)PHB6 zgry^PsHIoPXxuke6rEsANux4(N8rOpZ5P}_WQ2eU$^b)^M#2H>;)N8 zQ`$<-Nk~aZ|MS%4zEoducTw=c$lvF4Ppb6&I6r@_cSl5?t<$Mhc2(y(gE{5wf@R%?brFc&v*Rq{J%C^<+uO0 z`*Z9qLce}qFwehN_}QPWwfZMv31`jwPhWE;e*RuIez@pPu~l&+-1Wng4(Jq;dV4r#nY`$;PE}KRGHpN7mxAO=kC-O>|Ql7rD>m4zm6HI_X+i@O&#?@y)-s?kl}$ zUVryT-3+JO2ZYH>S(;M2D#_S*h&y;jn%2qI2@k*@Tb% zIkSJw{vYyTF7K@$*H_=4@HhSUzefAg`=)Qy&UOBIv){6Q$8nG+|DNE@R(sz6Z_WJA z;pgHl>%Z>S$X0y5e$M_I(nbI7?5lqUYGu5aZQJ|&P36ho?)U6%lAr%g-u-`y^mU$e z-cJ$c9NDKnv;W!1|8ri_zSrkAtSoWbwa)%)_TQ-EfBqh^zj%e^_eln3*_-if5AL+L z#)w;WZ|LHl8nE)$jfH%bR;;fVyg%gbFP$X3PC8ya$-eE!mPVV~40inDljT-LmuP)E zx-Hlt=6H+jn~CYQZ&>$FENEh{XjHd&#Q7go_x_au#opO}lmD7O@4xwTrL5qxLzM?N zH_v?X^v~7LQ$MGlyANs!iQ5^zpTAfC#P4#u`V-If|7LQ^efoL&4bRN;^FRHJwyU?X zw5xw2e)!dI{@?rFceR|j@PDHFO#aeWznA=GtKvw#^~T8WN$=kJb;9z|6KfL=bZ+7g zSgym;-Nm`~acbbs2!&Qdg|mw`t#RGXAwOZ~16gD7PVOs5y?4n~UF*!3&zK{z_3xAZ zhl{=c=V-sYbuaP%>c%R|VLShWV*LlFsJsV)^A6WPi@z5ChkqaAe1ZS7 z|EmAakLK`w_3!0R?dSb7*SE}{v%l!ynV;3)_}cG(=!yNy{&R`$>7Ul1YVp+X^n3e1 z|C{^${mq$1@8?(kKl59C`O(Rr|6bnBb$)-1-Pwv_vv0DqErQOUpY~OC^L+N&|AyI~ zN!h6fJU4_bHoRu|AW8Y)!^6JQU7syd{=(XN!P`}APWMH_O+I@cHks`YeVY?BpFL9a zf5hs|9QAJ;c-eB7$bD3_^E>$`@xSh2y;SS3_CIW=7qFiHBnWP`rq!|O3H<4^Yuoc< z{=M+S%)i_29QmIHspHSZ|FvxTEb^Lh<@5aW(NmuOnfiJ8XT|65=j<>3ckbuy^Om3f zUCf9u-{N@xZ4zW3AN@S@}0tSf3v< z+M@UCN;K>JvJEeuKb*|pmMeOF!=v9u_pWUJDqs6COZE-B{h#!I8?%0uvWc(zzh?iB z`9JQzvA;GeL2#y|5KDx*Mb59Y4$DOj?sQ`s-?am%z! zcG*^=*BR4|9!=Sq;3K@sy|Q=vlP~_IQp^7d$g?}xIZ0;f8En0}D0cP<;rV8(7SH>! zBI$1gwjJ6!g8^R552=cC!=WpAw!Q0Je2^lo#e)7Lf0k=nEF zEtOE0d9=RjzmvVv?vw_`o;Q7r>N~dHJ@E93x22lK^kTmp@m}r~ehInPjKl-Bw)1{$ z`*Fo})jy*j4=Oq%K5k83@pwkNzg^JRtze`EjGDl7WUm!*oo>(8^k<~;cm+Jpr)QO@r&uX<;6=BM^^ z{d4my>(ANcJo}>}-{Jvk(meljw#H$G{E^lDs`K}N65pwx+1t#1sJi}L@o?EW`49Wf z{AJEf;(h%-dW-Po7LVNbM*rqp{b+gkWA?gl$39%_UUQkC$;) z#)wSO_KQ<9*|sXcedE4v_SzJlcp34N0`bu;SKQ^@o8D?o(cYFXxUYh})nDGiL}AO_ zZvxLZ#+vRs2Z@fYt=Cju>;F^#S60*ZsS%Ip>F?od4Qv%daAj zUg+-n?~vY+|F^~4fZ^c8rxFvi)t7CZv*mE7zh!BbrS!DQ7n?bJwr7Z&=e|(6-k14B z@RH5pX7SWp3Vio$YHl~~E9KF=Y*u-=b@%)qy#G8NTB~P#xB6k9^|zdF>3_-pXa4W~ zeSgjW#ZUh~{y)w7zfSeP6MxSCIsdcx+ojW0Cw^A{zgG|HhJ$d$^gvJ>|NHCD=FejO z_=DQW_sZ+f?f-CA%6-$nvbcKN;LW>PF8%)aQ$G2y#mAl8o8COv@6-Kt&2Y(@zWS~F zZKYQ?-l-{3Dwb$?aw3UsPDH^`7WFTMn`XvejtK4F5u~p6F>AiX^p+>ZFWvV{%Z}f@ zti0QQZ`Do>yPwBz9lky{d#A9VV-Ku|zzPsDL>wj7k`+8>l<+WAq{&6XM%mR`#&olh7(44y>%X;IP z@=t?fA0EQPPhV^z(eYxLvM2U97+K;?gx-{_v7rW<+T!8)_;9|=ftn( z(S?!q#(Et`|9?sU`s4o1m;><}>fb#3tNr`@zkT(u9zVTn@Vow7{d2c(^<}%_BIH9o zHitd>|M>r0?wkKN{eS+axM=?WJM1x^XMg)In!n?Jz%$#X=i5S`%m4cNk8$?0@>~Bi z`_o$!ZEr8uz5L?im8u(^a}pR1DMd?85H^ocn;?9j(^V>Qk>-@h=@w1ApMUULUp{g+ z|Dv8>l)4fUP><@2WHZe+g;c`2W$DtNr&=`SS_V4;{|KI$- z`G52O&5Kk2KcBPsfwi#J{{~)r_=+WV7&iD3Tw!hoEY^C}7|1T7hAIHD`61Dupc`J_P2E3Qo z87I!kNVBp$Tb?w@UrtfFY4WW<)2>bxjyi7fb;aS7CmZM36mHoYU2|J8thDP{XTRRZ zuKe9?Kek2xZh3O{_5O(0ho);6Ol&?<-ov-*|H1P=(*McN`G4})X$bsRZ}5EokNXJN z{Ns-zXm||NcmNF^Sf2RXe*Or*(EfAvc9YZNT{tQ=?!SKi|BidY>bigaRr>#~bNl6F z%%0%B@Jvx@Mt5b)*8k6fAAUb>sjvBQ-2cY*IYunIA56BpHqZ6P zi#KBOyT7b|l$^i+!|`A8pfRNF_OI<<>;KdLXa76?+y9TB?=L$a4;nIs;pF-DDgST2 zc`gqd9|Dahy{~(-ziwIoc}KII{}b;2=6`OknBH~w!RMK4=AYgE!o=@h+&lT4#}n#r zbxq*UuRgfF_tuejn%V-DtGXwz^s`dybh4Y=dh+Fy#eDw0!OO1&FHiN?H#oVvOhdW9 zN>twF)5N(SVhbKg2l-3;m0hygw%c|4gUQSOY5lk*a(%<2$?Yqw`S0&~eJp<4|AY6> zfEqXd*Zlvn|HuEMzw^J%e`9~9aZdfO(nIq$Uj7+A|IsbOHK1B3!RU8?vFdyI&0ks7 z*GOLL&Q|}Ie$4;R`K46G9n&}W@@+p&eE9G9^j@9K@AA&izj3|o$CFBZr<#uaC;l($mQB6-dH&ao$+a?% zX1iVA7X5w-m+FftufBAiGuk-8>fwwnOJaHaraVju^8Xi8aHCkzqVwuiH7n=pYmV(l z59YH@FmKDZRNN-`<&Q5@u4K~WqLP!&N7R?Bd6hMPPvwton;(6C>){gJ*8SmPy!gJq z^4k*ke|)<=@x$};`+a-%?~!i%|H1zJ|I~kL@BiQRjt5jsZu)oZd^~6{=C$4bSLM8* zAu13)e(yi1PB{6``1hHvy+zyS*Z=%E`S-d+NWH!J|GMn|Pe1wDhuYWQ&;S28-sua^ zM)8{O3cp)*|ET}$_%3?n+ggE!7I;yo4U{VLs7zuBSnuE_|FtRf6{5*&$d^S!j8QOXgepdPrUnZ)z^fS z+Ctuq?t8oPB}?1P!jGm;jAY+^%j^zkyzMQgnCNAkr3Qz$&GMIR`E|=UM%?bk!TYZo z4*!26E^GuHDZg9Jv-!V{UHys4|BCPZn-6Nug6gnGbG_pyf<_DX)my3G@#g^zXr|sz zu+uold+Bh+IeFuCPk8KSL;Am<{z&-#?g!HTZJ*Wmu1wzb?(cbPq3=Q;+N$3f{kU?o z`#)p&P2Re@|DT-LH_>gw>fFP#{ADDk>Au>ZT6;G5f%=m+;mpR?6dvJMs zSHAW1qwk}wU%xll8~nfh$JT#Ff7k!|{A0QQx9k)D>mFP__Tam+=)d1P57Z>&f@*pD zzdA2>MqdAQJndTi`J8L<*W|Mm|EVKd$1C2~|J77{zJBt{ztauR{@gzQrse-`|D40?ZmBboBLhD4sJhtLt=M*WXV4!@0>%SAO7y2eC?*TUGB=- zk9|jL4}ZHTfBM3G&iPf#dpsVTyqBo%`gS=pFZ+?XDlaBIcgnb!xoeuByE|WJxATfC zHJ>@wYK!T6|J&A3`D*q(mVJK(myPoMSw ztgi>RSae_i2j#_Ud;cH*f8_s>|7-sJoA~*C)xG_owiyUp+}1kR?mB<}k^jg38`=Nx z$* zy{~JREA=Rud*wIny7*mNYwrD8UVG$@LJ}X7x_6eO%GKy~m0(yBl&;`5c&lRIoqan2Q47JaQ`Q(&05WuaQ(+WV6(i|apnbiL{Y|3}^R zKd!C)^=hK|k?{GfX?Fx-U;WsTk<(swQ9Xan|0}BUa}8@gO_=-Ps6%~d&F!7yf4ZVS zN_yWmTmOGHXyl>$dHj$2zkkg(|8EQ}rN!R<2em4GbokEM4{8;igtXoNe18v`BLq!z zPW*iR+j;wkEH__%K3?Nz5ZWxe^s@0?i1dR)=$4B%k8^y%ej90U-A2Ucia;f2$!k6(imD|L=%GZ`=@8Gig+V*41$vVA5)88lV z2(S6=WZiV%BZEo2<8e~Vx-5x*)%zY~`J8FLyz!_0bkOMKNBh5AUH@NJcKpA)OZ=sF z_Kd&kzxn?is@)cExq1Gx^#5l;g92~g$N#znnY`G1-@NGGn@VtZZI>8idhFc&GlJ)D zZl3)8OuK-y`t$WapX=|qdF0>eUoK^b_h--k)sr9lec4q-TQl}E(vN1Z_dWIeYy9n3 z*ET#d7oM9jyXB)|-FnN{!AFnVImLbwd?b4Pi$q=c!z2BMf1>K1Jf2kg#JXq^Gmk~{ zG3Pmq%lhw}v3BeX_LFp))ve2NH;dW!G-tc8+wZk2E(=%l$n$*q`O84DwDL#ss^lNK zyDu|OUvIZM{kMkreLKBF+yBo#uv~YG@J8O`Kku*9zq(=nR_Ahk!Ntvd5A!}e@3sFk z|Ek=vli#+!m{R{}_OW=Af8Z&(*|Gm4>p#|i{158Ye6O2k+zx8Pf%1a#^M2ob_29}H zG-?fEi2vr9^f~?iOw*Vre@b_pi?5mX=1)q_k3VxOcfWc5e%{g*yDvZg@0+^xUeDOK|>z^3e+TZRq%YVAdPkU=$HvOgjbH-aeYlP)4pMCV-S#|5JmdsaqzI%c1+25{b7gh_9)%fjc=XA?Py*ssKilEgCU8~;i z`^}ou$&wsNu`JI1G{_C00$Md$w*e_dMe-<>BWd9#JpRxP# z^Dlo*Kp}b8zWCpr+dnUFer0uD{#Ml2&+5m7BA@-aoc(RrVdE*aO!vE^Z!cQ+`MAk% z9sW%m^0Kd@>X-lAu4A`Dbbi^%_K0cgo8CWN@@>UxS%dy99%m-LbIIP*{OEv@gUu32 z3$}?ngrjQNr(ST}I?rl}rh4y{8g>1j$FeQIR!lp1ob6F=`BvvS>>Jl^@%H)DyE@%o z?BU_|uNT~peb~4#)~V!rWB*;ln!4Ky9tp&=-v1Vu9{B(H!^7OESI^ZwZWjMDk9h~j z|K1j18w>py>nGCk=VsqM_kZEs5B#U2|4y1SIltya^pE(w|H*#J$-nvMr2Q-Xl5_%?W>l~Ta&lB9{7FE0u42$($_f^6OE8u#yiKdyfg9L%NGp;epP@tL;iJt`}}K zdR6Rr%xRg7BEOH^Cr$ThN4M`4z2B;^?`=%W`sU5C$v>Wb)t#d&bLo+={G;gn4t@2l z|ErHKUqAcMalPEI7uSvcoPTX!wqa+^fAAuc2-CeOe~K z7tc3V>3u(Qtjft^`m;Y%L3Q%oq8D{fAk4p2Cw{KJFJ1I6=HF-aG(XV%9cYP(d2z!2 z`}SY1zMfV8!#MZTJ{OtW`@A2%e)YF~*Xaj~H(&l89(+@9ep%?ePdx zuY>ko{?~tQ!~bWxuk7DC9Q%+t`@OR0{bI|fQ|mu%O|Cm_H7n_Of7oK>Zpt{OeM6&U|}nq}a#hqt$N<;UoJ_<8%Zj+u+jqesF@kFpm( z3O@fSieL6qdv0c=?6nR5lLFVt-dSI@G0b0{ma*NbN3&Z^t>zbaq^#F_jvc8O8?XA%Vzz5vpzZZpq<%{?>A2V zU(}tzzVh1vcIJ(D%67Y5U7zbH|7YXh`V4o!GuP#6uKkTe72SKzU-^IjTIp|-=h)9QgbeU6 zf9_km^5q=+bi1VB=lVOQy}$d(|F*#OPm9jW-(a8q@&AoGnSU(1Z#@&c+m;G>NpM696nqus2k6Yh#4{i4gp8qOXT;{`?)$?kz zT-}3TTnQAt^=^TI!I8NUZQss%zD`&b|2lg4E!X*-Jr|3EMDc}wcl_%M|4JWRZhP=OdE4b5?e%G=tDf6`Gx~4z|HI74`oI64)IGFw zj>?PBe|G%8e)+$N=QsWpw*xKnc~qZfckJt;`JMk~7J^nB9WR~u*ZlW;qxt(^_!s}1 zQTvZc-3wAVnp!8n(7%&j^lw&S^Z5zW-|T1K|G!AH%|NV1?d**;pMI7H-~aZ{HcbBa zJIUn7=jAr>?Ax|=t8~q)Gr#}LH8RXu{`zL^xnhQ09Y4QJ-1X}EudV;D%xsVU8SY>G zNGhn0=i}4BnoC>zer^kwzQ)Wi`}K^vO^_3N-y#cxE%O_jE7*@7ToBKzlGsJ_SZ@4=kJ%h`dR(2-HLyQZ|41+p6_&govXFt`M>jf=6$v^41J7r+`_IhHzv!3sU$gjZbMhPkMVZ6P&-@Fo zzP4CqVUA?YmyFjFg{{i39C4gfz<#3UQt5@0?$ZNe)x%EDdS%i zxOh%2)#k=xJEvWbc1Lh%9^N*2tLyT~WpZ{il7HNq(e7`%f#c%ZAD=F6+P+1;R{pkE z#K(>8H;x_`w{+9pw+&{;@I_{3Xt^Kpl{da5ssnmax z{4f1q8nn#q^6&Nk()9naOJBQx^1t!&N`YFL%-7|tOLNxze{t@1z2@VE^Io@4_}yN8 z`*6Bv@{b#{zyIsr_w?49A8RXa{oD92IPSguu@9M>zbifJ-1_3P{%_CPTl#g~d4eDI zo)DdH<#ALo*Y2aUe%Z4N=37iAFqR%ry}#wj;=>7_6nNH6UdLzk^)-uQyA9i&lM3!v z%?fk6-m|FBuhMJlI?qxxDY9Rn=CoGb>36?&a@kcpl0M$|cm0nop*6STKd$WOd+Xex zJXQa8+TUCMLqCMS-CyybIk{@?k8k(w&b|J>>Bl$0+MJ~Rf_p#M>yHI4&V2WW`~T^) z|Ih4S`_CLa+XbF{{P;N?G@-D=9aKT4->Z*cy?wtPJgJpxSAXJn_`UtlYX3dElOXre zZ`0-H{pZX}KpA%q|C@_v*q=)lwrnZxv3b^;zI)IAGdnDOUiW`2?1?HlKfnIhf8Ob` z|5HC+j5hf{r$6~~f8E*H_1zz~ntrL@;%wt2*Yb0J@c+!?i#{&r3FM!>`oZnATTgzi z{uavt&ZHMjLWonrVR)V*4F z_i6USR*$5@YSgs03A`0PE|-~m#Y%Mkx10PApy@bfb_ex3hy`&8_o_&@caZt#zg@3Dtpd4n2ViFOJ% z>$ksK_~GI1&{$*3dY$k8=7PFK*(Yj`Z&_D}xqpUw62&*LLi7AroB z{}%dOX#e4$L)gs!?-pK3K6~c(pYEFPvCgl9&UbGUyW8e}xAO0Gwy$kJ-o1R%tf}`+ z;B`>nyG8%9cV9cmSFUlz^@^g4hP(XAAKMn+y2V*<{+GSIYD>EMpHqdw_IH#Hw(p)A z9sOM4iU2QLo6YCBGE)p4=SVo)e$iEqW1nEc>@WLC@bV)8rCVELYMj)~-v+F|#yEdd z<&PJOnls{KoZntE`E~li?dOIyxA$<_&9LeEE5Gfo+50Q?Uygk^d0cIg?k|Tq?20jL z^47_Jx1as|LHquZ=MPVBe4DfCvRQKVg-FBod{{jTP(gk5FwKmOV4 z*b8|ymE$gN%jUUn^rii;dOpwoRR6c#&K*1-SN2b^Z_A(gqs8XR;(q6vw+of0C7z!3 zEYk1hLUE~Tkt3ez(TdY;*w2_OJQ97}=#|xuE35h1jM&fBeA?hRi*w0cvA1uoa67+Q zwfLSuyw5AeKg$@bmL30~$vi(`x9+W@Cl~YGu(=iJ|0nFqLxHT*7FISMN6q^$Slw`C z7hM17{gwYw{X71OuYM%_T=G#czvSWR%D>|;C*2UwdDGH=F7Crh@8}9pk6q|r`fHQV z>*K}O^*;QSzAxqP*=s#@ym8Y$!j~L^#vrFx=YT5LpYvvXPCqyQ2WzeKx%+=38Ra>} zIqtkLF8=pU<7M5Gzl-m?&rmN=l%KaDEg?fMUf zUH{TV|1W-Tb5|QFHvcATitCxu86*TMDT02 zhuzaBjR%$OD&rnq=k%|<@2uNy)>rL+Sh;?_t>yod?&tRZ?OE~q z=y!In2ko179Xp|}|9XA>@-=r(EKdC6|A#-@qyF$MM;~FO(tRm^zt$Y!{&T=LHu=e9 z(1PsA=jFGp+EZ6K9@??d@1|%|CaRY`qlfM z{#*EMe$^7eS3>IijN*#?HK#8u?lF10UA{$BexJan4r#vE6SviLINDVv{}tbUOL)GG zYmAdit$x7OrE@I)s`u5lm|6I3?Wy@Wnf=wrfMqk(T#j6?n_qpR?$!6@@0-MC*X9+El~&D|5?=FY+f<{YR!g+)3Qq}q?Cf5jo4Y7FS5ke+zTD~cmpGoD z5}0q|RO?!E>5A-O_4&um`W|k7lxbO*BDn8ujJn;7TfCr^*srhu^7~i*;{TWFrDw1I z*zpHu(;wOCkW z_!3aj4I0KX2eqYca2Nec3P1DnbBbkswc*wNtpAt4a|P|T{Qtpj)2W}*daHXLE;i2p zd$GN8{{Fz@=kL7!Io(F?_N_&87Z@LL&wufMtLM^R|5By1|6jbg?(3V+0`jpr8b>Z3 zmD@FKV!HKe-cJ`+{z#gXKj+tx?7P$6xa{6~_VB;(nlB#8*EY`CGGp$c#6OPA{HsHh zdM}4{ZoRuiur#YumO*_|*ZUN_DqM=|$%Y4<-HfWO3WRGI*KuTp)h- zqwM+)ez9F#nJFFq^CFHtf0%suTUY+w)DLg%Ep92T(|vUMlm5EW_8&{K|8LZ_duUVh z>O%e7Nyo%8ogYn;?z-P)CHbh^^4NZ}6+6Of3MM?rm;L`?zx`*(dRfSH%>1fpX84>ZOM`Kl*y6EB2Jl?d>l@rdu@m9lb7=dR6S>!{_gpt!?IOvV9%o z7Jbs$M_9aCz2;Q=pXB(M!<9e49k$8ac(+a5Qucd4#mZw0Rl%#BLVkhZ?MFZ0mc z4=c-Gw49R*OS~Xy(7AMNGIQu>S(z^ar)qZfd|S-NQl+Q&WzLcp1)JaJYliH8CCK;L zGda2A{-#}J0*e+ecy2DX)qDO$$;0COv2rZ})-9huT+P)Au6cd+-|3xiH~qg7JbyxZ zPE3xx;-b9yxBdyw>C*rI7|I6DZMzz=<`>*szQU1n# z|C$Y2^5DV1zcLBB8ndH7BZBrH_y4W3?)Yo|S|1Gg?FIf{o?lk<@AS`p%K+8q_a&uY z*Ze>KQyG*TL9N-xS1jr`c3=6rZ~i~|H;VTR*7E)A_`OfDGWoas{GF5Szx~`Uo^eCw z@ah_qseVVyd;4-%{Frk6{QraY_vTgEH`o~+*&h37vfGu{!M5veJV{(%mlyx>pzQAY z1@p>|9_FhwT~l>L@JsuTt@Wbu|FVB?vFG2vjos#JNAULxoV+$YOfM(BU0@-w?Ruk0 z{3lMy5H&@`vJ=khPZbngxIFEv=jVjeMwZf#g5zz}`hV!Ly$V0rS9v9L|F-!>^KNaM z_D1cRzJ8vJ0s^_`?>&CRxigi!-A3J)at?&)c z$DMno_&c4txH{?n$>776Q6Myah zufO@=wM_nh{LjT#9GdgL=-=GE`UhLz>&~$Sg#PWicoF`sF;;kG8*Ii&?2o++*^98Q?%&Cu$V$Lg#`h^l-}i7o<9?mK9JIFO+_eZuS9J6LSL{XqX8b%>`J8{pqsXtH`L9cs zZd@z-nR8=iRcOs?{_plV*9uv~d!+JjMt`{wc)>ZV!*|1p%li`d{#Q6(Q&KtY;Pl1I z?2el1rP=;J^V)vb*FzJwY|G_-yLn&g=O4>?UnsxIa=-oUdflvLF|v>6E^Icj<}52?$`+_q@z=ldx-f5#tb^^lIwZ(8Di``=Cdc#-#C&Ybqgh#ha$ z@+a#8zsG;y|Hgjz?f;M&q40C@`_iBMxjEnbW48xvxDmW>V6(eY<^LD<_gBxifA&}V zef;j9e`bE&GW$FKt2b%?D))WeW6eK*pF;9;`%eet9!-|}{bz2?D}`fQz32TkU#FMZ zvgJ4b+g1PAZLZJzBiyvO!}Hdk#Q(Yde-fAtK06TMbT3b_kJ?`7A5(>7;T>!yFsa z`&Lt|Umj8DXMA!oO*Z56#&p>?E4}TE+U`$3^GhjgtE!mA6X8ki4a#;EQ?BoeIQ}i* z{J-1RrkSoi%(Uw7@-t?g%KI#CvCU>T^so7(vHHiWpk=zJVi~rre-z9<`)hO9ZC6SE zt*UmFQ+Pj~bU*e==g{%K(q|8Y>&<^mtv5IZS>1E}eB+w^b?YU6LDw>GHa@uNcm22f z^ES_^|Mge(`TBePue>>m|ACjE&at1#3|gRhHd67u{N~MSua(}%SN{KW=19$n-^YvQ z?|=3;d+T?7d;R#U|F>!0tZmCZA@ejQ{^$2K{x4$8&hMT7<--5j>9Wu5tM1ufi2L-K zdEe6)L20wMEX{pA)BcTp=IINrt77Zw8%Dt~5@lxfRKNiBajkg`!!7z$G84 zoQ&I@ZXTBR-#PziUw*G7yylgmXXuJG922*}neI;r}^xDgQuglXLFZ->HAP zZ0D7g^VQD(Jzn!??LYf}<!1EPDl_BzPyc)W(?2(Fp7MOv9Q$g$AAbzr*Ka;=^!caq@-;WD zEFK~JQTS9uX{b;Pj)?_(g(bmybUoYK5q2o6JxQOv1Ru1 zW$j;IIe2`Fu>G_m`lGDLsbe3u+8)V&b@^Mc|DLY+-;H)w9!Hnk9{v-x{*me^!MJ{XIS&< zLx#Jw^+W#GrospFWe!Bo{r|B3^{@8+UH{rXYkbaM{l3udAortR@}Jyh-bwv;*5b^s z)4z(}ru={X*Zt4?YoGZ(D?guq&woezlRxISoj*wbn($`-9Fw%-qov97o{K*B|91c8 z9Z*xY{p*Ck<*(~z|1H;+|K)f1jlHq_tiRLen*G+dTl|aH^5oCQ1-1Vo&bP0gQy=l% z`ltP|J-5>BEdE_nSCMCw|NHQt_sp^_iM4O9)_mETY5PgwE9b_*j|WwC>$=OzHnhqv zd6eK>9h>;uvG!=yHNz$IPd`}PA7XurVfmxg(YGUCXSP>8y3O{Q@A!SIt9*rpn(ikq zxBWFgU$VSnf_=^d$88IftZ&NjbWXA;IT?KZo3mZ1hqXXkDZ@$U3y0a7_O3de@-eJN z&d%)OYO@`(?psvDj=ncdo7`L$Qd4mBI$!C9&kJK}oLHotYd&pMv|E_F=yj~AU+MqRbx6gB1)}J}oxf;~CIQ7%` z`TMv3R6r|@Pk{Cm&0wzlKdW}%6wsReCx4TFS1P`jH@4q-@;m>td#gU5uievD_s=)_ z_?wB#?W}t8|NiOS^s92~`^E6uKs-Za^;=627a3(Kmd zwrK{x5LV(#eI=B|F6;8wuqLPCzr&necHidzdZIYh|10Ow^?&%k9xT_%6)s!Z-Jv~g z*Vg}!l3zO<<&()!mfF#Bfsd_e%aMuhv;G(gT~&9vu=4LFz0_lzl@cmWM=o%h9Z|pE zxv*|4qusX^#}_Y1mhKI1^EUD27@ohWyVWqp>BEP4{Dz1VSjqJK|*z5<# zuV>QNY94V^iC(t&`Hj`~cCvl@*E8Gsem#;3O544mGa~Hk+3V9Xoqoo*tgqYZyPwZ^ zU+%Q}Tl?n!<^PwXcgpq0{I%83lsB#X+MauT^~VqL|K^sr&8+_`2U@3QI{h!Z+OJYj z?``pY!=C@0{||mY_CK#SKPC3ccmHeL{J%RD|B2j-@z%A{mF_4|g`)|9hX;?(xcAB$|^QHgKyyPsUQ_$Kff)QR7FcD10LME3_x_am=^Z~xX;+avINVc%D+|GK+{e;H4!UsUnAvG<v`z7!NZR6!BiZ5_;Y&Q2e4;>70~XjOV-eSN?dx z_t7VqeU9OuX|{7CK(k(N7I828yJ6kW7gzQP9@k5%ee~pWMz_(=?RUT2H;YvB(|+Yr zBUGfwmuaw}eTM&@N6~6+Uyod8d)ejx&!#3PE4@R1n^nu!|JQ`)8|AE#o?q6`%2IFk z|4{vYJEQ+;|3IfYsQ)Y9`#T;M%%uNG4LQQ^vV-cuVgWlKDQ*Xceo_5J7f!*}WGWcjW3N7QZk z<)yF8ZuhrLEppnOW1qTBnCIik%gb_w?^|vC|K#oN3k}U;o>NskCQIB-+cnKoPci7E zd4CPtx@9MwWdd@GBTuL-m3_7~L)^Sq_EBkpr}Co+vor6vrrBR~cCXe+_;~Q3+#eEe7iWZS}*JT(YHG{*glwdUGA3aoqtz%{8(GD z>%mcF{*7`!L)Wa{d#nEQ6?5JHx2~{NZT(-m=PK{MoNo*7oCGCgd&`N2muJ>T*ESY& z%-i%YZFc>ier@%C_P@{P#GXkzdTlee3}|Zh@z3jjul-E2`knvnzLj{UVkk*{{ESyK`;c>|3ALeydq)8=rN4>)W5xzumbh_g-&9Z-)CCEAfLWy$SPwuC%N4 z$Q4iR`nHulFZTbH;0qV~ewn(Q-_{U#e*U%9H$vmB5C2W?@UK38O@5oePf5@+hkU7; z$8#6{{loafv9tLJgGUR?HBKkFr=i!&lG_g^F*VE}SMJIdvYwtXMSNCM;^m%n3kBZN){?{r#ulU`~^!dftBGczq|B_6fQ}^b^ z#$tc#w_A*F8&`ffxX;?ujy2;czs-jOEk*}*q}y)4O5T1oIBRF2b4k{oYn*jI((_XO zot5c-y}0f6HGgpB`M#v{%Gbm@0!yW~3sr*FWf<^-T8SSYtgm13(Cj~G!Z-ih{g*;3 zUmxC~=w+Ix`U%uMPn84h^O^lO{QM5vJJ0Mvd$5$B_rG*Ps4Ds=VP9_&_b$6AoLhd! z^Lf?p_I-K)TBb~qJW8&H$+`Z@j-RZj)>E6%(ExvbOVEv=N9Od%&>IIaptS{8pIvK9<{l$a7e3hd2t>xeMuZTXq_y5MV zdCuGBPdNVTkziQOql85Ejd%WK@7I4@AI0wT=tWq~+wATM?1uh-?aJrZ-Rh`qy3M4_ zIiWe^lE-Z`PSv*y3~unmmNc^P)mQMxSkg}M4& z(+x+XlcJV(2fF?1VEKRKK-jtLngcWUNS7Ub(fGZv1NI;$!T^$BNq%!+YvL^MwYIAB-*QeZqau$@g~6u`l{}K)=TWB=O|WMKL$q z;;TOr&Q`oLdee3B{7>!Y`fAK|X3y8ZTy^s2>cEXJKZiGG#8=FU%h*!gaq=ba|s>FSr>!7<^ zTEdC_@UBNvLGw3t`O8GMoIkSS$C14nD(iS}r_bBb^5RCC`qHOsGj6FBUNF!5f3@CA z`}fUlC*psuIjz6{_wjW*9<4ln&gS!@$KUUo@BIC4xBB)wMc&^9?CbvgXgTd6r^n1G zsIRo!rH+`Ro|fA%|GC60-rw=jct^<-%d(uJbC%D2^me^i^v?44o6YKP_4SMR3qSw= z{;|LQ=c?7~tk%~Se_~#%HGN|IF_-E+*A-m$s2iU9%l_yuSJj>U0pbe{pH%)&-dDCZ z{bzu@^u4VDeGjAi^d9}?FZ{U0KdRR0_QKc?nUmjUUG%G8;cjR3BE0&Uu+kLe7fO$k z`_u2YvdOgEDD<3tz4Ei_wZ_F~Z#lFVd&e-Zs(Y9bYxr5 z^=%XM_f;fkei68xP`%Z1PRFajcTU0IU3K5b+rA3y-}UI~`pUCQa~tEUj?0$&+`2wj zefyo7&riOI<;S=yW98weLF67?fC7_;cq|o9j=yqXTQh!k$#ZUz4aCUonF{>eOJG>U2kEMWaj6+ z!GiORa)pB8K4w?;X5ZeG{Nsi8tIPiLs{Xg|RX(cz?<$wHudp;*W1mIa+{V8@5|h6( zd-LdhezBt2`_^geTfyoARnw${)+HRa%b0Fub8F!oBess3eM?vHeeK`6{1N}#AEn`6 zk9|0LKu>8OvyNSA@{gjxw;88*J-TgIxFYy<;J?pre}0tz_fWp>m#F=>gLtY2wS`$l4_U=+er)WoeN#OD z*Olcz=1=(JdF}g__T577-S$jSe!I8h>7C0Fes_M)U**2@yVi{da;&kr6WnK=cKv!m z^3nD+eDx9iCQQ#H?4I6Q`{PLM3U0gaZd;~*>+r9=)x5yG?fu;e;#0Q%zjjzJ==Zhf zIX{;7-Zwa7_W3~&Z*t`F^Zy)$?D&k*Mk?wq}=3UPo>y_nd)2hRr=2opdK9`&S>5HW1Pg2kI+P9c# z?fZIF{fXo~`>ks-YfrD$wp;k)$i~3iT6RCDD7V;cn_N?RRXI2AsC&5VBWZEzjfD%? z7{pqNguUnVd0m>|a_Xw%`I7Fk(i4v-+I;F=+#SJxn@8p+-->P8b=vP(V!yPNdHnA1 z@8CVMW7|n(J+_Zs{yS5j1j{d!cdq$zWZk!`Tkmy8KM~chzIl4y$0y5ep5DCw=b5?s z{oLvO+wa%?{!(wXNCJEi6`?G2z|r8rc18JL7ux;ws_#5j3y-h;Dt=4#iFkCh-Hmzs zbNIij-l;E;Z>q3#pH=fdc!%}JbDhcI~=%c*`Qc>%Ya{b~x@V)qK2gUGB$u z%dSa3x-Irv>Q>yTqw4+aK83v6Y1;F)wN|WUuiN`yNM80-+mA+CA%dQZc>u1M4yND&0y=O~&^4h;{?PZG2HJ@ZPZhQXTnrwU9>d5xK zg@4`sFYddsjaTOF;`P0^{@*&k+-$D-o(HV@73V(B`@Tnh*SA~QyZ?W$xE@>X`>wu0 zi?}=^W5Wz;Aw9WMeE#h}{U@o@W6gf%*Z*jywCva+Sy;1*`vI`IYwHm#j{%SAx(|i9rGUdK*2!7qT-u6w!|HrcYl`lH{?f5J2 z{a@g`vv%c=d;B-qKW+{GIJ-0V$CI1(j~?CD`(&miv@vi(W8sOFORib0+IF(B;6j#U z;oBAcvaLoZmak)Wx7-EVVd%?#W7~q`j}wHIl6c<+n6;f}eRxAfpnbyeGO7H?SkUCU zq~xRK&$p+?RlPjF@88$;^=`kPJ}gm^ZTmnyZ^oW^?Ln(hwO*{Z_4ROi@p!y*eU<;-qL#?EBIX`t)>+25Bl1> z{mnVH>794hb|lB1TG_wP>5hAhb4iwD;pr^vv+69Tf6L!$?0Go3J%D|qUfJGoqxl!g zy7kkZE`KF_f5wd;y^JDI;cL}pr57%nMV#>8wtx1Y z{eNGr|MyCD`~AY>OaI)wIy-OI%HQ+*YYXezh&g)kL4o0c`N?~qO!8LyV|nfKdHeru z|9`K|-}`Xi?{~lX*G`qs?fYi`-@@(kyk@-OTw)!tXO^Sh$=!pT#?C z{#@I>Z|Z6H8C`@*2+((s@|L69Dj8SK`*uYA$g(6U=@(hYe=S+-E&I7MKZM~{KI3I~qd5{20$dlhRlZ7Y zw|Zg8(RO8GMXAcIsu!OMI-jd#T-0sK%VjTQ53&wfu+O4p+SQsbS&}zye4aMjsAbnF zgLV7L=3m~o?9VduJs*4d_x{~>TW{ApP;Gj@=JS(-?1A0Hcs=pK2cv>pnafM-+rCch zuX*xhPx1M^U)Sc>zV3Z{|McJUYmdff@PF61(_RqnbjMoQ>64(Ii^k`Ftv0U<|36wP z_cLx@Mt8~C&;K}M-vp-B8lG6Z=F#lyo0jLg)_3?@27UZJM~=JZ!;ASp?y-0F@B6F1 z{z}$j*X6=~v#+>&SW9Z} zoU)p`EoHL16wgOaP4y*v`~)u9BrQn)t*h+2=TY)un~zt+`!BfH9P09y5_}v!|I?J^ zd;Yb@|2XvgPTlXfKffiP_a!PDxVJQZ%YUZUU;8FmT|B1X;FI9_f1aeT-}mcP`L<>I z_uAfDeq(ag%j2@$(~FN>G(8*J{qzoh;4x>rq!WL+zx#jPckH+Pmle)`v-)c;-MQZ3 zUi&F4_O{89@a-$l@BP1M%{BA2wYQyrXSADn3cF|3e$l*bzEN;CTT2Z4!bwbZvI^Gc z8@%227A&6oDtYp+SC$P+I)$~C>@+l!m*#WY`uxDhdikx~Z2h^1*{WKuxb~amuCo%o z&+YO`VcYBpHn-aPWNy~ygw#CRCOdcY?a$A`_dF8qxBuV7z3+RQbl!`9-;?+Ky%9mw zIjrtYjQd!BZfLj7Ika6NfA`mG^%ehr-~Zox?Zf|-w&h!oSIfNf*)#p4UE7xL_V<2Q zTt7UQEA?9b#dmtgs%1}gW_NG-ZZa+O_KU*h!LKWhC+}XdeD5u@Hv!N7_UEqMmb1Lv zbK7K-UrUav=iM@!EH*!&x@FtSM~n9xE@Yf7@}@iSxyNNq>zpX2O#aGA`E!a&Rb7qN zdRw|o4m;ue>Vd%e(hbZnoqb+?TH!zYqUdyim8Dmg%00c}c*1=PW8K!r3syJpE4}D^ zf7c5I|E&7DueJNXc<(Pc`SJHV>$0<^*L~jY>fTCZi{WD8gFD6N=h{5v^q;ZiKWF8i z|CPtBe;BV>pSO1ZGTVFWD=xY%Kk-?vZAZD*Jwd@BzY~AC7aFZOeV2RJlj`@*G7s~X z-CFhCY_8MqMBCgeR#Ph5pUf4ge4%v1ZNACVN7BoEYD=T9h4foI?J&z&T)JT~Z>f&5 zuH471U9vH&FA644ddoU%M@i3)xu$xSE!PT*X1GoNwL~y?=Kbg2e){R%S~#zCMSrf- zYoX=7EjCvadndT9(#yQGN5Wa2ImPEJC#Tzeo_RMvrS7G7{H&Pjw_CH_I(CBE;s;J1 zb@=n_r0KkuzDSKwv$GDr4_$q->9pSLIpy~%C;$I7z5Zvpd0hS9`ivR#Gx){jzrH)# zE#UMn{?D|sa{KuE*)?DPJ)Zo(?)~1$+VA&Oe>y5A*YfAUW54--E(o8W zW3#!{zwSupWOv&o%irGKZfEfG6)(Tvzu#N=eb)W?RXbUK+XsawZ#JKw_uc2w9*K$<&hl23AG_mi&OZI0UH`&ae%7+v^Y_l* z@_(G%NgFX zdB*rzv8aG2C+W=h&F0oWm;KE-y(*&n&$CtA7VV$gxY)*g+jlifq$8bQNLE}~ENA*~ z&gY-2*Zqq5{q(+l-p>Ew)jvMW-z{eMMqMTM&Ti57F&gTA`@VK8KL5AhNiMVWgn09w zsP^fFA1^HCiM{RAq5Gwyxt}+8b$?&ssVv!7iVqUfJN$QA-BQh+Q*}h}QAeiX+3jbn zO!u$e(I?-K7o_0H^tNHi#llBZw1r$xI7@z&iFq5Cf1~Wugxr~5kCZ29Z136eV@mZ! z^CRl_ty->ZUaM<$)Wol2@2$L#E0^ouUQ}1_eD!u1f9yxjO#Rd=f8*nS91^#C-|1g< ziNEgm?fdg;zVE)D8(BU5`Ihd@)92Oyd$RnzZGKVW@7`wDqUhhpp1Qx=Rs89p^}880 zW%Kne&HMc0vbuilw~Z(L?H~7?Y<=!j8kWe>&cwY z|MT&Kv~+h%{+fFicRYS*WF!QSbr~7vKbwDF-}|ogGTR3G{ZDoCUtap7bTR+$wS3uZXWh$gF+TeK&$;(!Og~@j zuPga<^L$-d-p@eoA8+sfd;3y9|Khjpd*9~X{cjcTZf|B7w*N=>{u_ViPulpc_UGyN zc{LB1Ki!nt<1N5S3!>a8HNX*Do>vf z|Nqu?yX*IM{*TuFdH?p|(-!g{go~~_&EdblSO4R@<*B}3FFaKeSa_#e%zle{|M6<| z!_!QUDzB?J?!4zYE|lkVrYh1Q(fpuaD5 z*~-mjj46|wYOMlVZR9*xq=sJa^WMkeA!H_FlCz+nZ*qr)|50j_6xA zS?Kl?{*V1zZCreECxuNfGCc8kW$yMhuOj1XZZE4Xx&I|tzv|-UTlT4c?f$Xc$lZR| z?cTg6rQ$IbKd(QJH>i9RS(a^C9KZkjk0*1>@7Ps-e_Ne@Sn0@h+y6J7#P5G_=A^JZ zU+d}9*Ym3qKArQwZ(jNRzFhpiOL`{ydp;aG=`8n2;Gf%9udV&^_I5kJUW>kN)TYho zZV4}eXBcg`%)WE~2k!j_m0uRi+g`1||NEZ#&tvBME-p2%Jvfp3M2v%LwU&s3{lY%kR<^XaDLYf}gG&X8Z2U@zmx;@VUk7e(A10tt=mVD`@Gf z$oh`>uis^sE6x_m@n(=H5j%9ISiyI3vh3pt0iLS&O$u3Lh3VSbFMEG1>D$I3dh7X;&3kWbl5MfMX6SO<^V*`=+gE;Ho?rX(wERWAJ#zoI zuCL84x*l5|xG%fXdAG&y-u4(1%hi9<{%ak3ms>CQ`t0_5MnCo6D&-1)YLmA%``J6+ z!p!ou&&o*Nr}utG{kE&B`4n%rZKn5$ZoOR@MIVof=l@JQqNV%feD~d&&u1q`=j}|L znst$v8CIBGJ95BJ{>irgdu=NZa>p6$e9*+LRjNep5(}he{e(&J~x9PuLO%S^uQ1eR3w72i=!ZTLSvS(X${HV>k zwqMci=`E$W-}?J@+;Y2b)fOsloh|BMrdhTk=|<$IH!_O5Ca`GQ#OyLmRJc~e>FnRc z0Xj!&zR9Aqc3b~0x40$$$oglF`mZG6sPh6Ww_RgmKM9=n3GV-=_~KK;!NcJ%j^tm= zjLj9Qd-A;Q-E%#=_kTXiSAGrOXS8#BZFk=GL+0}Tb9dX^e*1Lsju@wZ%gZ{qy~}s{ zboO}t?@4##?fhnsMK<8wV9@JZ*57%k-UrRdITK% zt7S?%i=Vsh`yRh_&Y!M)+t1lILYDtHB3dHyD*X46m)1YO%--?z$=cXAXKwM%H^@-; z;M?din_Y8~<(oZAJX*G?9I45%h?KB7Vce@%)iL9daL{$n@V5c&?KZEszYt?&{+%Sy z4Ni-F57f zJUBn`bG@kOzxo@g(_^pwoy1?QTdi09q}TkO#m;xTUhmp3vq10R_uBj4b8q(N?|9gD za{r&x`$MMc{o8y0_uk2y&sk;9`oA{6cJ=1nm)UpjVVGNfukvzLczkW?_xd>}XOtgo z^!-=DQ?J>$Kg{v=|CjUsWgcREq_yb{>l2%KKgBKy&->7FGFk5PjFWTA?^!=uZ^E>WUzu(KfyW-{2>3;LREKx75-zOKl^P$d`H>@hfEoI5wW(9I-c^{V-uHX4= zR^Xq?WYdr~?PuzDKJMT9(_8eM?X!nAk=I$DXw^#hS?B(KX1;&t)A}RH?|<+A|9iVh zwNLs~)Ao(aZQo`J*EvW2^!k0&<5=VW&QphHHLkD!bG&{|o%i&epS~=&-#fd%M|#gD zzMpFE3vzjWFMGd0F6Obdz%#Av>^I^+r^$W}wb;J@x8S+YzUkY)TT~pezf@MEQI~n~ z&yu}=9;v*ZR`ucd|3$~+jre|?aeY5^^}24?y3IxH{%Lv}r$y$UVXooi|Hrj|Lyyhp zndj#`(4V?7zx}Xu-QrXC|Np(8e=y?ce%|LAWyh~w^LyQ2^+U!Y`TT;pfAo{;9KV8w z>#gqh`c17YUi?Z$4&F#|ekNNrbx8&j$?G*p`@0kAj z%7w=jH`E_|>-;|8#NxhR_qI;>)_2Te*R2J7O|qX>wD0?|j8jv5z3cMK*Fo-gq`KDY zZshE}t)G+7zu}&IXTMyMZAq?h>51*O-k;*}eG5}>xh?Oiy745sbKBBu$qh%AuY0SMx0_S&jp8lV zaM{nCf~B2{nc19V{`l{ESGs=pi!;f`&pmH_(#YNr8~ZP|nz8omPw_Qzg^s=7xBX}T zDS!P-`hkCUPoJN+=h@D(TE-V#uJ8Yzsh#})$G_^Z6^8Ls#mns&BA0(Sc+yW^W{t4^ zwnN}5Sb-;J7NZ_}{j>DCG_J$#cWMm&?0IgRKkN9>8?*2Kd8T)E>D})5Kabue<*W)& znp17}>tes(x?QhUWxiYg=hXTV`8Bf}|9;=|+*WP(1n)EV|D3&l=TkVh-KUBDCDRM7 zYbRK5`JZ0@Eq(I(y05F}-hIe=9HgW~yuW6ForvDcdw<`Rum6&Mefr)8na4A`kBRSn z;d(f&ME=$O?|a|B)yu1Yq+YjZ_kk5&F-}|Vo4vL3SpW0L?f(k%|NJ@s|If7U<*N>- z9%Q%waq!)wozJ9~+n%qww%NzedB@KS?RF-WS69bvU22jvs{yB%XxBXm@>GOg6NA$HXN)MBMU$6gr zeR(~f2bH_0!(37p%4|$-c8~LH10=N{*LWODZh{E~`EI#$WS+`N3nr-L+5I?jb~?u)#g9V4>a)LUUS7s*aHM=f4tJ^GtA($9 zw`b-goi<5D1;{MH*#qi+`-rvB~msq6dyeHEWmcT6(< zqx8`|7HhTaFVtQBVsF3b@3D%Xx)(!pdtTnZcI#7q-j2FYM`i0i*RIJs`@8Y@T)Us= z|39{z%zeIb-q(}4<@Odo&EM~+{&X}u{P~(~P4~T?vTpr1Em!w`?wpNJp8lU#eXZDY z*X^<;aj;su)X-p$OTzlc%;9oJxjptZew}rF&#^bH57q5HcAi{r|M#U|`~UMNjQ~Ryy1Vqm`~Uym`~P6O=O_O}@0UVt#leGe=PVQFeaKyG|7)>* z)DPdqQRUmkC&VZnD%?9`RoPE5t@}N5%BMY4`uH}#{`a)gL3KY@{S}J&-g_l0TY~+! z|Gy{xySkr6eS4E`U;QcA{%f#lw)dR;KLs}fQ!5xxZWoIGee3$W8*KY5kE&+>{dT2b z%_~+FafSSv$I{ztE^pno_}I^7lH#V$H(#?p$@^_K=l_=1{r`XT@8-7GyLbOXn|aR6 z$zLaBZO`WGdC2-?(N2HK;`yh~RUS$$`1^mE^ZkRaYM;0M>dWdbJ+CkKK{qb-;*7;ut9jGxN?`_R5S|Eyqm#P%DvJR_RlR~)xqc7Mn1)4L*`m}j!TmHc<; zV8ri;!!ds6f2VCO-7%x?UGe5u*jWq#gsJ2UdGZU4`ESFhAOnv#6kTJn7o$KJ~eeOCU6(^{bJmm9p+ zy|zT)wgy{S#g2LTJ?aInhjpPQE(AdL?vbUV(HFxRWetsaxZ=ZPWwam!i z*v}lY3I=Dz=UXKhHca`baD}nmJ@$)-@_+m4_fk30Vbe186i(VaR}o*zz};*n#Odt1 zvx|dCOhNo0caWpDiqyi^3h}xRs}HUCcTv>s|0n(|iKDItCc=*1t5$7fSt2UX@@Ucu z%}%ElAzruXYt0rtIq5uUy4?9Y&m(`n-FQ8&_`K=$d+G7_^poZp9xIoBACo=5_}cE{ zG1tu9Yzx2DeD+?yzs_RU2~H3Bg{Cg@ANu8U`<<(wGVg!XaPRV+xX-QiQF}JpvSsxB zd2xAN+@4Q2Kdiq!{raBYr@PJf)&E_5@Yt$P88Y&}O`cg_{rB^Hecko;+Th2J z1UQ%+A6O_}n9Q-dYI4Jqk}Jw`A3K(EKT%Lu`zi1zk-z$e-lm@8djD>%|9k7fX-$z6 z6STfgQTp|-`MH-;Z|#KL@0!2Nd$7Xxjrsp0>UM^6IBuVh`#M`_!n1}gjWZsyT&X*x zob-CJ$=B-dyYKI{2`tW->=u-D{@qRQ8xWmFYYL{=c#UfVEs^u< zbMCp{?=}4^Pdz&6U$^Nk@8bR=Pv6@V1pTl)ryu&^MADM_+?EEBl|7CM94w6r0xV4j zJl!0agf1^PyEo+A5Zs&JC;97EIThJ8m))^B~eN&nTAs3%4Lj|k-R{n;RSd0F$7 zU$3^AP5NWda#k_t81Jq^^DeoI*QFce<~m$ZHf!pp5xi(_2C&pCoy_Wrh|J^G7SJ&KS&zx#+nA6k)2_6Rl3to;jN`gNc{?xv& zzW<@NwkCrs^56+iUH>N!51$l~_dS;^bX!=V%#n$cg|W@S=c>E)xBmOD?JJ%Y&Y!0y z`CFmS@rOpU`~TS*PiU_E6+3;ZM(kHd%bgz`*X@3{>*2-~UrVBTpSNhKx2|&dQ2XPs zyqurrC)rFJzHQUJ96mYP)@n@fnII&@lW?|EE8h7>;jC`{FBAX8g)(ijZ#}X&tg=^2 z;Km*{QMqEy&e&8wM$7X2zu7bPy%5}^rFnXB=FfRPERRyoRj*T5P@Jn+W7&A(b?4+& ze><=B*Z+CUyiQ=koQUc}!t)HiJd$5u|M&IuBkxwtm%Z{pMdFE(is<^8UVM|=FR#2e zyYzdF-m`BtGaj${%~iIitg`;|f5CT#5up#ap3atNY*_cccHipF^Gx0vKDv0;=9wrY zsek_1U;pP3XwW?1u)W1ok9>~zslQg)`&SuV++p=?y=NWY=W@nFobGbrYd)0o^v6Ga z{_)QI{MGL+-}ueX^iRF+k$RcnNAtTSmp^nARy}zxv0ot|{(f*>;j!8@9wwv&@BAR} z?fq>6n)&w>6>39TVz_S~Jfm8!)PG3IsZp?grvu{_fo3mFvi#d0@WW`Aj-mllp^$pvVOll*P zUOXvheif4}Y!T0qBei?))!9rQ&k{sTiUm%$3Z(Ou9=rCZp-;BH#j@-RNA1RAd9^t) zwSSjMwa6TaJpb#+g4I9QCjU)~yYT9bUNttO9JI^M0O5fA_1;lH*YP->dPmF&42W zGPPRkUw_!)b3%mGXr=lREyk0Y``c}vDDL7{S^uQz)W0RK+3h|wHaPqXD<;9?LKly}S2f<^AgW>8jJJZr8moeZO6ae!G@f~xnsV-U(%tjE`?9xATDJPv)89$^zh&<)yJ`CUYJ5e6)^5-L-F#CwJWlui ztJ>~g|Lb!1_Wgg~I=Ah#zwcr6_3!ohdQacW`Z4_er|=xq0eQGvcc$_mqm%l7FX{8z z{mowdzdBo8sh$m7c0(%OCyEF53oE*x;`Fc()&IvF>B(FnT+*Uo+quI2>rU-)dJeC^4{t@c$dH6HTI&;2@Pq_uV5 z*DYt|atq29o#xEgcAv$8fnl+*gywcJB$Qp5U-$-&Wbq zt@@u2otW7?=SP%${U3?!zw?f+wwx(^I79FCb*nF@{+)5{y(d4n&RSjJ_T$VS3W>r$ z9~}Na{pe1ydWoWywG+NfIbT~A_KN@CpRL`+iww0d-+SQwcJs02f0)#Fn2Xm5Z~f=? z?%B+5ZlC6#+xXt%rnIOpsL27U!X9@z{C`;H@3iLCFGv2W3m+_ePpEOQb#Se#Iy7;I zmqXE|uHe3}@6+Wjo>Ep1@t6A% zz1c6-W(!T2^Xu`K_^JOyGLG`^KW_W3klVv$snCQ8)5EvF7YNs?T+X-YL92ev!qbUQ zc3bRxZaZ*m#&EVJ7r5c@aoU}?$~P;ZW3J@o8jj)~mUCL~Q* zXY+2W5X&#abBYSj-}V056JGbky)NZxu$9HzU(3w*X8z0w`m;Lc)4bQ5C#pV8xYJ+v zWwH4Ax^J7Orz*_7|LfXzz3V=8ua?(ky@-Bl#Wbm!@#mq4R;epNS{t{#o0rdAoPDkE zs`A3sb1jz#RQ~Vv^f!9={`^*{-%HeOGe2HgZdbbUli(h2*V!NbJr&UxKQhfe{P+8( zYgnGl`F_-jY18(?M@5(aU%zJiZGX<8mu?>UamM;p7rVu-$Clr{B>QRNb*@YM#lrs9 zM1B91-~Z=Y>Ix5C z9t8d9XP91WA$4tn%tw4iO}8)o?; z%^#uhuV+setWRE(@AvnGWa8SsiNBs~zit-$Y<1m>w-Y6DUu4%7<@(;aa!qKP%ht$G zo3_2IJE!(F-GwF0;DV&O!K*J9^&UJs9s_utQDOrLDJeEl8T8h98_zE+3%=D`NR7n~j)G9GQA zhcwmvj(zyCx7ovg!Pk`L{`-$N&iQIs_BF8nisWyF?f*CInbcl;_WS<-f4lo@o+ww} zdhZ|ov0@)6F021k9bLxqL~BkplaSF0yV6GChVxa|Hc!*_aQMV=e*W*B^P^wQ{BmRQ z_U^s;88mpws(!rcp^19G{o7P*!K-1^eGO&-3;FS!?^}iT}SRdWTA6 z8Bdl={rk24e-*F%v%e?Js|I;{1_~`?nwabVLrGJXjhZcQyE*+Tr71x9%%v{vp-(POm?i7pQy9 zeH_nP|K`bqLwfANobIJ(ZGKoh;tyZ^BHg#>+RneP+~<5f8T@*2ySP*P6}iaQ-ZExI zO7D{QTbAYad`qd#eQ|N-b-~}ql0Nnd$MC82@4Um1J?qJ;*_o%8E^xmiQ*7SpXE^=e zi<75$1vy@CPJ1^?`uKl?H>-W8JJ|%ip1t{e_x!JC-|o7#W_|CkIS*I=>`3>GKT}(1 zxc=+f#~o)YXX_~_wCfk#nbL4ZIpQ-%Se(a11p$bU+ItT;a(dXY{M#u1dt+>h%iG@L zOTWp_`z|k3f7!hD@&^f<#}$9%?teX@xjIzd=C%1Z$9Hw|ON8$W%hW7a?Em}bse(Gg zZ;5Ni8yl9ihwu9|b+_O2Z_Dq#nEL+2zJI@7&(v#u|K;~1@%=lVv%FYUv9Es8dzaOZ z+TX6Odayl7k!AG{4ZkdzT9c(Qaey%I>;g zrXuO;#de$ISAI0F|7?D^eAT;(w|^|Z+m>Hpc~Ymo=hyq9HBWxmeXp54Biv`Eyc*-l z?0?hie@>s?AGXbG{mtjL?<@7%zaPzx|9va*Y`MdyT@k8#rX5`5rK)f-|JOc9lK8nV zK5p^t3Hg7o<;U8*&Ge66_UPh)3HSBuK6X#H`p19vam~cgziWQ|+;acCdEG&$nV zmKXQttIwO+KXHEM9Hs9Q9}29R^G5!6_3CFQY@q!VP+h0a+4#;{K~X_;hX`w&d!DQ9 z9&T~7ozuMZ4y{i(K40+S{CbhqlZ}%?zD!=6=$ltDFG{{X=by6lY{M5PZa%*{UvOpi zvtz=?=bW~Av-w%}=~SEIbK=dJ}i zf67&Se)Fg5k*$K@bJw^QnMpmzE^;54|22E=GPxtOQ{tZ-{< z^#2dry1T>wAGSYp>U%e&hr)4mO-Oaq{}1}_WA^;ouJ`t$f8YoC3!k62JFf^n#P{U1 z@}__9-v4{&u&t~-(<}>YEPVB*8h86FXu6T-iH^Q9&(x-jYrED zDb6WsZ20r<{r`WeKJ`DR*YEuC_x}ICPiLLH!M^i%?F7FZ|ALxjwcAzi7e==3yHb*}sIHGN*DuCS7Eoj}W}Rg>q{^8dJ`ZM*-=QvJKG zudcp-X{^3H#ByzvE0a*{edqc|>yE9R_5J%Qb%pFR%yJ(Zjvki#w&CF;!zrcje-zG| z5ZoGSrmAq#usr|CgNa844(v$_Ke(%0l z^Z9Id`TpN`n@{hm-p6|;TmIa^`ZprxDX;8h9{l(IdtNPT&(E{@a(-VT`#1jo7vis< z{Mhv1|5%Yaw~xPCGoGZU{NMMM)8nzk@;&<3{@!`BvHpGa{oOlWE}NaTvazDM=JUo| zHeu7|t0p`3>(~E0Jw0zuT}wmDjF75Bo8PCuI&c2TulE1f<*M3+dGlW%`?qzYyyJd7 z_Z(O|y2(MnqK~7bKcP0~^~C=Vyj2dZG;mjce@JTLVaI-hQ#%cw%THdX{d|$V)w7sS zhG$l~u8HCOsv`H6ceddZ$1~k$_q;gkyvFqE!}R1NP_J6@QuNRx^TdsB0 zY4V-Bu{rUayvm)n8+&+nc@|x^c)c(4`Z0zD`cfrF6wky?K5lt{!)rF5`N7#s<*QyB zho3pvp>KE3p=ib7z8%Nf`tDsc-1O{GTeACxmFnB8azgv(SFSnVac=L!_5NSgpSvq6 z+}`m~Iih~c-{Wtl^8euq%87*z3DpKzxYvEj4A+nQnX}{W+tb5?@4i%PwV&u$ z7L|SXfA76-J;%kkFaFg^`F+=qFMnnH&GFqX{!7(O&2wsb<+Qo^LM@Iy>72Ie{qy6k z4R7|_^9KDeuX}9H#?(CT%9DC)UN1J7|9Q@HoeG{MhdSp;=j}-RnJ?$}*fGd% z$KOdYQ@tF%+5R~i|L5o<&>G%Vznk7StX?jzDEC4XJOHHFW24%wUpV0bM|Ja&b^RY> zzslAXbDY>&-MobH|E}_V>g$A-3y9bp5_vOm=lh-7jt%~fSrdEwYv_G7Th>wR}b3Uq!fJ{+Fd z%UgIZ1|GM&U2-$~E_c=U{Qp-< z<6mrf{QB0f8#AuUeY{zDyApO5z-%3rdD?Pb=xX@0YyIzCN59vc z{~oga>74!XmX25FF9HqpoML||@;F4W|HotIM8Au+j|BT8z8z@cpK<@kG4pqq-fp+h zV@dhn;r{FC6w&3=ethR%e)rdV|24~HU-rZlJw2pv-Mfx+28YhuQj%`usq*lF7e|<;@df&o^3Jz z_Umr@jsJhn|F1ci?5X&yBHr$$r@v8-gf^q)^V*H?o~PAYO*>To_jg9@03DpB0lV<4NU+hweWN{NcKPT_UNx$4_kVc*T2oR zdhzkHxOMU8==rANWhEY8lh?gZ$f>_#^@`7CQo*_jht*DonlI=T6p&<`ZW)ws@@to5 zjo{~vY&C8tj{S1Fw0$Le!=6T_T-iT60&8o(Tr(Fp?D!fPJb$9hK7m^$7aqFnn4b`5 zw!A3#xc72fT)o?uX9jN8l_wr@Py8GFf7woTh3LMc=j~rOc8kYX+b@fre1GTH?(TSv z{ejl%AJ5mnH|-X$=l+o6U-vw@T&M2g|2sd|zTX-7llS*8$E$a0j(nc)<;U#;8HZQk zm?Or*=jGsZrLZZxYmJhErRJf>U)JUA&$)UUG^6$K@ZC6jSV6n^{NAj)^C!eSUHoo` zz=Sy;Di3nUZD>!~a=z}#Z^25HIe5j^Q$h;o@V>y`>J^j zZ%$hLYFO}arO5TT>bLXW%RgNb^q=FbCCigJdq2Jpj9dKGItVmb!xw+`g0S+Nm%90t zrwh9B-c`Tz5}fcid&xRW*<;_oYrcN>Q|8Rs`Wwlh0r9WDgeTct+cEE+?CC(x6PEA0 zOYO~n?qpkeUY}RS<=gL@d*gMU-0lDWqyN2?>k>-xHL-*0~MW&xLmHy2MWg$))c6a)!An11+2y|*=EW%h06^B3FW8|^15PtN}v{)^l{Pvn1aM@>ne7!B?}J@)<5TA_b+PfYy(R+o!1dcFbe z7<2I@d z`mfh5|2gV^9F~u({gOod%@_nxUdFKf!^dH>FT z_O0=YVpMI8eLg0gf9LD2=<@R?4WEDAvZ_7z^{@H9d)D1lKXO&8v4x4*?|_z#o9L$X z|K40V){$@P7zs;mD^KgII`nNiUV7*}>%RRZuY{Ar1lK?KyzBbjyo$HqP0j!Q-1hSK zdG`Z#XRp_s{m_xVfA@~}r%lzvf6iR`Wqq%}1f|J_@E(iBOO6kcO!N8gR2=3Nnoy*b z(`(6;|H#qQQqt{&F$*8-M2-V(9_t(}5|ril-IBd(etA;*q4U39WY==?d``ZvufOlw za`wNkJmhNDyo~vu7WJ;xvh2vd&c~PL*IqUK_hQTTm+R~sjQlT`@?Xt#`2D#%I^1>%X2&j$ik2v)#@KuQo5f`7`*@1?k55 z;&M+uEsK)3E##`Ic1o|UJ@Y(6CcEZKy32*nvJ=E3&L}E${%`z!xBla+Z;eN;zV)?r z&&!uj_>)wfawdBJ5B=gxZ#w@rs^2aD`0Dw+^1`p7#=mzj{`!5LzW%*miFJB8{y%!d z?N}bRKazRKtgx@U_5PK9_`HfQ$A^e>@Bh7fAD8zMRKY&lUjKXh^w(AonIF9W(f3}$ z?`GjEAH`>T-`Bo>bn|@Ow{`C&*7QeRnJy?ang7n}J7u?XyRYy2w)OOT-__gx?cVX@ z_m8jZ>;GPAJstttfET$=d*aRda*6))%_<4Ozn_@;Q@^FN?A6{A_EYj=ef_-~w(50S&#u{Y6<$5Bwom(GrhoOV4;`1f7?=P0 zanGIOMcj$Q$`dNjY%~<8stH$FpWTtsYBNVD#H==c&F`I=d2;iAe_3u{d+@u=wePlN z_rBMNe*lfZPi7IVvna>KTfDvOL+ob*21^&x|%U-7&s%7dy*5 z&H1oW-0qm+cjwwp=h};tyZ@I2$lHF-%0Hc||Luv!{H6B$II>-AEmx-2=5X2Fc)I^h zsBN98eA%_F<=1{~c^PyiGJa2qLHp~Ii_iM;#RxKZK68`Ej9RdfGvNL4LO-*%3;cz7 za|G-2-qqf2o&Pa+*PfqeR`0u}E^n4}F_?d$x!%0fsvEAn|NOwe_V1R*-ga(}Zf`>mOMYp{rA6rr2g;hGnFTAdu#sqzyJH`(e-~f=7-*XJBfeAkA}iv zA)!wb`MoQSgsZ@djvI~)i+Y3=#r5On)Op3R+OwG9g%HzhP*`Eum+lsgkx z*%cL*Ke^MUU;8m%p(E*^F7v@t`%`P4yo%uMaOU)RWOlIaI{SKIx$PeOHOo_Mf0|x9 zY-PRtXvHN~Q;SHK{wopcw-pr5*3YQk>}G$i^8DAG+cw6zIylWzesEZy>66uydEb}k zny;)^HMqaTKe>i~liiE+o*ZTckN+O~o%+T!SNFK@J@I4fq+fPlpKq`K^XQq}JC{pM zuirdUc6omO>!S6WKW^^%%`7KySRH0gNNht{W`d<#@! z);yg$neV9zGVjbLKXg3ei6w4Eg)t9`v8bVf#obK1<>-hwfteIlNylo|YHv zzPl&a%47cVdr$YD@RmFB=giq|KI_6WAJ>0f*&b{Edhy}wzt-&RSQ_sB)_3ch=AUj( z2X{U?cGCGU$6|&J+xp7PyLc6T`M!L=tXd%=T>kSa_2sn-mF@ri+L^a1b^V#Cvv%Lp zs6NUsulHJ_x!3Am#E}FZs~wKZ7`A7}%iNf;TmRaR4;(2ec?_@wy`Xj#JK&NFAN zZsv)|w}dlIdIMU)FwNEO?@NDu{~q0`Gi4;1K!eQFm#c!NsoqzKXnlVMT4*%!Ytb#P zwaN}H zB$cyWTsO#A^arq-QKMcb^Ja$Ug*=B$9 zSh>Tb61p$&;MTbP5S(EEuU)T|Dc{>dEKLPN8kUyIeq)Lx&76v-(34J`_G?gI^yzT>xAoG z&$z$r`J*Eah-^8douU6@^&{c=JB&E{zx}z;Znx!9*`2AYIZoU%?w`Bo<+9nUv_31l zJoxo`{r#^I52CDCQe2aN*|0n*IU^(p86^gH%M}Dz{H&OsvZ&l={Q0Epq~S)>9TIvh zO%CTe`5)K*Q7p?Ta$fT=S4DE;Rh!(MBDLAR&yR)jb{rtf-oM^3*XoE+dhMHE0S<|UwdD6$N%Tk-$(rUI`?gLY2N6Td}|H$6j&&J?~Z> zHQ)X*TfS)h(fxG{A9Te2f1dw7>d)8v_xJwjK7V)Xj~D6hBJO}R)J*40Q4#My|In$T zhEKdjS$w&n5-cp64wMN*xH^2QaO`lG+i&$Xu=)1Oth#9e6FwW-oZ(Sa;OD<9FrmFY z*N7c4Zwj70>|(gDdj9|Y+vN^LOrN4}tJX6eWEW)k&LrOKz;NPm2vdN3rGy(xeW!<| zOz}zUNcMV9+gFRGA69IeBP4L+?B!+7{x{aV&WL|^*y7ER$@6FRbnLzM>&01LJH0<| zSNgIaJZ|;m`JwHvHqP$8X!B}zmT}?X*{<(hF0wdX=2+Z&QG-|c)<(nYVSnd7?w3zE zc&nm0d;hgi_caf`nqD!VzA!KTe%u!0DEUq2e{Ee>?4I<7Ro3*y-fyjQqdH74zFZ$C zd&ARgRq_+1dBPLKZ|%5oO*!JEC?|9{7`(8@wc&kj&7a5e_J5lA?_d88TC??WrGIVK zM^Hmcz0}+J{+~lPi|2iwQ#*g%hfe>Rq>nex*L`z&|53&K{Ofnx`#))i=QUoxch>y= zo=aj+EtulJhQ^!jS^o9U@%lfaixVC)D+=EjOY&AI4e?a!& zYJ*kNyDzqH{I&AB|0MpPK-uKE+n;U-Ti?5=@$a%~%ojH?Dki%Tv!fbVa_M2ZuRfl_- z8S)qw8}>9joi(drNyvo@+36F(zgVA`}$3@HTRgJ|d_rk@GZVdaS1e0h659@F3U z@a5a4?neDa=|=U&(}`1dUp&_#XMbd;VUh8Vhs^fLe#s|$<*Q1HEY9rQP$_gt=7r$f zXItD~&+gv);PkDCk|*2js!DUM&h&2Fm;GnYiN<-eO8xxT2-dFcU%&N>@^Kx-moXbR z?vgZ5&Aay1ZHHhot7pKK&6Nk-R6cLuWT-rux~G(N?aXNk!p?j(*?+gmTst;lKKH@< z;zngl-nCjL)fO8B9gbPEwtpV?+>dMC^2V<9m&ty^QTDp_gMs`(tB}+3@GOMWx1e!t zC6-g1C%V_F+-KCht`vVr<9ZXX9Q(Oe!GA7&t(N;fXdT<~QlR_X<^E54&o<5bxaRCZ z8QZUd$xj+LJnS}jeyNRbqVgiUCRzKUo$k+m+}v+_%iWmw(JiTK=J!mM7sb_=JXs)S z_PgL-$ZSr|XI#FQX87Jzsl2;G+UdB=-m}8&JJ~v(tV+^z&pGpPv)oRBe5R_;377fh zlP*TiH!YJd&Wbt88vlAX|L>!2J(Y82w@>`@L-R#eZIW$jXRlOT?yjD-Rwqx{G>Nt# ziVNI+J+RW@LE!x#z05B!?PLBFbo;{g?WdcQCKVT%y%4OJaf)@};qZGaj|ploZNyJOp5DttT8WVy(%zT}F7zx|n$%lj_wIkw38 zjdcA_os!TF$Kxvuw%6rfetsZ1{=?n3=!)Ipth1cAV|9h?J^X!?@zF(7P@9U_pS5`QG_jTO& zs5?ccb#o<&$=6K>PP#6zY5KZt8#kv%g@mQF+cgfEt|ih|*Lyn5++6yOR_u^?ek?5R zL`7EAe2Hg0PgdVQ>B0AT;_-^o0_$r>uE*qBed(JoGr4Zf#pw0N5*D*5SGC+bkz4!t z;>+d!!My)^e(XNJi$7;_E6Z&Gscn(7mGx(DWve>E`^B)SkKgcFai4uLW6tH&e|F;8 ztrEootM$LWnR@Z~f>-_edzH?7Jig4p{rrvRtM)xPaQtuZ{hDhDQ%a6Zm&m=Qn7)7g z_qh9h4v&7EoYRn_0UrqjH}4>ktANz>250%nJq#==M?63SVbb$%>YcRiFtZf46xR@X zvu2}Vd$M7hU|y?W{F45u+)nFz1?!VMotd+i+`(V@w^Z$q?0ev~ z<3Zw+Fcq~(!x9_KxJ{9aaV>DIbp*{Use=AzcM6Q^%& z>i_NXT*m%{hl|dJm;QQspOiLTdUmXzTfXG|Y2^rME}}ddq7Wc=kc;u>m$H*r4{SWp ze_*n~^B}E@FUqY>Eq~xF)9)3!K`=S*O-zCLiw(x*y=$+P_v#m0sy{!Ho$RNxQzYlu zmD&f&`A1}=vtMt0X{2xVN#WST<9B}Dm=SJU{HP~=ZH982jWjpsvo6a!4cU$>XD<^g zGe3HVcY~(K*1F;~jMr;=jua*)yZqYNpWG|Kz9Z%y$0skoFzLc?sq(kh`umk|6lV*# z$36bK**xhEzt!tt_t{l$pCkYGOEFe1d|AvSBtTRV-RZVKSz&%*rE!5KM@;9QJ{G0y zFCAvjZhW17zj3+ahKJnugN|>LX{mbVl34rfm$$;Euq_+Y{P>bqo}W|2VW#(`H0QMH z@swIi^_-5MYx47dOzf5dt=`=)d=?`QavB zYjG#NtlNuCV_!43r^wjdh>f0aTI}}b+H~)%RgN39pB&np_`${$Y?p8L-FPg3Am~!v;m$GW7{Mu5cZ26ui$u2XLuchbN)_y(c zX6IUcHuUww5$3x%%^QWtM5V)}G# zTX*_4?tLtFoPC^)=8hK(+w~j2BwRZUZbT?Q+01_J+uM%$KR+IxzjyKSeHL3@8m-^@@hQub${x@lm?SYN z*+IZ!BZmmnr=Z(MjBm51GsQQZc=%?`yN4lP5}zF6w>xT4A-RuP$aW7;F{n@uGh8QM zZJ)H}We1=Ar^U`Q4qHw<|EtL9TKW^Gj@4D4Z}jhb)tl(D!oTkGj_^kpum3yIdT&n8 zk;v7)%eg(DbusMXbemnigsm?04u@3|%i_Fw6^^f3v-!-D*XFMI z3hEskIBr=vVOG0br(xg5N$p3Jend{6xF_aJ?{>Szrf1K0T#*r&aD5REBPVgCl8W+& z75RUTE&MB;zh|QRhPw3K3hy4cJ((Ee{UUUp>%OHs`R{NW{y2EtAl+o1#q$EAW2asx zr2EY&-Z5(yzqQ$sit8^rw(9Ns*4V$-KqJo~^g^+WL=YdN=Re z8yLT`xODRITSuNeIL*j(z{5_e_%Kr&Z{k}1#dSBnB(9S$J~Bt3`rOBKzKEu0bur1; z+XXKkw_D>a=VH5fdgYqW~y{$AOlm~A2Arnf`bjU~xfda>Ex5035f(_@6o z{-{1vk)ECPGX8U9b4e&DFwsq%4+vre&_UiQTB zguRiszUJyR^VfZK+q7-o*N?6$(km}NPxO`f_~m4V@AYr(a=XLdZhR;BC|L2>ulG4D zPgr>@88vN?RuACz;^Z!eN|x70x3xdt!tKYJ*y8T^z)PT{zO!kP}#r>b7_dShnbKg++CRu)W&N=8BK0M6`P|Qy5ba-src1-#`Bje9MWsdh0 zKd1>M7Z`o={@~nY^(Lm{Pp@H5k>QQbhfe7{TLpGVyiPuT-fqU>n-TKXW=R_&+Xd~D zBOfdD(6~+T;IXCm_Fa9rdEZmwLLX=7HDwA`+^b$Ct?!1vT%vmLAfv^`B|(JMO77%Kx66|K}vD+`(V1`ZbRK z5xarVIz|$%4|eZ+y_;?R|G%mJHy;1qf4AUr($u>CWD!RN4j(s#_v=qin0tfa-B;^- zANz!F*Gus;g>yBs+kI&4-u-@G^+(XbFai_K=Zf2K+i>pTD863gUZk_;VTi=X^uG6R z-!?72*ynqXHLuNb53h~j&MlG4S5EsmWA*j(Gwk-q2!B17=)ilRAzGX`+7#3;|1ds!NQc{BgGH- zCv+rSJQ6z3yr63FLtllrTC_#}QNg_JhFEqwoLyet+kD>dODy z{~!Nfs<1!RK@F0aHn20+O}kh1dTsTWK$b>@4RVZpv3Gyp`yMyPx}1+`()}4ti$6}9 zuE=?W<4KgNN6hNU?-Ny~aUbM6e@JRw+YYUD8zXN|wD|HwVctYjr#WWVt|gkt**eLU z^c>szQXqf+vqSwd&or|C*7+uOS_c$i4cRE3&ULn zEAs;~1pDC8z{zY>IWzGI{Y@BW;`^hlsdPT`G$!R$2kJOl8t(AVe9?TMiUqVa{b+3Y-K`e&|MsXWJgt1t`oL|+ zlMacenHRJRGzHXu9p1QM8oLsoyq-(_Ux|wk(`$v$`!>C9<#1 zc{ag1X>H%dy%PR*&(^*5jL$lypXmH0y|3?A&$EonXIof`k3I`C_0D@^_BzIPw%I(v zk7=ATR*&}>njVw6#xA4hVqY_XYtGj%hHW-iHrkav-gENRg~_)!`nFqKGhJ`H$h{|h zo&MJg*MHsk>Z)(($#dOWim_5pT|rt1d#gNMrqQw`nLn0eo!rF7ThINqjQg&9m!+|k zqopOL-7m*6!IWuEL(BJ!|JxcHY8-bz=-u(a`$6=cTO|sjk;*?ZCL3Qm_Ch)AbaYiBMt*0+oK6@2*Dv#eDIkNuGu4`{u6x*706t$wUJSC-j(Eu!S(i#>&;*6U|i1)jfSx^tz!-J7^vD}%E?BIRe>KFsI) z!eRDUQc>Z2@`LS+I9fReZaOB+Zb|NsLJEQ8$$3Tm=8kVuj1q!8z0H?u6X`$ zo;k-`xy4l!9(wP1P%Rd7_PK%YSml3+eCfII<+}J>yH{UK`zBhnN)#Qw zeWm8c+VgkhI=8F8StIDC_eycySJ(9XZ!6_X*Y^7{@Y*pp`xUt-= zak<(e`HdV^)$$^5`)|$OS|wZfWI_F-nZf)U)v~|*h+2N_djG{6X0jY7Y??$>um^&l zB~!bn#kUKsGA{)!<6hsH|G3oN?4{cG0^uuuX+9h$CRg6S^mVH1f@&7+`;46NOcUD= zZ1s3`l5=BQbfbNuOTWRY^tiuIa=xUyJXh6sp7Zr&eyxRU&X0-Wv%j8fO>pl??(LQM zG~xQLT&pv&(en1$Gw;tklPH@c@H*Lj>C}p8{T7m3&?0vEih=$_(WrvlpAaP&?Th zClIOq;-m6BONOG!5?8mrG$`-g?_kK}vbLWuF{Ho0Dkt>(9h-X&uV+ik>s@=}T>m{q z_xsHlw*7YJwl1!n>CQCy*ENIf*}2y$ejn`?Zx@~*?wB~CBG~ZSGnGp@=bo{$+UqrzrAKpxhF2{9xKEJWW z`%a|ry|$fYzcW^;p6v9`PxpB5Nz`T>FOO--{ zHv68ew~c0(FW&l6;Z=;k6z4q`g#$OXeC#plH29SyVDcs}sNmwt{L88<&Ismo{EYbh zXhGdxLD7OgtO9#&Ib=3|YdULLmGqWdI?1k9Qc=40;>-T^wv$gwciK@|C8@Tn-kVv-T_W$g_g&hyAw0bL4!~m6qyti%vtmj)1?|eaa_AC zC2;??-VcEtB9=;SuD00~B0H2zI*Pv(n7oh_eD=wC&DYlEl`d*#$sg6lzdmi2cJsHzoV~K z7f0)hMZVv9TPxtmwP!PuUw_S;qr;@M;z!X%8|6bQV(VWgynnsp%EdiT7Ek+n zt3;sqVR-f_#fScOEx&$Q%#xSa`<@#2>+tl`b!V5`FD{+)`2P1>A-}slzkk1xz0&YZ z=7d8{QEy)enuod1P6aIlxc2LDvv0x%#bZo13zW{hJuTgI?@p)pL?OL`^MY+y&yQxHVQtPnwXjInigUK-smpHFq_N z4;*Hjxs1O|Uj5dx!)|BS^Z&aO^LI_Nz1^EeZrdh4Lw>WOiqA8YuN?dS>hxzb9z#=m ztK_fB`bl-ypNR&4PB`vn+fu8s)voSW*808im!~}0z_;&ztMG(BW(Ve$SN-QbD}g%k z3u`XPh%zb4^mDzuBFMs7GgyaY?rfr|d%{S&(epqg|N6D@#m5Yxidl9tSr>o#L-!l=hXuDI~v6`X9A1ATe2MJeRTTiF5l@% zI*UIq-RQgGcxy(wiu|IpwhJb^xU@e=uDy25Xp;9L0cpcqYjgLMxxLQXthVvY+o`5@ z|JTaiwdZG?>Au0t1beO7$HBEwApcr^Ci0E^I52TZ`Cgqd~K}W#=ZN_)UUI% zHW(@$%T9OcIDX87@0Ia(_uONPkN16f+*fvXzFOpCqZuDAPoL-%_bT#ry7C&%}nJp_m6RUh*k1v;~2h|;bRi&n_csv#zI!M?%D+9_WqA^ zxOUnXU$BEEW4kr4nyMG)JbrHX)5)PLkVxKGA^ZSVTuf%$xo zR_L#9nZNH^f{Ol6!8g}RUHtv7T{Gr4Tk>l4*~+c&UDo^*e%{Q{yF1eDTIu0i88Nmy zuU?i(k}=DE>?{*x?kD$0@XN1--z~JtK1ED6WpI9=cttg=V8iXnUpLNVpS$-#x?J&% zb{D0xqz|g>)Bi5qZda`Lr#d!R_qA|-?VmOIGG$+`)q`3Z=Rc;dDZlgZ^{Pnt1`}8= zf;2x4=&+nqdU%6btZ0e*lZv&)^?ld>-dHmG&SBpG>p2qdS~u|?x){^D3Qgi{Dx+=$pQOpE+HIn`QBx?j;<5c*O5;Sy_naU;DNF<$~kkw#9EgSRGl= z-rndjMf{TZ{#EK?i7MBAU2|41KPqDz^g7~x%#Yyvc3FInE}mADZ02{8`55}4Q2xm6 z*`*yv&q+!Dd$zK4!^`lmzI*ozY*`u5^6bn*wcHsK-Kqt8E-%|(XXYPgrhD_mt*D-7 z7w6l&SQ~wOSsYjC>b3K|e@&b|Pv!R-Po-y9{bj3;NFA9JU)y_`UADM&&x+MV1$@*d!I{O$;vK8rlM``1eUsI`KexEsd$#JN?H!)& zI|Co|$*^7AvCjNeTT4uPK#t=BIhG%{EZ2SG2;(^MK3_aWFs9pPQj4UrmEIeVuP^^@ zc&&btedWr&jpx2@w=?@8d9A?W)!LgO&U@^x-nX>l*jV8FCGo78EU3m7d=qy~b(&1a z#~Uw>3hw=PZg$pA_6oIE-<^2=y5uSq`6G}lxlwsi z+nI|Sm+jkl>*(x=mN_@xOq{oB{ny!5A5`Ub*Zu$L9slc6tM&Um#w;ovuBZtH+KHDD zXcXvs?9eJBdHjV})sufQo?n80t0)#Md!N;|9WzSUvb`6%dEe*rYB5d zpZ_Xd=U?257qd+_au|L)Eu$#E@7apIkDBL66u;>2y|YGD`{GRTx%z%dACIQ}sn5L6 zSlMTuBzN#uKqn;oKtlt@xxwBj(D$2Rvzu&FHm`*tYokJej^KoxB|8_}J+xr+;5cE} zlElySU4h|w;rF}c`nQxL{_=V35M{^j;u2qMOaAC*4Gk3Yae%Ks-eQWrix88E6e!W)rHtT6q%xASN zFBOhm5oEUfa@2eHmhktu%kQE{4g zea)(KRy`bb#~ydf{eRWYKi#nBN72FG64#fVj(Xy-=Ik7qAJONdjwQFNE46KWb=CB1 z(fS{U)hF`**ZMJgzU85a-&?0u8?(i~HjdY9+IT5qidn~gLlKvp3(q1qXG(A8oOMmy zI-5myXN+;W@Ui6Wc2?J7m{!mKcx`pn=hek`FX_CN(7*6QspneymVLHK>hdaTX4iYx zoLns{>!eflc1`E{BpYQGRegb1o1ZB?zkQ4I1h>Ehn>JIlA|~$Jrs;2)9=1v6-Pn3g z3DmMLh!W&@SP}I;=bI>~#dE{)fy%_*)$byqZJ99Tf~%q7yeuizEZXV{KlwZ?1(|G2 zHQbL#SvT?Nu{M@JbZVbFkvosoR=KHn@`Mkj9A=#U*N!AOpUjixm-jic_Ae$9NAsNBO?z5dxj%d_E4J{_4^`MsjIW8tene(USp0m5I$gr^Rj-2t%b@y+4 zQ<_k{LtNNYsBig8Q#qkayJs76tZ_fE+-_U_``D~`0uw%H73jpAdFV0Y@WTz$T3p%> zuxsAB@KAsH5`L@PCrNQT<*)xr*t|_Uhn3Lsb?=%ju669Je|~AHw|LR7LiQ2enejU7=FkRh9Z1=z1U0)pg^%rl<-Sy>a zU*FE1FMD@L9hS;FUX#1)O|#|3PadmlHY{}iFx7sM-dBMyTf<-9?9Z;bD(Ri~dU7*& zp~*Fi8o@WO*j)d&vsUfRexss1QQ9Rv>G-m!S6dc4e`vH3c1iw{EMoF3FKqw5eX|dX zCq7yA??tS!)4NFK*@ovrCh}#|0w2mdv?v4gEAMFPwIW~QCa-ZoI43i?5%#K zT?vo*;C$h~S${%m;q}-VsLh&m*+zj0>3>Bh{AF*v+zbkvV*SmN4?8P7x%x1%I%MYg zSGG3VEy@3_xEOCLPbw9N=ygz3sAPHFeVcWE^MTn0?E)X0!Y9tS;xGO0R!{3}$94nt zHq)}}xmIf~7KSn{dzQu*?rc;0BE4s;#M!ee<{N%VsCBRTkb1Uthnbx1oQYq1O_yEU zvd%Qp_;~o8Gx5jM;=V1LHzV+1<=h(`zAwCsN{(y}yxt?mR&xD^QVx^tA(_3EIWo4z zdO4=cbf=r1Y`**J+GTcWC;l5J-1RtZK1apZ=WAu_T|0I|-11_iu)M#)wwD2?XRZ0D z8fIU8&|SKC$+zya5;@;a$=t5bV|ik_M{@gDj%zgutXsaHh&-PB>fiET_nW_zrG@YM zS5`JrCtb90aou0J(!HCj;y1rnU|>pqzuoY6h{*Q2`B{H|fERe0xh9A{tO&E8abM){ zk-4@kpX4m7zyDEr_hZeZ-qr6yq29INp9wFy~l+`$7KM)g`&Mf7W#7#c#Y&$9Kc`-Ll+(*&ElL z^^{rgMfyOV-m_=U>?_l3&DXF086liL*X-`rYiV|$W{bx+CT?L<{x_-P%i6WR)6K6> zo^qpxF@j(AP)7c>QkVDKtg`#wc-Mb=y_nbfmsOJT`Dkgz%6+}j){Hax*EoEZvwU6Q zbN7G9|LO_%&b{%ve*c`_q^E0?3a+fbzj$4F*!%2nvMde>Z~mI4&F^}&?X&M%`TwAH z;{iv(2v>`58x_N=T>9$fRu_Dk;lFamZ)4WAKjcK2Dr4XEo7}il^?L1Z>mx!eO$Qnn zSX8e6{QO)|;s5orgZ&2{TAb4M+_Lf5v7<4K94_thbGiz1tzKL>y#0!xbdv4oO>O%V zRrr6N$dCIYkn_p<%thg5d1bSfS?gp!y01Arr{dZ(_w>J3i_FhSJ=<(&x#3~EZ|&LU zwdiU*aSApj=WRY0%iZF;vFzQmoCy)X4bIj4h>Dlae*UE4 zgt2+m8;;^fg3oVVWY*Z&QFrEKs$J2;$M-HiUd>FU?06Hq*LH^* zoBc`mYgbD5pQ(TS=xF!%!v){(=H%{s!o2#f#Jp0QW$)@&{mxkH8YNWHxPJWx?;|=_jx7##qJ-t7%jz*9+}U|Qt?Xpy6N?p;+1d3nS|_E5Ansd zSpMNVbV91BC9qMVCHrEVZ2aFDley(TWo2JZ<*BleN{)%XAGhXo2cMyR@gu?N#J;(= zV$N*6Ssct;dyri)pZ~_(VDISJe8q2Gob8ueS+{0o`}!Ese;q$(3Llm-jI+*u&Cj>` zpFmHjS&5o~rj@XUn}`F`b{ zGo&AT*mZin4(zs^u4H&(Rz%LXBQn)@xy_1RJM$DL%YK}A#ijkl_iNtM_2xb|XZ*x* zO*UcM-{+D48S+8-_<3EfbmJ52lN>T%e?MRGdhV0z$@iKM#IPK@m!JG?<=5?qEbNjX zeCT4t@d?^Wg-?&&Y1VG9)nada+~#oN*xNf3Crr3~&@j@^oM}QoXaU4h<|*lbnVxh@TB0`mXh}`)g?cZ$v?LH-J#Nb zbH4De`SowPQqf^v^EX^CKY#redv19_;iYf&mwwr{>d(x{WMgvw`^)xKmGJ`43;~O; z967)L?s!|X{2yCNv!en>4sT?0E` zE%#jUKD6Q3vKPl!@E89%(eIbXAuIm%;r=I`w@NNNZa0u>x6jUAl%8jE;m~&2SpetE zVsCwMOqVTvH?^W-`KkR6^KCyzIoHNMUN8S`YSUq>gL%QC97$Q1&*+}xs1Qj_nf#(- z{h?dGZm=GZ)nkpEb|-N$kwBDL!Dn@7>as(-#;mH-Ejk z%&+#dfzpjTn|~J_aj&mg`To|Np4$8Qnf(cS4@eubsBC!qw{NNJ+k^k#a30(IkMW-8 z?f;&yzdu-ireYo|OW&`r)mOfrJ7jxCuKB<+XjsmEr(Ni%z%i$eg|E55=I@HRdt~Lp zlb$?LoY~iW;2(!f`}fEb$Ns)QzfD(BVS8`Jr@3w{?~3JLOgQ@J&dy?+rmyU`SR>i& zl`_Mx7kG2b;o8$z!)k@{eVEZyH}y`zA5l>G!TA zlLyao5BT1=u}UplW^1JOk;vW8SR#&8{opj4y|y&s`o7ym0-vMg?T=iP`B9muK7G09 z+SeZTUjn~7*k#Y0y|wtYz;d~{rjoB`MTN(2i~fEVbdIKZvfRO26EZK=KiIa|_Q!lh zh4SR9k8eKSeEavQ^?p(N!{s)X6wDE@cy;}K;B{-ih~?823hoHp`1ZT-_Rl`)xR>f2 zEREXj4jjj|+y72oQzO$cQG4hAD|}4ujR&Sy%=ff-mhw38&cnN=P7d#mDX&)8zy&(e z$C8mVzR6*Z^eP_+sN({ep_i zOJy&S`sA)uy;Co{$v0X71$;rYyZ%i)#e`rqo^xZ2t44Y02iY*?OKfuNNfe$uTCZJtyr^ z`!?6=%kuelFIHyOcDjF@kh5i9wMqZp7wIz9Me)C^7A?0k{INM~MgKXgHJ!UZZo8dl zegD{;29_4JzwCL|x0?Uo6wayLcdzcl8THGbm%RPI?aJum1hT20^=@Kb_6w)>lg~eX6+I zUs7Bn*wB)5pRqFf^#|3rP1cR&51ZU4%}#7NK2c>&S#D3qeZiNr=EM}}K6y~o>%aD7 z%tA4x_``GVJaODIx!K#k_QFGNzjdcvFE&@sn0?r$=f%mD@w53%BNwZyEAQ+0`tr1d z+oyu7zmA;nO$=Uh{??wY^XhiHala2LcEoI1-^8{(2SfYqr$3Q0dvtN9rdguj zpPodQ^QnHtg3Wvf^J@QoG-i{}V%)Xw#@c+@(z9E*9g3p6C(3xpp6y>>RnyySP%{6A z(u)SyDi{`B?Z-~ZL_GyHF7 z_gX=K<(wXb;kqOc@zoCm;Uf%^V+xY@VONexaSrg+u-&f<3zu_ zOV8K0jO*B}&Ga619PB?W@n=o)+GSD4uKYQ&!R>_V|6@_M%9STp%f^3su_9OY*^3R8 zH`m)PR=+24?MBwWTjJlgHhs1_c+S=F$THoeJ-s&;6t2m=b}Z6)kzvyGlE-W-m-8jr z9Z2NMJU%DJV{Nkjk+8j%Eb~n5dOE)Dbez=mLZEh~r=MKotKO{33;93aGFG;#zT$6f zxwiT2@l}(i?<~u?Vq*U~`xa~7lSALc{2V^HwY1!6lljITR{L+K?RWVVUw>BrzEV}Y zZ{v@hUyptI{%z&ouOI*JdcXht{oB8P82-O^@3?>L_rG6$R{xIpxASB0=l-AlHS$$KW(1&{`YHeJO;n5-MjI}#=2$CW=H4i?AtD1 zR)2E8^v8c+FFn3|yWIVKZ12(U-}Xu_%Ut%&d>Smazkb|XKR^G>{{Hh;94w8SK^?2j z#p|EHF?n)L=1ZTN+4mP21$OH~oy_E}TW{XCe!_&;A3IGsK5Q*6zhApuU7>!1B2zw- zd6U8OCXt6peDO@j58tx<_eon|#+j|jkCm=jR48^Hxwn2MTYZtTshF&|Va&CI?Q^ay zuq%H1VuSLF8Hc4K@7o#{DZYBsXu9#5I=lFviN!nhKCMbOSzl{@HNkxT)(h6@DfwIN zO23K9elN{nn=NEwo}9cc_eRWC!Py74KRYNc8)V*VU&q0)^V_o-w@ocqtT#|UCvz*J z_^QS4<@=iUo1Qql>rsN-FQ@!Ivsf;DvD_n%4_AfC<@``Sv({hsq}OkU^m+H6u&Cs_ ztjj%-Sf6n9`TX0({~M#`@89mf_WE<_?)lOAI`#SUZ^g^sU;i5v@_YN`Kfixl`{zpO zegFCUxA#AtFKuu7f5!hAwXgmi`*im1e^9)g74$?ZSD5fmVdc-HKHc}{_MnAX<7BjH-G>81&Zr<`TM`W z|2+2R_m4Hr4gwZ?Ia&&A_I@|Bw!Y2L(qI$)-TwRUk~{AOCMy&*4$F;W{M66xh^q(bUYv?nK0!4x65A_uL~hr{AbLcv<1bYI&m7T@qLP2a`rV56y=gZC z_r+)93A78%Ry;vO%(x2a!Icw$L-c(qotF3u||GD(%_m4O8 zF*!c?q9AbS7h`aaL%#VpZbTmwUC=rTvNFD)r}fa$7D7Okj7_s!JDbT)l2r zR^j#7@~grVJ}4I`eQ=8TU{T~UN%_SNftsBgUi$O-GtF|}pC*;`@p!-BxnnY)yss4; znI7|F(P8<*werfAC$#sw#OPl;{%l_7RO?M`wU3+6fyTLZulsjJJ^ya^zaEZ%rs`H% zg3S@vYhUe7e*14pXX&E37Z0hqEx$K0=9T2ctkq{1sE5DT-;m?+;Dg`{v%8|nd~SM= zvd-=6`}ac7?Uzy8tS1jHUEjC!B*(rR7au>qvFtGS!J3|!j?y{8{RXr8C)QlKxUP4f zirU%V(QjFvn5zF|d2)sS$T7PB>CNUm>L(MQ&%WYQ{O;qevie$kNICZVSMc@V&;DQM z-#WkTFaPfQJAWR3bo@SF?XZg+F|N4BLFJ*6DAD^GI_ia`2=d-=`ul|1f`s|y% zSpCwsf9rmKz4Px^&EH>M&)@%^xy$a&zu$GoUVZ%+$=;|?P$j_eu%hZ+YMBtrGKCFY zJ7x*V-+$cLkh1u0ONmJ5Wy`h(o4Majci)nOt}@&A)LP*+r$^U;g#`y^DoiMQ^-5-U zmAiZ)*ZZJa?T_v2ne>m&npks0@mcaZ|GAIb=LyEUzs|^C=6K;S=T7x0zYG>_w|lMi zVr}9c!(Udngk^%iy7u?kaQriM|7tqD?#Q|+uXbEo7#vnF^-}uKT(=LGk3~KBRpDt? z^TEAmwX|!#ZBfC_W6Sz1tFApu{wz>#I{%|U?U}Xb@60>X+{b!$SAnZfrhm7V5T%Dla9%JRf=&d=Nia8YGy{y*Z+j9M+X_PP04_KFJEmCe4^`F@R$ z|NCKW``!0<{v>}){$|Ls{1~VX`CYf{mw)g4+56X$fcQnSy-`4Ke$-NJl&6PVB-JNsn#o~SI zvd>P-5_qJ-w|2d}@>j{X6D=(zzvf>~^ws-&HFADwZ}PiYcRsj1S)Ei{a^pmA2j|yS zH)dNsmK1!Yc;xD@TkOgI+a34rTc`TO$H!^1)Ojg;^F{ntk7PcUFaEK?EPsDt(uau? zF0Wt7cF>K-^2=hoLXP4N`$s1dZOW26w)0o7d7UPg^mV)XHIK8ZCp-8Q`K^xpx-mmq zU##avr{jj%vt_=m^poc}@mc++;2PV7$Btb)d4oMG`CIAE@SA+r_gBq&U1A$|``!BW zw&22k?|S=EThsp`|5yIax&42`@42(9I|25!d%_dS;Y9d!3l@ znr-hyj^Q4TUX!nHUGZ!MZdfu(+Rh%$2WGa=|3y=Y6J6xQkJt8*UzS& zSSnZl+3`!^WQmQz%@e)lt5SL=T(-M#k-O}Ot;F$N&yxIfsy@fuefGxj&_>_(T|Ztq z|Fimkwp(0(-tmc#Pu!kx_}_u7ynh>i82%3F;j_MfrOwG=oqNu!zq4NL-}mcbG@=OM z@T0s4sS)IOxT83~NbAL^{cgql>;Bk!u&Z-78gBZS@>cDxoEVd$B0u-dC$_pA1s`7h z`T2SJt-1=9)%||0&W;K$4^m=`S0%T+cARr~^$cd)vYa@fidzp-&*bvuoDqEd;o$T* z0r%vKhV8c}9x&Oy^MfLv?ID@GmFE*>bGYn21=QNr^enWiW?_H5{iVXXlZ)*??^DmY zvf}IA{NVSZOvjEa>518@vGJA4F&1{|MR%XQR@-{nq^>9C$)>_b3>%r0FJ8ZLIPIfr z_~Wyh0oT5#1^08??(567x{~Cw!n@~)!e8$oq4ly%f{N4sPQ1M5hvD|{?}t5j7CY5d z8{PYL#Cks?)1=2I%I`Qve}1~be#5KJ=igTJOprc(AJnGbpZu@(PvUz1-TPPmJpSkS zo8phJKKDPhe)ZdO>;A>>_P@{9vICVe8~@5}|FN;|_#4}O#ox`t)^E?>eeX_9@#Eir zzrJ34?*8@pyXO7+C2{+H%`(qC_uufp;qS!9m#@pOzWzI1mZj;yM@NO0 z$FHgdKV_ThxvxBHYvHxUeD&1oEs}Y+yO`=#)FrmJzPNef@at#SqVsK~XP?z;KH$Ql zAV2Xm%Mx{khnWga4^n5GR`l#Uu=375JxkGRF+YqR_3M|pm2@0Y$bSCJtzG|5uj$(R zA*c8JSh##&O#jc$!)|`ho@HHjJafM3*Xl{lJmfrb@Tjs9!;H11hwh%;mTP>UeWK#Q zipEd7Rq9)BzrFIeXHU=R zU%YSieR0=6J8UezEN44cv^u`$KC^!ReX015hf7z+-VclT{=5D!$F=0zjr*B{-uG|Z z|L3Xx`=#&i7gXz4oK8G{U(x!$WZn7tcb|*Dm+StQ{HOCTVsF_$<9+>q?bg42pZtCQ z_wu!N=|9syZvI`D_cQ(Pyrbo{^40q{S5^O6`Pz2c`;9+;|NZv)__O=3g0#^{jgb zi&yt{+je7@xF@%(@XBmhf9}&HtK=M7gACmts!U ztf=()cewOp=gi{s-ItK{$G=@#U;1>F zo&6dae!jGIBJqF1`2Sd~w(6UHr{c=S^S4e%z7{Ljx71nl>*bmG=e}9&@~&Mz@kce= z2gTKzEQ#7_XYa>7EbZUj{dv83;k(Ao>0y=|9$vSy_UkVwx+SdmZpWOXl6ICgS0lnL zdHE9`JbhPDx{6cz_|EA8@qey9kAD0yYUb9eryoy$UbDkqp7})mr^n&(ulf^8Hy*$7 zkN41D>Adti)&KhL|2+4h`d{(<`MdXL|2+R8{p0ahTR+eLSo`LCWp2Iv?*DuDXMeRk zZQnir?)T!;_OHL|?0fzD#_zdTZ$I{reZR4$|Lpzu+vnSx{g3;9>+{xl`SkDAIe*st zKi~U*&Hc?k)`6q+&aXFL&%b*6!?K@g@qy#P32c4*m#f&c`7giK-26<|X6dZ+hfUwV zs4O|^6>Y|Ryqo9qabc|o+1YFp{54(#?A2ne`#k%8%|mtjy02Hm@5_rDH^i{lwI!dC zS-LRMSkbQVxtv|vyTjZ0t{>`t|D)jPjPn~R-uynIIxo%stNOVo#uCMgDjxp)@UeaK zI*V$FAK${J>3#buZZ98Gv-axhc-s{1eRV(Itezi#Zr1BR^R7OrJ{Qd=cs*jmEJ5*P zZFT!%!{2&0qAnZcoGs;3-!5hFFpBqS)yi*wimuo0o$`219kcDfzm_rL@;(*WJBrq3 zZsy~CyE^*bu2+VCULC)G({A27m1jRs8#es;m0$n+fwf)2_wCRBwOu_||NmT``@8!J zd#2T&zrXrTP5KYp|2xm0zk7e{pY$J_eyKleuY}?;|_y4{7TYt@YI{)bT zcfWT&g{17-H-FE)di!zty6+MDjz4?<{q}kJ+4bw|-~PO{zJK#?TeG@r|DPYLzxF<| z=K6o0da?Sv+Hb$ozn1-(% z@3xYZ`LFih{46*Bne9FivG>(%6ZD_v`p%b+X0&g*+P-ez-*3^(C+aQbn)k6OUi+4& zmS!BbuQWGp%kS&OHtw(1vrVr#%KNKe_VtkDyYla(b1cvHJg9zfYx|>*SM+__PV0E^ z+?)3_-tx`Ij>xO+&+o6b`DgLkT!+u1(D2ytPq)kCe}C8cP<`(0g@U!ExfQuFdzP&| z7rP~_Z1#lMc@QMHCOYvev$OTWSW zV7mQ-y>|+B+&HzqZcnDvIjw7_qwB+;JpA`)_2WSK`RrzW6;BVnl$5uB^Hg}kzv~S4 zf3N(u-_ySV6gl3H>)+MMe_W-v5*{DNuRY%R`{w)4H>-v4cBJ^!k8_xnHBAIZZ>Lsyp}N+#_hN_SW4~xxW zOw}(N-`nuX`ndM9hsO^ddGcxX@p%5fR{IZ^o($w)_v>lYRqeW*{9hZy*KgZeeMSDv zdY=!@VSzK|Zn$$>>QciUJ;u#uN%3|*XWKJlEvo`|M99p&UwQv;WUcnG z`f6o_zW18F^Ja+dEB+f%ShZ2oXHJ;^PlLCQJ2pSm*>4+HYcS)#&A*Aijxl^%`j6up zsH&KL+UBaf|6krc%b!)Rsy_Dl&fnP6^=Kc9a!_o#ey{ds%q_}k|t???WD))n%<_f_xpzxzM(@9|^bf4_Tf{4e{X z|Jm)=|KE7N`S+Zo_GSBn^F<_B->pBuBlCX!)#M4Ed4C>X@!e$SXTEuE$DgOnEH7E7 z*L&l+QO=&Vk1PAPul%&D_TEn(#rW^m^KRSvFdlaQcGmp91mC~yj}6^lWd@`_O-@s1 z%XmFge@(=UvbrIEK+iQOw?T*|%dDcsz_{y+j`=5QXY%kw;S!pNt1~Km0{u5_Sy}!?5{$973 zL$f*(vnK7YiFj^s{9D`dy<2}-BvdDUn^~)LNb+9g!f!rnY@SyR39{rL?g6|3YA|GIOZp*r)=`Mc}Oze`lV`?u~X zs2-JH+&-rWn|4mJ@~NtWHVpI-@^vagnzF-r}Hu#t$K2d zS-S4)h1Z;)+XQo`=x#U(e&2N|9tuV+V5NAkNvv7 z|6A!-y@w0y?Y^5Ih?DwX{QdWZ?;-bK4WfH{<#xrLuGjsyuy*QqQ2DdI|M$A|ujd|B z&&~eWf0n}F|FN6t_koY^CzkL2+4g_kiO+M~pFh9&Rq9$L`}Gy3H~beitPeChe9V90 zzbiF8O#8~x8GcHzs(;_A_2KFC__(^acRpGx)LXp!QLp#iB*7%y&^}WmDeX$n35I|( zhuN9)&wn!SIMc7}S1eI_rr?w5Y0dt4zQYfB;{A_*dnCU4zQvCxhi*qd-n6Q}eg4+z z`S<5|=mpRIc>M7h`Td*!R7F;<(r1(R|N8UDp|}5D$xrz1due89&T-8qi@vUi?vuVP z$<-T^!VG_i9zXvDoBY#(p&v4)rNu~-&<~XR*BtmY&XXa+u)j91)jc~-p4H`pC3y6X>y+-@94+! zwrKW>q;rL$+sp13t(8mj{ZLSJP4UsK^>&Z9^e>l*c^WmdrvKlAC#CnR+InB#h_hHz z@U-l>{ofyt`|tnza@pUwVabI=|G&K3=f01f`uqP+P{jRvz^)*F`+i)}`|mxVMh~b{ zVE6d`S|LWhlSGHmEZU3*i7g@9a|GE9g&;L00>H81K`;j&8-}lrX zpZ{_G(etn7K7Ie!W?KIG?VsO&%syXTfBtNJZoPHg`}b@9FYkN*H>UdDZ~N2sum9ir zWBe!b&#iywf1G=_{rLGG-+tVCe{TEn?|&@&nernWv)TK0hZ#%UMu{Skj0Zo$+Im0V z-!uKw)So7`Rrf!0o>+ddC?ak;Q(J!>&+F^)^?&1!pZ!;0lcpqh*r<4t9cL!r5U&4*D`;;smPPf+pDf< z-wfbe@A|*e zN&QOplg|J6{$uM`x!doPU(f&g`^LYre|zs6|1HCjC)y>}h#{XpNkJXFWuP&dq|NG~NeS7bn+kbq$ z?fbvB=Kr_;efwkY{>}g9TkZQ^{I>G_f1Uqp{%3y%<>Bn#_K&T1-k z_dh?k;o76hDra4AXX~tdq4!-j=POI<+j+ z+)yL^zACSBE>oJE{r^9o#gF$Ve6?2ie_Q|NGi6@xwa--2w9f3TFxIX6UAiE=@9LXl z3Y%*;W<8kveq*{pkAJRz>BrXX`sbd@{NK3u$PXT&$d6OI<=uZKeLZ#j$WtqGYp(ho zdWDupe>{5ldY#2CZkwLv);F#vzkaw&;>=pLm(JV7INN=a^#TL;&Dx~DzB}B#XZ;Qt z|7Np2t6Ten&+I#>pvNE0dMr5qN8*!>rpMIpy)V%TtN-xv`0?fYY%2I)=g9NVk|C9c4b5;7!YWx1Dw_m^gQ~l@G=X>{yKgZv`-*^AF_3QsD zA6MI7pZERW`A_G6?KcDE-2L1B8}Hlv`|U^LeYX3)@BaMuqiy}U#Rsy(9;^gqvd_Mc zVkd%on9D;RsQxqeJpX1bpLG83s>;syAGcNay#L2l@!Ys&&;GdP8fmUS-?s1Hd&Z_u z{@}02g^%m)355JUwHH9smR-L?|;_yakgjZ`lyOS zQ8OcI<79rzGnW6ayOyB8LWVWcHT&Mq(<)8HhfViAI{rwi41u#ApW+WxKSQ9$w2me+MxSBKX{WSd$)emMEQx=jDuqo>5p6_(b^ zBo+O;{*m)UKCi-GiEA5|{})`d_@#ycR}a(T0|;u54C}n=2RpP4@2lJsoe8Q#YP?wO zzW-NysXx0h+3Qc$-#hmoueX*vpDg;}Tsp(g2vPO_TQ$M;Jlh0N!sa|tZ#OT^=$TS& z)`o>0pRImt^1W`zgBfo}FmbeXum|+mZ0Uk6um5KYzY!wZCzUTv-0Of|t>IugZtrs}{RieeS7(oSIPU zo3)}Z_ayawIO`hIw;?u2ZjGq_#u~jhK_BIAORszNcoV<)_RTeE>)VVke!jl_PnGa$ z{@+z1=YP!k${M`pa}@uym5kDD^ZP}EuQLSMohy~#d@RVF&;NP;{o3z$?SI8H+g$BW zu(gQaa`ykD|E~M@W!8yEu(~w{Ccvm2UXA^>1$So81{DHlDn%q%?Upjlzg<81%i**e zKQ#AiE&Jvjkia%U|DmpLzkGCK-K)nR>)-!odGf!~=9yNSO`7JnXS(0crto|?_xxLPrta+X=3rx<`L^@0;mwFX#0q$+*F%GtwO?P(VR+effdq zau)Bp>hkWtx&M3iXN?b2xXxVv9lYwNP0ajHvMbM~-S}bizAPesJJY{^XVewI9i!Ow z4fh!{Iewm2SNLCGAhE&luua;uOBc@kaoZy)u-}p^-r}>!KZB2*x6R81+aGV=-WAF% z7H(J=rdz%7mE~#E+nv+-+d|prm2Tq?wzZQvyKU9kc>AlZjaPTi`1P@L{?~J#<`f>g zed~_)x~%b=d1r6{mEi)>}rfUhFAvZo|^N*WqjCRIO3B`CrMS@c&}`v7dr#+NIjhGJKlL_xU-Z z^Z}PeAB04I++pw254`-cQlvtQ)$Uor>y=e<^OgrLNL1b?X<^s9?648n8?G|~Md2yu z@?#sHx^Iwj0ClG24Ydu!H*PA;_q!}`>0ZCf**TInJg3wBTB3W-Uw-rIM%cYq0U$k1)BPNj&M#E5d8`Ycy?L zP2XH<`ZYoN*U?DZ2#Jqd{gk>6udDp_?(q7$ou3{@{7ig2nfvhZ2UqelP8@%Z#t=4il?dxxXm^0J)`co6nxm%WoX&pnIB$Is?Z+k7q3vj0N$AKuJ@ z6Rl5A$G<&Xx{|%UelN4U%;7{i5%!qB2Utarv(gWA;Q&HC~hK2H!|zwB|9 zbvs12Pd{^Hwd#4x?0^?*uAMs?o;Ty#9|O5LS_8+{F-~+?uc=r*!I)6How|${Z}?QZ_Bk+Zj~0Np58wH>U+q2F6r+Z z_wMYrpoboT>ssLXSHOu|IttHpBLPCBk6PP>71jnQ#}5(<-BeQ zm%qBPKmV)zyY3Cvd2gAQ#q2eSIWqaepSHTH$j5&Q68qo!_Qj|j+vQ)8{<~^rdt3LX zt3iu@y;F>Pw{h>4=C6NV{$M>C|MT>Z?fV=1dQqA)pq!)e;ibro#>dMq|JxcqFaKEm zFLRss4=(R-&bIz=Zj+?NvLmM>p1;3+y29W8=F;-In)%-~HQTdADn4@kcyM+5{kqrX zmj6C~oH298^@!_^^EW^2FzwmQelO?fsW-JoLHmAkCut(Mq#_s4ac(nDq8KmWWGu=`h~tN*{s?o$3cmAch; zuRY)rS+AMhdtl4?_`=oCcDv{|=Wo?JsLpyty~)*^&&SL8*o5s|^Xux{ zyfDj8(hSq|j|+d_xVK}KzS?$~=T#rArJqX3JxWXZWOMZ#`{PUr$>pYg*_DNVe*O?# zbN@%T1@j5#xf@YyB2YeB0h;VueCqGA?z85P?|*qc|MY$5MoF`K&Py75nC5R}GH&?O z6Mt^YH&2ltZ}WSd_x*VEdj0-y$`SSDHoWX>pDBlZ7RokW@XRL7_-yK%#Jtm!&+{<7 z{b;hf^K(ILn(f@Rv!Z`qnGm11mH+xt_2Y}*o5r83nr>>(C-G@oeLB~nB1eDD&nx2HyDMa_7Ubnmy+3!&r^gxc z#|3{KO1Qjp&wmTH3HN`Uwy2}65A07X;DSUh4pA}T z`Q$;CNBa3y@v?TmD^{^CSNGpnvDW9zy~TBwVRPoO^>3Ja`~I zfA7?rM2Y#9+~?Z5Yvk-UPd|69VvP^q;e$VZT8TgZ{$%~}!==IU`y($#EuR^@Z|d=R z^IJEs&)@orb=t?L`o|^vkLzTuT`C_Y`}?ch$47@Q?{2I<&vKsUSo4+UkcTy4yrnCz z#``gKoqT@2UE5DwSG|6^h12_|50f5U-TwW7M&A5}nhiShD=cdy?Q`b*`I>+Je1gqa zY5N@i?~{UgoqbIsER%|i(k&lZi{GE$$N0qD{_mH|;&nW)Z)g~x^^JO%`U4Z#`uYR& zi{=M6O0Ke5zU%Pcotgz_4-~$y{kQH-*O^L@3QMjt44#!lg}1)EUOux z?3e4mfBnRn5S~3}lB0OtrS#-(&;B`eX6Rvu)sfzoXE%SS{7@<3Q@7gY&$ld5efK?9 zkN#Y3(rx$W@vk$SX1_+X@2LE={qFN318c6HP}kGHGwb;M;J=@KCa&FaN&El9T`$l7 z3uFE_p|e^f-86RMr|cuE4t|=mdqGUKfAz<(p+XLHZjwqs*>Vm`C|(A$X&a2q2R4!PrPr~zP0P{ z<>No=f3hsu-_bS!GsPHi#VkI+BeOm*d&B&oM#)t*USF4gE7tljBk^%=?b-WNZ--RQ z+*dhW|MOnkW!dll?Em+Aznrt-&cz2-2Od~I_xI1|^MA8EdEeJPbE3)e%zTYUnRQ8J zj}3!2cA3V1+^ur9qpSPj{nhHHIP z)h2WCOWg70tIoa3)^9t1)An`gUGwfk+5EwOvmPXT72iL#b@QXRzdzn>X((svb2zK; z&ghfP>&Qa?ZDxx)i>}#3q%Y$;yz$ZM`%fQFWxrmzHrL#Q%|Hs$&em6mSr^;PQJ!F_(L&-PcZ|Gc;EMVN8Jp9xmN)!AG> zE==`z{P&6T#C`ei=G{i&8>?oWm*|mr5Lsru9^#lEj`Z+CZ3eR#23wC!!g{H`-$duq3?neOlKtNX|G z{ohPuZ>_;BYp;P?aMAy{Dr~>c&p)z%Uir^yd6za^oSXjO$FzHYF5fBrxBI(^)jpMJ zk`DWpY&YF&x1A}z?&nkS`ro(jU-NgE)jQ+ljPn(@X0J6VI9n6vsZ&+DGuKQ``-hwPaT>u6^0;-5jLQMm}1;enxk$dl`3V zDqEK^K8#gnCRc9-eYV3`BT^Sb(RJ{-xgX#Uu{47 z@J!ds)r#r+?B(Y-{5k%U<%#R^pUJSX1ZbPK;xnk=JzLMYCyMcz^vC(fSI_`EK#=zx00QPyEM|4Xz(J$8$6}ElKqB_ID3I%ireS z=WlJb{v%ue&m)oPtB>cX`Dt@+em^@h*5SDPhYimh& z+U;C<^wau1iBX4-U9H^9e!q9^0qN)LX4-Meow`eBaNiOyR*UJCzuj$Vp3>YH|G8|> z5`%Bq`!>h$*V`Qb_DM)u=F{e|uWw&p+&AyhL+<-iBIVa?{&8#e-&1StxVJw$yt3bW zPiXCqdCAqCrEOn1J@$)#`m~>I1C}=1ZBRj*|2%g8*V*SDy#D-yYsU8v-@h9iKDIyG zaCcyWNQD)s3se%tclmVKf%gqxI8Ws7|9g$$)A!@aaY=ob8b02LOS6CdAm9%3ZHKd3 z$8B7D*4lhL)OzxI<=O7~r-qLw>aS-%r*qsgui9?ohvVOxB0m~rD6N3YGhS9$O6&T9_}`CiA=*50aKRh*N*eNtZkzRzY8x+_$5=j%_*)|$VkE$2gQ z$Q{djpXSV*V=?FOc6~ASiK|u9@;{{OE^Ax9Z|%phd|Ua4-`ScHPsO*lX6sf~{Lu*2 zo)el|t-V^jCh^niqy6H3b#`^<|8QJ$Zb5IKJy@$@znoVy)+oN}fUJGf)eRFRS4e8jnr#vj z!#+7pllRFJi`mN$tg+avEE86zcK)Wa`??u7&se=VbG=~wpQ0z5e?92mU6(M+vh!ew z^s=23X8a7CQT3?Xx%TJN0~>z5m^b%zaP79D>D-6sJWL4tXTksdt=Pf07t49O4`%W_ z-1WSB@!qsUvbSg3{JwhV^z_LMdXw~P()Yxkiqf^1?!V^M`bvXyI{QuKn(btMolxJG zbnQmm>DnVRCHg8p9iJ+H?y+3k)K}5n#|7E?Z8!gaTn?J}Z0=X?$86ER4oYC_TmQQD zT&~=@13V#e>+S}p?VI}j!MvN^5*F98Uq@H^-~Dd7{` zWBrfz`VZC$^)`9`em{}N7U^qGRL;CsjV@YT4--~%#FW)c8+pMkbv$3txV2#zI zZ$5qOYW4g6xW7m$x>DZ$%)0QfQTk_vYjtb4{+cC!@Q_9O)5AA+-a9k-j(6?8SMs-K z8_)YtXk}dUZO73~uS)9jb${AEFYCDSYGuHN8mae5*~~|?>-MVf6;_6|+3Tg(B?+vk z)juhj|1tUZJcgr%hbpfePd&e8b;h?xUsd$x``^tv8heLfvcKFNDf>S2uZ3S%y6wEX zRp!R4^&elY|5qz^`{e$=xA))e&N*JbFZ>hZs&mE9L!a-f zy?TCY<@cxZcQigIvf5p}em{Ek?}gOC4>ofozEfJVVu zruC%~kK*2_@=51cx3B+dd$;WR$6luOzMvN0Hgl`*l`ELq`rk}vd}1#j&9`|bo8mJS zxz96dj(yUm`}J|%X^ z>FZNY@ACM0jVtQ=o>?2-O+P&I|BZVReAim%2>aLSGfj`_-?jD+XXN{jBHI1;<ibL1Wp(S$?$-bRz^##A^TW!0|L#TI<=@+UUF3Jj`>&>%7Uhzl z9{2-GP$gEp%K8pyq0SYqJ#7cW4!hmjGp+IQzj^V8t8cyk5_bNx-u-*Czn^<9JR$%6 z-t)cnYY%)=j`&}oaK`yekd(lz^C{2N=AI2p_z_WEEH3k>Vur1J_iedt{@$OePc?@- z+h&K=?)-K&;_ufGpS+rHiDz5C^lIm5@3C03L+)B#m+ZUl(*0?^Kcm04w6~fzAG-f{ z&DHIPPOmQeZWZ%Bn&o}<|GHHxPq=8MoxQ)0`}2C=?&`eHA2*l!x>Sfq{rq(B^XrRo z=d4yVpS~|Q?Wnrmv1_LHK2)tZ*LC{5`tgJdbziSfkFv12`o3mI-jD9+kEs>qfA-h^ z|NH&^uaB$!zbZ$(|K;|z_HX&aT`sTtZl8a6?%MBXcg4f^W`BHo){4ufm1+K~*YDR} zt?erRDr8}IwYrw`mQOz<#c_dBoMy=US)hOm;o5T~v18uNY+18=-}2%gRquK$_xSgt z?#k);pI0BKp0D`icFp(V*ZZ|U%)bBU8Mpn1q#;zx%4a_4JP!Q5!y*g|Cw1;XclP{>|C;85Lpi zSr3vw-hRK=^7w6??5EKmzaC8Izkl!4wL9hWo}PE;etj+Xh^d%Iow#tacDguUvhMMy z%b#w{lJ1l5cki|6e|vVGeqc4{qi-Llg!86)i}PmUq|)-Jx^x%dG-FkZwJe34!p}RuU-6W-@n}j)$G=J_V0h}KKK3X zZvAyu*B_mpT?!h=fo55e_pek7YF2&!CA4Lx9C*b2hXkmxki5di)D1KMU$NZbu-o$O zCIxry|L0j-<{I~|^4`!;Usx*sdcDqv^-SH1A4a{tRlwV1 zuJHJ?g}UF)KW&*|hW-9OBPHL>jbAtYcmMInldf8BGoQZw`T14(N5gABvNe2dxIVA7 zw!G@Q`X2o$>-*g2U-h)M{8sR@@2#)w$GVhNJF3>q`WUwRU&7Uk(CW&i+6K%grvGDG{(pJE0ftM(HB6s=H^2XWJUJ}ME?MA`!IH*>GZ>fd z*x9*b##Ni;phbET^)Vmp<@jTmoeMWhXm?+~bvRz8T`H;K&;#T1o$qhN{nB377PGhg z^}P1ihmu1a86Ea`_^4Yt0D_{ zy*_TTusZ$rAnW{xnqhI;JbZ=wO4q8*uiYzm+xy)7zW&GcxeS)}O<(V46fOVC`*&Yr zz50jg4nJhKKfm84AtKc2JBv$q%7|M|`H z-LJy+|HSTiw6;3#Uu|#x@#ptH{@%H#{n6?Bm5+C8*NNACfB*c)qx+A4|J?ZFQ~AAD z;_vr7{`T4VqxE^vN>pZ7M zNe8>uuEQTMi5k?T+^_lE`|!?wnSRS4|7Is`dF?b)_m_={Kc(5MX7BF!ymh;kvCQ1J z;eCHTt|{F4D2ey$sn+Ck&z$ZqtgQ^Yb~7%oltW~B?Z)J4!%FRI^CBOI7~4M5K7Z=b zws^}!pYLZ*yu%vN-FkL;#Mx8%@pI0{DR=Ja;)tL8=jmaq@{NDa<$UcvxG64T$B(0{ z^95eCwsm&zx2l+PctIh&i!9=F8TALovV}nr0@9jzT5ur+@q_n?|Qu6_W0$hY4Yp7 zZv0WPF82JZc}Krjo$s|@U7q`A;g7%b_@8RN*W0)IPx(_@(SJS5e_dZ^{l3obvGw8i zAOG(8{Ql$LKUaRt%|8b&$a|QsYZ@>gfBmJ3`-P;#zSiwF<$rE)o!Rg)S=;WbT{`Qt z`!mn~d~4&MZ`@EL7u)_dRdYiP)204|zkff@cs-+Y#?~3%E8hJ4)w1}fr~RtX7$3Rp z2=>$G6Fynr-u$QV!*=oe=dT9H+h3NRd^~>cxg>+DZ}R>muKoG;ol z`_r|$S%x25C!b%n{rI7^ANT&VZhPwAz(4bupt``GHq#wkQw3tLNnML7e!8~wv30_9 ztB0S%?fL4Ot(~GCzE=ImR$Z-Ef1|2_bA3MlYQ7jd?fs5Qa;q!$9-IH4j;Z1MB4rH}0oPpyyt zBl%7zZtpeO`nQ(zu5JEPu(to`@#42tVc&K3U9Zmj6S+70G5^u`-)l7dE6YFLeY#)! z{mKvNHdptT-L3roS@OPQUH|*%bL;!xKVN?AeNC|(sJ#JR4B6HzkpHv1^X}RUE*b{+ zCFZSf-oETWan0GsDWC7(+WzgT$#+>+x5nEdGZ>%buIhQe7BWK*S&8?z;!6F$r~lHl z*m};UNOjG)I%E2bjV3)MX5O61=huAr^HJt@w|Mda z$fIR*lsX=-=-4_V=Iq+AGg@r>AN`nlbt&)tUr7P0tF+%0?7!|^Q}mkKEw3{1$HP~X z?PccQzqw+cjlZpl$eHq%ydA4|^T~8i7iXJ4>&!g+`S%K6ILq#Mb@1-WJA%kTZ&^L_jA@5Mjv?w|kt-}j2=#&;rZ=3U$Uq5S9jQ`H)F`>y?dCAx3xuetA| z9`oP-saNyQ_>bKE^B=do`}kL8U1|UO=LKuiKNf86gUmM6d_2k{^L+IKMJ}7;2G100 zea>lo*eFu*=6cOxx4-8OeEfOuR`UJJpG(coT-P#q|0(Kd9Q(a$`?{~!Uhg<_CrPBD zfvN88oaa9T*RW04Z!fo5>GLGEoU=W1&iZ%B-y4o~M~@u6{_jSdPi?VU?Ypqr z?}J*fKVszgEXLKRa;6 zd1uj&2bZ7r+yDFV7(9x~qwxQ2WgYvIn+}iONdHd%_&9c7y7j+XpQ}@jKh*iZ?}zO6 z`R7Y+ef<4%&H2qgw$^+<`hLgXJ9}T}_rHJsVRya#@$xoMVf8-xdrx}*`{$dj9+uy^ z`M130`R*TG+mFfbEB?6q8aP(0-^<-U@85g>=QA7ds9SVc0$X4H&$s9A#xG*}?EB;V zYyG>h2!=QZL&- zv*Y-NGjo>sJIy+55q-AUYQ3|q-7)svMKgDsG(;CaZZSQs$$l*IZ&CMZ{_x(k0PXd2 z3O1ZOditvWoSJWIexJ;&kZPZLFyy|aoOaw!o_m+~bmqU^Zu4(zoy1Pag1Sw5{EJWA z+H;5N$@-NWK1I~k#P;N$6<>Yx*Q3`@%~wpm?!7JD;_c%Vezsj}lU6Ywjz3%U^vLe6 z`w9h5xy0jbw{<=4R_CkO_vjqk+^~Ircva`VEi5(vS^w|f@AvyZiGM8qEx0EA{t5fv zY`+V)N9UfueSW)|?782MPVLwK$5Sr0KJInj{%DHqUv}^3`$O{|o_l2dKK94%KTqGolK<|4pXaab{&DK|VYn(R`^-CF#qN2zoz#}_i_HO+;f$GFZ;%vwqDJTnb-LDF89BDF{E|{(`P;TRd-IG z`+P5*;pe9N4@>@Au%5B0`}gy?exLloSLF`>-ie!ip7_i)%vj!7G)*DB?@)f-l>7IT zuSfMw^`EylrtsQ=OL02>HJUS4gw(*(+x=_pxP+c-&^WtqHS!%iKOK`($-+?eibe z{MV1px!S+Ds%b}|$m8zm{&I&IqtCp0c$&X?_17D5K7YcTKPX0bw>U2|oG!3_W6Qdk zNe}s6EDiio@w7r}%fqt?kFs>bYGb}VdbOqhcvSrHZ%IW}PdcUlO^weF6HBlCyq5V` z*29zeQ}0LWoqjH(U*GJx@70}c&kmpdSMtaC%hvy<4f}ii6U%EK{{}bs^S>XR`}FSg z=lgcNx{Fe9m7d>!x;{SUr~lq}U)S5d|2yaD{De%JdG z`|s2DA9Z}!cOC!!Id;dN^w+U9Pv3t0EAwvMSDyXHzkfcr`}p_I!H>)LftS2#e3%95 ztFFKQu15It^;td7pK2Jy@1K8schvo6+u4bapMT7|rg!c8mS5@iTs=(s&W!c#=?p)O z?p-bUX@j&D?$zYB{r2jMY{QPH^6V@$M+Q0l}z|Ofx&lIjoJ|Av( zuI8EPADuWuG4}mC`S&GdeU-WGy>6@Ahp^>Q=YFo;F!%5iYp3Z^MOV!Iwf^6TTl1^v zHusI!+kag>Bz*1Es{ijwPS0n|=iK}JQUcS|#R{ueB%RrLx+F1OCb3(7o%DQf!#z(U zpN7QuzB=+y$K5U`y?R=N#gT$_KSax0^a@woM68ba`lj&2%HtM~-^=vH+pezJIrr_) z2!%l9XLG*O7PeDJTNhUt?uvxj}#SIsr~HSwpfs>_{zUn73L?{$rM-S^}5_xF6T zJ|Fws_}-6m1s~hr*Ibv1|M7d?`$wnc@>-x&w|JVJIt-t>{w&v$* z`S^dkul2X?UtRZabDjLH^grcmtM9g7yIJ{e)%MTj_db5SE4rV1|L^a`HS*o{>-W!p zfBXEs{O5D??T_#O{Txz$WrK#dp63_uQ>;&nW3pGx zzSnTp6vfq2TkCGFpIqE7V3QAN3B zO@dKJv#j=qR9|zA(VMtS#O~*Yqn~yfyw0hY4lg~$ue^V+)YbF){&!vlvLAbOr{DT) z{SG}baeE$};&tiI+dA+1`}BXDmM+@8zKX3+@=R{U4EtKpDv%fTydSREH*J0NJ@)sp zviltGYr_8xa2$Dq>X_^M_x^1A@^#kS)ShMOT(+?_Tk5QI-ye3#-^MTf-1d(9-h-e% zpvH#^)<56N+9vd0FO-N|#`O2f@yGw4|Ngk+;QP9rt&-ix?=0PG*~_g?$lr zpT#yyMErcaw$OC)!^z>k=^IV2=bU6PzL#A6Fo$jFz6hJMiwZVYz0fN#$O@}Jo5_EE z&eaXix_9qNsycSlhwIqPrP1XZx~@joMO6RG`gk{M;(aNbIY$N8vMT4jJ@jE#+(vD8 z8-r}V{ocpbkME1A_;~Ii-}R&7;YtV6YSzf4|9*9J=e*N`-NmvNa__qDa|P$snq-JP z-dr|+gF(%sGY%IcZTBS=trnbad`G_i$HVsgd9N<_v){j=@j-)Cs^!dr$ALzEpAa*r zcNT*7NC`aS`p(0*PT=*t3m3o4bFyX3*;2m>tulp9ZF{`!Lea^?vE4y#&wCCG~e=dkONcwd6^WzT&8($so-TZT+1YetSPEA+ z@%g9{+xb;1+uH48A3gZLSpHzun)p9&^G`lDG2^O{0?l4zmdsxT?LRF(kR6)9*605} zExo{Cmfc<^`ToLvb@TnQqc;8Kk@>#rvs{_$GaD|O{Y;;~zx!$WPe!}qy>Y`InfqtH zd@&S>V4G0K@>;%cIpb{0-o1?;tABPLlzE(d^kMhM?fl2n&+8xmb4=^}sZ~GUeJRgN z-vmeRjlbM@an^~)tLJUDn!EPgnW#0zr9ZBQH}gG}xjp;$1F`Pg`+hyO*!*gp zcKz4S>r0R1n?B&5`A9EFIC0|Vlj84l)^1>oe7-^N;CZ1X5qnDt(>I#B$C-ZYSiP{l zqW>+c^0ZK8nZAmnU5Cr>|M^jP`sKsd!V~Xaw4A*A*%tl$z0LZ4A3j~LO8WKEebY7J zIaPJ+Pwao4{t;r|B>EA3-u;6nXxjAiYP1yfu#(l5eWbY~9{je%NF6Qcnu>UvWey#g{?%IzBM`{e9B?dxxvPgMy^suiEES?F5FGKcCIc|HZQ8XGi3u zt2)bf1~I#&|0_8DZBzb(42AS%Ow&J_uIN5LGxYea=J}S#+vV3A+aJFA=J>q(Ty}1O3zb0BDH>H!P-BZ&Cj>l9SXZY({lUu$qQv4e-@Z{bN$|}+pC_m>6Y!# z+k1uI{@=TE>+QN1FI*V$^>lkKfBt?x@!Q>%5x;j_``vl+VDf+a{lDMsuD80TU-wV4 zCI@X6^+%0p#)B1ye;)g>ywd+O@0sP-YfWmaeBUR@tgT#a+!Hs;vMf1gWy{!~eo zV^7cYZ=N%CzhcT>(;a{Mk(LXp$e^a4A9F-1)-^t^asK)+zj90UjS*oLYnOLF{=qCRT->;$Fzuto zb?!B_=`+^+Iy-$8H+OpKS0VdzU-kajK8^VJaNDMe`*Z)D+yAYjJ@Vn>$JOVV_C3GD zCwREb^7o1G`m=8>rWEAlE<63Pd$&g558k_b7PMSt-!E#m@6YR!7gmTZ|Jr}t-XZ=cXaU&QMQ8sQ zg8PiHD(eHMC@6I5mi}yeweG~<^Na8P-MUM^$Yk&Op#I}~P1oL?es;shkMY*|Qy;GV zJGXN6`^tBJcZq)ZUcokD{cqXxZ{LL-U|$c~`o914$N0YEcaFR{k(HPH*3f<9_O^}r z3=wzc9G$RfXYl+@|og(5g()1KFi~kJGXTuTUuhaR{hbnv)&2m zO<5n4J$-|C`{$GUKCRgytg85GXVuTskInZ)|6CQH_x;e^*7moTJ0E>Jn(%se=-)MQ zJo;ZRe+Y_M^ZP{X`A1i`=Kokxw)epL+S~t+e^idx|53bGC3LPrpkscCi^#lcge!!yrMxn8v+ zuP#PArtD9JZ?m26nYhvW8x4rv$>UlZ;>s#%$ z=@HGo5^Vq9A7}U!T`&3EeM6kdOnYzx23kZ*u+9r?Wb2#%Yxd*MyjR=zKe_ns;jOz< zEoa?Zdgh1yl7{uO-vs|R-)grm^7-q3Qd{k0%kEuXe)*rJ*7@Hxe4+OBe(!79Cd~g| zJ&SLCT;p3%2Y5w-UXojqSW3mSocD=oCf^Lcg;_j1)72V%z9!A^LI zyZWEhr_#3cb8lZaoeR;R>y;l#ugvg(Zi>tYNxbiJ)-}%M+=F}Yjmc-V-#){Ya z|KH#5_y3Pduw(RWMO)smJY+$m^11UbrJsD}-O;}PDRM9cAGq%E&GPT|E%VYq_51XN z2mVxlHoA8?xcueb^9-L>hRW`nzNkU*$w$!U;$MFcf1ELQ#_<_zO(JZz?f-PJqdoW7 z<2S+GJ?Gc3KDSaS5i_2@F)VnUZFYX^W}`b6l77FlK5w*Z)m&~7w^`Bd$1C~Ur|0c= z_p>PcdVSX1)%>RuZ0?%If1TAD>TaL&HhxXi$1wd|JN!z*4mF*E92+nZ{2Zqm0V8kfkR)K9`WCg zipewO5&URSrxw;XV{=5|#!o;0Rq!b6|M_zH{CyviBaWk{BDcol8XtD@$$YmyYyP0j z^5?yhxFqam zRm#{mU1j*RU%vl7Yi8Ob!w*?o&1DSdKT1Bk=!eajtUBiV%KCnmg^@ph&anAvT<32) zBbvvSr^#4+JaYSIL9EXHKffL%e=6uS{P%U`G>e?CA8)L;ojN^!&5nqlHRrBP zwg3Nc-;uTDQXkrV?o9UJT032TzgyM@o9B8;*Y919+p}=Cc#1~&pBwjL0({l-?ssom z75X>1`r)(lT`ME)vu+tz|9JKJ`sBY=>GNGe=KJ4$C4akn{nmh61BLr9*D&XWKl%6k;=6xQcf~Dd-3woN zz4P$x-N%wCioV%xU^j`A4q}J`?-*>B=jrx%|JG65quj%wn;_=y?2P2P0?ECTKNl5UW zdphpx7?=I}Qw18zsA_6lyKi$;_T8GF*Cpi7O})P_QY5Z=->;7KyFcANo}c<~O;tS7 zD#Ud=Y|dAO-I=_$H)GKpQ~ql+R~{}na60|!`%fQFai{OUrl+6t^?Gsj&Uvp+AHBMB zVTQi@yyg3>9-nygF!9L8(8V^{cCW2UZ2G3#?ELxg_33+`?Q20nbRMH2t;i~6vF}U% zr1Rzv?7mF1myv#Jx8}U_qQx(rL#lUL-Yfrh>3{SsTe(f=uK#ronLP)*P+V?V!~bXJ z7(ON5^1XIC^g#Q%8m>>%{T=?jE)?Fp;%nx+q;JU_84i~&NA|4$IYG4DLfCkAW=Dp{ z^v>4DlhyaT&s)CPw7Xxwr*7`YN2h+wU7KxNsqHsUov%V-+WDKowH4{vpO;$jT|fHc zb?{z`HLoM*sdGQq`5(p%S&UdGeqgKFqB|YR&tKPt zKK^{~{O(_S?w>C)2amw?r!!Q7Mqp-%fJR{U|G0hs-!*lG|4(I&b4?h$;d^(+9c)oFu@#bSw?e~bX>wTX0NBdsf{)ekH z)921S7^=Ol%GOEzwTvHMPRv#IwzEI3ZhfXNer(@y%Qb)3>omo)))k6u50kKbeER;b zUq7v`zv(-Cbi3W&GcD1UKa4E*HcS<7o8P*!F6l|UVa>+}83mf{@$2`dJb(2e{5@z# zl);~GcQ4PInlJBfd6iST-P%Or>~r@G{~p&cP3l3b_<3bCKhD}8X?NeJ_Q&;K8Q%-u zzB?u3`#$K|)1Q02zs>sp`)5dg>b`gLy-q%VKC}GmA1VLVzy~`;!L6h7Yd?Lc&*S>R zvSjD+kN+S4k_9b5U@J~@KZCSpar-w-cVnrKQ=8Wt+pJcLGn7a>|KN>vxN%)}Ojw~^ z|D2>h&+L943aS4-efy_7+ny({y~-J_^Z%6eGSi%xxvww&w2f|j&-%_{O+~LjO0I{L z;)51D0f+r*3WPOvfWfA+S*Gx5#!n)ID=|3uq&`-^pLzQ)#-?Pt5!dEa9#_cd16 zHoRT?HI)BcZPG-2`!&DL8GQTsh%-O+;o}dSI2J4Jk!8Ji>Of)r;?HNV#7_J@-+lM* z?9%ur8CCI1?eyn-pLX_uq3XN+=dS<#yY<(V6P4lffARYK4Sets(i}Se+JZ;ln{hw$ zC3S`Ue?jLZ*~|1xc18L#A4{&5eD<}|&Do%kf6Zn~Z_DG~9&PWce5B*wlYjpF^!lSK z^Yen^wZm%FwwRq|o=eZ}uK6*vj$;XIu9#&s3y080?#qryzb7sz|m8z6@7ZVhR?2AMlz<2dA;ble&4lqwqF;AT)+3`sO`td)#W+*|8`sz4_A)=`B^!F zKkyiG6;`3mwdZQ%<9~I}XRq9?^xeL{?ECds`%YZ^vd^nFYR>m5pzukn<>oq5zc}uC z^t|sscinqloBtS8!SBoBeYaJk;CO$++soZ)_H9+q)Of#3F-$t3!+LDjuhYiIGutjp z#hrPqBX&K?yGGV#*6l0NmY-}kgw@S?J#+s}e*4XBnri3&WV}7O_u9^2t0~R1kDit{ zudjVIckP|0hYZp!W=yp|cer-9YeDswSmC6CSl^`w0hX?V9QR%F$?bdR#vfugvq=Pv7sq{PWrE-&HZiQg7D`Pes>2(8=06W!X=kG!+4%d<+{%;RtF!l>|6P-v|L6VpukX@1ewN#&eK!;N(O&<9 zeLwT3lZ9yi6kB^`omUYQ^Oh>uLwH zm)C62USE~;%*tZc`!#pke_yiJ5k4H*`|EW2(`196`hAc4Us*qHG4#K*`q$Tz9Q|vO z{y!|{O7d0TNs6>BtIH>_qOr;R%Ij3o!_jm2!+#bXEsU~#^>~x``n=UOA9=+8*>y&& z{j~PS?=6pK>4)jRP5k(Ib!O_?Z&?pD)%_%Xe*GlRHo>m%&-MMguAvpo;NjNq)zzQR zZvXwVL^^BBZr`cLf4W^h{<1vxTW;0ojgl5|tDil%-^8^2@7zl6?{#a-=Y0Peb^p!J zy?cI3I?Q`*(s6xp!$alYsSH1NC!bCad~*1|je8#+J$$OYF@EE@dGCsH^p`Dv=KS=((5}wenkyI9?d1qtZmU;V z_v6vrtKr=I(T`vMi~aJx(DKKt{lBLP|Jxh-!TFkN){bQ{+r(An{aM#m$N5HlKmGNP z(2s@~9`@Hx=Q@|~6IWzU{~CStW7qX+o0@MMk_xW9I)42p$K4}`r5KLM`&YixU)N^$ z>fp_NGiJ^E@+kdh^v@3#$1g5d)wgdFJ#gMx4z+7vag$5J;hgz}^Y;u3|F~sGVC(SL$1?u^cb4JP*8NX+-d_b?kodJ@=5dK8lj)m` zK8yBmzB=ca+_jrBn)dPMH|{;TIlXQA8JXki`h_P`U)_#Ane?C0bC?3w7zVqC-qkV6WK9H=J5kIb9e}S2wJ6ldv{{JfGzIQ>nGTWsN zw69qv(6V-hY5i}#J?6UaBK0SoKXuJi@L_Dm)6?wd*Sl9+^1gcV;puw)2(kEo8KR>R9$Nw!@@p1j}WQFvwq_Rs5=jSY4sA&IKxcuG2&H26D^LJi4 zRW6fX@LFJ9_E3TW~ z`xLfMG<<)}w-0aE=A5m49{G=F%Z|LeZZXM?Ps$Aqw-uE=G`Lo@##Fa|?aqfkK2}`m z_zXICM`$bK+^E<4_GDRH54X!cFSY%6=zfD5xv-x5cJ<8e68j#VD|ls|qLY^!Keu96 z@C$u;k5i@jEQKj&0dn^Kyo zani$X(ewZLzUH0Cls_kTY>r!PU3K>6RXg%dXIkt?>bv4?SHth;|M!#ezE|Rplm9$( z(b-dacIEL$;ve+uKRoScx2rR#mMAm~v$3Bam$&u6cDDLLsVR#2p=*vsIZChiSUE>{ zIm%IgH-A2zrT0DAeKm8xdf|`o?&DFlgdt6HbWik(>S>e1FmpAUSCdo)#>f1Smf{l8h3{5L(|Z~yfl|9i9|s5=Clf^v-; zcED1QF-^-d7{Z#*TQY14*xm+k^lU4wh8~PGoYlY9wz~<=hn)-(ugGWTRo$X=_B(0-j0Z&zdb^G&zx?e3G0xwFr& zDO@#Q@8i_;)WX~AWgh-~zs2Jn)0(4)o&~Q-d%9i!T>AQnaZXKbD?R^xN}RhpqAq>g zucHZ(`kHfQ?5+69`~KG>n{Cr)>}jk1^=i+zBk%9j_PtGwudQQS{H*HOUGKaONw#^W zAye9g^?2g<+-*N!{FCL$#yUg$wy9hwfwU)wHI1Qi|9A8I9(xffDOmf%h5R-5miPaZ z+Sl(T&u;ww(c>3?L_(j%+O~Gh=RdyZ{Q2jxb4nk@t}VN*E`9ySO}YC#3g<&+{m2eX z_{p+F{@}0n$A;GvpQ%5yP1E~!=D~!SGbJL7B-HxvOYT#Aym4>AllON{y`QM9KQFm@ zvih+{2K!e|uez)r^Y_ppLy5XD+20$Uw%z{xwlaU+nGP-^s-}XVy~?_7`h@!bn~Ng@sJgD56qp-fBgCORWQBz2wVAAA$$AV z#Xk=}iu(EB>PLf}KN3Dge!Z%&@mI~atK!p-|CnK1Z~Kr-`TEV^v#$hCXx z@rS<$zI>eUEVf2w?)*ik_N-nW@bUA*8Q*{Y+|#{P_`PcNx_bVrGZ<5}&i}dvnI_*~ z_U?!5ggTp7@2CBiGMF`U#$<`Eh_f|o{_rxK^|#^WdmC9%_gP}64qu(IROyk`#X0#u zem)leZt?l_`9oLq_uJN&zWFSBTe|+^tHTDaa=URoXnm$cC6C#kQ~G-A?H*~a zmplBnZfm}2OM2Kw+2tIMEVPnz)xwKci*D{ZxZa{Jtu*tndD4o@#X0&POJl1$*B_LX znJjPLBf}q4`{{7xRr5E&@$;6;J=t(o{n)DP2PZxqo+j?5BfqA0>z8XA1pWMvJ^+s% z**OC-&gJ^CwRqlR@ZlN{E6!w{DOhtRD=n$)@crVP z{50Dn>%9Ki+a=7*w6kIhYbw^f3c0?=jW;ZYhi&}~8M}{vYI^wHorCQR`~MXD(e8L(?5Wg zq&?zc%a1vCbj{Nvr91S#u6=rFW#ZrO^7Vf{&YoZQE0b+Py98=>ECEf%Ub_F_`ThSj z!oNP(yU&kqubupLr`_4Yx3$l+e?%Rf$8Z1s(a$ZlSU5XiCdA@-R&pu|8bMkPCq(p zw@E{@w)j0sv9$AsTTGr$%x(?k=WD+jnYZWna`D7dy32oM`&PH{PoJ~n(FUU#JLWvz zcum`W&+$2#XIq08?*UC!7nZ9-k7EO^9(#am^;pH^=?vd^me$wK+BVNS_5bqs`}O~)?(g`l z9C6YVr5SZP40N8+@4tIn-aVgvLI0s{?Jha{<@uZLEj?7jdw=PfZ=H-SSIq`9(eHT=x+4sE?F@J6-u;ozIo2x6^liFV=WzAwf*__!{lA~YV5YDc* z&myY-!qGWjW!x(czKiP7kK6aIi+S6OtB0q{tF2u#^T*n@2e1Rs6yuV)t_4&kJ?wkC zG;rUeBAePIf&6Vnr3aI)9#7R@=l8o}&DYW#eYNH8^LF@KPK(bsxO?@L&arEZ$y>v6 z4j&R#_qUT@S7p0x`md+gqiYXrUC&;1@c+vn?$5LTXEW4GqIdGPF&Q`Px&M21e${>d z<+lSC-_2dMCpP|m&fhEZU+j3sd*=EF(=1#4vU^8Azp{P<+5l6-_2vD1F8!DH9sa(m zZJRJfqWUe;nyV~_AHN?Pu1MxRBh_JY!1%f0g!YVg}?R<6f@e8?cg;HFf%K6m8ZCBUKIQOl_r%ufO zV;z60%+(K^C-Ql~M~{IA7U6>g)7Kv0QHcNcyPEUv`2!DB_bh$>a%29seOvOk*!4>t zwt~#geFzhIao_%XE$@G}a}1x>);v9DyZ_Ip)2A6e{SaJJ%d}}{*G%8T2iug+o%Q)~ zX44Ey9-H`|Nl!(mXJ44P*7V1z=jj%2ti{C-YxZ4^iv_K43fm_c$b9aP_VU_dmBMs2 z`TRdwA4Bi&t3F*GcKcMEdwWMz4 zw>8~6Vw6fXYd$4*KP^tYcJrUvx>r-=-Ri1MSIv)~x8v$!zMiW)6O;ZOF5S4}M`A+c z^DHx;H+8RG8Q%M}Ch2MT`2&WR#bf@KvB%W^dbj)izl;B+66#p8i_Sv*YXJ84>5vEW z|Gk_achuZ9ZrQK=<*y|j_N^^{yKVi$*=zHkuRZGv-UhT|KGWy-Ki^uJ=G2`1|LrWp zr*Gx<_pUE@u>bn;$N$OoHhJH7KQ_$HtjNfpmh>#CG_T>oQ z0;7HBu1?O6Unkken6~Hmw@KH1+-o;h%yNC0_Az3&y3hA1+n;S|Pd}Fx@%d2QQ zT4r>WR~ov===s*TIakZ|mhb)b`oKqveeEmbzDk>%x;{J9H@h_9$B~%}7aQ~KOZuv$ zzwXzs$NctxKAf%j^)Vm~WtLxj9VpfO;I2`8d){0p{zUh#O=tH#)Ou@LfBCCdB%2*L z{8oo1{Ijk9zSv{$gYDnm-{Vn;e;faL=Z$6HgT^XB8*Y@p-0wdwaPG{K#6^FtShjrM zz?S>eV)o{UvsI^Tx0y4$71n+H`cU}r(KY8jb{N;$ZI&)QQ}pASaebP8nEr<~x4tD^ z?Uz>1F_htnzws*EdEL)RQ?G(n6@}PWM69m5${!u$x2NWPB5o6b1yz$zOBdhYy zcS)MPlE2>d`~S_|;!iC4lcR5MS!KS?dj&_o0dPk{nLG;x|^4}%E$G~SBh&j z@p7pYzT`jAqY)Yw7nZhmy<>~@-QLnYRU1Eas$UIRJjdeIneY1X2elqfk6&~=Getsz zt*tRJ0YW{<;5ozaDZ~HGjKAlkryZ}!yS{tg^NP6>E%})bA9!zQ@IUX5ob&Nd_RF8Y zTz9fq+N|t-?eXJ(cu&locyYcK^KFJp;T!7qhcTNKOYLgxa5WD%oS}S9W&V$vH!qKF zym<5JjQcm9-t;uRKfms9*|hAm%L!ZN)O<)VH(u3dv+b4T>dQCZ`MmjQ72Y0OYx*JJ zT+sS=%)29}+Ejf#U8r{TZuz%Y>GxlMm@j&8zR=O^4E81OdCRwnr#oER88JOUU2xL+ zxLrGp@6S{2kM%G3arMQXE0d?(-YIqTWBcjp@ipJi^2O^~>Ta_WyeT_ZcxSa=Rb|1e zquq-uepcJ=EBf)ObKSiCj6c)udp?V<(U6ox4w4<9AlY&LoyT1J<>os5Ut;X8X6NrY zH+$Xuq|BPb2Mj(`^PJiLfB*3dKlB?L>z=<%t$Tm>kIM%W=M%GkN}j)*kno%9+TVPK zSuZ2fw9i(|>9q86cKG#m|H~6<{ycY^0{P}2<(u3evU#STVa?H5w>Ox7PFgN(m#&od zetQ0SLGd)u5~R-u6@F>%lS=At)^6(;(N~+heon#BLr;Z|-`iPrx};Qpn>6czALq1yNnOq{(PEywNzOlui)3{ z_ujTIzkN9Jd9s1^=g6#*`D~p}KW-FFSAX>I?Y=kGaesfZJke(S%;}-i!^3>|fPn!I zm@0^2OJk_KlU}~$+;iR+r|YBk{_4j_91sn|3*7CF3IF>OybZm%K8(Prl9Mw~ub#^*d7SHe_3KX~KE zjmN#MdtQIFx_xrq_j^Up_Os3}oa^(ai)pjRk&ChW9!9#n`8P{z-CWzG2XkI8zVXUh z_<4z~sY%M_2_7%1^Iw*E=WYBs?d28kzZ(v}fA{9qWCJOwPoev3HokoH@^^vZ-1AB= z6W@M+Jej%uU%z?&y_)Uc#NXfJlt)e_2@)1s%*G8iuO?fE-T%z?CDnF)<>#-P<{dBj z{FCR*e$DykZziXn*<7XbY`GrWuUhx{|C@Qm_W6CVWInO}alt12`Hc5}W$dl_`RVx8 zx8Jj8s!N`m*=u59EV3|q$=rJhmvY?a)W#DeLQgJi2_eO?Tco|3mflRsZAvso4K{cUau6_V{YQy63ODZM7#B zUfbEj$fBk9plFV#;m@bj&c9dEo9er#yL8*;Qa=BlJ1lncg5Ed2&G_>+NokYJ^Qx!o z>nwl%eDNo2>yg&2S5`Y}?EO(z`0!?@V^YMqHwLF~ew22)7TtWh{{M%={OkYNGd|Of z2(&PQq!mb#DU_VS_@r?D-HBH7%@@dj&*c5zfBJvO{%W>ornTSa+!KFfv-)>ZSwT75 zo^z8VO^zM8`@UixOPRTP%beN9Uo+j)lNvPE z$!t4UQpjuia$3aJ7fGAbi`BkWSxH{2PY|>d=a5bl>MP#cv9w%la>)LlL8V8#HczhN zlz&zy{w>V1tYX7kl{?>;-~aGk?xDc$A0KYmO<=M&h_hzV*>?IO^ZmD`<+glFEH;^6 zetP3)tcd2Dwmi9jBd?n8>Y43%^LwXMjhNSd@kR1 zSY-3#?zLf+AHGLKwAjl1I6B$j?fCC!v$yrD9*RG$eS9kqz>g4?N?E8OD*KF!m zW@}!u>+P?Hw_hvBPjgk@eJ;#yclC|$b}!~0mCET-eDr@O+l2Lh4bFvcm}fEbKe!Zz zMzkNQDA%b`gwlcaoNYN z4=m3Le3Ceywd;=&+q%EJC-&=z6bl*)ZB{sJoW9HTOva0(7iEP!eX6$J^q7BW%4GR!}(M2@fj7q_|i>ro-Yu=2BEd(#rHUgW>|`}yjy9ap<&2VeR(U#RSM>E35r zd?AV7y0TVyzx`J9zUU-HqQ9JCk9>#V-tj^2MeWaj<+@29^y zFRWf>+)$&jZTY!mgM=R$&o=G@uQR&-X}iK%pEYdFWv2^{)U2xX-mGEPedBEYDNTJJ z%bRcBA_wOS)oD)>xuqXp*Lx+Q@?5No-d(Tf`7fR^N}hTe z|LQ91Rh2(q1~S?oqsc+ zSkvl%T(|$6x&0~J{l0#tKVPO<7V#QfO}`%e)7$o|id)XtxmRz!PCLEt_l<;iKfa^| z7QD>)Di~Luy1YGK{piiF`))tHtHF9tVuOq+^NvTK*8E+wW9l2wG9z36HO7JM2L$xz zhwMMyuD#ykSKRJBNvrqIzx*`n>U8ea#m*Py`fOJ3vpVeY;?dC$hgZ8*e#`k*`$E*% z`wi?YfE|6yZFb%~dR_ePuXcZjUyfVcFoKImA^-cEXJ;?p{#X)xrTBUNy(xQNPA$~= zU0g3K|2orm`}89R{=A8~ba}_@xM$yQ-ThGEB67ZtZGwAE(dEy%k{=do&u{wkRd_;u zd}UhT?=0AAqgQ8+U#mI6*F68j%(EsgCQH13bR|z#->-W9RgV9mWNo+o=L!;4-<
    l<6^1IaH;2}KJooLHccRW^&l|6U_ZqzU9XW5R$a9_lYdCiG#;|v<`Lvs1 z&EAP`q+T>7t$Vz&6SUmOdS&6qtVtV=9DI^IIoRHNuTt|~nKGu;>_^nW%Z(n2mG2EJ z*S@YUxqAQm4c~5LwQs+(+{Us>^!ELlm{%+PH$MH?{d}aCZ`s__RX82p&`_g5x?62kCzW$#r%U*k@Ce)SbeLZ<+ z-TLD5@8`TN%MdOtVYB%y=^*!4)9?TMqzAL}_f>v8t-t>Z=ZXF6B0dXlmM&J*z8kZ& zG5TAo)!E1+A4ItiPbfV8$hcVXs5tvTs%8joPu`$fRK;MuPNFQx=c}^vZ@I%_d_8Q_i*9_q zs!g9e6PK6!TWQXh^Rv9FX~t8YVKD1#_=bO#c8s0JCc^rm;0$;604N3hdDgoPoPvU% zoxgj6M>@aim;dp9Q{s>NKi53#t2eRn=gpl*mVYYrpa1!H&b*h$|JbT`Keu;2@%+n? z`PXA>nJ(RVy!-vW&*lpM_f0!E=cb^c^TsniZ)$Fq#nycLX7@D1?ePBO4W(lKt2n3o z^DGoD{BrIp&waURbLXF(G`auo9rb9#tNZix^N(9D-#qc#E0Njyzx$$nsy8Np$fAKvn4T9wfAww$CR?<=oARuy%=|9S4ys5jLzZ|ovZ z_}`M&cxU?{(Vd>CSodcF7Ne8m3G4TW$XC zXMBT}ZjPsb(@oxIx7*-!v+~1pxsG%#tHS(`ZHd3bzPi7+7(V^pdM4mZm6UI3t!mTlpKA0EZb*WC+oj0t3>ab<@~xAVSDwy?wL|@@Ati16LcTQZmBUVj9nsO zR{8eP?iCWx3wHMyPZVBP{PE?_Lk>k-kGxoVF#hY+4X%s9$cYSwzzWvbV@cfnP)i+*!UOjQ`pPyXUTu+^VbxlDz%fAsc4f#&u{wLM^bN7xMz0rUAKw$jw*zjJ6U#jjNy^UIWuJK&!pPv zGtT+GFTcru&NGI0R?!kKCvLm_GcW-^Rywang_IqA^+SoezZsqaC&yClVurs@F+t6Lu7H#u)e*V2Zm0Q1EK0fg+ zjx=Lju|wA1+*P)5|GfpJ?UEMvzNpOK{+DC@kf`Uv68zSC{#(-t7Cy+f#EM z?Q3CNzgg0ujeCwcMGpRHoo3?u_pa^+_T{KNu2U$vaZCNSxXB}{+kl< zf8{=7AH!#!RiXRmO{F0A3RHM4&4`1H>1qEHlpO;t8J&B`zIWHKe^+o)_uPH z{?_k))_k3$CuX;MR@o)LaBe@##IA|)`v1)uz7#&0UstpirPOI_Tx?{(eB!q4&dSBV z%WUq7ly?3(J9~?{?b?m^j~r0l*O&k5tL2U7l{W3mZOZp_HvW_?6E;q+=V06OFOA`+ zfRBIg@q_~(CjPN%_;Wf)@=Tgk%Z$kpY3es${Lk0j_~p+ht8UZjCy(VBMEF(hJY9O| zdHUq=e?jXD9!~glwBvsA+_mpEU77r1<Eg?{#M2L-dG>Mj$Q1a_7fEY z5AmWto3FMUmIkZupW~mt|K8!m#obSZ)7RHk%$@%FRQwvogdY#5JpcD6>&0TZIWK=+ z+487+Zc2W7^J5ve`O|D_SywaMZ?{3|%o{+)e|D#v=a<~?TRwY{-0c0!f4RL){#$3NIm|5Ta?jiEt$vV#LQC$Mwb$9Vm(RX&>RjKmMboMdajus8{J!$%tFwHk_2O!oPTzX`|Kqo}x39myw|DmX zgrgTwN+9;s2fN?zo4tP4o~N5qe-EB8M9*jFi0A;R|T>wk?c z^@SHJi8=N)WKe~MOJSJz8?|99!_pB{z}&Fq`P z|Hw_B+k1~k)21w<;7hXl!^?;7elIwE`{TDAzfu=>`){9Y`+aZf?|jGEFV{#F^opwN z@BTPZb~Cqlvi|Y7%b!lnijW*r=n=QUd8$H{;JY0RwyO1;W*BCxMt@%}GXoix28bPB$Z{_dpQLLz5ch2>m zdi{pU&%c?ke>eHM#oStn9U*MbzSghwe^wL!d5_(*r!V&Je>Su3kI($cM?cSJd{SKX z==}3_`>H`~zorG38H?EMo++ql7ys|g`^ES8EngnJcyz|) z73cl7o3G}29piWSpl#aHd7qAMPl)<@+V94y`Te~cW(!Yz^tRg1_L)8F|6lUk-aPE! zkC%w$v6nwNf3B~7`qBrR&&Bt$r5?B~x_V>TLf$Jkbe^BkoPO8f?78%>Qw+3!{_bzll1?k@PvQ&8SMYx`5b=@tx$3{1Qkm5>nbO|{T4H~ zdyn_Ogo)41a`xoMoqyP$E3qSm?cJyQQ@!^+4}SU9(tdqie&sa(m*v-s>z4UHef}x? z-NT>f89rr8%(>&8dVt|l6lgrH>Q9~SW+CSZ(>5=hGn4Z!Py6{hM`YU18_nOiS@qEz z-JSdLuHIp7E4C|KB6aiak#o!4n1iYcU(J%fd3540?dy?wg;&L+=VskFt$l9YvU@-8 zF8=ka{kH9qRofpQ>5q;1w>0jn&-3ZmU&$HVJjeBX`I1FR>zJoiuTx}w>ee=6uVB^B zq^x~2YOc1oTd=&@_{d8Ct4iXVZ?D83&+)CjkriSdFHs{GvRChG$o607iaaC?JPpfM z-`eo~#-B2~MQOEH7w?@>zdqhzJ&(fQ{fy{6kCUKwwj`Pf4}LR-?yXEjGsA|G21ehnI$<)+F!i!nP$z=8$T1?G@q_z&^$Itdz+|R*^Yv; z|5kMq!gFT)d33h%PU7|Mt&`7v`E)dVa__wSmFg3Zhw03{aX7?2?vVC*zeCI3OB~&N zU!(Dk$Odt3v)M_e+V-~g(y_|6EgZVb)NY;@e|_iZChN&}!QGNJ47;?LptKdcjf z9^`LV$@~4w)ynsscX$5Q`MM;0{@jkhV*A7I6wQz5xY=Z`(BNOTBk9JWw{|(#UJ6gh zt~ZQ7+|`Pbp8C*&XxpDoW#a;yd76>;EU)9$x-q&$IGt8{?WU zzrAbp;Hy3JiQP|2F6cEkz7?LZuj%XWt!GL*es)&&&*YvfAtPig%PJO9zE@HG}nZF57~<8pQ$jXgj4Fx%uA%5QB# z!+rjC-2v0c-Q(Jcm40bZZF*W{y_LK-<5{d)3;_9sB6U^eY0Wn^_a@)yC1@S zT)p61Q&v^ma#LaB!Pvbm=l#|_-z3hReO!2bpX-xD!jsRgThG>cHGOgT{CK%U<#TVo zvaFWac`nR!wQ}43x;Oj!rvCq5{rTBh@A{sv%jZ|c>b^!P#Sb4?C^3Wa$y@pB!8MP+ zeB1v2*NNgkUytd2k+i6jJpR1muhEi|QjnRVA0o_u&&|3Y4w@1=-^pk%Y}`=e=l|#D zov*X=_gVhEx$~>JLaptq_-(VLp=*t9oUM8D2DH{_4O@Fjkj?JOo){sv-IBdlf38Np z61A)T@n@Rx?mtUr{7PNEIlO&d?#l3Qf3CLY?gTA0+Gbq+J@Qp(kB!o{AF}h~<7!)i z<7~ys@2>k6$@rr>Xyfa`E(X5EO5bXVOt*X6Sp`Z+fHmRet^^;~bwh`}))AAI&1c{oXrA z9QLn&R({o&r?*z(M=ztjzH!T+-u{d8*qHylnX?rtve->-q}EPoFy*Pph~0+FMH}Heb9jrT6@#_?T^}yAElH zt7T3PpIdcG?44%f-}d`+R$8ZQ508JJ@?Oa`p0AQbmeu{9qaq6*6))koVJUXVRhpA^{-BI zwx4|v*w3r*vr}S6qUH0=(}k}Y&3$$IwCM7-zw<%oUu_3n^v9zhE{PgUQ^CP>5*$pO zZ+K&NnHRR(``p>fv%dWNO9ejW!v{VmCj5_mdd;|`#_oJwUX?k|56M}KPwp02YD_=e z@Nn_^#M-Z~uFk%CwSIl7T5?@dMB1^WjP&(jj7e=Qe3Iwjig>-SkDO#IX4Y&f(**f7zuJ$Ze2*~e*?m*;8w z^?sUGb?NPf-IHZX=j4kp&Yz^G?{;u+GnU;mM3ef;5j zPe6fGoV4J6sQKS{Remvdp2j}^ej#>KrH#({dbSD2tMe{@TrO$wx#Ih~yWL+!*ZgC9 z62JY$GuJeiGYmwQ`W7!d&Z7U z>VMKfldt+gG6uanS?YT=Bb=Xp6y1I$cyZ3prxCSD0(qN~OAppuZFhYhu5K$+U90<5 zr6}stkJ?ik|5OQIj(vNsCPm&LEW1B9V#o25lh3oQj+hT@W{YIOFCzN;aAoCM|}1BKbB9w^`UBd4&OBc10EYuwqLeS?Ticd z++S|Bzy00x``+%~|D-cizVy%h^*e^`-M{NFasQ8qK-n!^&td6xZ> z{)hCp9h_rPELJF1zkAQQoM#4CwU^gyyxCQpHr-pjZ0pT46)%2X$6_c`u3H_y_MO_c>X7(*k(wXY6dPw5G@S~ZaAiT# zk)5Ceog|Jvi(jTa+gotQ)6$u*RtL^CnDf+R#p{^)6Iq-2pULe%u6zAt{&e+gdf~QK zJ?|X(F9%H6TU=Olb@OTQ%QMfpJyC!7FU$>XVNBqI@=*tkapkj<=Kfp=62TXc)0p#SZ&q!Y46u;oBPDPeAT{+ zp#H>F&U0S-)_s5U+k@%%iI1xr_s`&B%Xq%}<(r_FOS*T&sFZ3}d^-B<^s_@tjQ`4n zm7daftJ@`Y^}JsH{k)aR$KKsBF#K&aS4F4HFv%0X-004yH#JYg&mSU#&9tJHun*Q?1=5qGkH>ys@ z@lbvq<_T^NlUrd+)A@osWK6hi|{JLCG=aklU%k zd#_s~Yo8Zgx_Y0z@AVHypRcR#F9_Us?@iXN)yi$X^ChgT4kw%r*Z*{A)%yCs9}e^1 zKet?7+!(cdngK4K9@d_ny=?pXPa7ugow@o|?f!+oMSfP_SYEpC)`zNj(|>Q_d;b08 zyXVR0KmVvXCujV4+j(!9o$v4a_Mbd@MUHJA7js=)I>XP9dC%@JgGS*LpZsEZa=Y}; z`>i|=&-h5GUHY!5a963!cuLWnvypGoY@h0V%{p-6{JH)5W_A%r-pTOUC#DC7%Wjt0 z_V>)Z3qN1E+N?C2yZ%?=VUgMVY>nYLUso$$uQ}=WYGq7W`6_vfC9!*7iO-Jr+mR#h z!D?ra$Nq0_#kyHH%FE7fNKIFM6RW3VxMa?(cL(1VzKm5WI{ZL=!;9ZLXS|xOtv0{* z{L*ganxdOJ&uiW$ehi)O_X)HX>6+a3zHogpyN^p|Wla%wpZoLQQ|$=VKcBq6SoA_u z6O@waZ2bRs{(q~W-Tk*-=iWD|y`omX{73S>g}+69{FbefKWe+j&gSjmpNEV8t?c@2 zV|Vo2)1T*T^|z(4^%)xeHYku``@?gd;giMrY^%SuY}*)@tWWq`x0WsEnMnz=V0YfS zBm?(3o^~I9-niVIym<3z!~GjiZ=RgB&;D=QTb=7?mL1Hn{Q2NuURnrmWzN;&u;rWY z&b;xtbRFOBUs(?p&RH6Fm%VJWR^^vh(;xe++Wr2`)${wVKeX3wvRCc8eu2;9zVy2s z{c{a#iZ|*V^ixua-&<0czR%WOZuh(gA68$iT&b?Pz1XztG5>V^{XgE#mfaUs6qQq} zw8`2^z3BU#FP|P<=@xhY`00C9&C?H8g=1~&nLnMclX$Kj5om>p!oDvFz!brIP)|hVGdh9{c~9%ies_xiH$`)Wgj;5*jnj+QNE_%Y>8uf~#}QfI>Jo*Rhj?ep$_+J2SwP_l8zYopkGyB=B| zUUBZLZA>9sMRi?eV(4MLb&8AXUe~TvzbiMdqE09+-OjuB-DQQ1Hg?+{y>YSGb9Z{} z@zwV88){S&>=-+-^iukN-Z@uV`!fI4xd{*M1pltO{o&VFnL52g1^;&T+|B=E)BpSF zckhd~(^J@b4L_EA|7lsX>-;w}^Ut7aPI{TzGYuXIhp78?zjNm|n8+J?Z<_toBs{C( z#hJJ}LHU{B!T>_1*L7UK??vXqCQO z&g#!bb5-`#J{J&QW<2-6{pTS$HE%v%;(J`R_gvYg=X2H7jr^@xb!py{EADi{Hb$s)$f8JLY z4XWL)N6!2_QS!su{%fbF>(|G8|52y=S>>?h=80_SZAvBGTP}mnJnGo|-djh9d!6zA z;=(s)7yr;Lmi+hW?T6Kh^Pen#|LG|Wm|NH-^ z=Raw`U;E?G^7j>2Pri?--I%Uwbk1tJVS~d_)|ftHO||`ZKK+b6vUF2t`Nnf)+s-}g zoH+ZybLAw?+j5il$NIQTdmOX=&sBYOd-=KdS54coVOo_b$5Qe8dU`h2h8{epXUe8o zTGu(BsLC$*`5tuU(bWIy2WnWgxln@0LXFwD!RA=;>$7*2_iwb$_q%sKJGWx5e4Kr& z)tvgSx$WQ2ey)f(_i?Vw&+?%18GrL6X3Rgl`{BnE8gb0VEjFKo=iDo2lJDxc98X6e&Ab5{CWTM09}6h7Thx~w~Uh3EDot6arr+s-!Lc>VIp4gZ+CKkRh4 zVKBL1&TChly_;t&`E_>sD($d2bFX;+F!;WE!}e1f4>#wkKLiz5`@eIv-#FTS{9B{Q zkH(L;6caYa_R0OoTfg&lp~BILduQq$Klgr-N1}Pj=LV%P`8Q=7AEw?vfAzs;56iDF zeA?&hFS_}E&$M5^G|tH_i+D6=|7O``Gi2j)ww`L_ulvEpjVQct#Hj+nkw)Iy{Ps7dE+ou1ix$FL}?%8_1y$=`P`l?j- ze)hljUq#p4|K&J`@kvs03i1+(X3%87@%n=EPkHZ23fcV2&b8Vh&Gu|-jkyiqsiy`P z-Yd%59@$V>*QWRUroZ~(1F?qSGP(Tdvj;Y2%=Nz}7oO-AUmv&kljxfI=+zGsoUM0D zb}BCV$$Qu5m{E47<>zkW`I_r%XRh0~E;Od{ntnY7J2L}tGxLXa?p|Z_TOba zPk%j#dz3g+@?>EB`(j!Dpugt|73SrwPn%J_|I@3v`{#A7%-j8Av(m%hN&kb7nh0c? zUQo^Q;VINR7AH4<#@;xqc#96zryDnaz3|=Y<)d=j7_*;c+rHi1e@1<`MUsKXs@v=2 z_wD8Tlo(mE>2=Q2&AZ!c-#6cjTyt=lgwntH*$h8#LDJ1+Ea`^-_YJvUzW3Vq-d(=> ztn|70&(ilCPfUnAeY`U4^2_5qF^AqS{3-eC$IhNq2@5Ocx^?Lcm0y-y{5^hP>wd(o}!)u0N<86ZH4hhKq+!>h<*=C=4rqpDMfl%`5T6 z%PcMxeE9qFuVh|nLey1p_vzws-wWdV;@|O#jT?uYU;Ld$D)-?HbujdmjEN{p0)Xse!@zr>85$E}vX3x#P-x z$Ir%JUOqRwm-wKA=f}=@j86pT-}zD_%-lBNb-u&D4S$Bg!lTRI71w`838TXY4uXc( z?%Hj*_oB9A{rcUv&&jjp-Yck+n78~CsORd>*7wCaqfXxD?DZEm*O&i{$*h+s%T4egH4`TFp}_j#vIpPN2^ zeT`ZA@4or9GyUs+_bUAeK9uh|$?5mg)9WWn>73u$ePU_!%Rjt#Z4{h${_)Nbw0;2z>;F&~*FF_g=IbFdx7D(IVgHUf=Rg@QCAs z?-DP{F9g>AKl8r%e)XZ_U(OfXJ}cgRdfi^OG>*#YJ$%=a4Uv`_eNA+`B+zp2WMZ(Zv+*DD_7h27$Z`PWN5y}9}3_l1wG=6!mSCLSMO@><@G@g@63DdaV?2@)1^%*G9S z{u;kN8z<>rd-(ge?R)2+s7(G;S0Q^PF+rl@Bxe^A9J^JDB|a zm8k*qiQ{!#!TZ+ocVYI3UH1%=ce*3*IbN$Wk zy?A?P60kV)y)p5@ z3Z5U|^VlZ1*H&Hrey(9Z<4fTQ>*M#EHT0b|@=3Bl~ zD1O)6{Qmgklh;bk?JhmHTz*&RdT(2O)w$pIZ8uBdu3*=l?;9ho+2$L!`-h&^G0Qu8 zkA0rBypE}<+Gj8!M%S<^^Fw&8>6%~5PM_r4Z1v%VflwhQ&yKRfeP&yKeZ3OC^4;Ex zKi7VEb2a+aNx5ym{$!eqH}=Sw8z`DLRJ_7!;WE*nHWq|NZChXL%BmQ^2eCHns0wcPxjd_B*st-l$~uM+qEkr1}{-=>>4J7&C5Km5!8 z>)gaH$l*j=u1qdz3$B@Qj)hIuEIz1zuKf+~e+Mew3aq%hDj@Nu$-SfB*gjqVQ|Br1 z=hGXOx`=acIPzCqKYWVa++KRkr>CC|Z;5_&c+uzZ?Xhz8tW$@1kNzH|gM3O3!KVE+GoUv|62^MCyP%==yakvYF>(%hdsUiro5{MVH>C-wKY zUq8U3uz$|}lY4kT9nJO3C-&=1J(#o1vBR=6wQN%FzyH^SywB^e-yBgqGv^Ik^V22M zcgLvL)R|R2)&I&R&ZimQ^TYPq%~yKfww?24@lXA~`t_;&WlP$AeLWO8wueSXC^|UHMaF3H8 zQ*(*p^Ao}MnmEXLaP;1NlIcER7!;6(Gc+W6=df{LAYyUUVHTCg5 zGazRb34azneKXI`S^RZQ-;}v)w_aIoV`aEU<(Y+DC8xJu;QV_%D;yJVoI4_u{(kMA zXVyuFmV7pk=5qck8y{o&=;zgj$aTiH_k;YE=51&%H2U*PzUF}9(OK@T$M=0^SiCz# z`dFmk2hEk53`fJx%(LCg9iKnz{w@7UXZ^m}3LV{jp>Mjc&2G7uMN(HzCZ3LqPx7p| z+5I&6F@Jad`osPSsp-L+=PaF9aA?)>Kh<&jsx}|q)Ez$mz@~3M>i5+C{`Pfu`TJ+u z5r!rx!-0&FJDxD6TKJa4S0B%%MTy;XU+CV_0PPWvuDe) zr`D;&xf=9`tkezB;Nh~K3np{%&9Zx znmjO0&&)XCcjL$0=$tR#HawWA{kGzDh3Izvhf*A$POprczoTXE_vv}hm5;XE{=*UX zu{x&Atjc)FhZ~6pFZR!E@#inUe^@vF`0dB9ruXXE-Szu+=lis``&o0BZO%Gi8aCmN z-ZA&GGkP&Sdu6J9Pb*jF6}~CZF+CLXYU(+$mAo&m-1_=y)x((hn{U?M^=}W|pL9cK zQvcj}dm9%^Z2NQW(UtrYGw#oen_I9e*zkWO^NH!7Umibt1Ep2Wp86n&ZNhKqgVTSh zeb}?`+gJTh4?n!NlxaDgm=Je<`e&WG^^=wV^!?mxZR7g?50CB933mofg}tLAV>-DRIG`Nj0jruS8wHFryL&A)r5Lu9^w{kQLd@7w2mdGsRbOy-sJ z<+o>twwCHGfA~OdbCCbfN6`jrf2FGDTs?o>?Z(+okB{GMm&<*g-&FsXKl)q2k#_wa zy|(%NPtKoPHhpu@hsfva-I|RayzROgvHJpBR?f8ICsR)6%}9H``IpzFrStTPWaHPp zEQ+^|lKohq)LuKi;LX+N;qy;yy|R6B(#wgb*Z(`c^-J_z+4!9Jg}bf<=M|QjR#*I8 z>rwdX(ALA7k9>Z2}Ki9jz+-lyeUwWgW zZ%XCjFEZNm)1~?B``35w%VB%=wPxn|<@fb>SzmfT<8(^#E=ULCv*d^OA9xh(=Wjo` zLx+t=VeMDW6WdpBet+Fa+mI#GQu@@)nHSC${5a!#rtpW(XG!a5rE@nYy?z~bHa5ZH zxv=}HiFf_p)MS|`EEQkAZs){UnU(vC<~|h*uibccW!v68kKSaxntR`N)%yA!cb(T% zS^NFDar9~YtI+c$b(L%1F;0HFrl8JCOY50c!p`SXK>>Lw9XF*HPS;=dtovkmZAFLk z0Xgk;pM(5`j^(YdGdy?mO8Z*3($B32pF3WC9pqoS`n^tj3*%&w?U762p%&lKiyD2Kb@m;`y9Sohm8_`cz_Q4KD=}P+ElY-yA<;a!U_31(i|q$ zuUx*F zEKpUZ|M8@c|Mt{`-z?zy8r@>qq`IVg$&LvvDytV!?wJwPKz4Oh{L$^L2S)DAn^TUyp&97HGCVjp6;_CD1?l(G&t8EWzxvkqAdiGVv z!}apJ*C#*y|Nq{e%FmbNlmEV49v6Pv$_RN^t3iPT+rBb}o3js{f0+I5+1V}Y>m!kp z&c6BS7vGD%IRCKx^xq8@D-IucY-I4?&Q9E`_ty$>arFAi+qZ{@xBP&)to`$cKf=ZggIe^c`9 z)rHNvUr){3|7(Np_sj97hs)C5+j;Npn&^H+Z2#lWr&sqEoLYVS(Yo7L?X(%{{k6($ z{R9srh8&sazwTMt$@J&K`;TuF-t8^DPtkeqwIKh0wfCzz*B_i~p=4iUSfo?<^`zdp zb^8+M|N6A1YJzi_wEW6-jmjtWw(Uv!v8i)uxOYCU^wF1^^LNy*Wqh)F>-q2vN{J{L zjM?bJPUaK$Bt|Gbj*)MB?!E32s9y7~bGm%{J!nuP^0jsZufqQL(`%0L9QS*Zrj};@X6@3r zvsFLV9gqDEJ(cMG;~NidTwS@YvR6vQe!j$xnxY#&Hg6U*li>Be`9tUD(bVW=+C4>y zlgcWuu3Vn;aGub$`X6U!?s6`x{`%GLTil_`yQ6*{sZ~&|PuNq&;gZ9fwMOaC%a;8! z^fKEgzNwoLdqght=qXo+h@!;M`!i#X_nTB(KHAm%dV^uo{EkNHX~lNcmWjHTSMJ*zQ>fjzYk}V@jo-eWe+SZ90%ySU)nb4BcAmel{@KUw{Y;-P1_kjvXU;#WHLRA2 zSr3}Ze_rXkT;4e0$BXQU_`OwM(<=X0>l#ab7CvlbEaq%oo&GOrlllIM?x$`hpN*9| z(5W51XLE$%^hB{mjg7F@;%EwqKc?*M4{IlNFC^7IXZVQc`Ki_3rHHwGQ8AX@$w15-uHH;b;4)v(u;a$cFIEF_v$>6-=u#^|`b01q<67gKu$1TP{0n z`tfSb1pa;VLTv=^-%Yp{{PTb1?{9Ct?K?h;u6cnn81$fm$E4v+Z=(5*^XBdS$1mi| zo}Zn$zwqPITLnLsp7Fh>YGknf`Rw_plK=Y6OfULuyffsy&1Uafqs!L~K78f*@pGQy zlk1-?IQkDa%sjrk{C(V-^$B0i75?uky}0K@&xtojl-@j3FSASPbK3snRATb9qPt&a zwLi}x-?BA&GuHpw@Z!&_CGE-U*Dsyt;^!^5AACSj(yrBaXZF8gK9==%BQN)Ni^@+o z6F`;U*VF5_{}PxU$Nxj<|NO7sPp1AiZ;(gbSk>0}*zf|wr;54uHOD`zy}VuwZef}$ z@@zLZEUy3d@Xt|hnKz$q{AZt5srLJ_MVsCEHxlPFcge8rYhkp%Z`|-l=$YDcA&DQC z=l?62Rk>z;f~mrv+fi(#OBy4YC$d#Mvq`hz+<$|u_|cijBawgJezMv;^Ki)eIiHTE zX`h=Jt2g(?)imSB3!ewC-g+gtXRq9YFn2zl=Woh3&h0+AEoOPt*A%r-JNcFS?tFRk zYi-@uU9)ez3#_e7UwUBkxw9({a%j0b1~qpHKG(b4IyX^dcKytCIeM-Srd>~6wcf4t zP{Fjz3)U6ax{2}F&8Yq(w>?IEf9$-7-7#NZ80=!V^>KFmcJAoO(DQonKIvA{6X&-~ z-oM{j(#^Dn=~FbbNBm**@?D2*-|u(3e{Ol4ZnLR!@)zS1yA(?-_B770HsIf0?(itx z$;SNL-SX+j<;>pgU1GmI{nFn4J?D+BKV6=Euf5UV_`&mPwh8l}W$c-L`hfZUnqn!3 zb?Xz}3Qss2dL~DT&rGB+FYQp;G}kkUM>bDAA0Ah?lWp$FxaPGrWlYWYEbZle>SmOb z{xA&>_>Rk1oXXmccpLZpB#w!8viA6u` zCLORV`jhoQe_0dbt)E#|yF;vAD(Q)P#&XT8+4ytQPJ@>|_U)l_KXp%>zs~LJ=F^Y2 zN5AUWXl?FuW}lBbXLoE*#HF3Hc!hV*-&Mu4-Nrip=T+kZpD(KG>UJ})`M;;~^Rx5+ z?lXKAU31a&H@HOvT}O00F@bHu{O@a?`CdBz_;t*ef{MPWyEpP~FF*YF`2w5Nb9Z%j z9&t?G8+(8LC*z%U*OwQ~OaB%!@5!BHi61i{>1xLGjWW%R`@RN^qQp) z74PaCJ#+Nk9fsas6O|>;Pp5%TE~<)nlpwV2+||kc`qz1mGZ^1lI`7l0mn+VT`)$^^ zp(0cLUF5Ru)3=r{A9Ze)`j(RzKHdMk!EDdc`>9qx-`qW@x9#30@xyVt+cq;j2%aQ= zAr5*t&{;=dS9St?>|;yRKr^lL zzhA%-M#U~4Z+Z5ag437|My<;4qOFR2wgrr-QYpKgOt-c ze}{dsKmYHYrZ{J&=V6y$b}UPxkL0xl^=-E7zPo1mouzTS5GNsM>2H}=9$-KA_P~DO^P$4O&#jZ(_9mxg@99?6wkg4vZFkt}?e%ualla3TR%&<>TXT7b?zE_t$?GC&BJ$&o&wU4ik9#Wqd65Lz#Xod0p{WYws zTjJ|F<(8u?OmAycHZWj5alYE?v)irbA4~PBENqUSx_hJT_U?xtH5XU(s<_LWl=Z*< z{YNGyJ>}ft1CI?2?ECwV|6LmLO=6hT%HKG<>dD2`@qNZC-|gERZvQ*3{r?({e^WH#oUIjV^LK3CYr(wf z+|gYu)}0e-zFs;y_vbg6$~RR_hu6D3UpjBeopV<;`s`!&{du%IzwAfW$;^#kJ5RiO zG3UhH;!CHSgZ1NNj-I~%`s38Y;r=CG|L~r${|!1S#PuXf;yIoK&R~0<^=?7WV8M9Zcll1TM8zqdGw+u!|5K7*Z@#`+(&^s3^__cU*tV@txci@N$;`ggZI^nE z&z!N?gk?$m|Ji*xpN?G6m3aCg@{Pey57XH%MGl9r*~wdNtY2pJuvjhWTiwrZGKGm| z!K?Ne%kwOn|7f-1Hj5oeKRiArUHW;7Gh8ReuJFy=)!Ti-zbEYuWT^4_<|cBfhWDBF z{^A*2;`f&x{dD*h)5DFDt4e3;#ozrfCo$ytFS&IV%zJG2@7b^_QT)0<;Qp`su1wD3 z_qVa<+-y95soVF=2@!Jg(S>D7a`)by-uL+Ge1C_1LI#*~t)L(|UKQuR@OGu~r+@Pv z6;#*XiL=_2?w@v};-!DqFKM=U;>@3`Usl?_pPl!*)PVWK>>HB5RgH)DQA9$ZH7}Pg zS4r(XH+$mu?=tPTe?R^Ra%!%UpF%NUstQ!JlUQnMvu8}UphnO&hzP3 zyJy0WArk%iH|m*ZTXC8)?>QdV7h;*q&1ab07EHfCJt9IZCcRGi`acWUSpd%;-I(qE zG5VR&pQpDUhCADx^uPai?%^i)cFlFaylro;mf!cIWMg9Y^3Rh$+@F8%|8)D4{QG}@ zX!XDUanUYoR&^f*{?&s=wzdAds{h_*riMn621ibY3#l}>WB~6f+W^8??sO(SMgs;~g ze7X-RhqeFvH~i!Z6G2%TT%g02#_+T9eD*zszc%~Mx$?I^kJu@FyP(?KCXTD?xo6si z3Qhl%UpxHSp50&nJEeRBs5m}w{yUF?{C7#8ulmUcK1^H#Dui#}zh;zd7{BREXwpGq@y=I_qOmC@8_;wEn{tSqfF@C@5}i=s{0E%VrwdLrdh%ly6>9}uyV|eYlrv&$(EBWzLY1ZHK*(=xgKYEkc zrF!nC_3gy2n;(yct+x45t)p{Dj{nai&l%t9*TyU8Lync%fp)Bn2IyFs7017-%$jRH z^Zk26zU|+SzpYiSF57+PLScIHm*)o#{Q3P=X5ObeA9oso8#?E|zLfue&#vO@udmtl zr$4UGo;iDl?9H>eZ*+@AcI}m@Vm|QanNHi3vvYquPjXv@To9C}Snl|y*hUMYMBj-fryb8S^S5w;(9rx|;o=bi+l761| zIy<*i@A175=FLgjTGdD2f-gW@8&f@f!RPMJC-;4Nvq4!^>DA7vo2Qe__uT%tDn9Rf z(_9h#ZT{+?E`RP^`@Zb!_kZ{O|NR%&wfw&d z=NO7MqIS%{%N7pG-4M2uEf zcboUVJ-Y`KjM3ZF-c15En0uV#_Eda*HFbT$-`i2V?9#Vxp7r1nJe&U_&1hPr_vxAO zbAI|%zCB&?wRG*HQ{MdBE6UCu%%1LiYU}CKdhYvv{aVStd&k}F$vW5BzYFo7KI75% zt9t(Hib=1^`fv(h2;h7fp^$ z*PegZ_D!|?mvc$HW=91+{*PfkaUHyn)ql>JdgL=dEJQ%1&XvbiLTArOPyGH}0$l2N zPqdv3TANw;|MwrAJNC!RV-x4yj5V&ZtoWRx|2)zrO+Aj?xTWTdy1~}{Esfdr%%AkR z562woIihpo!6>5KC$2}@6#A`a zH#1hQo>5|ZF!SD#w4?2Rel6SloPYTYQ0HrEN!w((x*OkezJ}&l$iEe`Q)M*M;l40a zW6Fot>2bkHSzbNe;-|x7S~j?XZaXXR{JQ$E8^8K)3p1wUk$3k_FWs|gb$rjPM;?a{ zeqa7QeaF?t%+Pq5*tm+jhb!N^%FJH6Z%&T4ZRbJdm41iM)$gnQ{Y~_E4U-VJGPGF? zrewMyE1|;ga)!Cm`}cz243#_KJcNy}3(nAHB($GlNBK@2#9A{)wkf@?X#C@U8hez3S4<=%TL2;q~ip?);V1DY1HY z+UmH?8(zI=fAjZqsP>&#N6%_z{`cqH{dQMeu_*g0gKE%4XJyrvf1aL5KYvVaS@*Q$ z_e@`RK2H@6uH97{yK3w2)l2K@w#6O_TV0j(+Ih_kxqu%>w?CgA&Fk!9(K7eL)Wgru zfL7FO1C0%VcSdnz>t>}fRIYjcRbW6%EO7I*I1ZnyA#7TjxC`1AK4otS^dpko&k zA54!Y976*QHid|DOz>X-~9B%?1q(gyXT#Xf3;HGFlqJsHP_HvQ<@lzbQAr*A5g=5|`K zv{n3E@+;OZrt;{;@3)?cM*sagNALQoeK8SprMtcrJc;~zRnpB#T)#~|&h*sg^v&;` zkC)m!J$Y7d-@X^u>}!}V@h>t(85}bJ*WJ+ca`3=k+oKP^z20$D{^uRX#~=Qc?z!*& z&1UlNgi?d{M$lr0BDO!fZJ1B!KhHOkZ)cR>^-1$YyglR3?^jzRuk4$(d&XZ0CaDQq ztUhlvmEUyufqG4vF|Q!+OQC&_Zag`ee{!?c?a3c*bX{C;923F0dvoo2_5A+H>8*-! zJSU&!gvRgLy!U62#OV^DZ@)tHd4AVTOIJN=dD>pPDNp(OL8aAy^cb@9Rd%!OS}@~v zMNSg$+n7^+SuuNNspu3M{Jinx%K4!6Cld7A=N@>)`0?cGeVZ4??>HK}{_5RRUpD}GGziA{ zGNlHt`3X%x+_NgWy~Cz zjftW08*a43##VnTI(i}c+|f(+lNdlF6({o78x$Oxwzqcs=F)XHUl(q;@$Ks2o*lBy zx)U!m-zYq~VRF(cdC8mKCAJkLnCzHxc-?imO~s`*R&T#Dd9FW?_1@}Bo!};^TnKfO<&J{=JYT@ZSdKEYT`ZVWncQ9^FI4s-E{cv@jH)Hc6KKwNBp+i^FAl0 z&F=gYqj`r*40(vP5PXAzpy(~-)zmfuP^>IzG;-V$g_C!QOfbey$L2R9jBk?%m}*^ zD|&cWr<3U3KoCp4H4pZI{ox=f3Z_R{MIZZ%LQmLN71V z-5v3D?$HaITZ8w^6_IcAclfn?!t(#-4Yepk@`(>DK<7?coPV{l#46wE-u=ln@9ylX zFN!~W?8EoJJ3sF$HvDDq!IbCB`AgR~l;7O>IY3!j=*|)D;ms@T3 z@OHZ0tCjxij=xVYUhqyh?7Pf4NR_ugspxZPP#N$ZZy0 z-z@21_e^-kt@)=9@Wvm!wOssc9naS@zEbZ@8A49!xc1a;pPt@#nP>Ul3cJ%Y_1Ekb z`)^lavVG6_Z{HYvH?H0+UzVh=Hs9v+;=StMZ$0<>7{He!q*s08&DWLXo06w% zw^?)xZ+_gq^UQPAhR^rD`+n%WEOQ_>om<)VQrYf3uY>kjSPI^lu-5yOHk;q{P2t`> zr`^MT&r@GEudI68tJ~k}ULHNLcHNFw?cuR@+X^;WzpwaG(>C>8!h;iHWrpVpx|jd| ze0H|^`fGK+EH)8LFRSkC3jcKD@UdSvzAr!ZyYBeK_Qv*vgt}>RO;3-nG(7*Uuwws~ zRiN~;XUlS;F8K|I2$qKK#!2Y|{tE&Wg`e(|p+STkbu|{@^h^`5e>YNWN%^ zqdJ#8S6w_8pI5AF9mrl*kyIY@^~agg1e5zWH%|X~Wp~6O_RUgXr=LCNb|l4K@>>0> z_dLNpm6PJGu3x@%-V)3gRd z%+3@@@=KaIH)Zkv{acS*`h5De&b1gd>D>ntEMGp=yUsa(zHi)5@4bgwoll7?*Y%ff z+jTm~e-ZeevRAu4LGCFl2ve68v)}#W&)low+nBV;pb&e)^3#>?3QrEKsk63^`B%l?-m5pw zf6m@t4@=|LY1eOLYk1fmJn#4C)eHNp3YI+&zTBl>Hfir%-o9dq+Ne)oMAtCY$bUks zp$a8_yxaXgPUfZWzsCmFbL+YqE1Q1?zp0t~-s8?IQ_Elbo!uYVo=XRv&jndnHj8n; zemcX?3v2xMu1|y<9Fz#Xs*KR`pFH!`nE?{pj33^v)?WX!Z-&9kKWC>M3aCFW9^O|` zXPPkWwa@wOS0;C;ze$|Kv;QBve1XTtXMqnlzPCB>Lhou@VHit|R~DDUM$ygb{_hW6 zpZ#q6x9*h9lWY53KI(0GoGN^No%^miY^6mvHeH_{Ar$v5>F13fhacU3{Xsb5=FKZQ z=_}ReY)K*ZkPOK2;$-41Q6Wb>idlyp0!cA8txtx8?EL$Dw!ZTCx>R=r6CTeI)elUi_}P z{UXA7pOq_)zAwCa^TpW-hmzY_-R;YS>}>DU@^9ZGo8P}W-fY*866>4A_oKJ{7uz!P z+$zTF5ssgBOUU0e++AS!t>}%ZZvUH|M>ihcc!i^QWw=%J60-%t+1F36ZY!=$-Mqcb zUN-D+SK?+5yRxcpY<)>LK3R7M?^jH&tF9_N^wRI>pLAY@c+iI1WYm6B4`?p)O{4Gb z!w23Q6mT|gXzTSayig(hclv?fzI$!cf7?ud{^!f{cc26BeBvGjSN@m>>K*+2u*d(X ze)56v4Zj{-1=mpj&quM<^6q}K`(DneytYH>=Eh1#pP!!pxAw|!MfJTFyCjOGzTSNK zEiE*0?&(a69mm&P3EuZZ%x87oP0r}ApEnAY6)OepsXf2)_@Ctu;{P9>W-IgYA@}0$ zhtHLNZr=Rz=^BxmYd=?CT)F@I0LbAgmFQi zY4^RayedJ9gL`I9tL2?|=}ev2t*=KJih4xU>p1O}u1E2#q#9$)Bk6q(p1|NbgP{$jfFQ! z^3C4aX~{P`)vo!n>z_Be8$m}5x$^za`4eDz=`lxo@M1{f`b$Z+yLa{xlE+SGT(zpH2{d+8lj#TJ`s{eVY|cU$2(?So3e&zl#;g3@`t)Nl3AZm>VTawne0v*xc<1`-Mzam&5AlAncu;bpL8bb4&Dr1^pAO!9 za)W*PZ-zuBls!;D^g7EbM|M<7x=e>AqeO`#a=<7>CdDHKE@5B~4pQ-t= zxUK8alPA;pV=Jxs=a&9pdGcuev+Rh41}4bq=cfWF{oK8Znts|3g!N^#^(q?vkrAxu z_fXikHYPfAwjl{JyhGU+B~Y*2>)ebo=d-y>*uBe$4yfwUg7dtvn*8 z**f5+R@>>h`<`{(emyOJXFTuSAIsIRyIV@DnC)0S{nO>ek0XB7JiYb#WB75Wq^FN3 z^IZ>bKJx1F#MS5Z_%13||Eij#Ex++wnCa@n?R)DA;*X#DSATDB_4ix)$$vi{j|=y< zMhPZ`f=?W07(Ug7oA94|*M2?sUi0JJ6E*w(?Yr@*KkbHu&|!Vn#^3wo^`72&Ue~vC zd-48*w|~#yy;pYj^puZQGZ>$E@A~-J?)CKey2>A0i(i*J{HnTQpR?RB!Nk~5-B9G< z*_wi1Yz@!U!>dn>2N1=7UK5dTv_T|yynpe~3`NYc>?NW_< zxj8&O@AS_v;b)6(UoM}g8uzoqx#siz&zrkf_kR)z@Bbefg zZq8l)^|$x1AHO}JGRF4KVo9^MBOkoo68^2TJb!y`we|Vx+3VOFe=9twwR1l4TfuDK z`PPPb>-4qj6HFWar0H&!GM15f2wE-lWvy!5*{U0TfBW7(({1ZL+x2L-{9KzIR##2e z2QsIoKUUVCEn)TTOG$@cU)!>hoM}J)T++Q7+L!dyrLgeo%H<_bZCTdX-#9zd%DHOK zuPXOy{im0AN8S7pySQn+X1|&0!{}zI)g0wUN#~b4KPqzB9ea+ii9Kpx5@Ueg#-h;s zawmpmF6p3W(1ubPse?d@4IeLLF|NK1vU(d`R z1sLvL4?0+=?&zoO&rd(MICkOE9Cw{_;kI=}556UxuKx4V)$XWR@ZY^^k|))t&nTM8 z>|S#!HC}E{+{>TQ&wQ$N>`l9(A2}X-`pzfm%EtXuE$+C=&g*Zg{+y&eVc)V(qV1PX zUqATbTgA3nYxQ^O?LRns2ZMsL<;kZj{A@RUIPLwH{ zp8S5Qf2EYiv-r7Bi{8GD{HgqJuJ5@jt$**|-``*Vw$~#5AlJHui1J#35EaN$jkGxtrOSMD#)e_ok?`Ky8ell8z=#rN|TSVnH-uDo?<61rOkILm4&Ks`JXfh3viLUduG4Yxn+jCW& z?P>3~7+HhpuTPaWubvzuw`bq93I#*m!Z&tLBWm`3e7R;{~JFY`_KE}tOZ)RWCt#n%1!xQ-^0qKJ8S>nV6Q4q zmwXLvBq)5S;W%@i;e7jF=kR}X=6fGGr>-FX%T4WmvciX>;_))jQ-$`&onF9aYLKmP ziQ)X5<2~w0&u=I6&9~&X@3z%jXFJ!@=WCbdy!>5%-n=|INpPLnTuFY**->j%UTZ5*>zg)+5+QS*%w6p`=2OmKYvb5efOM{(wnz0N3N&< zEd+Y`ea@3-9&f&R?Ah})ynEfRC+BqU#pTMRnwPJ#s}Jda8p3|_`s^R)j(*eDy1AZb zzs8NvD-$>ix6Sg?pVDL1ahNrzeUiV;{hXIF5?j^pPg!ks^trNKWbdox;>Y`-%~D@eS)%D$LiLHpL=y%eDa!qb_FrFv+b^~u4{JtSata7k=2LW z`(!1pZk=|VzBca2)Ybd;{r>m+{e4hx#>g3-AQTKZ=14LbH|)9Jde(XK?}w)Mt_xPY zVz0iw`uw|%f;0BZ%Sk^x`G1nYjPIA9-urgv?dN-MHUH`?nl9;J_x^R_s{dw8b?i&P zX9fL!`u92Xte{EX6%}qe@!sm%Xr6xXY*kn6qpJ-Q=gzB*FUcuVytB{dO~<@*Z`@=z z%j~N4m!Ej^Rjd6fvzcpuJ)Jf=-^_AC&Cjs?Qb}j07lim9y<{Ey_eArfSE2Uz-z1&# zF7MSU@ZFhvqx`|ltfc2(W-avgZ+~GOv-8J-q^w=txBpJEc6l(ZS@xvsz3)Fm_D9&= z{9rrn4FAT?rJLVuK6?6SSgp~iv>Pkxcb4tny0>cMhL7%7Ll)04$U6UR?)n7L59jOI z`tPD;sg>Yv$K4Aype(h$azBfV|4YXEx!(U?cR1r%^;1%s|{!8wB;xyO*|XQ^K63csbluiwMBI$DOHBg%y(GGgnmB!E`I0R zqqAtH<+i(5Z2NX~VR$^Rg~;Y3t3RK(yT(gq=dYtT7QcEo zXWy@v->u%53q9ZM@looQ@TBi;w;%tMoUrx$b;TEf4JoUq^W~l2cD!Tp^~pAGvbMxO zYV695@BMS*^yz7H>!17T?~h7~Dydc4WPHm#>HCZ)kDja)*YEpt^!?WxU5TsJH&xZK zKY71L^0{_|qY+9$3@>8@_JaCh@lt)yKTLSPZMVcFVv zt-9%>F2AkjZ0?KMl@})q&bEED`TOZ@$3JMN8!vrzd-KW0FO%y{e>_vymp7YYKR;z# z(y7zoab|U2-mcyr68?PA?x`v}x*z}2sSgvWgCzTeJv>A&~?e_em4?8wFa4lL)smi}d0pVe2x#&PENOCG(< zsG1;_Z}T1Xo<8SKpXKjh_wsZ`S1l8$cY1q!{%@8gKRY6Y@*vlc+1A#1+nfMhLv|+g zhieJ%t5fOytD3hzasT#oa(rBMl}h+#c_Z6%{dau2_2PFP4Vlk>KkWBXtAL+n=MJo& z^DRZ?zuodh$&2}??~pnE_15Ez{@)9BK0H4s-#|9xO_x{N!UkpQn!}qLZoD;}8b8M_ z;mOXG{WYue``=9ddga1|b4*G~@As-co_3>Vv+mV}(|;|TzJK%O)%~X~UYM}<*U`_u z&;0MTcc07=^U}LsXJ=;kX~O?s@9yrtumA7W^Z7gZc@dp=P$|O=E@gbrGGF}tuypo! z%LhB`UljLwSKcVUJ-6rIXF-eh>tCPG|MbV`%-%Wo=f13X_txh9+vMHze(#mk-0`O5 zrG2%b(GPPt!K~f zzr0mnUVh`mKRF%xi*DC$I{uR-#qitLQ*nQjHf^4Gb8Xf~?dwA8*%m(e^Z3uHcID>>jyyAOzhcT>(;a_qf4^V<|JZ*{gZP77hp;yb8*hS|g}<*9+>!qg`|I$&+wW4o z%6(|1Q%fCcb-W^S%%oP<1cAzy5R4`~Oa6G2@muR}KD%2pZJ5ycVADUi^0z z?0}%u`=A4YZYeXn)E&LBRsD1J3eRmnR=GZ#Z8z8U(Ce2ABI-}H-jG>vr^xN;#`WU+ zo_woW^vXPbm0oN4_|9lp5PS|i{E@7T1)%lKi^&pyBRn9$(?iTai!pggR9r?`*rGl(VxdrpnJ-8?Bu;?icTHp4^{RHm$f<)uXnnp{qCLRF<&=^TrawOKcxGd z)7M7z@ZX7eqLkK>il9-C*lXUE31#*n ze%E)i*X#ei%(}eVdHU6xfBqKC`fmBXXx4Y5*u6O{dT(oQo|n!mt$ViPeztU(al;<@ zw8ww9aMXNkEj+P0JpbOFkD_bh*IzBzuuwM7EvX};&e?48#xqe--`@N=lit;>fA#A1 zt)H~@cJBFkIoogF4v7#QJ-xjWA78y*ZdXvZJNNuXpX=w2#_Jg?8@_s9yY6k{s{3|4 zKPG?7npXTiJZA6a>%n$cdq3}=$a2T^=6kJWjSj0D`2v$`Ce+$h6z0@?t2&wUlu<{k zZ{9lZ`>$0#-+%h)Qs?oPk9OCtL3->jBZ8-VI5P4iEQsKkz`~U0YCf)hGOz&;uP22wZP47NGc%QQV znX9Q;z5SeLrRVp~dA8Rly!pUR#SQ=0Ec`BMVt0o3P$}C4{^qACl`<@Sb?i^%!$e_s zl~r$QJ(F>w=7fcPO8=&(+uy%DlXU8^eeBm4WxIdWe0cQ$v^;2@{U-l)>{iCgd*-Cr zp1i!L^Bfod$FIK2&d1HGnfB7*TiBJjc~3q~m-Y{j|2ge>c+7#=kV9>$s$1N-Tyvg! zuhXckP?k`Z~L;PtLsT_HXRo zJYCy2C+zFbiASfdFTU}9?}x>kuZU01>tr{oaJia!dz(2pKqGy^zvcJhk1-o z4nMSBFkpH`8137;>Y#>g!qkWy?yH5yn1hXJAA(WqvX!esw0*jv9XYwGr@#A1$H|1}b>%bqq3FZ2{$wthvM)s=PnZF?m?etG%g^veZD zAIL7S`@W;3W|jZ8zLinC_eQ-+Uw(V#ovhIQ{MrvsFSAay|6ftI@v4E#6!weC+mdd) zxw&bxsQ>r7QV#q6zFa;(?x)l>lwz8#@v{TyG?PMq{hg=(Dn77bs5!a5<+H_ao?U*Q z=RJ$_`y6MtZ1v9F{f?P6cA||xB_9V*tiECK-GKQ-`_Yn3wmM90{g581!v8(f?z3j5 zC7DVb(LF5qdF3@!ZhVaH{2Y5Ek9CsM?}y!> z1B1@(Ywl2uKKX|CZp?&*G2c|!we;?MB;`{tea zJ+oFQu-2+{_5LHxdh={+eq40@!b5r6rd9O!23D>vd;jehPwsr4 zJlpl8_p;UfpGw23ihdSOkze;cR{#FmDUa9koenS-3Xhqy^}Xo!MSBH(MK&M*xYhlY zg5{5H_p9$eJQbZTU%5UuX5ZEO-%lp3ebqg6b*=M7J@+}G@o%4YocQx|!|CweM;}Ul z*p!iAg9CihM+J6t>u+^>*hYg{fBVC%De z^3#1BHc$S(vyVP=UiACk&gb9D>x~;~{#DQ5%X2%>zOIJr({z7_f0>mtUEi+W*?qHL zaRH;}YFp{p&x$d8Wk=G?E(=_opqF&I-*3*3X%?$(<)-%Q$^X4|T07h&zyJN$BX8>- ztttBOy!q12=&R53`_1FEjt9wh?6bS7&A#vb(a6BMZ;$d-{N$aFpJZD7gHPf5J&!8h z5(m5EKVSTix@9TSmo;bqtQ9eTo}?@m4z~B+!_>S_qDm!P{D|7RU*Fp5o}PWbBP?C} z8t68%;+_IdJ95&8N%@v{%1j37#|_=z@3 zI?Q`@HpVahH}gTirw1Q6+m-0N{{Rjnw#L&=3IEpaSo7P)?(FhA??0XwHO{ed`)c$3 zT`Ajy=auF93t#K+|MTgp{r{im?HGR^FHM6U7<3bK4cV`yR%arAYjG1bYwK7p@|M5Y-XygQaBS5y>LcCGZ= z_q3pmZSl(**4OW!2~S9nL7wh;Py-r({(0xBWl7bafPnMcZ6*FpY43a9aPW%-q<;HQ zz;R~3D1ZA?&9q&w>-y`L?RfjVGuY<(moJ$de~!oh`&{%n0PyU^Ph^H1!Y#= zK4w+L^Gkk){EvvgGw-?DOunP5C+BbbQhl%H(a&kCYi)1EFTVS6*28IM->nyHc*D!d z%(6e{TU+K&-H#66cyIpraQ|`NU)HD2_a47J8uexO{5!RqCdeL@)_7<5^~=G}&g+tH ztZIHfyXShi?Tzo9uDia}T;2ZM*)M$FpTa5imNiV5-nZKPxzF$et<(Ne*?{@P<^79; z-+uUUaDmZuz~(N)NUg z%x|cP=~4f^T=_w{!!MR6;qkSp3_s6CrD>$u@=8pvka+gB)6LnStb6@lOK(GOn-_&< ztLGfucv1HFa_{}W!3PTMUjM5j7kr?Q)wlcKpE=B39y51!MD^Fx)8pnn^U67Car@o= zZS1k8x1MLu_q9)19XGwgShQsG*XC`C(VgFy9KHPUwZhK}o!y_`FQ|EQ`gY=*i8DUk zdOm;7S{a9RV)A=UeyrXn6;?a>=#uH1tv*eB+VR7+=tTGD&s$esUB7&vSLyrSGkH__ z*WVN3|5dd5{5rQ?kDhBsh-;vZ`A9PvH`r{KuKrcmFVA=Fpp6Po=R?GxP=PqpaeMDG z=LO0ael-G}G&S>ko!;_&Pqia{e_3?1f8o5Ho`?6cHS}dnJH&qf>(QByO%8WHKc9AU z^VID1NB8l|oy~o6sBC$)mo|ChTwxc~p}{l9!C-qv)+`^*fUdjdO;UVAX{&I6ymG|Q5wC(>8)h4flfZ#=uTU`d~(-_IZKDz7FR zU!S=6=ec>+EBW_+cFidYTm0|R!;%jFU(HE>18b`-f6h>U8Tz*>>QUpZ)068h-%gZC z*?DtORZe}cc#Uu67ER5(P>t;+QtuP0nQvy-*)NfK^Qb_je&?H)jQ0Z8pFX9QUuLzl zOZ>E+dfrNX@tJ#f6@Gj(G3L{E&m&o){ip9Qm;GL`t;+M6w*B5&7G0CCPFg;r=#yZ) ze!Vg1_A&YTk~L^`RWZ1sQ{dfy`SHIA8@N7iFi>gZXKFsM6x6@)-hI*Xe6do&ALAo` z{(P9Tz0h)NIzy#pd1a=$VU5dv9)mGVP|P)u;c_-TIchcYLckn|kS@ zG>_Qim^VhUpEh6a)UN9cuYBrw^z+00zi&m)P3>gA6#RMNqk6;Gn`ft73D_Sev3jzO zxV7#7H*c?od&_OPUH-HAYkZmEr>phPb=Cf7&-tkLO2ITHnD4f0=k(=GKMG@f9~^Ig zeTb=Ir;G>RmBu&B{tEm6@&LwqEkfCm-J@QycZ^gXkKW8u?FXMGdTleE#jHAC3!aK5zI?9BBLY zhvc?7-~RfP`}ZH%qdrgWbNecb^6vp2_w3JqJkQ_%ar5Cj@BhAk8l=2O?AdpRxL0rI zec#!)uj#A*Ym;Y&Z3<_X7NqP;y7~B-Ny@%&&pckfjPl;orL26|JEiaO9Jt{s`zjj|v$(yH1w_k5i-g)Wr%E&W9{FSFd`)_{Vk@L0fbnEAE`ID({ z|JB$2|MxfC{{NrPHLTh#D0R7oFlaVVO}w< z?3Qp(SiRP^+|0bZT-|1VuFb!l4_DTw&G`NIjrN`yEOFe%4SQz1-m{|l&+YwxZ)@NG z^W)do*YB?%{I_LVFol>k2~ZiYm+F?mhZevpfFprHMb)A7}Lc zU2yZ?natq38q;C{_TW_B%x~ea4#htoXeR=+a6YYAtZSB8G8>JneygGQ^xhd!GUuXFAwdPl$qL~S# zu7)gikyQL}|Nqzd=~v!v*`-|Y=YYZOV0()-?>=01N|1Xo?^>;o`FU`H`p;*#wRz`m zf7f?acRrryUH<9wp*!!tR#%<0Uf(L|uzJv3XU|U6IQL1>YkVwpaYqwOspase8%Q^KR`g z&UOa;`ym(Hf0O^*{y&b>_u2e8eZKch`&`~sfB)svr8S>R_wLu=J*CpG9hO|Uj`zw7 zo!C>Z6H~%Qpe=4fo7hksT{x6m#|D_)+pTFz>Qd#82 zP=bI(CMbPfx?X(s&PQkGw&2QwimOjJ)LReOT&UgmTH?)o{@=T`&hNd`dM@+!vv=>x z?LTy#dzjw3^L}3Tj_Zeb6rPtBba6;HM7O|E6#qnVdm@^ zk2gd8eKY z>GJEA-Mcw=@vmRgw-!JmJotln4CzGgkw_(S?)=y7eXj)1KhJ+H-(k)+;a`3OS}Fb+REjSz_y65|c$alMd&gI+ zKPCb**mo^2$2VPgTO?Y0KuD>uE z%km)J>pUKt^gkMepS*6|u<)#h`5s`lRU)AIdOy^3ZZj?=kc(sgys zk0)?tqOy!yQH@6tO@=75GB<38O_KW?vn<~+yex*a7fd!B)=tl3^u_x!dU z<4f&`{gJ0**k{h4@qNb52@?-08W|gIaH*MKQC0nqS8{sAiHZAa=iC$0UT5RIrz_d{ zDdbEc_5Ht|p636!(EY07^XQzq_Q~qM zMKK?3KTa(Y&fI{_FaSAZH3aUG9E-p+)|EmsboA1kxS`P-MTD&clXZ`Wppwewg1eXy@@>fir+s=vS6 z8h`B9F>2K`1esj;hxJPHt&tz{r?fgLX zPwlqa)bg6*6DaOkQmWPwx!>`SSGnyqlN1`#-IWuQIAF zJ@Il{#nSU}wL5j6Uye6Do$G(Ua$3bxWxkJR>(8IpTW5DFIL7u_`I_+GZj(N2Uy*dY zuFE5)uj|3hBUyRNb1bC)-|d%s$d~(rji)rq+vZ03zVAW%*vkJ*`0?qpVDiV+{#A85 zezn!U>fZdyk>^%v&Wc@ZeHym+AAL&nK0ZB0cdu#AljX~E{_KlpK4IQ{K70dHB1$+J zgGQwJ>jQ0F?zH!QR`~d^a9&Tj@&_Tg8~1w;M6iPv>si>c{E}RF?%DHZevdQzBljw` zRqLK%D2iiW-ZnxO28n};>ix5=>Kw}cCv{@U-Kzdy@Q{t{%fM=XuuXHeennsb?;Q-tpCsr;N*`uF+PGbv~M zc}|~+;CcJu+nb+D^6QlOL^uDQwcDiOakx%>^}d?EWY8%>M;_H&eXP!&r@w8_@%eF2 zf^!V7-p`&iv8Jd~Gu*P^$nuzPPY=GHI&XjKxh=;(1ux#ADwh)T?wpF7?Cj5Yo;_xJUCpkss{ zNFmp34{Si){Nwj8|1;RQqH=|V&|!bx#>yGLYs`&q*vo$lt`w;7V(F{bn=zl$PWJE5 z>d%)q?mptNzFpEO?$OzK?`NK|sr&cydH8GXh`)R%?DNz!<5JvG%90eTJ`2y`ow;~| z?zW^Cvv*6VsELR7rdr*&G<~tv&9jv}EQR~TBIj0}*cQSbbXmqjW`3H7x6Pc!{Z@ZY zh4=k1l06Z3{^^PN8#kvd*4B?rpW2*nc4v|IdG$3PI{vy%dZ2f!`-%F@V=_&9kBO{V z_~^!`=tm0!cfCnkV`r$5zvcO>hMTMO#b?IOee&tS*R4mGJ2N|zziS?U^t#tS{pj19 z7wi(&TzhwWL&0}p^?82ls$w54to!&iO#aWL*Nkz0{_p#jSn>Ej+lMri;gAFYi&~bt z|G)2_U;Z_3$Fj%lT{}aYpEWWtI52p+IEH*lD3qJjdg4Q{TSDCO^X1mfe?KSMPi1dB z?(pEp^QJnvik>Ka)8~Ko{tU|h_pG?u_6)dnJHXJn{kBYa?JpPL-jQP;|>qaY_ zdCy37m>e*EZuq$K#!s^ukJHZ`I-k_vo$a5_7rZyA>-lUw`|7HVDJ`pg(~miyTNakx z$u7S~?#bFd3ClN^AJ^P|J~?kD-_}g!zeRCK8dX%?BCf_8_ zi|f93T&z~kN{E1$1dSNK`JIcl;ZJAQtnD*Nm?yZ^u2 z?!#`a*Qc)+X1hsdZgY&Ev*WLCKRZMD#m_IdoyphPe`@mH`_7SlSwC2wL^Feq6GCZp zDir(zjnH0Q{kXj=FIP@y-oNZ}t3SCc&l2C|Cx3~MYyO+8Xk8g^#N_{RpVhya33YN6 zC)e+={9UZ{V6O%9iRXJ7SJw6%0Im3xa6mmrXk&hwQ~I>lGl@Sgi=GdQDci_4_hMZ0 zx{4|l_MNq5W|lXfs;oYJZ{9hlqq7A~ANcHlu43+q{&Tbosf#KgE*%dKgYJM#Gb~R_ljh|PpCRcVJzS*^Y zUSskS{kpHWC7=BIy}SH<-Shu!Gu9{Yu0t9TG2obE#-yLiQ28g};@dNak6y0p^(&v> zcOcki&Hpd&^sI|E*x&shyKKRCa;YEP6Q_;4PXSzpc?^c=KJ%3Key4tTtCU=`2 zHawv7UWmW&Y{`{$ZU4<0I|C~}oIAO^xa)TEq@T*wrXNb4uG5=6?`e+O)ynCw5)NB4 zpWA-#(sSo{-Cfe2O}jOAyHp<(I&N)H@B4mVb>F8CH6 zYLu-)dj7_(pL2D)zFOqp+6OzfU9VXc{+F%y(bu-so#E~Lverf=Tc$VbMeps<4zI2K z{`dR+{d4{8^-|FLczTr#JMClMSUpor_TZ`K(28EH`IHW$eUfibN29~ zpHptWt1kajK5IT>nTeYmi=Q;(`};pxo@Cy?=>7WK`v#MinE4Gg`_KJDT~D+_(#!DM zGo2lg{u{mbNEvLpy!m~1pRZoa?dk2Z7cZ||-51Gsci-~<6FFZG$%oE96ZW_0^hxvC zG9LSCR>$*heCBPjYI)Mjxhw0QI2L|gH9x=1@afXsZlXJu-7$M({lUj{V{z5l3rm+f zf011mQxjlldiUttx|6a>1*Z@8JyCl9yJl6q&itGoa^BC{ZydQ4`R(STr%9{rBvXxZ zuI!K5eg9V6-iRAN7H6#r^pV(_{`*|`2Cg5^?VFG1p)?O1AA|_*XkmQvk@?t$dF-HN z=S!6e?zex{7hQhb;(Nk>i4}G}=XTC+Klssd)19*NFV<)G|F@QUu6n=h`18`Pm){fx zK19u6eB!KNX(`9mn9BfecCKceZOMDn;fT`g)e>hEtEcqVoBew7=f#OHNoVp43N2PW zYrng{=ytd1=1hYqAG4oNKv$0ymR#K&zT7si|3l8()z0hpNfl_Mb%sBmxI1#HMbX#p zjqX?PTGoEO{J!)?zRJ1siH}UTsH?o^-G2PDu|oFz_0AU-Gn@?5m%TGDw_nhGy?W)1 zs~P)`FpJ*aC-rmV^y#|R|If{itJ`{H%ZpzwDd}7KkGwNHdGsXcJfWZ6_g`-mJsjqr z^7RkjiTjnt=fXEMrJ#h-W%mbn*d`q3msGUjm-7E#Y9?#P&-7X0du74=Rm*!1?9uo8 zUH9%)-hau2e{c75ul&6A?C;Mt@820(eXp9K_#|1u+R~o2@vU~m_xp^Q%aUiVHF>8~1ZkQvscTUcVS!YW=C7!;1r)}R%aa+laH@NbH zDP%ia#>4(+cyoT;r%#E_KRX)oJT^ECCb`~7`Y-le5_yP`dtc4y?fD4xBZuA?^GSewL`?X+_E`GV)Fl~4Qnyq|BLt~h6?uW!%1$9CV2qEP1NkVA!zH1|yJx3|_x zuQv1UJ$G4QqlMY7KLtnP_uZXVcRsw{j`3&P;Tk3(F4XRc9n*4~hCA{mZBHz13g)z@ z-@W$Xxm!Y9_xW1p;Qu0mGrk|yym#vByuSZ`?c3{rub-b#Hoxn@9(#Myou_*~SIuC2 zl6vp0<-Ai2m#Th$%bni}P-`Tjh@s8c+#O2um;da#_vU^nR zH|fv+^Xb-Q<(;$sPIy^Z_arT<vHbZci7MJ)<3Ihez_niJj95bRp#bH>3OV2^472X^XLns@_FCdC(*UlDf8DX zZ)+ZuHJ|1@4G50g`@ydp>SL^>wzj%KSU;HuK z^P2D55A4x@*M2>@QvUz$`g8xE*^9a98@}ITAOC3W{kpXE?UD}n`p!qp69XSORQLB+ zd+5*EThC19d49%CYK~;r1YHqz(1Ak_+uwJukD0dT+naAcFPir!Z9kKGqx<;N^=%bX z=I*(Dd%CyXra6CB?LX4I@7L4k^UrL*^XKH76@TQ*RQG>Um{b4r#k#=0>r>ok3w?fD@MO~a zU$d;gO`arwYxc{6FK_s`M5>(4#YHy!T5$a5H2uH(*0arS?ON$xz3I}N$Kmu^O+kf|Jt&@3N99?n8_jYfA;@L|JK&eG`CwW$08@s zSik;^x`Mp?^OYYya{PF3H9WrdX}RUULfvBF&B}M~u;tHOJmF)_30{WHvo}iwnU%i^ zo|Gg|8)Em{Hoe;N>ErfQg3DL)$v)Dbp1SXF-n-y+zamy;?|hlR$~ArAuLF};C!hD% zwfefM|9QOpQ(e8k`{EPZ=hWQHUova=#T`?sgL%(|SiX=l18&{Ws33mQS(2Z#VaZ-??Mk_dR~){xzurbP3s;oVo6A z_NA}a+X=da>`?vt*?+cw6)ECEnKhJ#h$h-7w>DoVC-g^1}zRa4eug50Z z-R-UKw&&NcmHcz==iM&WxxBUbWEnfcm(s!$qf6906DS1@5 z>qlPvtLAy~MiMSpdtbNbu4k^T#hY4x^>=VbI@AZG5@2$QgZzpEMuju?J&8~UD>_W-6kChD8?>>ICd=o#@^sWOR z_kUjgCI8Q#y=5!c@3OqEP+-h-@3V2s9?97k?R1&k_cMRuU%hK*hh%5ugoiV2Z#t!! zq}Zj*k>BKg^V99`C259FAI@J_RkAy_#;&5Y;IHYE?DO(B)vq(pohcaSw`ty!%zG~B zt?fU4sa;Oj_qRJ;qEM}!rSD(#^K|d>)$40cf7aG}pr@61c$3gA z@q?e6o{B4!H0rK9xOmTsUso3@Pgl3Kw^HffyQ^A1yLxH3y}aqqg>B99W%A!Xg}M8! z{`Kd?qf^%{-+YhzaWV2$x99dF%#t>XUYWf4^X>2N@A(qXgeL@`rkyW>Kh`on`RMGS zZnczs;`06vpiP_dOrID0`?+EMspbQg3LE}Q*X#Y?cK&|$^AD$f?U8%lXV1UiyZalc zB3pX*)z5jy1&aRiop^tpbKkIBT6Ecc!TN-|@=ot!=bvUix%c@*_D0YwDmd?av;rk!I=|A#+|Jl3k{)g04 z#mA>tuAg6}1*+uhw5o)^Pe5K@^wew^t}j~P?>NtW`{kz!1{^gyOrHh5Cr_-B*?;hV zVL|Q7$i3^zb{$cCT(>W|@?QAyj+lFO?|yuG_odkH$yd->r;Y_l@?6k!iR>7EE}wc` zCoBGJ?3p?qMqZDow>MwR;(u7QLD_8c%(jlU62a)Yl1E3jABlYXaYaqZ&llI@;&v)k zRoARn&-*T%KDF6ie#*IftL*Bl_xud9oc7A$%h#20mLF>M&vkv;EMBi%_)EgdPb}hS zIm6CxZkMtbFn_W<=YIV9g>wrFLLUFQ>hkoFy1Mk-8NVVQiAsDqdO>;TE(No~tJ}@L zXy?}*-)a@T(e7l#-?^u^{tnw+bGoKOcyai?zvqst%Kds0EmLjzf4jd!mGZwIkN@2g zL7i|@C^*G&M&Q$w{PZem7Vzf93J;cZi3b)QpBr~;L81Nc6U_${J`{n5zEAJ{9c=w` zdVJl_SM&e>NuS^F=kcraHAmhYi#g$C7M}TFTHQ*%Vllg%pQjQ}?0BAJT7(L^+uBfd``Y~p_P!`K7! zrt{mLTK=nXV%_(J+Wj)TdPgt3-s-(=JzwqDX%!bXe_W_u?q{SmFJ@lSs>%75a~2-V zu!=wUYxhqU6^VARk3n0b91{dA{8|3}-v95jjkNvab>|;C{*XLuy%sdZukb;e#qZ_& zyR{cAoR7uFUey5WviS4v)=!Zqdj#f5GtO@?`5y8A@w)qrKbLRid3L66f@D`}TGQsG zw^RSUd|Z3#VozJ`dB^MX>{l(@lT#xg`B8cM`m~=PiypoynKmQm%QL%|pH}|cxNnE; zd0!*hu5k7HIWNEO`FZ5CZusx2E&JVeKQ=wAJNs_DGQ&-2AvTV>n{Rk8e~Nz8_(pou z$A|lm%l_s*)xPKW?e48F%I$alPEoY(G7q?u{OV=%^Y)md8$#L7n@g@=U$x=AaCgbe zpR4lEx6fH;^YgLB|Dqo(OYU=5{@Bm>0ezm#Il+$i=a=#_FaE>x|9uHA6xiXz@~pOY z*Y{sC<(C%}w)HIky=%rf&?*rV!4Kb`^C=@>+e}VcspCP?z zYK4E4jqHBDN&ItnSp4TZb$s6**<*5@n(J%-oxFL9@k!Rli{8!qU#(8OY98rRWw}~e zKC-VPUZs7Hg?;?&sJ~UOR)>7Qcj8Uh&kwJ3KQ7SU{_9QF679NuO{I;f`+igv44h9a z-+%OZg~Got%ja}8A2{upaPRW+>g)Zb=AYcydiz6{OC4r!^ma|SXFa`Y^ZYVBa7imw zCj7O4eETd+Uv#E;7F z1{a$T4mAv^Osr$m_B-Q)a?49iB?6^``^zCw>2x4wVd_-&Ccn+E?CDOQA;;{ zr7!E({$q)~#x?n?+ow<&CltVi@cYA z&QOt_)~kUus?nE^pt&{F0bxfY!Rtj*`=v2|MBZ5b7l{D_kSPVkE2XsBna$aVM*io zxn;Wr|J`|F?^l{}*oZNGj;qs2vA2JJ{2uTAxzAn)mz&J<|99he^*+AkpPnljl>gbu z5f`@S`r#U;Pn+I-k?~Ld(NQPq@Gr4bB+Z!D>5Qk&=E)^b{%;qHFDfg1`*YUmC5z1^ zbkugpR{We^c+Tg|paY0D zsHX>C=F+d4V&|vcUu*em%ae!N5tcvfo}d*vryUdaP5PSozDRD5t?s?xT!9K6mS?qp zz(azMcW-nzPN!lzH|3=TFhY^J94}ySJ*RM?Y%(q5P{zMr8jVM*hlxea`})F1}wl zVe#gW=sxMr!?7X3LQkR%ZEB0y?eb>by~RI?&)u5eMU3u+d`r%2@-kEB$K0DceftjE`|rZ{m!$kV zX>lvrK4Y7G@vRW^F4c7#=Nu_FFx&F{&4Hf}jy^Ee<$JsF=f%^>D+AA|#+@u_yw%{h zHdb$))VHrw`SRbEZHoDNy8WEf%@-$MN?UwdcslRA|KGNrn;)ONnzG#Z>F4jJ4K=p& z>tZ^1QO0l%a-0d@6!+ojxr?BR=%Bz1#gomBmFr!MGxmtbq`$OzzjpJUZJAX9KXh2q z7=A{6@cqE7@IX7F_QR{y>-QNo{F$FE`Nj0jq4J$KMe^DXwau1X_-Avf|Nn!p4^Nmp zM}B6%W$&*qDSIMAcjk3vTI~3}=7O`$|7ml={$5hv^(uX_^Ot8X8uc~(E04cne;)sD zfp@&zzo*aLo*h2dwrTnD%cpy%eC|CKKZPxI(s9w%8!fK0WtB{;eIVkUKcj7PWUcB; zA%1qtbNbgxcCMFQ%U55?)Lysz(}Sz&;qskZuN)8D_vAoo`2Vj_zt*0cH$Ojq;jSaj zIdwZ`#m4Q|o-}{gr$?V6Yj#in)Fpac-}-)jEz_m{ydN(6-~E3HWt7W+BSwblbLNTe z-Ipvu%l2#xn2c2_6CC<4on7#eV}kgWx!3ad^&a~vT9Zt(j>N}h^^ZbJnLHla&HS42I%O@VTleQ1({bF(G=9LTw zuXFyf#maN!SM5)Fd-Pd&?Y^rk+2UgAcFd|uFYkNxI{x0dgW-E^{eL|8vq}Hss&u2> zJHnn%nEcKyX-~J-spl4n8_i9ZEVyyt!De$Oy?Op;pHE)<>k}g%!*2ck-@I)CEX!)Y ze%|Q6eBYg{5c6ou8!;h!^*#n{|Me{?!19U9&j(>!pWdt8{5Z$s?5|bsHuLwdegC)) z+ZjPSa#+$hDsO(bUJh#To_9`YQ<>i$f6+Jty#5!opq{Tb^84TD<#QRIz215z?M!QwZ@g{JgnlyhPdv?@J~>%F<{h(#-L!~(Ym1gl z51)5;-?rupX4?C{IFk2t84P)c)OCPZ*5Ah zJrthMy?@sF#MVQgga99^ncjbZM{)kQzVm+*@9+rC`}Wo7DqCZ*W5T~Yi|Mmx*|9e+ zcYbiE{#m8fk~lZj_3d8|PM=ba`cJK-!K|4xCQEcZNVBu3Wp?;1y!xP`qSr?N4idtxntd_NDcCq4hOK6!-mn|MTY2tL~LutB?Qb z`ZHgYQ~v?W>1y9I44+u^pS5mza{XN7Yw)dMk)T_{*xh%`?7Yca zo81|{S#DeM{^Z@2-HFMY7yWqWuFk*Cuk>v86^ENQf1Eh2*4AfhE4yg&;)R;BvsLZ( zmw1;>T^wN<7!yN2|Hvi=1t$+{Gf5#`Ur+8-fLp6Zg)TalbKh)Ek6B0y!_X=TEjm&rP2&x z%`>el3+dvLLww8JK4yHC?j+eydy?40&0Kwf{^e5oJXK{p!Qo?rJXlWhWb4@%1> zPKn95rDj)j{VVq3SFX#g0#@t?&8vSf;rR0XkmbL*AFkB5+nw#*Ge@hqetP}&;^Win zkAJsac>M^E!u#%9KkP-A5Jv%>vtOU8mRy$6!GOL;wt0UJ)RPC|x-Xo>`{&G zCabR#a#!*#S!OxG!tU&ZX%!aC^`$?iu9x|kYBgc+ywelylhe<-g~#nWr^S9hXNT+b zdHxX(1%HE1DcK@^(%-1plBK#=Gs5}k#;4nlI4>@_c{HLnDd1kl`KyeZL*w;~c3Yi% zdhm62C%e#Pq2up@`;K0ho`0_E_U47P2O`$q-JbaHow}dR+!)Z2cYhzfUTgP5^*ZyO zAOCCrDt|bJ2w@9f|DSI!ZI)@L^qx+gzzeDG9p!~eM-g#Ow6xU%0m{+{+@ z6MviU<+HvU#qu)scQ$+VJ7^R-RV@%$wPict4z} zJX4`mwvYGOkC~f4Y`*dM(XGp%`@v>B`nl}%`FU|Vk`J>k&-^%H^UAAHj}Ef0XRlnX z?8f)|i^ctKKbJ%=b6#6zG+ApNZ)ki@QPtnD{ZVs!^PjKSw?kUx+<8j+K~6vt?TItCl9JUf4Bd)?&X7h-H*Gw zL;H2ypDRqi957*DZC%pU!$&`7`Y&^SwD?oX`|knM7E9SN{=CL;>G}q=W)BZ2$IZHa zAm6qlwLk7q!otmbpiR2*$_DlFH3yz-|99_?Y0+X!RhDP}{9c;Lt)IU0`SHWwWQ@V< zo@Dah8CCro{>K41CbUiP|1R|*L2Z^}vImbmOPm_h-&%uu@jEsDjc@FboL+qK+~2vU zeQV?97oVTseqYtC+V_mWC!zdrU(R3IZny6Lw!ev`zuSl3c|bf&`<)W%^q;I(_?dDv zm;XuL<@%z9oH8tIjg#FDRNH|@1w{ML(>2Zs-dGl3L7FgE@)dGdIl&@;!oj~`jzWN&=#bf8-L?1Yay^AcY1F*P43 zRxq%?Zo~d+d2BJ;gypsN)9>6Jp2qYLVCp&iTz6c6|V1);^ zGT>uJL4(NNt_gMPDp#7$-kXfpz z@bgEx)uqnI&fA`7w4GfveKK$8=9zwWIX`FJzF_`&k-D;3^^x@V({uYDhM!CGy1G4m zGV@FI|5+c-`p4PjXw=)C%sDz``uaUNe_q@U&tJLjoNKwZXMy0`S4 z)132ZD=$_`sfZnSn=aq?ev8@zCyImRe}>(cyQ%(qD50^)V8lYA3pcZx2w;qm06GV9$Tv8==pQ%4vFe1{$(4FZno}lUi$cb!rQ`K z-=02JHk&k`_oHjcZvSr<^BZ)I?Tfp)I^L(u%xHJ0Zr#(UM^_c5%&DIf|Fa-vLWEv* zm1XzM&*m*_wzEyI2cN(8!=CY(c7!9^>4qN+L4!GUJYMq8jro%yC99lJBU`UIujF&v zpA$U%*Ev40V*31VSKskBY>m^K8ovMIQH(#8JO7*|?=V?~^Qr#rS&R6CRR_}kL5J9( z)DI8P@bN^4yARFylio8tXPy15^kczv{?jj(B_?m1%m2?>YPtIPzjN-*y|aAr&i%g^ zla&pl*ab_uZ4#;!JiGU$2J8|BUUck2!tk$Qusx?FXZuX{6Z57cn1r z^GpYN1(<}3{M7Sx=WoXO{rs^o>&VMh&h0-=r_Ox8VfODStL>(}ipu*nJL_WP3cC+a zUfuW{-0ipb)#IPn-7CAj_rDLnp{O4JO?u_CJQKaApgX{7vbAcD7W$TRuzQ8;+*3U9 z=1;?H}h=Rb3c?a$Y<&%b=|&i&^L%I!85pMPE)?tgV9 zD5&Ohy1i#~C$CYj zoMnD7@}c6seJ8)%JU#imk?e_kUAIn8j`>&g_~k3@`=9=FaqsB%y0KwR%QugO9cyb& znjT%g?1x3gzMP+|9I*-A*&j6YSJjoiIPui;d_UjG^JTBRLb{zuXtU_v|mY=bU!+<^{=qvwcZcfuPfd5lSM@YEiKuJHcC3( zliykCP+or~&gqDEeXNCj)fvUdvFjI4@B1HnV@^}tKl$$c`)pL2`ZL2cZC&z*7iyNGo=yS!H!)Vi8pSy)zU_~vNGa)0-D zKXzTV_Y7Zm9$)%6xOP*i&(&LRuLjv$-}QSMwz{h3b+i6_y%m3c9^c%(woP%7O^4h@ z(Zgxyr_Ehku?uwi^IL!Wzh6#a>154sKER{+zWtufg5C0Q`bU2+-J>^0*!KE@kK3+a z_CEN3+voYa>fSxSlArMlG}h|);5x^T-PLRp_8&_%>F;iMxEQjnb7u5+<7^=9;c}=TBR`cZ}uHDcsAKJ3qS8{{nJJn5Mckmen~q9d+?nlb%P{R-UN# zKe{yi^tmvbxwiYB`|rQPZe6EcxUc)hT8E$v`*XMY*lv$#<#lvHVZugPR;* zH7jsVs9qnsD)#s8d-fWt6}$odhy33=-u$}ie-QuHo0Ds*%=+h*IElyCe@k2RzWke~ z%io({*8UIT-}dd#L*+i*K>NVS@v+~P-+p>(`g--!!^?lxec<%4@9;P=(Ghww1C)9o z!x3}peXGs!Sh-Ed_DuXY;YD2j+vneQ704H5x;)NZKjC@X|J?6;!hYM#&#o;p{;pua zv8ROP&tF@WC*JjAk;9I}4*rpv4I)sNmhyYKeZ-Jx82OcN}n+#b$4z4_bbXJMQ8lRApN z*=#)LBEJZ9Hu16)&FV zx2`oK=icMLQXlR29WJ&z|GDy6%>VH8?pg5ZLD&5q{+0T6 zbl(c!!~Kq(vqK@X^jUJZ{HE0h{eKh~Pwep6)w15gtnyRzr#0ukEvd>mI^%j|>{g+& z^xyaV@5!m3U)5G&s4{zVX#K}?-+nC3(z)z-V|MWVtQ+4q+h}W^i~Q#)_(iiQMrXsR z_e@!Dn^Vjk#6^l@`h9gSom={5$-$$qJy)sv`P!LTp51&!+Th0NMD?t%4L_b-y)XGP z{O+T^>eB5+wUajf`@Qa(T=e@_y5AN3`y!8ivzDJ;H6u8u^3T;j_w5*8vVVL&|NHf2 zTQCyOX+a65Pmgb$m3}FI{DrDp%%|6fa-Q7sJhnS7e0tCS*y8;n_ig4+|Fq=!JkUCy zI|3iRe;1f={_V=RZ?*gW{d&Fr-`Dl^UpY_Muh0CbyhD1=gsFYuodu`&`LNG(<%!>z zr6Bn|s>VV*sHQOM^UBk1;=#7*hUbpNt$lO!_SFFH`;%+?m(Sk5qw3U6OXI??tHL(x zU3at+S9j0Z`bs|{=g_+Kw$(e6Ug$ngdbxih*Pmk_S1az{d#p=%+ncw$=dLY2EO&h6 z(QWJH(hj^ey&+_2+pu??L|Kr}UuNasa)-lYO_lVXZkWBb{Y{Mgw_mzn6P^nn_Ip3C zB*<>B)zd4>Z)ELoK9XS;fAH6F&`KY7@R}WHb4r5cT;~CS3G(j6utXyiC!VIzam;(h zbJcx(&(19uoN@heX3V;iR_8y=ns;sbd8_k3Pj9SVH#1Jy*}?Am^6Hu2KXH2OIsWVa z(mM7h@zx%~UY_pPTM zuI}G^qolgnw7GbGM9OKsu=;evFF98=@A-ADZ}WHfwRb}Mf2jj@M#v{GfDR~SZv1IG zLEimiO#ZpKtIr)*pVx8R;ep}&<#A6e>lb}AoOkmJC;-xB|(nnK& zTzXqm{l`i!=j)4@HN|$HFRV?AeU+*Ca?AI6>GM zK!p~|xxeLig6}5(y4QQa=K1cAm7Q_xI~5h;A5E^`WqlvK07&qA^OeK1UEaAeNJ&js zI=1ij>BEnYJlrCFKHc(jX!iS~`-S@}W~XVp&r`j2Zr!uGwEo|T>fe$+ojff6)_CXj zbJnfSmRXZuZ3>^g*Yd32w_8uU6wf_6^5*O6ooALWWm>-XeftC9bPLwVb_O<#2(wX(Kng+!P&mv5|X_`|zDK8UxjvTRY^);TvBDQ$&f~gr4OvmBDl)Rq1&S?MqkE;8uo}Ftx@KyQ4#{G}i{ckI7c1#f1 z!OLj>-`U|_+qoO(dl^1W{Nv^DFLNc&j+q?-Hl3~3C*A(nXLl}rKK**6PMn&wb<&18 zUy7!`4uIY{wsJL}W_-^N+iN#p>3Q3B%zV^->i^Z!$Hz5aF09{Na7{f{x328tPwUs~ zr(30bfB&oc{rf4gqFd2%27q6+a_uTzE3=eg~g(_v+qb91)0&PvFYW2=vD|Nc-tD>eP{ z<~d8{UWKfd{QSQ1=d82qrp500=c1e4|Nr*w?fLs_zrVW+Ixh&lv}pq+oA#o6Eq^WC z&f6Z!elUgSW(C*Ojl4|n1!wHHem>QJBZi&n^X4kq^DhmTf0-r0^vO`L{^s7g@4N5U zKAkNezqjh^W2Z;!vlX8dsP34|VQ1sLL=krB*y^QnahdD4_n8-3bBZgT&|h9x`zYvb z?YzFswTgS4?9wxncdP6!&?q+d!a`^E}i)VT7y?B$!w8?LMtp0krb7!ZXy?5(x$<|rn zJhNRtZM?kM-J&b;^m`q@{~pKweEae%WVyBI=fg@0@n@IIizlHamvq+zjuZWdE%VRR z$}D~^^e}S%q+plFd-VJiO}9BdxX*Fs{E7V=C2|FJq_8|o|2k>@xyxssnHsV@xt#D{ zX!kF!F!?>dzTM6jobbO`*Cjq>dhPYc%idUs*jbOZp zZj`U=+xzd&FX5fj{*?vk*cSZ!TEBH#L38%Kx^;E) zk#8}pw8Q7^_>=Vio$!Qz*$we^FMsO4#%LP*v$Qq*v1s^w?9Oq+6yGhJu(JSmZR0rq zWy%~SDgUDz&%SR_7g&8iPQB*Mqfh!@)6%T=?+N=JF!}A0f_ti_qQx;A?gTSu zYM2`wdDDF1wD{!@N1v?TU)8{TKu&wz=OF%|-n()CljdxGxqh46*R$cgcKoX%r&qm* zu1~jIB9%2M=}p+)tM`&W-~QP#@9fo{Z%O}l{<~D)+wdixxd*-g23j0FcLF6WWk|yE z?)~t_@8olV-sPWeJ}WJhHcFOfxucgG!055s9O8`ox~ zgon?)yT4EViD-d+4X@|ELyduzeP&+Ec=x65=!_EZS1)bRH$Jh~xt`|k~) zQ-Rj~UHwxkOam===5RMED%kfu*<<*&$%;#(zKfBV-n`-V6C-o5Qr+JD+ggy+w_Cv&yOqi09 zQzN$QjLqTGb#}&g6+T?x_;bAe?|0|zGk!H62#>G-`}N`Vb8GK2zI+|{e~V*N!jYK| zJSQlX&FPbN#%lWohs2y!UoabUz}t|N8Uk*JZA1u9xh#-uAjSNaW9qD{n0P zgj-h!3Rm0hY`d*Gf3E)@x#NCs^m=QU+w9gZmHYF1-}#`u9oB^|bzhI3*m%TLeYeH# ze<$qzK8-x9(Ei5EE-1c5`J~>qJxM<{buPVrI%i_96>1zWr)$eKURKyqjN7slQ{^{K@?I;zFe)=?e*_f`00M zj+S`tmOA+^d~^2==Cu(!8CFb-+4}0ePv2|yS$ky)?>g2Ln^gaO+OhddFTc;?zpYF(`3=dD?K^qf8M-P_S}2(dE*^h)IUA6`CManygsq^@2{`3O|RCkYn^;>zQXAO9S`g3^nXd4 zj^96_{PfMnis>8{g-^T6#k8MUuxEBYpO`JadcK9}n{!30LHCOpKAjf)f3N!770aj1 z$qGH}cO>NWPOEQesp9z$XMT$*teUd@N^@TLZtIg5kN*r4ESO$WX(;vX@aeUV-`cdo zm*%Rt&244ja$DJ>Fy5aWf%~zz23fH@; zXRV0stqn80+BrdIpPlxT=Jn~K{zuBqO=qwCBY$sS?eA0kk7`)8cc8bTT0yNS_fNC# zP1(IA@@(R+O*N(nU z@;H%Qops$@|J>udyUXLDON;j0RoKVj-eSFx!}{NmbM7BBO1js}e5(+5Nvf*+8nLcf zzuNTGWcl;W0$aMbzW8P0yf4+NV_tuYCNTXT&j+FZhku>^xAni&0shArO$I)eeZSxBUcYWGixoSc{OZEa{8O>F ze4bgVp8xr^H1qrek$>m!nw@{J)BfSk`=B-GVoaaEzf4xFjji3I*VeFSU3yvX<$n+P z>n#f8UTa4Pw$w**2f8brQF2lG@WIAnUQ2w=kvSGN-4@;ZW8>1zY<&Kn(u~j9_Gr${ zr&bh0%t=RD9wAU9_&nyUf`g!87)4u2P?)|#H zdUxkrxv$g9gSc#7-sxfESx{u6!n;DU@SRcYjmX}l&-#~p&o1rQ^|W;6uh)U|vn)<` zu6TWCPUBLx`LnA3$Zd~d-yb_KVt35n7g;6zRi+c0-puWuyn24@z8U9A%#`d``u(fp zPc?n@P#Ci1(7W>b{e`43)V;@&H?w=tQcH!Lh3pbZu z@)R%J>F_G()k*Q$`m?zwpZgNL^;K}4;it=ASJanP{wed8H!OR8;>erRB@?nXb_;r2 zT{kw``1@t{u~*a5pKI^0<2ZgK=FzO})+@dqo^780@5O$|VL>;+r@Kk8K*vnpbsrFz zFu(1AcTMoQx&9};RiykM8f-i5@IdunP8{1OC(~ zIOagE8@vBy`O|-wqjpR?;cTVH`aG$;&mmcPV#}ABn;&$aK90S#TGh|@(6ya)pI$zF zR3I?pYV0dTeLwg5eXowVuJm1%{C-~2uH}1d)njc6uN|JZ_SV;@#+zpq2Hh>6$!Awx zzM(sJ+nb{su6Ms(qERsYNq9zn#KUiTI`=MAzlmFHmGn*KTgTR=_hQz>eEc)_b#%^F zCdZsZZl?3LZY@KcVkj)`q9qVwG33 z*46*{@wor~ndS20M(Dj5=LC)u{>`6u?$a!nKFKjvQOf@9R>MI5?gPbtZ`MSGEdLD~ zDYfn;+(VIrwzL+w^ZO=dSBK^4$Bf=Ii=xvywiqbiAUy z?cdi4-SL|yr)f>UJ9n15?4@<_f4k4>FW;3T@4;(lkjMT{wqjk|jqUHp^v zw(xbu=cI?i{;yWLTP9wa`CfisQ|O`n|3q#4&;q6Tz;tB;mM6;-%ipRT&vkh`p=bWL zKkBcF1b2L!fA+NNx0=akjjiOT`G;oCdl;-}U(4RO9MlF7nBf0kX5McWX~vhJrloch zufMZlpd6zh4`iExq^d?7vkQ`su}2{o^yQl;6MkdVcNu!}UQd_f=<^ zUx=HqkN?iiIGLt3#T)ew`Z1}*Z!RfJ-)HMCw|nN5hu0T_x+Zzgt3-~+$L{;{Xm@_u z*RPW)do`xdH6<5)6wykq=HrMteg0YTfnVP54bH#tp16C?p31iApLNnEIX=)7_)vae z!UX@uKc`>rge)#9v=Ylx?K?j6L7)=jOVAlWzVjq@Ep@Z35!*ehX34xltD_%8ySFFy ze@e?9Vfa#q>1&0k*F33fjHxKT7+{n6FiwKu<4oqaAmVLj^^ z&}Cz&!_) z<^$di2ktXEJM3#w|65Y-;t+Me=Ckkoh9mtCCcW7)r(!9GOZvA*)2c2g%Lo=(KRFfKl~ z(z0vqe&a$v^WY_lvsqo7?x%Zik1pyyyWOWfa#nln-*@NM*{^h4q8R`8wD@ejdHW`J zzpN4STz{?3-p=yXh5z54ot^#u+P|y2%MYPVX|Of^hUA|gBKiAX?L4hHsqnk}Yk$Mf zA9;%9z-973yJmS%G+U{X(n<{ zRht7XfX;yitLL{pa^9!7{F~l(Rab_)?&P7>Tjo5T`D@E!V@HK9 z?e?|Cu`x^3?h36IkIng(bMDAJANIq)oOKU9XSy0@yt1!&bH~zhvB_8L>sIbdI(pM{ zb4dKzzj|-h7QK13GFSa-ZT+wEzqM|q9kDfEZ`e&>0uNT}Y&(5Xd*5y8cNTu0g(>pO zPH+6YTO;7c#5}ox1GAd%>TRpK`Mucohfa{6vDM|P=fy9)sgLolFBVB(zbxX>oc)_) zeGRK?H-6Rf|7#njdq|G&&m&LMxBnylFFmPkkL|=Cwnk$GP%+$C(P#eTipM!uqpiTB-UzNQLu9fCDANUjd#WEu{?TyXh(=~ehhF5J~w>y0Om0cBkMqOe3f6KUEyfq(Q z-Ok_tb+^p_J!1D*%2STtz7bs^vTLtI6-z>$4fiCYdn^4tPbt3f{5t3RthrZ1{AE_U zTSwR4=&0DL^M}v=-twrk8-3)jq}gBXKC5&#(SLpaW{bTyzO3HA_s6ppd6hT6fA+Gz zB67MuNb22^V#)6dmCkhKu6Sd*U3!=Ij(}}NZ)2Oz>7P^oeQNV+Sq;XEXTF|}le7Mm zw?6!T(eCNDJU=G=E>W_#oqyw5-gWy-u_sF_mGpo9+|_^Q@0s}cswa!@omHxvKl|VL zucB-2|8SIHDq3iWRtSlK3n2;n=e(91PbLfWe!cbm{LJ$6(zW2hfMU=x^SRO&SDJI! z$S{5W{Hx$bTyg69ZbgOlKRM(6y{Z4fZ1rUI`ndgdZ?z--Zwh;ouw<^Rdy~tN`xgq0 z#MUi+dPbkmJ~-~T(cPNZ)jK|2S{-e(`{9-B>CUINo<6PTzVF|&OupSa?ry&xv5x

    |&-Ynr4G!52dKVLt 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 z z-!F@16rEoA|K4Q3E5Y7=TURBjC#`xKBU`892s+~o(`%}W#cW-?AvxfI}OpfiJ4)aPz2lcE=s{`k!JrNe3@v9?o zefrL#8*i^hz7n0eIfBc~PINz}s z?rRc_!Pub*TdICJx+3{?a#46wz~0-FTI65<)%;ia_}!&9@ryhuRbd{8@%IX zIcS2N|9RzOn|u3ef1ib2Kb11%4~hA&^|-a3_d$Ch?rN&6yW@DfgNWJX=l9yb{JhiQ zxA(V_!TO`WmCP%_Q_DP{5t}*J4{X0*S6v|YT026pr9PTF&|T?_l8e%Z4>lI_THm;8<%co!xD0S>s;c>0#qpP-LRQyF#+?ol)$K$lj#S`j@AkUD~nhY3a;guLI|2 zS)A@%@%ql3#-(iYXI1}^+aA+?U(bI{?7F%V(_QR)XL&e&J9qTt)$@AsKIvA{6X%Dh z*Y9uNB=z+J=ZWbY9@sY@HXaa|@ZSEow~~n7OTFL0yRKBfEtmOQs9>=E=<$zp(oTW% zqMQ=bKWU@*!@msXo!Ojzo{y=hmNk2RLr?g@n=X8AT^7e@Zg{wfL(a`6`e)74r_;M% z_3h@vv_&^!nHpaeABpPh={YPs@qF~% zJG-4i=f-NyEfJjFy+n@{eos|=d+1#7JymXBH-qk}deyPf+T7>NKA-lMqk3*SFJsQO zb>8)lwQY-@H+TJ?SCSTLzl6f~-(|eE|Ng$(-|7Fe8-8+Kdoin4LV~TWF);x~Rs7*O z!vMO0-hb!8V5uoKOLy0t+B|zk`{@IF#N^*?-dU3Vd5!+r7mtt6zJBC!ecSh1=Jg9D z9qxS({t>W0zc%K7{YC!MpRR8`6D1{g>1@!Mm^bHmFWm5OcBZ z{noquaC15P?i*F7<9MpK-dHEf@La`y!QO-eZ(}3&Ec<>#R$0cdny(^zBv9iWeT)xrrN|t`@IMyn4O- ze*OQyuYZ1doRpRV3leAmRXFk7`O0u? z#B8fRFDTU!Dryvkafq%HCajm+v42 zJ~1YG>i>34o#ncKIl4*#3<`84PB zx5_IIxP$Jl5u5J}@Sz6TK3;`d*4O6QrU}N&7fN?TloX3LTR!sn)Or5+yf_)@xv_me zLHAgNd_Md#JSTl;ni;R#>67gIWyXuMP9(3Mx7iAMk5%c7tKrQ2PeJ!sZI~T;a&b85 z9;>^x>Fevh?dAKwRq4kZjW}m(h1z`3F*3}Md#pMq)O>~AV^!63c)c6s7?~`Q@hJ zJ$dbjXXD|kUvG1)@$T|H2fu3??w`K;xrDvVy|=;g``%A`e|v@5`446hwKHaXUL*gk zc<1?b&rA#Fzp$xYo%1C9X}p6 zXKqJ3Xc0}t*XP0$)`QNG*=S(IgPMS1`Wi1MKFY0M^`U6)eY;EVYn%OTe%?uZ{eErv zZ=O5;tq&i5tCa7{pZ|EJ0Z&X<yB9ohqd3czund`QnVJJ#}Qdh$40czyeGF_@U zqH{8D+U1y)jEjt`3%zZ>u=TMO{XWw^f30I|#knO`-^6Mj$;j30IQNDnY%};KtGzSD zqBm}M8Unq^N@Y*&a{=*X#&Zwce-2tx^YIej<1KNZGiB@|*8SZ60DPuQV1ihu#jexl zHr*X}@WS-uG&{ zzFDkIt-Ri{&ygy&YyQ^N6g{}`|L3>2w;$Ih{r$K1!$d?;4K0^;h%jHT<$bkugS_>* z>HA)4&#!ss@M+`c^3H$u-z97E?x|MQ@kks#pIqT}`LV%=#>StObHfiA81UR-0|(J3 zvl)MDXMmR2{QUHkU;Fdyt!F0lJU`m@H zKiYmK^~dS$hu613?zL)X?dJ=Q`8vJo#%g)c5}U;C<)0^iu%Bc1=k)w1?e}Yc99sUq z;_AuwF|`}7d!@v@jycA_Br1+=g-yG`N6CBdhNld`}h6-_dERGbkGrK8Zwe7m6`;b z-thxG3i;1IUCRFzC-wf>x%c-T=k0f|dmr#kv-o>;#qN+dA1XD~*wbNUe#IP~ANyI; z7%KmtKlfqc8h?j<(YLQ>&)hgeKk}KD?(=6pwYM(Llu+o>ZeMF08{-UGXrsFeve0H8 z-{D{EVh@WOHzcY(w7A|KQI&4!`E|B_DClIFmD4{YzAI16pPJmxe%tTR--2JF_3s7w zHg@y(zg5=!p#1oxV#3DQKDi%x>vvwZnDFStJ)h~x&&vasY>?hn=^(h8ziju751ZaU z&-xI#WKLDdvcu=aFTSad^RBHGN#}gmDz$%%sBDjtaYAKFsCy-sr9 zm%|qE2dfH<|D$Fx9%k|61hxt0!IiU}rEWa=&i5$q-M2l)&v5{pzD>6Mt=39)3J>PE^jT(ED*UwJp(c-~R5o#OJf|&vmb}v9Du}?On;1 zcJx}vx31f!cU5CFqIZ7Nb9^rTd~)s6n~CmTE?0`bZkm2PuVVY-(EWGbu_8{CiN62# zmHOADik0)*rvItA>;A6p*?PUb4;SD1s#N!W_P_OCMc1tVt8k8?Xrm!UaWtXv|NHvC z-?aN&bQ|!NX_LCBcis`j?uUwA3J^%6C{K=0Wem1))`v#m%^X51Hw5|IsWB-*a z&e^zO&;R9rmfK6V@2U9s>Z*49!Czmac-f_I-8}2TBX~CdMVisHNbl1#esK8{Ghw8l69`Te;49Eea55jSM~hY6&_!$k2hBA+B+-p z-QQEI%l}nrE!*|>(RxwN=PLhqCP{T{k$NFys@7&9o~+;Re=$SHeOFr(F zLtc<0!87UAw%6_X>zivL#OA)SivIcLUE=-U3(Cc^H-OHRDdSbR{{wt3k;Tk<zkviRb*Bmtuw}r^uv<3HSZTxe7T&Cj9ui{cSaKj|xBkQk7tAys6#u zy6~K5zByqvC)Vd%RsSo1o+4vB=gWt~+tOFBPdfbbtlq;pEH^gjIHWHMI3yld<=eSZ z(@-x?C%#bdkl4*nQZ|QFude5lww?3l(G3on^wRHf*FK(FS7(^jrOeB2KgVv)!!Y(` zp|yo2l@Ck#pYIhf%$fG9Xp`<&foAuhxovar@2md)PV{&UlMuHua@z-#%brTiV0>~m z=G^RR^Wx&`^D4!rr`G(~qci_|tJ(RF`)2I_z3cOu_wzot#}&p2^Z(_v?fbW<4_xS+ z5-9r1d*Xe#`u#PjWl3_$+b$&(uH3(|^P&DWNyr+V&0;ftPq;Aie9f^q-<>6s^2F2C zHzW$p_>u)VJ;pv}v!dC@tMJof{>5!B{t7)kW^Y>J)rFdH}QnR&Xh z_ekc69KC7)i4b-jW zRrtSg+J4r|v?NoBEzxbt&w|fJ&vM-uc_gnc*sn72)XB8;bmdQ1{BNwSGF+XxW2LyA znd#vMPW3zIPM3I;{rq~+?a9F`jwAclXMOBmYbW#TUNGV!s*juXKR?`lU!&3@CIlqFPG#eZsD*w^V*37ge_URfh=`m#lD z->)}cUGBesGr8l{=9STZm&$GX_UEH=pKjy)15er^i*%}Lcb5FQa(_SgR20Q0m~G~m zzD7xhduN{Rd01_1{|Z}W{qL9gAMX@M?BHknlQ)y`Nv*;E zY~T8_cYl9>uVwo5`l+FECWq7e90PZA?}gFNbjv=L)YW@mTGJYvvsue-^TKDK>!-xP z*H4Mb&7PC>>GIj4CsGNk&aYekX?oQc6}OzPbFbcdopyTP?;8p4etby_EO?poRWPnR zb$NTf`q7(T_uYPYSA+GQ#0D8t<{ghdt@*oV$J95y8H?uF`mZq#Y(F5NKR;yu>2}aE zow(h5l2-4ZfB9+D)#==;i=8immg(%XI_&Y{(a{fwSG!ey%lTIOVn?6*ygP3mz3$HY zds$uKuR;_?E;1;vWJ_bHG@kys?fuz1JQ_B_Vf3iHeKmE8)R{Yu6Gj%+SydF_=f8LnIe>3reu-)dF zZ5?eWi*zb-j=s1qskf%(?#+GICvQJ~a`Pbp@NHA8^zYrgSEJbjx^2qtD)-@i^Pfg~ z7M}aGUes~E((;6fp>^U7Tg@lMGRFp-(UhAV;cPv9(_|^}^=h2nGCp=@mR~nt(KZ6D z(b-VtQ1fZk`e-%^U-@g_y!%zcysxo_wxw;2 z&yOD9QF#Bqvi|GUaQ(V}Kc9mR6uLU`XUEOnofD?!t-EvpbTUk_m|@M)Lk1~#HvTvh zU|J zbB^4BKJB)-BEf%8oY;4KLo4&*gG*(~_I{f%clF`8y-VfF>J67{Oi@Yy-xqtP!J$iE2 zKUb}|TP1sTxx)MRFMqHs*?Bzv-zV{U=1=dlCC|*16*Lw(eFkYQPMXOdYw%i}Sp`3j z2v`ZazmGZl;cX)Hc$l-bn?!^E23J>FLym{>+xTZW={dG2_im%?cS)yuN0q7#B!yh<3>cv0(h-bdxj+rKmK*Kj_ za?gAB&fZyhZeC@q&GY5|H@vf3f3*Fp&9d2v57tS}xX)OA_Q&Nl&r401PyDXl_K$6e zzr()D&&L=(&E9$@;7pa2f!4k`S-)7!${HM*yy=B%MTbiD>}=yDJl0K<*lY4*^**Vv+RIN<+9PEvN+ddW zu&~AKwuqk{^|$KP>X7gEUi=BG`1VTo>xTBVcKfAno|?ZtA$Ca*sMbY{KkzVbKL~30 zr* zzh~~f$#1<;e6s(%pBL{s}r` zuy);!SMA}kcH0UzS--FNQqwl|UBZJCVr7Qs3c8oq|Ni#&c6heEU0;qoC=Y;}pzsuO z+5prptDIy0E$`Vg%j##PALq>fcLy^3*M9iGpYJao+H@bka}rcoy!`vIzy6E4LVd*C zn$2O%cE%z}aY@HgK7bb9u=RgoOE;MHbVF<486(-C-m-s1v$Jn@TBTV$?7Ule^|A5w z#)~!S$K#$YF5lR~pJw_BzVOEWYI&RHF&oeIudag@-ta8{VKA4I$0}#v5;^PoEz|!@ z{P;v*#obi_i8oE|9sS1k>H42KPl-RD-mug~oO{EOzvBAgQ|#vU(rZ3F{d9Os^sB>* zK8J6QwX0|1uAA?&ChTX~kJ?*>=bx{hUb6AS&8u4`m+guwIK>&<^QY?PbVks!n;(m_ zd(o4};R8#-g{aRt>1y-h&vR@)@2WWGU;oYyHV$E<3#xkdpTGQJ;vb`iKd*x%&!kDU z%$OXJrhfCq|9stzU;ccu>NcHz@>rfhgkROp)1?nSZw6ofw4(rdolRAiUC2NEb=v!9 zPLg_cojbksQsT$W-RJK|)^2?OT4y7_XaBFK2Uh{=72tDEJr{w&RvPcDj`{tg9LBx7(nXp*+mf!QH@O%jRW>qQkyip6y+K z_TACO%kcY~Xz2cl9Cl_=CT`U+t{yQS>O*v^E4Su6brsvhmzA57^-^hrN^f z9#5XW;fc`KmuEYqMB3i^oGJWv?^O0aWi=nG`pruXuH654bgJ^ac-|RLtuBAo{VMRW z#kS}0htu{y8l1aK`?>mSpEJ6ZuQcn)c0FLZQj_6m*qM2@d%5SEoy~tMelkt{w_N9= z*o@<+)#k`@cJX8x+*@ zoOwU*_v1P(erEr<)=)%Wt!$xqrL! z=*Gi{td^ZuwCCyuNncpG_4U)x!#nqZk9*-;U3YXtq>8+?Z8fvIA?Uc5mG>tY?zi1* z^{`}l(!afI6F|E>yEme@(;plHS0_%-&)&nHChVV_`n;>+g#Yu8U!IkIiU0pKzJK{c z^(!mE3vA5u?@2iP>)*=rORDT<`QDpT?((#r&r5UZIzQe1cl!!{XTPe#62oUEuQp$P zdv?{KU3$wOK9JiS1iIO2M%dp?!rNYfR@gjqSyJ(PUU2`<{s-~@5>LzZ{rJ#&@#u%o z6aU=2`K4&BNX^>M;)@+6Ka?HKS`(YW3|e7RbSl-{XY=RCTGf|9{oQjOoi>eqm+ih< zS0TCA@Rmud*N=+oGRW>vvA8TfO;l_gn3d=~Yj}(!)2mU%%favRp65 z+QvKQylTwOPe-1L|6c3w@GGAA&zE4(i7)VC6;{YT=#~U^^+e9iu0kzG?#MHL-u?XF zj`|Z*pO=1|F#p`+muFvRuub^>c@GcxGNQp8}-meT~xG~E8<-#ucn5%(UCX37fy=@ ze?IzTwVllo#e{y*>y<0pTQ=Ta9p6)I_BC;J;N6o{*E+< zN%bp_$1IKbEV3`@O^v~~gHP=mM3PU6-sV!ajeM8(ts1<(Xdf z^U>;)Zs)gOfnMZfaJ7H>hf|v;Z+L0#_VJCmmx4L#o1$T9?mXDp&ROW~YSd zcjGs5Mb2lEj!bUr`jpV6-KKlz-QhIZ`3*6@yMIcB>0ks6tgy|0br)2?*i5~CGbS);=9d3M!G^V+V}@f#m? zNR$Q1R&9JLRz6F;omb7!{Z{3wbu)em-j3-yD>VJe@s;a$-1Wczy1j7g`vc*}d{-J) zPv4qdpsp2v^v#CN*JCQH?|umTarJ_4O<7fK%T0xi2V?iPocHr9zS-Tn^>JtTaiyY% zohQ?-hc_R2wfW*|=n*hgP2fwMW?dCL9B&W4#Hk)MfqzLp`R~W$;7gof6)wDnjz4lB z{@T6Qk%xO?XKxqA#3{v63F@K8Ux zdG_%Ws)-wBUtDoGe(ut^hnw4>XThwDFSDvHg`Ndddt=(~m+NOGT5m3&zclXX3FV~j z`yYQkz3Oi9^lEb9^0KY#MH~KmYL!VX=XhYCm2_S`ym6f4AGTp=K-S_9hjKR3x61z&7D|=N$8I=Rbdr*$d5HG4btptLG*AoPoAt zKB)5icz=>dVSmfP^QXV2KVS1zbPd~t`)g9elG~Ei%Z!CLOMkl-v_8$Y2DA+4v)JKd zX|8XpWu#?xTU|9>AK3ilxiIr|e?IB@GP6T$ix+B2&sW{QBjw5KyxPd9VlT*S zuJgR+ThXDYWsCRijVa8!vH$PGcKNvfUoQI_H^ii1gw1qt*vup)Y)nD-Gp&!?TeVx@ z-^OV(dwzB%&Xnw42w8VC`~C^#r*Aes)8l<`WUBVP$Tc%A%Q$-%%k3=N_^Puxv3#2J zyO+zwk4}m9`}%!W2^0UcIU5db5H?J-Y)@VvUiNXC<>h(We!ZWjRlO*?ao4lY>YRC3 zL-D1jM>Tes>u+benY}8aQpI`?_yUX?eDuAXM zvoWR`d6t-JR{r!FXn)L}^%@zJ{TWF$hq-=BV!1j48VNWmfz19P%w&qc>yy zuMIE$yjs$pyna36Ql|ChkV~1qF(z;QcB8GedXCM{oDHu^SGxcG^m?t`k)_v}_Z|6P z{r6M#Q^{beR5lj``Rj_$y)RKL*nzQ%KnD!kGkud^L@p>J=seSWY3))*en>**R+I9 zRQX)&GH&a`8fO2EVsFND9nf8WIwZdLRm(%2<&Lq>fA#1{)EIpKVVk#;Z-4B(h}|(? zUl{CSxAk!buf7R|ufA!Synny5q?>6C)2FSBOV%gK;^<6%wmBzV_5A0~?Dx)#7%)A@B{`0OK*6ZdMsjgov>2U9_@IO$&%=qLN*EKuF zn=wbvEPI&XEciT4EhjDVhzx8YPWFYFZ%l8TN>?{{G57Q5gHPH$!>8{zp6zbI-ov}@4xCiVE7eK~qQR+rZwUgh`m=n4Pu#lLPo{dilq^vI35(rRh( z%bX7-i7QVlS(kSB$h+n1SIr@S^7}%uFlajN8jCH=aLgbK7E^0^6^L{Z}qkft4}Xa zpK*4{uJ=Z=cGcw@y4P-hb96&^_uDAO0>4kpx47Bv+-p6WUDbcr@Q~o<=Nrr;qF-G- zdP?;C{hhmxwuy2k37ZA=eU8&V^U8Yq`7W3&%5)PcUh4C(@ndB{~l0$`zmz*jXy<)Qh$4BeVABi z{o(zQ;;TpYZO(4fwU$nNUzFIX`1DE%e_p@$d!dQaZ1#<=_s<^<*^hQ+41f3fUnP^y zZwUOq;oFYVJyjb&bgEwsSv<$$)tT>e*C$N<@cI13$0kOYt(-%k!e+C1{+D^r)A#hx zZmg`efA`${uDw6ov*+I`?Y{5)YETdk>V>VF@o(!nGf30#YQxz%ZFvew7teFU)&bnzLp{p)$bK`8!D#iY_Rp(xnY_k@w-goY5 zVt72S&6LeoR{uVb7pB@D_qS+{XX*F3dw<>hZuRGS*Ms6k6})d7zU+N??%N}t6ISA{ zh2E$*eY)x`UjFQM@so|OIr;WW&7EH5v2*U~K$-d-H9wD*-+%Mr>ZHp_uZ1Vxy=Xac z_wyyw*_X%dvFMt<|N3L?_Vx2#y!t6Uq5d0a61r;=Mn@AoZfVp1+3kI0-Md@X=O1tC z;h#VKY4HVk`Z<2?0FT1^f1G*o2Y3DF^)Qw_owHQ3-`LPSlf%RQ@9e&uPe(53N<94# z`NrUB8S7*?BuOB)-SVqSge-xt?uVHnZiV~;8pvK<#`s(f3#Y0o5hZ#A08i* zF8w^k8Lkrpx-e-q_`;;!fedpd?-gt{iEsXS>b=aeLr2RqH~!hM%b_BtEh~1}>2PzK zbcw5$cMprEH*9}CT|CV6%_AwLSKIG_4vYD4(7x{CG*)jpF-|SdiZwV8|%2g zKUtn=Gk)gu(7|l1B!U`pm2()+LcPCEa(-2RYva$G6*~S|zhpqm86G4W8!(^PU2n%W z;o9r#>wmK>`PmUU>8{T5ok7el>E9krt9rpJ!~5jhOn&?5=3O7=c$U7={c*(7=10NY zo1AOX>`TgaTT~hAZc9o$y>g$##|fAe9t_3mFPJ#B3@SM}p_c2)ecivb@J6Y=}+k0%Ef{{Q^;_V)V7-`(HexAya( ztQZ6FR6#>>m156*|9<{+XKVSqI&+k8%AL<PUdFSC35!iPuT=+wj4X6mh5sCHLqwODM+JMZ+F^6%Uh)26@O}4&?WZ;#Zq8MISZDFKYyWqS_8UjrkAIse@?+x1 zCjuL8=(+RPY`=adQ^un(C4brJjh}aG1l{1hYqOx^D*Nu(oQj*@i%oy%1o_!oU4Hny zJL8-E`lb8qx;D3KPP2IaKBrwX?YMaK+D{MOZ`{C9ZS$d9J@MB5=>1>fet{Pp?7*_% zzyMUCn4Ftk32uwn^zTlqd1Wic_ALGJMw^u{izRm0vOW8L;BDdWI}`R!OJk_q?thnk z{k=VvkMk}6fT3XzUWsU-IypO_%&wlo2MJ4@4c04_SE_Y*&YVA%Tp2X|W%0c4sTDO@8lQJnWch#j_wMml6Xp}UAOH8SH{z@O z_~`2D@O@2RUvHJ-GuyIx_CyJ#S@$oTP0`srZJP0Zi_bGZ!S6hh%lr6dR`Yee_9@xZ zr^oiyeEk|MUskv~|9Hf@{&%W!(`HVT`TE`N`o{^c%KMl55^Jnahvx>LqP<^^_^VbXCtzJGVw~ax%^2ks^ zw^9!KK7y*5ssf|`pz;KHK1du~&}Pmt#}_a% zQ$Ulc^BDIhr!iF8nr~0E1yxtZ=~6rv)k%%<4jb-J7=eKyU&u< zrcW<*}q) zSA#&e8zrs|wcYqtG0cZw+?;YZCyXR;q_+Fkv%pa)uew*MZ(Zv+*DD_7h27$Z`PWN5y}9}3_l1wG3w|xy2U8*A80JP`N!k_-`T;pFqbmb=z+VzclJyy2X%wbecq9MZ23KC zah#l#@Xz`uXn)|lQnm@@-)r{$dbL{I{{Nri`3-+=ugbAYDofT&Svq^QNx|uTKF8;{ z^2Bd6;E^oXu`?DAswv#?^TDQzM_Zoj9GiLL@Ts^xvTQn^=e?=6iQRuRH29pIv2gg> z4X;Xf^1Y0iBeO9vG=9U4me|Ac6GaCp*35y(sK3FG5Vdu^6CTY!6n zwT1@!FTd~pxjg)OcILjOuX*!U`#a34Uh{wdnfncYen+ttr@0^DIcj9Q@pJ0!(vLT9 z|DLi~lJ|e#!E2E=E7fA`AeR?~8`o4vl+~Ge``MKh&(Ap;^8ZTQy}shP=iF|s4$j&4 z#yZdN?a{WYJLTruPqO`>e4Mx4Hcpx2ru3vX&_OZ0m%E~0DW2oKd8Fh1XTQg)qR#g} z&wU#8rdsBWUE~S>ThbcuEWdtH{KOn)S#x!x`0Tv(>#GXh33un*Ji6+=PTM@)Igj2h z`C(AQbm@Mp&A;mm-_ZMb2@*ewK$Ge74p%C_x3MpOTkCQDvEtWHs^=eq#*Hjy+yM{2 zf%D6c8I1qGALLQ6fA(aX->_bwGCd8{^OKzW@C>Nu_j|&;g5SdByq9pXcoLf4UVq zU3j;4UaF5xf9<^QpDWH4pH6&WC;6c|t!+a2XO@3Ij@$o|o?yQw>;9Un4d;1UXH1`A zD7iyI;~2`2Y%Zk+z}MXb)l z=E&Y(r_<7vlQzk>ef9r3H?hmm|I+GTU$~`Dw=1hooP9-SFw)+4F3xYj*xIcsmU=PJK0Z`uX_> zn(nI$t`6NN3ppa@m1?X`O_?d^;v%s*MTbO`_s9K9WqA4cg#Eu4*p@+Zg0s)j%I5Dj z_UCW@4vCZYe=2wW=hho{pGO`$^7+Q|O8frjHrr*`-c4rQpPt50`P=`%2w1lQZqip0 zNHp_{PgmyF@MTXfmSv9fHg4F{H}mu@zkN+#-*ex!IVP}V=ajiK)<>KxD+ZkrQ@rF& z&f2AMPcL>pR5d*Q@uYV|QRlBOX)e56hs)HSSybmgHN7t=tTuQ5%^-4 z+nJ)dFMm#}>Zmv*cP#P8Q~8<$ibrR;w;td3nPKtn5b0xEl^)EwBGQngopyfSy;lF( z&$fT-PT4%Uw%_HW-j>Iy!spky@0!C_T6AO6_305pao>`D-uQ9&(e2kCgd=X=yrPr7 zlHD)j>x}yIr^EBhBFa9#5{|eg_y2tP`+IvU|Nr}2!>ZkeIoJwXjQ`o?-0X_yKP%7O zTmI=*h1U0qbL)@3vpa93Ht)FI`QMc`&(H6Cy2s3}ee21ceT?guN;d9+r|ZYp?Vs>}-?YX#k)1a^neB?FwY9xz>Ak=6s9Qci_q?5#`nLCl7ycGl*Ql_6 z&a1DT-Z!f2UzXVg`Rq8`|3GyA@znIi=FVLGvSKoSZ+QOrQt;jO&Zn|Hw(II{zIb%` zZOZw-2{-@gW*En=W{XK?J^4PVCgu2>Lq~6%-gteB&8FvK$N7#2DW3tI6*KWxgWuX% z{q<7kzD_-R@7CXvh_Bkvvtpzzx)M*n*YW$?*7Ni2%d4Ertwle-H*Kh~oL?8ygV9g} zFYbAMa*p}Ob9hP_tO=%ubv1w7UhrDU`ZcK+u5UQK@AcVbZ_+es%8ZqRYWDrPY41`i zQFN($akt^}!1;6Y^20>0m0I$$f1fe6>PdJ0!7Z<*&)pDeFE5>FuC8?S_V+neXX;u0 zf8vk+R&bnPce1xoF;(+l2QeI7pl#MUd@Cnvp}czXT6(_6np&y|hOiC?(u zit=`g-Lq`>{0m!RQTp)K!^os+y@#i!s_X5)kzdPn>A%#2<@2jRC&z%BBhVHan2J9F z8lb*xp8sg>^XHb;^G{_zUU}!S<$kfm;qTpnD`)w=STi&9!345&%Ro)O}O@p z<;iZ*k7uLORNEAE)157ig?CBv&EMH+$u~dME*W-<(W;%?JfK^QOu@Gp^|CGb^5}}G z`KE5=ui@)9-+8o3f1B0S4b#Kt#QN_2yxaZjSN`qQ9ijQhJLSQ*7`=krVwA8cR(sC# zC5w{$7*FqAr^x!$t!>6$!K$B0S^H+xTy1Z+V0p9gk(K_}2?k}=U%Ly>EwjrpT{T;u z$Buth-1Mp|YxixI5n}TR>bbkh><#$jm=%%nUo-Td#lIH6tIh23Kf3|5A+v)A+^~JT zXCY_?^-ZnT`d-is>Yu1L?>_6mW>DqCnd|EBxBt2S|L6U>;BQ~{tDZA%_`~ZfZYp6n z>H7M3>2tMvr`_!NIpMB@f5Y5fi3v~M$E>O3iZ?8?llc9hNZz4qgjQ7@jyqdE3dGssAPdB=j3Rll~b=6!IgvW$PHVw&M2PiNOkgQKE{#o)IY9j)Qj7Q-lU zz{^ZO+sxa?S!`Fe=X_@)w9N5azjyXKtMi}K(vE>9%ls!Y?*E+UEp;X~TseMgx8>I7 z^>23nKFjc_Z2qHfoF4H9f1QnbW_9Gxkv+%HwEFSzb{B=J=WMs@BQ`X6NhwR+IsbfqbEwYt%{U2{PQ*Wd+C}# z|DV6Tyb=A+uN|&te14S_pbOSXf_qG%q8q> z!^Ja4<{Sw)lJ_h*J)a??F3A*p<wPj#K$ z&7(K3n!gE-pBKtsbRzGu@>SCUm77PWh4aLlZTyn;a&6*b3)`o{-|tE}?2Gzc!>TQW zk*K&K)mYW#)O#}4=Pwq2J(vA>r`^w;-wi$#NX)qJT>e?-L(T1?m;a-a`qMHyy%;4 zA8%jm+*h-%uWP2BMB zp?Uf%zMF5aUbntk&FTL>>#6YfiBrI9m^*GrU5RjQxy)H_7<-9N`Q~4P-5s` z^Z)!l;oiF-J=+7jPv6U5e9gHo_s+3e_RrrWK19u8eDd}q_stI%uW#5__4UGebNipk=PB}|j$+)7_f^!G_wrQEi6 z*3(mo+uJu^S)KT(&sE(Zp?%|bEwwppla7X`x7K|5y5>>mk9TaF=bifheRui$xL=NQ z)+e}LM<1LhkOa4-k5@9k2eqZG*Y`gE^X2)w!w23PJotVpwj=Rw=32=IcUeD|hbRA& zE-jC-Z}*DxH*VRpS3URH$A5o+i-Yb);ytlHcj_$hnSwLtMzq}hbL5=+nZOrf@s@AS z#_|YVKE3)_k?g)Vi6QFyE&Cf6#IA7-UoQ7a_p)NvEasEKmw7T*9+y3`T3K(80r+wx z+x9@4^zyUE#q^@fTNTab-%UELr?&15=l`ut59Yja?P6YLIQ_wTL)PpSHv1k;t1>w? zExzxnI@?1v>oD;%;k6MZb)}aMZ@hjzh=1bcNypy@_dUHnd&ax0@@LAw8#YE&=Nvv{ z>o>2)ECRHev+n2DF!@K9UNgo&`oFjCwjG~{2UQ~ zFw5b`*C@8qC5@5H6WJ=B*`(QU?!UoS{OC;Nk;p%9KUr;_c{pVKoKHv7w9n0q)th_c zYMSxmh0lXmZ@r>?ERMfmwK98KaoO%0=Z>aCuUi~uJJWOOdG}TN=C-@*R>!Y>r?#y+ zB>vvkpa)yeon3K|L(APUsJTnu0XZ(Q|z;?Rx5}^=_qy3Z`9Nu&%h) zO^nBG2J&e%RV5O4o8^`*RH%Ob=*g<|>H5oz=k}iPKXmf`{e?V>rR*4g-eS0PeFMhe z4r1VschBcPJ>?P-Y;x+%b=&VQeZ#zK@3*}Dr|af6n{C!f;!~ctwr1a_Pp3^^_)?8 zKNCJ3Ub6c1{h4Q#p3W9DeQ;)9@}=3zAFYLd790-mUi<6IJKg({xz;E1--XnETq1Wk zq}}5B>_6|0ewXHaW8N3f^XF)YfrE9tZ~AmE_1Gg%l~#HmoUCsaZzirb_vQ7((B*%U zo-AJ-`1j4HA8)5wCA~SvE4*3%vSQ-KZb5IW@Xd)y--E;ZA5KeuuD!pCt*>+6k*oRT z4PW1H&%gig=6|V#eNCpj(&Ryt)$jvlBtXlgK%>P4_wLx9KVQ+_`25HLJB#WS-{&>n zbFMYId>!1(?4J%=O#g24>uCAw|Kq% zf$8AM+&5=u|9t*a^8Mw62WIW%{fQahP3Apnk3RE$&GIiM&-K7|Da)iZ4} zzucQNx2qG5huNl=THT)8X&e9i)rQsU+2l?|zPehQV7_{i`}#V|b4zypJ{R}*O||U5 zY}XH#fqUA@9Ddy^NUttrOPSkU%2_6)`194$ZtKr)EkE7(%F-U+d(PW-$(?goHTvvh z_WgOZJHPBl*2&C`Upr5{dokz4-Qr89n}hY^WR9M`|N7(9!{PoVU;pr)um|6M;(8Ki z4Q2e_#{O|_6^}{JoP!S^*KGT2{kqU@`^zfu!o~J;2Y3|o-*e^;=T$N0pU;0bzW4m# z0UlNP^TqS-NA^FDj9qoP^4avHPcI*y$$tFO_VVvN6R%&c;eGwqhH-ct__BY^-=n|3 zAHp&7(VW*)_y2nOTI2fmYWaj zq#w`ch|K5J`~MZRwD8k@mKp04Tp!}hGoRnt*nfXGH@!%H&Hv}K=5begF`s<5<^H|D z->yIK{WY(6`mcNEW3SDP`hNU?&FA0X?Of+O8TV(WF;rUn-}x{sPJB7I_X}hd1eOzD zz|FeMIp$^OKNrj2t5o}b@YnOJHnm~PpPzT0yQY|j=lJs*m9zF$KJ)*)^W56D#`a?k z_f3r(_Uv8$s5w0U-ky)!W&UrQwzKo*#JhKn-7|7uc)NR{Im4O!b4eaI@2vFqJf--? zv*Mg}TKbF+Mu(s9$0f@)~UF{-OF~jaHnctzo+`*&!d`6>us#x zcyxADt&98i=?3rnvOTY+-`<;`ezg1T<<37}YLZ^>j{UnNjz|CN7ZwZ(S3sUHqS}#e*SYO|9hLszY}V+_?QnLa86CA zQ@6XKZd}XD?B5M)uiX3m=koj>=eRu;UtdjKpYXS8ZCf+%+c#+{Z5_|dON=E?uUY!^ zjQ+WrWqZD*?)tSWtnlg5_Gp{k&mL?&t@!lT)70t8@wI=iw8!3gciV8<>&4Zb?Wt)h z?tk~5FSS|nYwlwQo4avm4Zhbsy=q-=D;j*a?Bn&Wmf}hOV+?s+qIgR>rG%a5bZ?w~ zTs>|5^mF2TNzfaX{C53_<)7}mZ|>UK@A{t;#oc+>JWFqXJ-q$8qn%E-U)kKXHD%v7 zysy1r-EDe9#Q8}5Zng>ee?Z5Q$;~-q53XH#5R39$!HdqMp7-AU{O3-4`Mi_08|+Nm z8xtQaG&0yPEdOe9r9|!7*N+oz+LvEyy?(id>(eLy&rk9l{*{Irh#M*!avRwcFN;3X z)27#!C+c=pT*Iki~-f?4Jp zBR?wc-}my(&%>H&JNXK?O*&U_=`jE8d29D|@jf@--BK)+aCj5L+)gLX_==aNs>_xg z*-^2v=BO)2bjs=M4;<4&_FLtADcIDVtXweX>fP$dXCm{b;8#IgwCs$q zuSYLFZM|+g=X>0djghZTpWJrEnMcmERI04*_q)5h!)5R;)ii&14xV?efEQ>cNL2Lj zoT)dKe;i!B!}dJGr*HFm6`%Z)o^XFXsJtDX=eWQ|LJQ01&Hw%3obgWnYxY-;{Cz+5 z|8M*Mx8M8D`~jWSp0eziu&yo%)|J70oU2`~FC+JostO z?v9vUQ_tPMaF*F<%IW=AR&%fN{PEIOV|Ucm_*ac*=RFDDTz6%O@U9=PHeVO6-M`si zY1R2zvaYrDOX zA~9CcwJq0UZ@zqZ+q1B2@B6X}bFW5oHXZk~4C{8-WZP@!sa7k`g51V*MbY5MY4xk` zKRrC9-M8<$-ufG_-ajwd8TR$*p;vbTwzMmsU$y?6fzYlB!#^KZ1+|PpE95U3S9(<#;?@W53`#kC8{)r5AkAEDUa6c~bL5ptn@4WQaF`JhcZn*L7 z>fxRpvdy{^FEigLJi1|W(kgk$o8Kk26(pGKm~wdCb-7K&r8ib@zjFATdfVK4wl9~| zR9QR?S$@Od&ccHkX7LAqJ^#s~B8AZqJ`En`j5#-Z7r35wu2SP)IsJEq*!-Yki(ews z^rVgF#7{eayus}JA48j^FAF6qq3wW}cs=Gf)O>!{%lO1R zd*;F!UriEXUKxV!V`@wIGc6*$cv{i4svB=>!e%`ExN+{Y^wax}uguR2j;~(xt0jN_ z&lStF}j9TnIFPyP1pQdcKRgW zW~&b`41@|fd3KZ)?lar^>+6;9mGAam{JHkSo2${U68WQR>r5fnF?mRWhfk0OqV&#! zrZSCxMcm(V`MdM<UVidhd(`2dcZ=)pi$0%u|GRL-jjzwYe%vts zeDdpauQS;uOs~x{uVKxeA7}F0@QSf{=8o$O0m^BbNpE)VwJDyHX7Tpu=g4z4iEp?5 z_B%e{=TV4Z_uiKcCE$e`~w*x?Oo!dr`vVf}4la*8A_BEW10# z@JQsG8M5|gQuoC%?YQ@QA*Ws8Ean}ra}t-h-^!a_u649~vT!3W_-dvHC7RV+kL;*P z+4{aR=~d?T^ws-n-%pR@x$~-PbzQ~Pr^(#vyFd52pHGi?$;Z~0lPLa}XM4r3?fLij z)o%Uv`0)wsOS0zOVz@M0i9e9%b`|r7;P34f{r)dk{;u_UliXkFSN``-x~WX9Uh(|- z=5y-p%KJ@==lx8sEh@kKeUII{w&%}-j)H@y{#N~;$MS!9PsodXGS4=BVC<~;Of}7i zEx+a7qwEhJ)059JEso@imN=?&S@CMdbN%f*r_Ei#Y;CjAdRrGz`+WQTt>68u`8r8Y%x?FrvP*v9+>zsCPv-miJrkKg_9CuUWJ?OBFToBVH&gvB`zR@O3oGFtPe%P9ZW-&04I zXPxid{JiA4f9=2Jg@-R{DsQisI|n(y*G7%)S^1&ls;K_O;po(@xG9;>C}_>8R>4^MC%nhcD~}O1R%W{3GTedjgsS zwb}lZr?E{4FR9u1sonn1!`A$|nxCJZe&>GkK3np{%&9ZxnmjO0&&+_|>9pa&OzpQ7 zuPa2i^FNdV-RTrJe@DyS@6+?1D<5sS{f8s&V|7fKS(WjU4>uAIUhJRS;?G}x|FCZU z@!OAIP4CsS`};rrecq-gHhm`d7kAklYM*xX^KRzOkW5kA_qiP+yPwGXpQ|8wUvKDleF9e?mubGUxo9)pHI{abl{p&nmz==tgSe|cY>oiJIh zk1yG8v7PnZduvw3JWrD1dpAS0>d4{kPqrYh@_G2S+Q;^p{ek`e4o}-_^WiD`;={1h zYr>f3m;TE#(U`m^cB51_d+vf`X_oGO8{f2Lmf5XduM+#JaN^}ZNxsv6-@5qfz-eL2 zH@l}CkE^Zw+8NHRO)EkFPB*5`r} z-QZ?v*o4kL9=1REzj+kizl)S~hRu3>tf)A_Y@^)tO9i|5VCS5M@r zm)V(0O}KP;Wp-XlyYkoYHJfh~Ty0*m!f%j>?c*!S=0Te%Id-c~+3&Nsb& zrMd0ppGUXuYM+yn-uk&VC~(H*mZS5sJsdYqWZZ1-q%XJZ+2JRv_tkVbALwfZ-41nX zz1)z=pcVAg|D?Xhtxn*PY)oInopKbpvX!?4!+}p%|`|4KO z8aI52XU5n-b@;$r(1AXweCZWM$f@RhrGy0AJ8|aEzhBhZ_W!-J1pZ(*%z zUVC0}-ru=Flgb&tB_(dw4BPzZ^5@MLO)oijTre;_8D|5#CrV!DrDE&j#h=6Pe^@8} zJcxh(j<)Jwul9V0-V=2-UELt-UHZ=I6TF6p4@_?Bdi11)`*7I3cZVUT)=b8FYRz`g z`rPT3bIjl96_<2X_{_0gwtJr4b4z~a!w3E*CDh5^UH`oB{;rwVkJnZ!#g{=kuDjEB z)G}QP-%z)E+D<-0d&BpJ#S4X-os-g%5JlGv@K~?pv(4G~(C_h)4JSR%Oe~wXiaXeT187ChjwN<}wGYeeYuCs3 z&93#YNxm}$X+@7-`L|ixdF!M1vF?}Lbr7_o$5L9wY{%;9pEggv9Pw>K(c7O7u5Rpz z_?fWj=GUtV8-L||dG)zlIp@gCz4M-MDPOy}Dy=l($Lr(oUPt`=fBp1y{rSI=*VzBR z^ExXMqdSuLpc$NEUOnU8jhu@r&wZcWSebk8{qxU;yJn~VGmNOUuzddYW5K+qwL3en zU*S=F|17iS@7L?c=g*Ci$MWSh1^3r8KH0qWeE0^X zM2urcm_ajkGmlgrerM#qyyN(ho5{Ogzbu~j`EOc6-0bhaf7bN8dp5J4CrsY&TxG4z zob<~0yho;{%qMnNO8t8?XY0PEs|=rRZ#|QBrr^zyytJgU!}p?Ion6!ZUZnh$dA?yz zPS}-wk8eELxH>rYvy`bvot;GG&m$W?rl%|C6q%T$KHhw!{q!~;bIY!&lecuQ_OngZ zelNJ;AM!dL&H4APo?`z#P2|tCk52-G!0UJpylk=enZD)p#5Z-8pmjWlx?CN09ytX% zwPu$6r8h?pl(PQ-t=;Kv+$R=QZDwPHpvZudUu#kac7K z@0ZKx&-?%Bv_95TYsx|ARqAiH$iET$?1jk385Y$(<+iowiuc{;Ig|al&VGLX#k)42 z`wzZ)0vd8GH+)cjjz{7C(R1%NOWXaDx|V)^-rksr^|7aYj{P~Z;Y`ob3+L|5wD0puq4l*pOBrQiHhws_!C<)|Xx&cI+YPS{o=hwki@tZ+U;mIuv=8X)8m0L$NvA^j ztQ$3_7gxUddWtW9rt#a21z957uQ+c%eRuAW6_5Y;F;>hksgz*-{_JR&LbY$JsQaeV z*N@)#RT5`S&enZQ}OV{Y|N5UA>?2=X2fS&q~Hh zn}xeK%$|SaXNM)%-ACGOdv|s_CRG()jaYYh`d*oBdg?Q>8{t55$=Ra>=ew>d_Eq5iA62XQcYLWjApVE{_5KwV&u}c&*$yk4Kk65kbV;1^ zlbrc^kDA@z>;#MdU*`B91veh$gqi=9r`a)9n*0A*y?&n+;+?n3LDDSFToe<9q(5?8dpo zO}f_uSI;}Mr0cozRq@&LV)tKNA6DM{R_>~Jc^K2Y(mXd_w*W(~Nm3y_7UeVb-srgB z_;b1>xmZ&vzc6;$udI;eGUt+{u9U7je_~Rz|2f(HkEgx}|9(k0tXrS(R(QhM&@(wwd}bnr zd1;5zrn#O;d~mbtxwhW^h~{%C>ko$6SWj%eXK6ow&Yz-7SD(H=lQ!|u*$%0KwEM-7 zRXHC&O^esv_UiKP?G@=;->U528T|F3r|q<0*+((?k9LdS&tH*RC z7is2y+tb=6Y_ES+`}*;(|7rGXbLyjT980rjr+3xP2TxRT=B`$s7q>>Tk1?%sdesrr z%YpOP+ninWMD6Lua{n3cH1qmB+ttry-Pk-8bi32E%`-#3$1XdZ{+_SwM%8J#w!Kj~ z>8?%RJ?lEZHL2#kKlEYNy^YmTP}Jia@tJ6+T_H{(b$QkH?>XetG=p8T8TT z0(a1)y3xeXYX4IE`~(l*)Ko5>cm2rndS0IAkaFctIoq@EhidDc;^XS$f{h#Y{4M@$ zuE48!U0or5ZBBjcX@PTRmLw|G$}?Tky|iGhM0&BAljhm8v%5~q@Fq#@IC9{ROl;DNcYi@+WxrHY<~;wW zYP0nG^~Zbc?Bu`mZ{2kL3Xekm|B~&DOV%g+EnCZ$^US1#S+F~AU6O(O98bF+HE&)% zyz$~q(wY1>kKQbqmGAfe)LWfvXOJN+6>qg8 zzVBzuT$Vg@t;yp;wPzZH!dWM!h41$+y{)@3@w4vbi{5`XoW6he=2i8l z85t+S|2|5*{P5-P0>ioIm0mu*_5QfJo7}Jaar;HV5iR+{q!U@FroYDG; z?SD$_&)?m%?Ad#Vdwtc1-8b1W{>;j~zb5rq(!P|LtGCRVZTvOUJw2&`Bb+BX-3oNk z66?f!_;Sv`6Lis%xY#+rS4;mCy(>@57fqh- zpJ%Q4e)i@4pWfS^a(?sSX>zqU)4o(2%PA7uPG9uicRTx?h`OrG&Dk%D-u%()5-D>w z=hsO3dN8kDH~!n-7+$+>k>LJwB|ksAn*5f(78Ec4@XgZ})pI|sZ$E9h`T20zYKx!c zYhqe#<$gT$w0wJieSC^P_=-2VJD6)J)`E*uuIIfd#VIJ?K&$5IClBx_ynnXy=Yy-= z;`)DdkK3j`m3g=VT-Ni{Lk|?Z=Un%;6%tO zn**mIt8Au#PN-RX=gsph*a+~ecNjqhq|YNBKfPj; zj>HE-%%6)(Iv0KfH&Z@jO3b)_e16;W;~}YR6Smjiimy$T`Sj%E=JfM5;LHDHax&7* zl?`1?_Ai`$G9pb^H@(i{^UO!LroVjlI_hDUw|;&_+1ZoV_1Z+T#iz&iRD1;;OS9wd z_U94nw!dT5pFVS<1maj4(5*>N@B9`89ZMs!Y}eZl>8=NUtNj1nm8ozkYk~I_37$f} zWc@yV&?1{~xg(Pv-MCrxqIz!0k63;E*%j8&zu(0_JIsf)$Yx)R80gldkI-9_+Dvb> zD1NxVmhlOSwpDyvs;@`u+k3U#N zwm0g}Z2YxqK>3FUc)QET!U^&-M;UUfH(1cI9&_ z@jL#WNfQf}gIt{S=7{!%u9kQ6wYXI9;q1$^k@sGm$PAV5(_2?__i*KV*1oer z@jly@$|Zg9Sao^B=iTA!<7^+#@OMbU94mlTvw`I^7a#ANas9;8@B;-UGZ*(aO5C$& zTRpj0;>RY*8TYy4zkS}_f4AEAEW@X7{>Q+#Cdr2{%fD`9ZP;%Zow;GhmHRgmejGM? zT=;FJ>!Gx3O3&?7N}d_d-xwaOGk3}Dhi_c+EIa3Xf!vy;wtr8WbIu3Itw~2(9*5Vj zzq#|*29{&5*4g!A=3pH5fb*H((9o`H3Kuf#rku~GS%>8Bg|2X|M-=l{OAev z;-tf2@p8ZJ1sC4@`RTLh`DZ!zKc~k(JDgv?oMFHJkF_2_8T)HKng%r=wJaChSfV|5 z|H9eqDH_x3SDK55O#X1WI-qRps{L1#&8sK*pZyg$+3&@NtLf|2f7PYWcL|yAd-s+8 z*9}{r_sd&sbNT1uS66wre@nM`_Jbd`W>G0l1Z*IQ%eW6gc-(us< zhoHNY&Vqsk+o1ul9%+Nk&%B>TEOWl`I(Tol<}50&bVBYv!Sg_FIC-?Z@rqP_?$U4IZ3b5SDL46 z5I^kqzErOEkl69~ zbN^ooPpA{9|5sU`%OwqJj)F%(;C&o^&>Gn3k+aQ<^ozgT5d17v`DT5?@9O`Rx%cj; ze>Sw9{rsQd&AE3#jrl&t{pD#4m3=c`=fv0l{W`h+-{<+YOrOqcpQ<_X=2*-LFZ1xs z2h(b2_E~cC#79{2NPds0Nz+rQvDo?ZN$TRmQ_f2sn|b5(RNFnVd^9)3xW#Z|3`)=Q~ zy8cGfPj6f8R|Dm|^9QGOykvY+nRvr<#w&NXZ?cEOytsKutAw}7yt|NKGJAc(-@`RbLcJKHC3iuaFHYN>lioSqvg%DoWv|V*@B@GM z{@-Kv{{7~kGv=Nx{y*c5UC*7*Qk4?tKib_rl%2&kLH?gh4b!DN$$#sO>zP04qg|x* zaP#)>n(oF@|7_W#(<_2}D}N?%%sp_?I(+k=Z$+Sslnj5~I9t1^b>+X6dw1BLx18I% zC0spc-<#@t25%EjgN~}XKS}n-w8ygTvf#BeoX#vUcIk(=6nNVn*{LYa^GB|{OI)OF z-*M~itvAZ&+^O9(Vg45LfIG>rUh;nOU6=G@RWd))Ni~UA%i9*FYx`GNbH?+{Z}?KK z*#BSZfF1gbArCWrbmXNT?!-|mvGcjaT_$UX{OV#+#xrce`COoH0u6d&(?O?o#>*PB8l0 zfBnfy(XQLqR65ZJJy`Cjg4%3np6&63Rm#crtY`kVgRT$%u}Naa|GU37&AUGR(pw%y z`#+w0A8SYa{<7$1|H64YJrD0?Yv`J_^uUes>cVFhXA5o}1}&F)dMo?m`)2pz*;U$Z zb6B&}rx)9AHvgTd{>|X$5yWztq$g@mQ}xZOYhTTMv$MNZ@mzsH^}iy$&y|`7E8ovn z`|-d;{o%UJQ zr4Lud?|b!W<5czCpXc?@JHO$QERW31Q?kb*?|u049@Nvzd3*f$#J3nZ#Gt?$+)&$J zIr$x;G@bDq+-ilK{>-D0|6S_G_xk_k^~|4^PknlOtJH^?3k5z48LKs$JLP{gtyp4i zF&VTL#_|w!EzCC1TA1XvV7nW(>p_cQicId`EY|;g(OT!>;Ip@N+>rRcQZCPEm{tw;9Cl@X$TkUjkQ|6xTx4ci*|NJ|t=tK8r;h(3U zp6UD0R%N@U=F_wE$*U_i{wcbp`}HaK1|^$%rRjfag*HYVz5Vq4<-Tg0_`ORGpE|#8 z+1xFcuTEM%qv%k_`sw?n9e!DSI&Z%l%d*Wopxf8t(hAzVp~XhbcP@!}>mFwYK!+L+ zADDjP04RH`l(d@^&px3(N~`&%PqRR=(CIfS(trQ2WA#3-zs`8gP9L+f=7UL>x?|TV z+uP6H@o0M0w*?z~G3Ng^ur)l@_b+^RetnzWtAjJ=`TJ_`yW#n*%&c5I!%``0J1eyBZxC51riTgh25kS1EuUG0R5U46?Pd0}hnx3H zU%TU(wZYRRpUtDS+J9Bo?MQm?^Xi1n5$T}$VkZ9^rwb+O{<6z|ny}$n;M3&$l@k{4 z4vFsD%=E!-r6%Vg%v+Q`=xup^nhkXP%nY{Dq#K*Ai|c5{f7?)#^XDn}_?excTa?ZO z_1ipMb^K3t%)YA4r&HU*=buP@`(yv!s;{q(zP`Txxpssh#_`thPM$Bc6y5nw)W9b8 z_~iv{jk^;P>h8U3I(pKOhlhE8JLCTHe;@nn|IC|k@ZYHe`~TkFZ~O6VKWL1kaOS^F zSP!4kpI-CKt9oDQo`Y|lcd#}6Nm_MXUGM3=-`?9lPc(R%Tc;BLLw5Sy-g`VNYu*%{ zTr6*`X}@>R@3?!9zSUTRPM`VkvTW1weH(NBv)%GZzbbS+Lg8a5%oYS^U+-SsR$QC9d3%|C?7CmAiJLv_%BsGx^%>;+ocr)f z{)rj)=f%zaRI=Q_ehuT3%Rj$7PRc=V#P3iBmmnu9g+usLG#MBi7(87ZLtt&Q*Kv%8 zFPGZzW=ZVeW_$MhtzJaU4a;YypEk^Y|9r<>a3#}IIZ{`rb2`@XYD@ma1MW8i1O~aH-28paPZ;>-LNFvcO`z~xunCP z@}QGw#Kq68TXyf~-NnCtP2XO9VAb~Lo$}T(|CZkS;`3bm`YXAjO>;%hefM-t^b;1V zUZ==<)Q#=TJ&wHeDU`+>$mdyUpFe)^cfyMTx?>gsoNV3f{2@z3OkCE8+sZ8GN^$(UOx8|R@z5&l5f@As2 z#l;=RkK9h)^?GM|?b_UmUDHf;^xhZF@ckPKSlZ@>w99R~QLwx)>BbY4XCBu6S6f%g-*^_3BNh`RzkFZ8?)m$! z>mNV6Pko%Y9-D_f-tpk5*rA@c4J}bKYy6*j^`#g6aY`*+@@f^q*G(T^i%+#rl z*!ivI!>b6FH8ln|-~7s&5K(JZ_4VgbL9<6^;{1zR1z+ccZniRjok0WI>*@d3@Y?+P zci7LMIS8KgD*deXF17ERqMUGk|I2mH=Y8F}?cvL)W$(ny_uSW=KN)gycjAM)JU{Nw zk#yKMdwzN4zJI@7KR$nM?S96WuLJ*YdB`Ji*5`~TkL#N>yRvU=4bRlWnw_mU&*#Z0 zPn*(wx5rKP-z%N3YWCGXf9j@}ee|61D|Pwi@b-DRE6u&~i*yT}C$dP&eYo3*zOn=^dALH1Wr`ZMU z?nkD}yY;Y!&wo=;_LcYd74h_|%@Uh#|L`c~mGLaQ@#xTp)aIq(-ub-J55G*|fA`z8 zp=R5+pIl*>mn)SY01fI-w#dI1|LlcKQib*LQ;)Zu&3^RR=KsULpFh}zf*ZaSJ&<7e z_fP%(`E!x4wIg^HK&8zwp5uOR($vz-->hAF?@ZMXzry8ppCMN(S@-$M!LL?oo;cl~ z2Yj`Xn!9tbnVokH=xU|Oiz6&Ockg(0C3xE>ImXxWb;ZlxO}HCZyLa;5>7QQ4uB|D^ z_dJ*{>CdOyxYn^Zlx2?JkHaONyJb$ko4&dGhO+LO2$m_{YhtdJt1bVjd^V0Jro3T& zf7SYZ5*FTf*&42HxE}uX=#=)e4+8sn6@GH|?0H&rE?s|F%;}OV+r_z;xBcDy|IhjV zHUCcQ@3;B6{{OG_r81ZuXyoqnIpYui|IYtkc+c<}RJb2>v4wq4*kSkh!@u6#+&o?T zaQtyO{TQ-+JeFWwO+D9o$>FQS?MyaN^O4Z$6b8ZnK@YKJ9h)+V=Yod}CNHbk6xw6tZ0IXM$3& zti-o0G3~ayar2hm;}QNIQ=-&<=jn~=R!x8AlOL`|PT0P0p6I*-<>r>JSN@QX+gtVZ z3jd=TR_$FFQ>C|!4dyrOIrFfl>V=W}bAiLREyLut=f(-ofBuvI{rvXtE3LqbE|XIa z{C{_5xkCN@%jTae{{H$p`K#!fe{4_YZ-4R3HO(bWT`bYue&c7sVv$`(!+ENU#hZ_O zd9-R{OuK%y<*Lc|=Nxyqz?XgT>dN+-({Vm1f^9}A^eRszF8)Nd;vYf+*WYzs_ zX2*b!k@@&FOupdd*9QF`^4Ij&rT@!ju`pSDH^{$Ne}h@>o?XxO zb{W(4o##K7w0}Q;_;-jb+ddYyXWtJ`|1f3W9=W~i(indJo_9MuzP9v?&9(3iQUZ0G zr#Z@ICR}q^!Z^>eU(){&|Lp|6b8}eFJ<1oqKJ%>1vZ|vZ{IhlE81IfizE6q$SRDVS zF!vsrb2r~^n0pv@evByS{1`Ln`7vy_ZCB~PTf<`W`c98j&w?Zo71I?Gh3|}FZ$$QO z_&NRMv1dUp_a5!?`FeGQpXHpRCM#aY%%7;rK7WpN-ErOP54U$WZ|x54*K_~AVEW~N z344nzHom%f^l-_t&4M32D?fcN*Ek)>JHMeOkKrZO!^XdX%i;FV&+dTA;kNC?YkDB1 zuK)1^f8_p^#MG~x`popxQoEhM?{2?-l}DlezVWYLuh;kEx=4v_-r9y^Vw!Er%?yK6q>W_cjyuL{vU(fc>KvZYp-1W;gb1$8&_o!&%m8DOF`Dg3T=AL}+ zOYzQC!8H;eUuK2a@3yGhy_B!#?#{%dZ>d&GV%`{RSW;{%tyX4V`ZeO-qc=52!_OZu zyeJ;?w~T#fUB%B&Pv!qyXZS3-=A!9u*o+9IGmYqP7r%pLt7B&1oU}YSp^m@aYTf=T zUZ16Y2F<_o_uXx9qvpNj*R}nx&nN%cqV#{uv`Fv6&buPJW_I7*$tWeA>EUsH`q@28 zD~hLoDLQ!4^M+Npzs=qVV;SZ%pY*eQ3Hj`Mb>1#+%7E zq}S+veU^0e(C6}Xc{hq&nQ{)fbrs%wJ$3W1b4Qn~-p?;{{iCkW*H!ly1n#-_ChOK} z=EKMQd1U84O*kE{|L9a`{Qdtw9`~Pre!0JUCi(`H2YnJV7@wpnJwLniw9H&*p8V$# zlDEO(Hovd&r|qAYJLY*EK49=cpDm5yr@r30tABVsoKJk^JQ1$_Y(3hkF{02@W6D;V z!%mGk>H6l}(}(JBa?+45QTnjtR>{6s)1&=v)D#K)JQTKHD(UR>H%sPqrIs)MHL-om z>hQlCejc4N{jKiG1JTFc9@sB@K2-Skxpk7;-sH6GJw27XO(giT?GD-L_f(a(%lvWC z`&Gvm{5L7_)6MS@Rx%HTPp4Tv&(;@@|N2s8e&XVPPj3~zuK1kvuo-lT(hQ4NXTI-U zpCJ0-e7#%$W%Q*x20S$y;DM<-dm5`j4ZVkNWwevQi`E}pHZ<7ZZZCU1I8#D`?cdP@ zJPQAh9^HBia*fhD^lOyZ=l9#%%1F&M=incpvXe4TpbkE<{CTygGt8`E3x=jqea{P$}& zpI$$0hFJ9cjyHYhI&avj?X{?Ub+lV~&yT%w@rE^DUBb`bZ}`(Jf9xk$*pwa~*q8!z zs0H2~D9|r1;WOMbH#s#2ELCI0_U!wI<&UehK*JEXdCmxY%C*y*yKQ~K-T!P$X7;6S zyVP@h=8VNAEKBD9^K~~XG$`@zOZuTxW(mGbspTPecHZH8XS(P5{g}gf=AQn2Ip*+l zX$pG|Ilpc`1cSpbZO?*(h$$Zg-XW0hv zALpK4S@1)T_q2YvxQ6`fg;CRAe!8kVf3wV0%e$w!(;K!Q7Y|>Tb>pFw(ksYiN}mpX zo?KM+Z1a^DcDzE}kCVC6)jxcCyYEf)zF(g?Poy(o-Jy>&5TK!DQv=EwzvpdaT=MnL z&(C&@nRZFjQp`_huDil;ai;B^ApX6LiyQCQeSVmp9T0Ap9wb}sUH2%)?&s6eH1#6W z-wQY2e)!_-mK%po=`QJm*iFM<`zb9W`e-O)p z^ljj3rPCZ*H-^ZBClDy-}^ z|IfZW8+4P>r*ipypDur|xq9+_Ozn-$LXzooPe(LOIy7~MM7ogL{u_^e#vWO^=^*4L zrB4Ste4jj5-q4bJ{7HU$=ZPfnIWb3{fX|6((!L&)&$jT(hqnb!Hw!l(DYD#rI`Ygs z=uJw$`|bbzI8)DQ5Pz`i5JnLSt8kAYSGYfHc+Q-E{QP0 zg&Q~Q`L|QjZW5>v&HkOHYb^Fz^>obAr+4P8^tZMWW_H<;bi?ZML#eDwx)EDnY`D4E zQn=byw(V&xGc7Wx1h%003nwlD6}-MHfA7Mc%F-1C{9{JcDH$p-0Nl@5Zd`OBlB{5e^XEW%slyRQAbbiPkyTO=Hmf= z|5KU&>;7Jeb-wHkNMXGQ2=-HjmPN?{Av*&*Ms?TrU z9}b=&2RW_P7Mxh>zfLVYFbJ8^&<8Jr#C9wUY$?;(+lWR8jzBrtaNpjzWzV~t^Fha*t<@+NG#1*daM(C~m+P5~ z7X~HPGKFeC54}w{+dSjbf%MgKx8I4&!%l^1Q$P3e>w&bi6n*tr|4%0QNt+)z*VJCV z`FXnfnIhRoIjVD?dg|Bje0%eic1~s8X6}mlQ#K? zIfcA(PgSq3=ab%RbMxVi4x4kY-tArUxHtB%LDr#(ZO!?9`R6``x%;jDRZvp+^tIf% zYW;$oX}^*->3$Vxb`P4{HupYgv|I8x{w0y%@UStvCwIH{yzS@goWqw*b?(}xRqU_! z+drk}^PBxs)J<#onECq|_t&Q}RQ@eCZHcL8{&ZaQdG+4Z zI$VC*0ko@>p016%Bjfnnp7qVP;JweZ^j02vBYHJp`mMJ|KZq;Ovz4y4jNKwpExzKs zt)8^c*O%8;hGc&a_x}4QXZMuowXY6dW7qNFU-9SR?a$q7+Y}esw9Ne=dieR7>GRiD zYQT7tH?&5b! zNiV~!>YdH`PXy@w56ahDq4se3_XTgVLhDz$=Y3O|KkMsawYe7_u09{<|K;yFyUrDM zvv*yMf0dYhUf#YSr}IzeoIjs-$!Ch|uZx?nCu{%pd$Yg8FGrIWEJG=`jSZMjoR&E^ zd;4@ttM-bVJ+|9^&#QiR{YKmJ>p@On2(vc2nT{5f;CwVr&@vdXzOPnQ4w`R-Y% zDf5ZfKfW*2p5OH6tMG*S$iTF~-&yaHz9n;HI9z&l=J>Um6MF3S4~=JMc4T-=|InH& ztiDh6+^Zb_Q^&>J_MiK73Ua~Hqp~>`t7SeIsLb9RT3eA`{dsAT&Sk|nUsuLizWE(F zXKG8aSbbQ-x`~%lCWh9CPsq+!+0C{~;Y_BTS%kCo^i7kc+QTPL;r8>hGc)|U`HHmB zjqXJCqOT17tM(etM@{=EAq^JksT)jjLd7%J~x{`c$k z`uTr8&;S2MctU+#;4|ek^Jh+ByLNgpZ+~;Tl6~vy#5el#JPWDs=tnQjg~aNeQPzYZD+BEhQzs z(0#t)%Y6^dy2n4Rf)0f_iMVK~un2O|QZ?T;7a#tF^W2C14uya&T9VlI>BPkcK|H(T zs!yD|nz;U65WlrN5BQ>`k6%8C1kc^@w4j}B@y#06*YeMVCuCscrFU(Ok`8gt3hzw; zw|SEvzukEE`yJ!`$INVE4_``X1Fcm6?Qm#6*zo`Ee8neE(_actcqRuuykh^FRD<*~ zmoou6#=_R|+hW_#-@CV5=4{4~?=m@aA9|WTecG&8!sPxw=Ip22r&FJ&Z$9!Q+5G!S zv1PxOe|z-J=6Q+PrMS5per|eSd3Z~^Zus-6k~;6Q2hn}yGG%+*1U8wg@CX+CoWpzh zknUH3=WRI#AFA(Y#sx_Hl6$XnE$Mz?(f5;1b(iir6!x!NZhpdiXV=5keYQEf_U?Oi zaHqe{rquS(`;u+**4jLLt5RbLy=V#RNicW%z@d=OriMFRfQASRBtGo_4LVy&=P&r+ zmyeHH8J}#&IQT_u&1Oq)LvPzRWp=CQ9R0X)?y>aK`yO90-@bCa>}tD*x6|!jt@QW% z`1_{Jir-UKSBt)0Q}=VzY3RW(kFS5+5W2WH;(5)lh0$MkUHKezq4K?Sw(~Zj_nzJ9 z&99XbZyecrxI9qe`KL0;bfsl`&ON;Rc`EbCt4$ZZoAwVYO*?tXORh?f_x4P!rE8VXfrh^ZD5w(v$xC`^(mv>!_U*m7s{k;GG@BX`? zyVz%^v#H5{%aE7O?|-{b{@bdGPbn3@0-oi`o8P%V@9;@bt^tM4Z;224L9MwnH?8+I zZS~im^;hE6%-JS)vKcgXMsoGkZWmAQyUerP)@J_GGvVv@iv72%FxkFxd(x4}4P|AP z-;Jv`%amR=q`Ff+GI_JA>?Y-iC|9Q@2fB9#>xc}-yo8SFM-#n3JYiso8`SI77 z`GmL5-jDx(@BhDhKjY8KR<*msnC*;3lH!t%rF?LEp}UW*{|j4sk;&;qZTA_eR!gMb z{yA!PeUotMnSxX7yPt>lpO10xduCnzF4eB8UA3ktZ1KNMH*a$Id^^11-^zWP=NLTm ztP0&fZ(5Z{dgY<%muH@EoDRNmDgQ0&{!|;wDOd7BH6joQ9UJ+r4yO4Cttr?&tnbChhlE3R_*V`%mqy!v5#0rxXj%>K-j z7y*l2z{{az>p!>MDYcoqNDiE#mY=Ua_kDh2W$(TJ>0dTl%}M{iaYk)K<@3@{8|FQ) z-PL>j8js@r|1O}rm-M-F<&rrr#hmgx6RwlK+mcuI+D#cv>*(y2=7l9m6`p4bYd!_( zZFH%vGG4^i`V?~a(oxgOy& z7Snz$`QPW7W$rG$RWwJm;k&1=r@*$PZ*N}4{@9XPm%ZP^%=+eckCyUulo>b}hu{HckVLzF09m=iT|b!phYa+#~Rx|9#GTd*;tld;gz*kz8tV z{$H};?+u^My?&Btd;WKc^!l}u4*ULh{<*#X?``4xe|~&o*6%(|Z>FHg^Zz;SrmeM#8uOPc=WT%Qk1 zIoQqhx7Ry{F;ixpkia(K`b3NT6S2oHC%d10{bb{Qrg#7UJ~yrUKmX$KR|WI_9#8s~ z_;l{|lZUJ3eSc{d7j4{7^I!O*=o-6Sf4n(_WEq!n`Z-lyh(FYsoD4E z=KTftcr0H&d|~j+NU+>mzbn>?7>WyU=*s^k_6+aO{`A(HWLr;^R5Knywm}@d1=F!6Hmkczl{2|_S`)AZR-PK zUkOT|TbIVae!nQ^@^yR4e(Kzq=UsWUtNAql@45aCzt%I>{apHdKbEb_9~{By=hib& z`l))eqH->HIqv@dd)(gtH=e}@nSJg6Df$#_+OXxCxO8CYj<8e|F6J8ruKOpg#Wp(j&&q9{)`bV2<%anl#7n@5!u} z_3xK8T|XJLj{X1l`PX0kt#`Zp5Ih0GKM~aKsaw_7|K#WA=WWIJ*QA;y+ohOaVBTOJ zW2|s;|CQu*Lf33s^?T;}_th5c0Y&L5yw ztpO;we$QWQZ=JptyeX(mce9kSjP=IZGiTi0uzgyU@#}}yN9X=J8_gpE= z6YAc*>pR^(Co@i+|L4oPd%G)h|2~%g|6`BuoyV`*`uDYcy}3DEKYVuma6VB5R-W|i z2A3z-jSTFAuN#@}NPO^4V#fU4yB~j2OrLfAq;uV_`QP)vwefdj1C-S(<|#w|WR>Yx zjQ^W9$R9&*#wAGXfb8YpUupafR{}a|0$Rj8zfsa*-~7$%_x*Y`1H9o*;ZK@wv(=>o zYZ^V6ZHncL=e5XhJ18^9l6%h4`+Dn)XIuJw?b4Jpi?&EF+gOqmKKpD>`#k@(*Mj(a z_R2k3+b3Z;XY=hu>-Lk|V%*nO8BNxj*B=s}Q&sjiY=6{UUeJw4cOp3}uI-dGm2f<& z;gJMsY~cvO&db#r(7OP_S*N0UE2dH+6O8u-SeJ2-AUdJ8H=O8=aly$z+% zeJ5vr=f3Uoc&}rX-{MbAo@LkG*nYC%zT;=k6Xo`|N5sJ@^5?*t{PXT@*^8W=O26-T z`0t(N-yoxNn?Y-FzgY6v#IXI5o2B^V=kwd!?biLT|908wPp0nXX>IK#n?;PpcNa68 zm|dDMVV?f%O7D-)^jAHCpRU6YR*k(M9eIk@#A-TH;&Q#<`-L_tbx?-r}CNV=wpN z?5gAMEKf0SKEA;`BKp((_TId@C7ivjcfN#`)#-!N*2f*0x_aNf{~wRb&p*FhUfdX?2$lu+qCMuA=dK5D z3)#wZ=KPhdK6h>NcI>bAQ-2JtoJv8B*}FDBr6;sa0G%!<_G*}}SK$DySLxeYdH5en ziE{UG+wa}aON>C5O~8(exPSKY@LjC}I)mu?NAvs}@yLypUDbCA>c7wNJC^uhp`pQk zb-7!@d+on}yftfmg6)5s;kjf577|AwyJMiuHk={B_~hsFM21Y;`hR=;9cJ~AW?{d}Lw<-PA$(En<9~iGYd}RHK z6tPZ=U8l`$x;yU12S2=ZQ`v1^ac#@mea3};*Mps%&A2;T_I;n0xBW=l+3h~=`d<(0 z)t9G-&!4h*pNPph2taL!GSW@Bf;U9PuY@~WLJd+_FW)6~=|Gem=`*h)Tzr1bVT-CR)vC7%`@a3N+fAanE|2_5p zbozenk5m5lKZmOCFaDZ%-YaEJsa`Ut7gzYBq&c25{v>rjFBhDCitT;U+_yP%PqQnV zO`P98EG((haNs zwN3bX?ZKz__Wyo7HvX@ApoUeO3u8IYZQ}%vpA(+e|Ns8K?Dgxj(%-f(D-Z&W=h`MF z)Xl#;nf>F;TQi>jpV={g6KK!!VbHx`D=NGVYg9l*>9ucXqtbMqc~9Hvb$X{|@cgn8 zHMWj|qZ>+>9X7qPBzi;E#l+3&#cJQGtax6_@8p=zJtg|w5}R{hnY`cgOb)q!XGPtQ zmv1+G*;{V;-MHRcM|1w2yQ}xGKM3ck#aOj6(M$hl-uj)vbEXueQBXX{s+1MOQur$mH0L8>Qme_n%I83wz}_W)$6zqMKdKk1MA-x%kr_pzn+WtPh54IuRe@rkN>Cr>u0bjt!3Ng(tA+gxxu$bKN7xGy{viasH538cWwK= z>z?iRzkb@(xqb82_y1Du-V_{3m=Ll(*1o1%_Q~ngiznA@7Crw??%Q7es`Q9vUkRrF zp!dQ+&E`3$;|Ey-FZFl6l`CQxj%0oKW70-oTik$c5({#|?MTe$6H{adx-IG&#+SCg( zHKu%+s=s$xLKfGtqlZ7Wb_;AfA$I*iU|i7OR~s&#o-Etfd*bn$clSf3ccO zrp1qEU!LjYmp<9Dir-y4eBZl=d%iOrPg|+4b~}jQutMc(=8d0sSBI~kS9nHUVI!9P zVxXd7zJ$SxIgC$gtCTK-PNjOobB3WPJ^9ObLxc5Gzi%|&2cGjN-<-~|^B>!je(qtr zE(M%2zIQfCI^0{n+;A^6&43pZ{|R`e_D+b|xWVT9gole~9{&ZpLwf(Zr}>VvW=8O` zy`A>3<7dd{X=#BuVjE}Q7YUBBJesn3^Jc-qSL$!V_RhF!a_0)S{OnmzCj`&?R2H|) zc~kd#elsP%b!`rBey2vk%<3Hw{`(|7JE!FPNw{orzzgzBiskDAO zEgr9I8ZoC>T+n;_rJtZBe{DrSr&kp_nsVCjWls%X{ma|7XtVmyD{JIUU$*eY*M6&7 z^uGL?r_0xySJwUu`d|O;o!XUeCcEEPmzFPG{VME{LyNJ%DTQgA2OAS?3^{lhdqp;U zG}!oiX$mWQv)V@m3(0B$CQdmPZl5dqS;yyP3izwoaLki1F+6wRNZ}J6rRKsWR=F!{ zvsTA_`u`^S{^j#`OIKad^1NGmWk2ir*w>M-x5v%9zcaieZtM4*KQA49%-*LTXdf6H z6Z>8{^XI2oU$>q<=Ks0&wz|S!=PfOBdKwK4*p3~LkYG+u;DK>|*cfhLee(VP*s2JJZ!IJ`t(}-P~Q?&j@`SD%G}m# zeS2g3g%3G}`@Ju%Yn9&?J9Wn0fNITcKW=*S^oc3|TyNyP%rQ;MG*+$CJwA@$*t=ilm@(xOP`(w85+Ai|8 zUHN?Gx_4PBITaFxUta~v&F#0F-go`$G<9?Pn&ORfrFd^?wD{wpj>no}Jm5;W@pd_3>o&{mSQG`l(-i%$*!pUV7E*$K98k z=kF0#KfjXAhUet-cUR=^&CS~%(tEm8_}{ZD>!rR_PJgcQ@Xk|vErA zIZZ%=!_a`uj+@!O=jh96^X5NQ|5`nHGwYN0y#1?*~b@--LK z750}YzHxt(_oj7DPW4o=yr25lbI&s=i-qxeAKN@_#$0YrdB0r4(w{dBt`@f!s+Vm2 z)V};`!0CPJ|2xxXo5$EbonvjhqbhWDw23YLS;P8z`gcwb6F>Cq z0S*eAShjDaTkZGEzbiJu-sYV>|J?7N|J(c#F*_{r<6>F@_lf@he`=X7-Fy7&fBzr8 z6Z7}>9i4MmaHDhK8=s7gHOqPD+uvO-^ETtid8wMa4?S(KiZ(0eFdcsvcmCDotBa2Q zl(9Ve<8AGy)|LPF?%%WdT(X(G=XLd*jepYb8obXqm(8 z>C6&iSblm-!SqVu@6&P&KBV8XjSG_aHuJsS^@sL_S>I1O6;8@qSnwoz?<~P)Qdoz>uN%ZxN&KqB69;}$TJvDBA#ugUg@`Sr@BTwx-Gkd;R@v6vq z68CHC_We=!tFNB@%xdE=;f=-57tjCqM6Ukc+r}#YtySSW-~9^L-*5GH>XA*E8-?p* z^Y>Mi@V|~bW0SKyQvY+I=F5*SxbwZYam{x<{k-|LV&ab{OCMHi^i-Et_gGI1j{W}O z=FwG+PpS^iSb8-6@7ID^vvt+?&-xnJzt)Xu`ig~myw9_PU*Gqso%+gBI{MB8Q=^p( z(6azm%Ej(Kz31oZwflF-{XBI)d_&w4AFN?wQ_8lj;m^arEZZA?JuLiR`C`xf|IZ&T z|6r1Km7`%Mt*58O%H)n6Tlg+qdLM#_g?XT0Dk7u?|=F@++ zqdWBV8`U~JxwpBq*2+}!>6~5vtnzvO_rv}#430jzDL>b^^7_v5uJ)oUYFD4GH>)q6 zHFwU|)2)i{3JlW!X2rcbzLcroJ)TFAE!~3EfA)H*n-j}^J-zE)VPPqFW71mpQ{0RF z`WL-sef)9aRJ+d!vtE9AzS_R_+-bhWd9@E;#qa&q^)Xa^|L@5D*fX0hN$be`TqS!f z_U?x_`8M_c{(SYmZ`bETFi}k7LQWL(j`957{mG=x&%g8(sGOYq`;qwm7v&Ch-@Epd z&K0XE(>Sv4NZ-jvy&J5Pbmea9p1YDU{cw1%!SvT^Up=~~-;V26`*q`C2>-V=tLM+y z+b8w5{M@bSzs;<51cNurot@tQOxfUPe&6fPo~c)pWb!Juea%`aRt9MyT-i_&y}wVOm`Rly87w4{twft{%+`689m2; z?Wd<*t39oMtv)KYK0j(-#iD7yYK1n&J-z(ud**TD_%)H660bhLK3OeuTimND!M+kd z&wkS7_KzBE|e}5`{QLg8Gb>?V?eLhp3D*w!2{CV~ClMS;o1(WCPyU$|&o=^Ip7p}8fQX}z0`1QLl(@yW{oOz3X>i@tOih0YIwEsJ+ z6fr+%>ye)iyUVY~>zAI8w0|pp@%_=KE3W_9yM4|F{mg^@ljSZQ;C;IB?}8_*gPnib ztyg^U`}kMp?g!jO!loYlMg2B^|0+CL5&3`1j$Mz=#>v{5t&xz4{r{?TzZ3t*4Pp&f z*ZWo8(_hzaIqTruSRa4&eLp<^nasC(clE{PN!uZ3vrNX)$N&e@p9PW?tGX{wUcP*v zi|u`*YEX@8z&1|~6cB%mcmL+PHh=G;Z-&zp-Y(5Z+W%fA5#`lO{?yDpU2`H? z__TLY|KrKivrel1+I(AZtHzpb)*FvorfaYN%jaWy^U>RBs}}x`lwT)PQD}Qb=la~( zH%9qP{y$b17T0`Xx4WX4_;&HCi;SsC|lLsHG7t3uYlJA}7>`usBTTi%EpcFxy=U~2x{ zGuXiT6tp;(urF;p2Yc-nP|C zH{UC*JuugMhgj32qF2||^{(1IKfUaz$Bb9o?1S|Gbe=wcJg+^(wr=YcLw?^?=hwYk zxjOn@ zE}k|0XToRKEN-j4e!KTn?Jy6w+f{t*W|pZw&wS^ukDEVlFKBtF{f=*Wz4x(4C1tg% zF3&zx^E=96-!^~yxE?(Im%PFB$yjLn7D!6@VVju1ePVj%7w}4xH#d#BPwX#{?cO&n z_DkmW*^Ax=9Lca&7TOo_@sECh{rT+fBS+aXomhH65MIVmDtlVDnqi>eq z=TE}>eu+O;{`1X6#isU|N%BYOAB*jOdN3kKm58|>EV~q>0##^-#!nD-TCQ3*Wo%) z^?IG*{r>ys|9`^Xv;dbJ`|?3G%D$CS;8vyqTitw#8$zF|k3>0GT~}AQzjIH1?D2I+ zgqA$c(@al4wC%9qX7i251&iOLXY6A+cX#6J*I{pCuN3IBxxbn?Uv0|_IbDyN55H_R zU-Z!9^VHXR<}rU0UkCH=+EcJ)UYhv#zF)KB@7`lveLqsYE@Q`|=|2sOqhsQhm#;Ya zeFaC|tSchV_9g7>=UuY!&WQ#~_QdJ@mp>$SU5&RrqWIv*q0;?lW`{ifa^1eC+V1bw zYm4_CU8VSp{py3(5&F)dq6<*5GWZQ-2R^OeNf#DX8k#LVONkZ{+_SuXYSYUuNx`0LX@ z9SRGUxhHo*+Rs|Ych~0A?d#R$ci%|8=OPy$VYYDf%KAMa>uqL*%&xu0asGd2&_sWx zIcE<&ySygxX}b9HWa%aHPAzSj9{)Zi-mQ+PD=+$WG{Mt;NkLN1$6wL+zE1yaly6w6 z`~A$-zjHe8@BJS0?Cd&w`^Jl(_pH9lzf(0$qT*6e;JjG{i9c4|uKqFSwz`7;-&6bA zM7ePnlIK8~qx{@W`6WHNQ~xRaHL0(^ziGer{{4Uctq8x*^r^a@xzFF>7uU7z>ypjp=URiJyK}3qvAgZ5%!og(^>6O;^YiyVo4#@1 z_qh7?dhb&pwE?U=1ZN8f=fUr^15B6xfA}4lGQaJY&YIeNMcYDt)%>-wJAe7j`%}+< zF8}-`{WjC5YWu_C@wH#SWj|kcA9Os*{$G1f}mSv>+N&j8_EAU`g;Ag$F*n02K^Pwjfaa*@SHANb4I zFSNb&iC6MhiQZ>1`>&SXU!(3E6#RL$ed6N-rt0=GYxk$l|MzK5+5~66`4TJFw<@3H zkB*brShL|x)y%c2%5!FR9jyHv<*={rWi6|=kQ$ck0`ABEU^M>lYL0pYwZYKh5NhuVtZxzd^4>d3po z?}fj`P9H0CeJOl=Ip13U+PB$X6pkKExFS0Fu=>3D{U26dyfnrC%tU#;`%kM@1g@K< zqPyPi?3DGpwzs_IFRWg6Z^Ha_`){7K^!|EgUAWs*FOIH{r-KXPfE#nijtcWKbkjq{9WUH zMOVT8_WhZuy^V$+s!tyfn{fZ}JIobD0u(#jV zRgS_lvUY~I=Y`c(9G~~{OzY*vdrt4Ux#iYg&px|%^EDXetJ%uA9WJieX?o&*K;qMh ze_nkx*k>HSCUJK6dilC;^Gd-3YFV3B2hL9uY3}r?P5ALTa-B@wF01K3H~83OZ|s!H z3V%FDbeWZ|%HiwJoA!M9y5I@B99J+Sh3K;b&@s_X%-(Y3qJ|`#&G1zSfTT%XebEto_Dsu4OJ| z>UGRy&(tPrc{j=RR+T zzvZ<1IR<;DmWeArZ`v5AzAg1(=VbNy{%h0ro{9edY4%#n2b*Ry#(%h9_xtVk`0w$| zKaN}A7}qVMtayEI&cvl{ zGiIs(I}*Dvdd@U<@6%WN*Sft=2)`UOVSly7&R-WlCGOh%v*XVatE0bdr(9jp?(eWK zk@01AggUOW1X>TDXJ+1izx&GllTDvD>qXS7+uHHZ$!}YJ{(#s7{kk^L5}RDc%39X! z`3*VilhQ92ZCKh-Z7poKTPKO1`F!}kh{~f+qe|4$`S*SL*(vqr-O;00M8YSpU0+dd z*FGiR{YsPZ|H#RA^Y89{y8E^7V)i^bFXPTn>)h)fZydJWCTh)}Uy&AS&ziFD-CJ;N`+WQQf2sdX z5A16)-L>pE+JGoDBp_{53FiIPY<2smuTZPWIr%eEeA)ajkB(Q>2$lVl*8}xi9_-Jr z-SdyP?)#^juU2Kcy8JiGG|Tk1RCAlyU79o@R%d>#_s?&7H?KAYPySH4etu2a&N2(J z8CUn7iH@_D{d;uPWj(LlAlY5zhrak#ru&)M6kcyW7ykBF*UZSXWkGwt7u`)N$zPB- zTen`~U)4ujEv}kbBH=G`A|96Tx0!$Gw9O7-e|F|!{>HMI{QTPDaeJz34~JFnNXlh^U{%(vKBQWD<0K4SBU)nUc8pYN96 zuT7p`w`ayoq>2|~coZBY$0dF^>IB(e`||z9$Hkjm?lOHk8ZWb-`I6A5Uo20or$2wb zE}1hu{gTndT0O>_e3=)+`gYrL=UxwfmujaYarEcW^M}=!i7mXlTG{W%&o_BrHlBWH z{r(SU^qR;Ao_lX5eOD$Xcd|!CAN%5&kiTw`Y>35Ztwo5&7(fwA*AN;>4vFl>G zo^)Tw$*0A4x|gn24XZcPOuLy;x7F`XY3+~GN^JhGR=QgjUWt7(dtX!NA$EC}{@b`4 zBk(Yh=VAM&pcD94rEa(DE3pas|Mtmod&D37b*(gN!_CVZbX{b&?d>`$Q>cFQLHEb> z_Q%PePjB46@ae@R^YruXuYRj{{oJyn8J0({1n-_3X#3>j)$_6Q-)*s8*j>7wfB(O# z2Mgz%uBqt1^>)>hjj!YTtXIBY`SbPs|8JE4tzf91m2uA@-SL}cLAli&*2wQ0v6Sl>h zP6scK{PUDU|Nk5Hu)YZ6jbA@oE9`$G|9D@Ms4C93DI#sm_h;KT-}M!!VgFO+AG^iX zkD_ayzi-%bx$sTct&cl|tEWtBc=P-I%MM+}k9n(6V<$gQ8=Vr;*2S+_kcXwM>eVHfL`Ly$6>tfD5Rp~naBiH||Vfs|sP|GBQ zyG@Spck%;G;{?W+dp;hMu4TGZcSNsq+v&{pSC}r&wZD^k?~PcWSkd!y?sL|=#(ury zS^J{z*O9$duU5Z4=YJ*Z`{8HHAKrMo<;S5_y379=Y?%9Q`fIhT)>|23Oz+-w`CIIN zRQ;H|ex~WW-=)h>&isDp^NIP5@|<^L9?jBvHlZWAy5{ue4vWXUqIzfL4PV)qx!?G; zTljm9@m7;3#S=VkJkPngMcF)Om!#@jpK}f51Ky0?z74b0qWhnD>3XSowDA^?lWQAFX|TLp}1` z&E72*n?(|>RnF!aW^QM8pU)nq>mFNP_`TrI+r>v@t0g~v%KZ9TalT0U{EzRh2KBF1 zi}|bn`PusVuMamTuI4>2rhc`)u=?ZjilCUk_msnGzeTRMJ9_su|L+wp#}*$v9og7* zD0GKRxzMs5cRn4pJ+k=I!Rm+3C#9=-9% zZ|{Rur8D`v1Im7w#C*+2ni!#5UT1oGrQMn7>z!wCMX3gEdM6ao)k8YTSnSm*DsuXyG9_~U&?>rQSoE_~Bx^{DpN#Qq3{LsJi5pUZna zXtUMZ4R_AVy=vciX7*j5cP_e2&l#_V8L#ZC-h5!w?!ziybM`;c)&$%Wt|R(_rF)={4weCyP(7ya>v*Gc$vSWdd{SRCo;>9f9$T- z2>Ma`={&zi(%FOlhr{&$SFUfL;e0C7t$f?Bqe`>xU-GXnZdtsV)B8?$`SPnRmah+A zTfN85Q8G;T(EGi*(hof?e$BrA-EsdjP$vI+?Cd|ZdJb#DV4elDUB%ZoH;wn7{+NAz zqxnYbMQ?L6ehWL5^B=y>v|-2H9@W(9<#wu??H|;y7Taf+g$LVO1ofN5*Z$zx6V>;( zZ^vH$t+O5%?G2gze`8z?UnZZ`Zo78{RUco5*IU&Thiu>T=lNf+-B(*g>qDg8U3~D= zradcBY}>+5*XNj(^nX}T^YoH!lP+KS%`myOWlLOKjIZn0SN@q+p1$|j^xM0y_#Ha@ z?WId$nczx-)}_wLVm^~v!`>W^=1ExB`4SNd)GlY`6j zKR#U=>_r}e~MC)G08f4v!T)Dj7c=hBf z`>SORY<~G{+?`Qelb=W*>FF!MEmlWC-<@fLMGwu2DcD3gU zZ-u}3w$ewUGVSNFtqnDh=uX1ZT|)TWCX?-59s85;{^MKDJWjfOR$y1E%x%7-lX_bo zS{FW#U02()!=`#h&0YQL&UVpt61(iS{FzpB_hDysnem64k{7S0%=Vo7&9}y{TIuK6 zv(NP7<{E^*P3%cZP-ar|?&yQNFW;Q5+3@q0;K%Fp*Dm|@ z^_jB4Q<3Y3^E_-T*xNR|_CL*8KGR%A{-x}@ukETeKUcqvv;Vzp^YluN_@MgluU0MX zGq=%d+CTSzMVD1q)|`H`fPSmLPdlb7&$pMaH?`d|r)uT%3C8;K@BG?4w|eDu$@SC! z9sN0}s&lUK4)NyD;JEt0JBODaeI4BY`E}%J!Pl|VD_3imonu&R|MzS*xwiiPh{BDZe%^Vxx$fWT+V0EqH4e;Id(@ZM;r9IT>HG<7I_LMcpGdX7`AGNf zAJ&)U@?Dc(z4APA)5D^=b@!d^w;p*Kn%?}i{YZ1-;p_5k`V+6ut`(Yi_IdB8M+(tv zcFd^ysrOke{jc5K488Ztj|x}h8x@3`L5zg?`$YTdg}k<#@HU7+<0hu@oo ze?R^8gV@&xi8q$WJr!Nt>8jFrd4Bxce@z#b$KMIxu8mm z>S0E0hQ(H)y6?|UtpC<&eg9BfyW-W-@>l%N{cfwzHC^}G_s8tu{aF{D@4XX!sj+za z{}mda{(AT(ih|cK{IK+>v$Pd>woguejp}UottHt76}FyRA6yZ6Jo&QC^vc!lpQk_e zyRvHDzE7|CZ>tObd~oD_b?4LM(<{@8FYHy#*}FS_!t4X90@rS4TcaEvf(~5Bq1r#3Ngnc=dtzgWrrBj&kzYa|ZuE zabmsw{KMh0rgI+sc~f`d>HHb@g7Rh*ix~#>Jo7%h>TvnDqUYNewD7*yj@ZA)-yyCC z`^+?2)>l8@;O}s&de6^iv+LNOL|@OG_#(GVwao5q%ejcM86}mqr!MxfhTTd0JhycH z>)b^3y!@;4I``i@n!$8Dth?4LVq?|Z%5ToErqy5D@qK#vwaPQklwW?!Pwakb|GLey zeQntH-{qg~KVf;2(c)Z9`A)y$ zxt}AReSGfyx_g1($A0lo-{P4s5L1>X@Ysa1{o#WzMYz5`dH+mx0&m-O*vIdhmvl2N^z**HIR;PLb;}&{DhpcTWvdszihXui z=2K^cS?s)sqHhn1`CrHRZ{B=9@~HgONpie(PjVE)6MJQY_EoExhuBpnJ^da~_;dOE z^K(zEY^(n9Ch4j}(cXj!x58&#i_c%aGqd#5=GV&YE2Q_`%x_dyd;UiC-1SF+Yi^#a z`Wi6b{^h)N`Zb#`{N}nQF_yR3NFKE%?KhpQ|Ry8ZM8& zx3{HzvT&o^r1f*&z51fDE3QCJJ~FB3+@9CJ46^H_rd^r8uFUk%iugDCrhh-7`tZ=R za!^T8(Vn_gYT8r-m7Kj-IM4rk_WAkwc=j)aPlznBt(fEgJQDxQcjA5A`yanbb^g2w zebd+x+jV*FHkFh2ohJ0>t`Fk1tB5F*_{#aGc709JkyD}1_k^$iA-XT|_5F3rcRuW_ zu3ng9%5mmpvo`-R+c&BAlJ3qvYo{r9Zu`OVeEHIABFZ&6wX;7P#lL#}Z_<=Mpr&}> zt(AcrYIKiDy|cUb;kk0+xnJ)-t$wQ47sHbJ-MJ`y`;XLpE)E~lny$vL_3%0@#L{&+ zy{`LUmFVR4`z+?$e4hL9b=7P3=-O?UqfhUQ;qN|UP;{mJ;_9FKa~WSgKJk9<^GG7o zb}XBY{7HB26YFEt+V6UF3sg&$A4+d``uDZ;*5wbDPY*;pttx%Cea4y4Z3wbzW|3vb2N=Vv}MuDd1vMD6F3 zDeLR=_5U%|eqa7zxhMb2kGxMe$_3fQ!d3~aocZ5K-i7xP{}J0yU*5OtUB764H=b?R z&DFtcZ0fenQmLf`F@da1a$z17#BRz)({`AV%y+F-i)bNcs$f5jPv&kg16ElX7nRbPnI zm$%t3d9x_$O6z(3c3$su6~=RS?Ruyz`s~QZ!yis=lt`KX@7b#Q!l*pk7Y1L$^&89g zOgvEk7&Jov>~;8e(KY6N-;RU2lgKp^mOj^q7Reun#P@yZ%CD<=yY>3Lz4Ja^D~&pF zbMBTE$)9f@xA>;L{Qa(be{`>9>?qzDwm0hpr~EpZ-;zP~|HLNd{5>4^toeiB-h@@F z<>LS9eO7z;<00qn*hv+Ordd_Z`8@Ty&+>J7mFathuglcr{K%O#XQ#f+@%fE>*B7U? zO6yGcBd6weZkDYDPb}Zv3!hHRl5p{T1KEy57w#%Gf8i`qydx@7~v$K5gZ<`*CIdN7ng0*jAoO zpp|hCKA&$`pYV0z>h$yTA|3v{DXmf3=*m%h>+P~1ZvyUIp8m5y-+zsT?+dZ+s}I-v zcl%k-ezoCg>(1-XIGD@7z4ALe;hx~SxRTASS5MFDXjwl^VosI8QT@-3KR$&ouVh}y zsC+Ny>v{g$yKm}yKA1kIeEPKPm&Fg*rYOC;SNMM6)2_&67nAz@f0{11_5JJ9Uk`u1 z3hG~TKGn`<-r4yp>k{ zxte*oSmj%*d;H?xjPjYn^ZveO{_Q)z;Y&R8p8s{{t0(TTCot3uNe&;bNNi{*0gpGF z{rC0tjj0h$C3oKDzKOh1=J8D@CyM7<-ioJ*){=$pcji6aeZ6sVuzW-z6Ln1{%b)Lj{r8%~&+~Rlt^28eeJvmFa=o=?vVC^KbT7}0Vu7-s2E6jiBK}@|&0di7a98{@ z-yc_6reD{&x+iA)_8FZb>Ft`=_`TOu?QJdlqMp8PR^0|pAJfwdpISV+c~}4X+P0{g zugeeD{C>Ore%)QBqWFVV8;yu*sLnHCp4R`Q*ZkgwIlpg}zNyhUkbxjR?5`Zvpyr`4(Phr3#dsp39Nk+gtZfKoSiT639` z?%NwjCQZDt9yGE4{Wt59-L~B^yQSJ|=l!`_kS=Wc`u^UVS8~NH6Mw!|zCQO!b>Z)O z^M9_sxaMhT`26)Z-}KF5b&KJZC}-k!|8eN9%ys#qPxCjvF|ND6Uy5Jq!Q~|fU&wh& zf0(yov*ey?OWyE%H@8=b|8Z-PsHrO}4%zIgboRQ=)#a<5g{ACr>b@R+{aE1d!_Eqe zpS7}UTo+oMfYY@YOPRf`zpLoJ;LDD>Kl_Ix-OKNnf%|$uqC;XlmGFD?HwtT#dQ9Z znH+t1^KH?&s$W8;58hO)3SR#$@SV%tXHCzaH!ptrdcIitcKa;5y3!{bWGl~>%ruwp ziD8odw?;p%{>Q5+;qwc=*X@-TJzHnJ@}{kyaO>(o;axLg4$lqh5o@+D{NoZ^c-lN= zN4ehT#w{P7>wKLcZCUiB-M)I$?D?{O>r@k-bPJmL$=GD>D=3=1ddAEf21kDgZTq!% zVQRAF(FglVbrs^L?^vI3^iT>Bosx=EJU_M;pZhAhMr=a-{yy2>T3_yMWoBjWf98TF zks~a2#Z*f!SDmwTS&h^7?UuDy#g(&eUcFHBz4Du7(w~Q$RxjLd+rKo)Hgoyk3#s?s zJq>ZrwO;m1YWyiv! zhrf74^*-rYebf1cNAp@Srd3CmhyA^Kvi7gR(@V=cPG7bEeWp`<#mubB_y8G}}`$x*PlP1nTzj5`-X;Mq%65phqYFue=&vTYPc+Py2 z+cOXIvtN$u@VA@u?`li(mT{|RJve~cXTbs9Avv7Is<e)8EeaGh1fct)I#&LFZ~Vww!8;=BI z`2KY6US}>d-^M+^;_uC*vtjlYkIvbBe5b4T^XcSQBF(Gi=3Dp3TvAv4dB|?r=g{xg z`TPHVd;KrFp_cV^@A1Eekc|P5iVP9aDAm7BBHO+%OZD%T$z2cM5G7Fe)vC5?W9!UX zzRbpS`zihR-?^UISgyH$uE1Pf@q3B454Y?;BmHil{+hYxUxu%@y^wk@Yi0U;W_7jx z3lC>E&tJRWrlNiQ&P$&jp4;_P@4GI4*t&mDW1smZ%uP!YmWuz7RP|w{@HDlvKOcQN zF`rSMbMF%?PAzxmpy0C|)%}JM&MO4B{dijSp;9C;JTBtr*YxYlrQQ`iIbEnk7dT+l_BTdfoYyPo!k7}x-oaPCI$r|PdY44Yr z-%xXy>C*KLc-HzMb>Titk*xT7H9VjD#B1${-z+J=m8u0#JKhRv`5z

    E_dp@Jy4$~e)FZP%`4}pDh2W{E5G!2!GrFV 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� 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 Date: Sun, 28 Sep 2025 23:47:39 +0200 Subject: [PATCH 14/23] Update examples_report.md --- tools/rexm/examples_report.md | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/rexm/examples_report.md b/tools/rexm/examples_report.md index bb37b2db7..7c9de0b57 100644 --- a/tools/rexm/examples_report.md +++ b/tools/rexm/examples_report.md @@ -57,6 +57,7 @@ Example elements validated: | core_high_dpi | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | | core_render_texture | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | | core_undo_redo | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | +| core_input_actions | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | | shapes_basic_shapes | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | | shapes_bouncing_ball | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | | shapes_colors_palette | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | From f76666af3f08765037f2b5b5b350eb70a61202ec Mon Sep 17 00:00:00 2001 From: Ray Date: Sun, 28 Sep 2025 23:48:10 +0200 Subject: [PATCH 15/23] REXM: Avoid updating metadata from `others` examples --- tools/rexm/rexm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/rexm/rexm.c b/tools/rexm/rexm.c index 7f303538c..f6c297769 100644 --- a/tools/rexm/rexm.c +++ b/tools/rexm/rexm.c @@ -2331,7 +2331,7 @@ static const char *GenerateUUIDv4(void) // Update source code header and comments metadata static void UpdateSourceMetadata(const char *exSrcPath, const rlExampleInfo *info) { - if (FileExists(exSrcPath) && IsFileExtension(exSrcPath, ".c")) + if (FileExists(exSrcPath) && IsFileExtension(exSrcPath, ".c") && (!TextIsEqual(info->category, "others"))) { // WARNING: Cache a copy of exSrcPath to avoid modifications by TextFormat() char exSourcePath[512] = { 0 }; From 584bc14929d3083c6a5a6c8979d6989cd17fc9a5 Mon Sep 17 00:00:00 2001 From: Le Juez Victor <90587919+Bigfoot71@users.noreply.github.com> Date: Mon, 29 Sep 2025 10:28:20 +0200 Subject: [PATCH 16/23] [rlgl] Add Software Rendering Support (#4832) * add base of rlsw.h * implement state support Also replace the triangle rasterization functions with macros that generate specific functions for each state of the rendering system. Also, add the OpenGL definitions in order to add a binding for rlgl. * branchless float saturation * apply perspective correction to colors * impl line clipping and rasterization + tweak function names * impl face culling * impl color blending * fixes and tweaks * add clear buffer bitmasks * small optimizations / tweaks * review ndc to screen projection * avoid to recalculate MVP when its not needed + tweaks * review the loading and management of textures to be closer to the OpenGL API * texture sampling optimization * review get pixel functions + review unorm/float conversion * add several buffer format support Several depth and color formats have been added for the framebuffer. 8-bit, 16-bit, and 24-bit formats are now available for depth. RGB 8-bit (332), RGB 16-bit (565), and RGB 24-bit (888) formats are now available for color. Alpha support is no longer present for the framebuffer at the moment, but it can easily be restored by adding the formats and reinterpolating the alpha in the areas that do not perform color blending. Additionally, this commit brings performance improvements. * tweaks * impl line width * impl points + point size * fix and improve polygon clipping functions * impl polygone modes * add some not planned functions - `glDepthMask` - `glColorMask` * framebuffer resizing + handle init failure * add quick notes about line clipping algorithms used * start to impl scissor test + review line clipping The support for the scissor test has been implemented for clearing as well as for triangle clipping. The implementation for lines and points is still missing. I also removed the 2D clipping of lines that used the Cohen-Sutherland algorithm, opting instead to always use the Liang-Barsky algorithm in all cases. This simplifies the implementation, and the 2D version would have caused issues when interpolating vertices in the future if we want to implement additional features. * review scissor clear * review `swScissor` * impl line scissor clipping * round screen coordinate (line rasterization) * impl point scissor clipping * remove unused defs * add getter functions * gl binding * add `glHint` and `glShadeModel` macros (not implmented) * binding tweaks * impl copy framebuffer function + glReadPixels * review `swCopyFramebuffer` * update rlgl.h * update rlgl.h * texture copy support * fix typo.. * add get error function * def sw alloc macros * reimpl get color buffer func just in case * remove normal interpolation * review texture wrap * fix ndc projection (viewport/scissor) * impl framebuffer blit function * reduce matrix compuations and memory usage * swBegin tweaks * preventing a possible division by zero * remove useless scissor related data * review color blending system * greatly improve float saturation * tweak lerp vertex function * use opitmized fract function in sw_texture_map * tweak framebuffer functions for better readability * optimized copy/blit functions for each dst format * review framebuffer filling functions * impl specific quad rendering func * use of a single global vertex buffer * fix 'sw_poly_point_render' * added `SW_RESTRICT` and redesigned `sw_lerp_vertex_PNCTH` * tweak the pipeline flow regarding the face culling avoids misprediction, improves vectorization if possible * new rendering path for axis aligned quads * oops, translating some comments * use of `restrict` for blending function parameters * update rlgl.h * adding `GRAPHICS_API_OPENGL_11_SOFTWARE` in `DrawMesh` * add `RL_OPENGL_11_SOFTWARE` enum * temp tweak * build fixes * fix DrawMesh for GL 1.1 * update swClose * review texture format + fix copy * set minimum req vertices to 3 (quads) * check swInit * review pixelformat * tweaks * fix animNormals (DrawMesh) * fallback color/texcoord (swDrawArrays) * review swMultMatrixf * fix texture pool alloc.. * review triangle scanlines increment all data * fix `sw_quad_sort_cw` * impl sdl platform * rm def * increase max clipped polygon vertices * improve triangle rasterization along Y axis improved robustness against numerical errors incremental interpolation along Y simplified function, fewer jumps * review current vertex data + increase max clipped polygon vertices (for extreme cases) * fix and improve polygon clipping Sets the vertex count to zero when the polygon is invalid Stops clipping when the vertex count drops below 3 * fix gradient calculation * cache texture size minus one + comments * tweaks * BGRA copy support * adding software backend option (cmake) * update Makefile * fix face culling * excluse some exemple with the software backend * review SW_CLAMP case in sw_texture_map * review sw_saturate * review line raster * fix sw_quad_is_aligned * review sw_raster_quad_axis_aligned * tweaks * codepoint fix (?) * fix var name... * rcore_drm software renderering * cleanup and tweaks * adding support for `GL_POINT_SIZE` and `GL_LINE_WIDTH` get * fix sampling issue * fix swBlendFunc --------- Co-authored-by: Ray --- CMakeOptions.txt | 2 +- cmake/LibraryConfigurations.cmake | 2 + examples/CMakeLists.txt | 4 + src/Makefile | 18 +- src/external/rlsw.h | 5230 +++++++++++++++++++++++++++++ src/platforms/rcore_desktop_sdl.c | 143 +- src/platforms/rcore_drm.c | 364 +- src/rlgl.h | 87 +- src/rmodels.c | 2 +- 9 files changed, 5739 insertions(+), 113 deletions(-) create mode 100644 src/external/rlsw.h diff --git a/CMakeOptions.txt b/CMakeOptions.txt index 3c1c12742..32cfb814e 100644 --- a/CMakeOptions.txt +++ b/CMakeOptions.txt @@ -8,7 +8,7 @@ if(EMSCRIPTEN) endif() enum_option(PLATFORM "Desktop;Web;Android;Raspberry Pi;DRM;SDL" "Platform to build for.") -enum_option(OPENGL_VERSION "OFF;4.3;3.3;2.1;1.1;ES 2.0;ES 3.0" "Force a specific OpenGL Version?") +enum_option(OPENGL_VERSION "OFF;4.3;3.3;2.1;1.1;ES 2.0;ES 3.0;Software" "Force a specific OpenGL Version?") # Configuration options option(BUILD_EXAMPLES "Build the examples." ${PROJECT_IS_TOP_LEVEL}) diff --git a/cmake/LibraryConfigurations.cmake b/cmake/LibraryConfigurations.cmake index 98c7f2362..8f127fc23 100644 --- a/cmake/LibraryConfigurations.cmake +++ b/cmake/LibraryConfigurations.cmake @@ -158,6 +158,8 @@ if (NOT ${OPENGL_VERSION} MATCHES "OFF") set(GRAPHICS "GRAPHICS_API_OPENGL_ES2") elseif (${OPENGL_VERSION} MATCHES "ES 3.0") set(GRAPHICS "GRAPHICS_API_OPENGL_ES3") + elseif (${OPENGL_VERSION} MATCHES "Software") + set(GRAPHICS "GRAPHICS_API_OPENGL_11_SOFTWARE") endif () if (NOT "${SUGGESTED_GRAPHICS}" STREQUAL "" AND NOT "${SUGGESTED_GRAPHICS}" STREQUAL "${GRAPHICS}") message(WARNING "You are overriding the suggested GRAPHICS=${SUGGESTED_GRAPHICS} with ${GRAPHICS}! This may fail.") diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index e63c1a7c8..b482df0fc 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -105,6 +105,10 @@ elseif ("${PLATFORM}" STREQUAL "DRM") list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/others/rlgl_standalone.c) list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/others/raylib_opengl_interop.c) +elseif ("${OPENGL_VERSION}" STREQUAL "Software") + list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/others/rlgl_standalone.c) + list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/others/raylib_opengl_interop.c) + elseif (NOT SUPPORT_GESTURES_SYSTEM) # Items requiring gestures system list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/textures/textures_mouse_painting.c) diff --git a/src/Makefile b/src/Makefile index f2bdd811e..e767d21d0 100644 --- a/src/Makefile +++ b/src/Makefile @@ -235,20 +235,22 @@ endif # NOTE: By default use OpenGL 3.3 on desktop platforms ifeq ($(TARGET_PLATFORM),PLATFORM_DESKTOP_GLFW) GRAPHICS ?= GRAPHICS_API_OPENGL_33 - #GRAPHICS = GRAPHICS_API_OPENGL_11 # Uncomment to use OpenGL 1.1 - #GRAPHICS = GRAPHICS_API_OPENGL_21 # Uncomment to use OpenGL 2.1 - #GRAPHICS = GRAPHICS_API_OPENGL_43 # Uncomment to use OpenGL 4.3 - #GRAPHICS = GRAPHICS_API_OPENGL_ES2 # Uncomment to use OpenGL ES 2.0 (ANGLE) + #GRAPHICS = GRAPHICS_API_OPENGL_11_SOFTWARE # Uncomment to use software rendering + #GRAPHICS = GRAPHICS_API_OPENGL_11 # Uncomment to use OpenGL 1.1 + #GRAPHICS = GRAPHICS_API_OPENGL_21 # Uncomment to use OpenGL 2.1 + #GRAPHICS = GRAPHICS_API_OPENGL_43 # Uncomment to use OpenGL 4.3 + #GRAPHICS = GRAPHICS_API_OPENGL_ES2 # Uncomment to use OpenGL ES 2.0 (ANGLE) endif ifeq ($(TARGET_PLATFORM),PLATFORM_DESKTOP_SDL) GRAPHICS ?= GRAPHICS_API_OPENGL_33 endif ifeq ($(TARGET_PLATFORM),PLATFORM_DESKTOP_RGFW) GRAPHICS ?= GRAPHICS_API_OPENGL_33 - #GRAPHICS = GRAPHICS_API_OPENGL_11 # Uncomment to use OpenGL 1.1 - #GRAPHICS = GRAPHICS_API_OPENGL_21 # Uncomment to use OpenGL 2.1 - #GRAPHICS = GRAPHICS_API_OPENGL_43 # Uncomment to use OpenGL 4.3 - #GRAPHICS = GRAPHICS_API_OPENGL_ES2 # Uncomment to use OpenGL ES 2.0 (ANGLE) + #GRAPHICS = GRAPHICS_API_OPENGL_11_SOFTWARE # Uncomment to use software rendering + #GRAPHICS = GRAPHICS_API_OPENGL_11 # Uncomment to use OpenGL 1.1 + #GRAPHICS = GRAPHICS_API_OPENGL_21 # Uncomment to use OpenGL 2.1 + #GRAPHICS = GRAPHICS_API_OPENGL_43 # Uncomment to use OpenGL 4.3 + #GRAPHICS = GRAPHICS_API_OPENGL_ES2 # Uncomment to use OpenGL ES 2.0 (ANGLE) endif ifeq ($(TARGET_PLATFORM),PLATFORM_DRM) # On DRM OpenGL ES 2.0 must be used diff --git a/src/external/rlsw.h b/src/external/rlsw.h new file mode 100644 index 000000000..2177467ec --- /dev/null +++ b/src/external/rlsw.h @@ -0,0 +1,5230 @@ +/** + * MIT License + * + * Copyright (c) 2025 Le Juez Victor + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#ifndef RLSW_H +#define RLSW_H + +#include +#include + +/* === RLSW Definition And Macros === */ + +#ifndef SW_MALLOC +# define SW_MALLOC(sz) malloc(sz) +#endif + +#ifndef SW_REALLOC +# define SW_REALLOC(ptr, newSz) realloc(ptr, newSz) +#endif + +#ifndef SW_FREE +# define SW_FREE(ptr) free(ptr) +#endif + +#ifndef SW_RESTRICT +# ifdef _MSC_VER +# define SW_RESTRICT __restrict +# else +# define SW_RESTRICT restrict +# endif +#endif + +#ifndef SW_GL_FRAMEBUFFER_COPY_BGRA +# define SW_GL_FRAMEBUFFER_COPY_BGRA true +#endif + +#ifndef SW_GL_BINDING_COPY_TEXTURE +# define SW_GL_BINDING_COPY_TEXTURE true +#endif + +#ifndef SW_COLOR_BUFFER_BITS +# define SW_COLOR_BUFFER_BITS 24 +#endif + +#ifndef SW_DEPTH_BUFFER_BITS +# define SW_DEPTH_BUFFER_BITS 16 +#endif + +#ifndef SW_MAX_PROJECTION_STACK_SIZE +# define SW_MAX_PROJECTION_STACK_SIZE 2 +#endif + +#ifndef SW_MAX_MODELVIEW_STACK_SIZE +# define SW_MAX_MODELVIEW_STACK_SIZE 8 +#endif + +#ifndef SW_MAX_TEXTURE_STACK_SIZE +# define SW_MAX_TEXTURE_STACK_SIZE 2 +#endif + +#ifndef SW_MAX_TEXTURES +# define SW_MAX_TEXTURES 128 +#endif + +#ifndef SW_MAX_CLIPPED_POLYGON_VERTICES +// Under normal circumstances, clipping a polygon can add at most one vertex per clipping plane. +// Considering the largest polygon involved is a quadrilateral (4 vertices), +// and that clipping occurs against both the frustum (6 planes) +// and the scissors (4 planes), +// the maximum number of vertices after clipping is: +// 4 (original vertices) + 6 (frustum planes) + 4 (scissors planes) = 14 +# define SW_MAX_CLIPPED_POLYGON_VERTICES 14 +#endif + +#ifndef SW_CLIP_EPSILON +# define SW_CLIP_EPSILON 1e-4f +#endif + +/* === OpenGL Compatibility Types === */ + +typedef unsigned int GLenum; +typedef unsigned char GLboolean; +typedef unsigned int GLbitfield; +typedef void GLvoid; +typedef signed char GLbyte; +typedef short GLshort; +typedef int GLint; +typedef unsigned char GLubyte; +typedef unsigned short GLushort; +typedef unsigned int GLuint; +typedef int GLsizei; +typedef float GLfloat; +typedef float GLclampf; +typedef double GLdouble; +typedef double GLclampd; + +/* === OpenGL Definitions === */ + +#define GL_FALSE 0 +#define GL_TRUE 1 + +#define GL_SCISSOR_TEST 0x0C11 +#define GL_TEXTURE_2D 0x0DE1 +#define GL_DEPTH_TEST 0x0B71 +#define GL_CULL_FACE 0x0B44 +#define GL_BLEND 0x0BE2 + +#define GL_VENDOR 0x1F00 +#define GL_RENDERER 0x1F01 +#define GL_VERSION 0x1F02 +#define GL_EXTENSIONS 0x1F03 + +//#define GL_ATTRIB_STACK_DEPTH 0x0BB0 +//#define GL_CLIENT_ATTRIB_STACK_DEPTH 0x0BB1 +#define GL_COLOR_CLEAR_VALUE 0x0C22 +//#define GL_COLOR_WRITEMASK 0x0C23 +//#define GL_CURRENT_INDEX 0x0B01 +#define GL_CURRENT_COLOR 0x0B00 +//#define GL_CURRENT_NORMAL 0x0B02 +//#define GL_CURRENT_RASTER_COLOR 0x0B04 +//#define GL_CURRENT_RASTER_DISTANCE 0x0B09 +//#define GL_CURRENT_RASTER_INDEX 0x0B05 +//#define GL_CURRENT_RASTER_POSITION 0x0B07 +//#define GL_CURRENT_RASTER_TEXTURE_COORDS 0x0B06 +//#define GL_CURRENT_RASTER_POSITION_VALID 0x0B08 +#define GL_CURRENT_TEXTURE_COORDS 0x0B03 +#define GL_POINT_SIZE 0x0B11 +#define GL_LINE_WIDTH 0x0B21 +//#define GL_INDEX_CLEAR_VALUE 0x0C20 +//#define GL_INDEX_MODE 0x0C30 +//#define GL_INDEX_WRITEMASK 0x0C21 +#define GL_MODELVIEW_MATRIX 0x0BA6 +#define GL_MODELVIEW_STACK_DEPTH 0x0BA3 +//#define GL_NAME_STACK_DEPTH 0x0D70 +#define GL_PROJECTION_MATRIX 0x0BA7 +#define GL_PROJECTION_STACK_DEPTH 0x0BA4 +//#define GL_RENDER_MODE 0x0C40 +//#define GL_RGBA_MODE 0x0C31 +#define GL_TEXTURE_MATRIX 0x0BA8 +#define GL_TEXTURE_STACK_DEPTH 0x0BA5 +#define GL_VIEWPORT 0x0BA2 + +#define GL_COLOR_BUFFER_BIT 0x00004000 +#define GL_DEPTH_BUFFER_BIT 0x00000100 + +#define GL_MODELVIEW 0x1700 +#define GL_PROJECTION 0x1701 +#define GL_TEXTURE 0x1702 + +#define GL_VERTEX_ARRAY 0x8074 +#define GL_NORMAL_ARRAY 0x8075 //< WARNING: Not implemented (defined for RLGL) +#define GL_COLOR_ARRAY 0x8076 +//#define GL_INDEX_ARRAY 0x8077 +#define GL_TEXTURE_COORD_ARRAY 0x8078 + +#define GL_POINTS 0x0000 +#define GL_LINES 0x0001 +//#define GL_LINE_LOOP 0x0002 +//#define GL_LINE_STRIP 0x0003 +#define GL_TRIANGLES 0x0004 +//#define GL_TRIANGLE_STRIP 0x0005 +//#define GL_TRIANGLE_FAN 0x0006 +#define GL_QUADS 0x0007 +//#define GL_QUAD_STRIP 0x0008 +//#define GL_POLYGON 0x0009 + +#define GL_POINT 0x1B00 +#define GL_LINE 0x1B01 +#define GL_FILL 0x1B02 + +#define GL_FRONT 0x0404 +#define GL_BACK 0x0405 + +#define GL_ZERO 0 +#define GL_ONE 1 +#define GL_SRC_COLOR 0x0300 +#define GL_ONE_MINUS_SRC_COLOR 0x0301 +#define GL_SRC_ALPHA 0x0302 +#define GL_ONE_MINUS_SRC_ALPHA 0x0303 +#define GL_DST_ALPHA 0x0304 +#define GL_ONE_MINUS_DST_ALPHA 0x0305 +#define GL_DST_COLOR 0x0306 +#define GL_ONE_MINUS_DST_COLOR 0x0307 +#define GL_SRC_ALPHA_SATURATE 0x0308 + +#define GL_NEAREST 0x2600 +#define GL_LINEAR 0x2601 + +#define GL_REPEAT 0x2901 +#define GL_CLAMP 0x2900 + +#define GL_TEXTURE_MAG_FILTER 0x2800 +#define GL_TEXTURE_MIN_FILTER 0x2801 + +#define GL_TEXTURE_WRAP_S 0x2802 +#define GL_TEXTURE_WRAP_T 0x2803 + +#define GL_NO_ERROR 0 +#define GL_INVALID_ENUM 0x0500 +#define GL_INVALID_VALUE 0x0501 +#define GL_INVALID_OPERATION 0x0502 +#define GL_STACK_OVERFLOW 0x0503 +#define GL_STACK_UNDERFLOW 0x0504 +#define GL_OUT_OF_MEMORY 0x0505 + +#define GL_ALPHA 0x1906 +#define GL_LUMINANCE 0x1909 +#define GL_LUMINANCE_ALPHA 0x190A +#define GL_RGB 0x1907 +#define GL_RGBA 0x1908 + +#define GL_BYTE 0x1400 +#define GL_UNSIGNED_BYTE 0x1401 +#define GL_SHORT 0x1402 +#define GL_UNSIGNED_SHORT 0x1403 +#define GL_INT 0x1404 +#define GL_UNSIGNED_INT 0x1405 +#define GL_FLOAT 0x1406 + +/* === Not Used Definitions === */ + +#define GL_PERSPECTIVE_CORRECTION_HINT 0x0C50 +#define GL_PACK_ALIGNMENT 0x0D05 +#define GL_UNPACK_ALIGNMENT 0x0CF5 +#define GL_LINE_SMOOTH 0x0B20 +#define GL_SMOOTH 0x1D01 +#define GL_NICEST 0x1102 +#define GL_CCW 0x0901 +#define GL_CW 0x0900 +#define GL_NEVER 0x0200 +#define GL_LESS 0x0201 +#define GL_EQUAL 0x0202 +#define GL_LEQUAL 0x0203 +#define GL_GREATER 0x0204 +#define GL_NOTEQUAL 0x0205 +#define GL_GEQUAL 0x0206 +#define GL_ALWAYS 0x0207 + +/* === OpenGL Binding === */ + +#define glReadPixels(x, y, w, h, f, t, p) swCopyFramebuffer((x), (y), (w), (h), (f), (t), (p)) +#define glEnable(state) swEnable((state)) +#define glDisable(state) swDisable((state)) +#define glGetFloatv(pname, params) swGetFloatv((pname), (params)) +#define glGetString(pname) swGetString((pname)) +#define glGetError() swGetError() +#define glViewport(x, y, w, h) swViewport((x), (y), (w), (h)) +#define glScissor(x, y, w, h) swScissor((x), (y), (w), (h)) +#define glClearColor(r, g, b, a) swClearColor((r), (g), (b), (a)) +#define glClear(bitmask) swClear((bitmask)) +#define glBlendFunc(sfactor, dfactor) swBlendFunc((sfactor), (dfactor)) +#define glPolygonMode(face, mode) swPolygonMode((mode)) +#define glCullFace(face) swCullFace((face)) +#define glPointSize(size) swPointSize((size)) +#define glLineWidth(width) swLineWidth((width)) +#define glMatrixMode(mode) swMatrixMode((mode)) +#define glPushMatrix() swPushMatrix() +#define glPopMatrix() swPopMatrix() +#define glLoadIdentity() swLoadIdentity() +#define glTranslatef(x, y, z) swTranslatef((x), (y), (z)) +#define glRotatef(a, x, y, z) swRotatef((a), (x), (y), (z)) +#define glScalef(x, y, z) swScalef((x), (y), (z)) +#define glMultMatrixf(v) swMultMatrixf((v)) +#define glFrustum(l, r, b, t, n, f) swFrustum((l), (r), (b), (t), (n), (f)) +#define glOrtho(l, r, b, t, n, f) swOrtho((l), (r), (b), (t), (n), (f)) +#define glBegin(mode) swBegin((mode)) +#define glEnd() swEnd() +#define glVertex2i(x, y) swVertex2i((x), (y)) +#define glVertex2f(x, y) swVertex2f((x), (y)) +#define glVertex2fv(v) swVertex2fv((v)) +#define glVertex3i(x, y, z) swVertex3i((x), (y), (z)) +#define glVertex3f(x, y, z) swVertex3f((x), (y), (z)) +#define glvertex3fv(v) swVertex3fv((v)) +#define glVertex4i(x, y, z, w) swVertex4i((x), (y), (z), (w)) +#define glVertex4f(x, y, z, w) swVertex4f((x), (y), (z), (w)) +#define glVertex4fv(v) swVertex4fv((v)) +#define glColor3ub(r, g, b) swColor3ub((r), (g), (b)) +#define glColor3ubv(v) swColor3ubv((v)) +#define glColor3f(r, g, b) swColor3f((r), (g), (b)) +#define glColor3fv(v) swColor3fv((v)) +#define glColor4ub(r, g, b, a) swColor4ub((r), (g), (b), (a)) +#define glColor4ubv(v) swColor4ubv((v)) +#define glColor4f(r, g, b, a) swColor4f((r), (g), (b), (a)) +#define glColor4fv(v) swColor4fv((v)) +#define glTexCoord2f(u, v) swTexCoord2f((u), (v)) +#define glTexCoord2fv(v) swTexCoord2fv((v)) + +#define glEnableClientState(t) ((void)(t)) +#define glDisableClientState(t) swBindArray((t), 0) +#define glVertexPointer(sz, t, s, p) swBindArray(SW_VERTEX_ARRAY, (p)) +#define glTexCoordPointer(sz, t, s, p) swBindArray(SW_TEXTURE_COORD_ARRAY, (p)) +#define glColorPointer(sz, t, s, p) swBindArray(SW_COLOR_ARRAY, (p)) +#define glDrawArrays(m, o, c) swDrawArrays((m), (o), (c)) +#define glGenTextures(c, v) swGenTextures((c), (v)) +#define glDeleteTextures(c, v) swDeleteTextures((c), (v)) +#define glTexImage2D(tr, l, if, w, h, b, f, t, p) swTexImage2D((w), (h), (f), (t), SW_GL_BINDING_COPY_TEXTURE, (p)) +#define glTexParameteri(tr, pname, param) swTexParameteri((pname), (param)) +#define glBindTexture(tr, id) swBindTexture((id)) + +/* === Not Implemented === */ + +#define glClearDepth(X) ((void)(X)) +#define glDepthMask(X) ((void)(X)) +#define glColorMask(X,Y,Z,W) ((void)(X),(void)(Y),(void)(Z),(void)(W)) +#define glPixelStorei(X,Y) ((void)(X),(void)(Y)) +#define glHint(X,Y) ((void)(X),(void)(Y)) +#define glShadeModel(X) ((void)(X)) +#define glFrontFace(X) ((void)(X)) +#define glDepthFunc(X) ((void)(X)) +#define glTexSubImage2D(X,Y,Z,W,A,B,C,D,E) ((void)(X),(void)(Y),(void)(Z),(void)(W),(void)(A),(void)(B),(void)(C),(void)(D),(void)(E)) +#define glGetTexImage(X,Y,Z,W,A) ((void)(X),(void)(Y),(void)(Z),(void)(W),(void)(A)) +#define glDrawElements(X,Y,Z,W) ((void)(X),(void)(Y),(void)(Z),(void)(W)) +#define glNormal3f(X,Y,Z) ((void)(X),(void)(Y),(void)(Z)) +#define glNormal3fv(X) ((void)(X)) +#define glNormalPointer(X,Y,Z) ((void)(X),(void)(Y),(void)(Z)) + +/* === RLSW Enums === */ + +typedef enum { + SW_SCISSOR_TEST = GL_SCISSOR_TEST, + SW_TEXTURE_2D = GL_TEXTURE_2D, + SW_DEPTH_TEST = GL_DEPTH_TEST, + SW_CULL_FACE = GL_CULL_FACE, + SW_BLEND = GL_BLEND +} SWstate; + +typedef enum { + SW_VENDOR = GL_VENDOR, + SW_RENDERER = GL_RENDERER, + SW_VERSION = GL_VERSION, + SW_EXTENSIONS = GL_EXTENSIONS, + SW_COLOR_CLEAR_VALUE = GL_COLOR_CLEAR_VALUE, + SW_CURRENT_COLOR = GL_CURRENT_COLOR, + SW_CURRENT_TEXTURE_COORDS = GL_CURRENT_TEXTURE_COORDS, + SW_POINT_SIZE = GL_POINT_SIZE, + SW_LINE_WIDTH = GL_LINE_WIDTH, + SW_MODELVIEW_MATRIX = GL_MODELVIEW_MATRIX, + SW_MODELVIEW_STACK_DEPTH = GL_MODELVIEW_STACK_DEPTH, + SW_PROJECTION_MATRIX = GL_PROJECTION_MATRIX, + SW_PROJECTION_STACK_DEPTH = GL_PROJECTION_STACK_DEPTH, + SW_TEXTURE_MATRIX = GL_TEXTURE_MATRIX, + SW_TEXTURE_STACK_DEPTH = GL_TEXTURE_STACK_DEPTH, + SW_VIEWPORT = GL_VIEWPORT +} SWget; + +typedef enum { + SW_COLOR_BUFFER_BIT = GL_COLOR_BUFFER_BIT, + SW_DEPTH_BUFFER_BIT = GL_DEPTH_BUFFER_BIT +} SWbuffer; + +typedef enum { + SW_PROJECTION = GL_PROJECTION, + SW_MODELVIEW = GL_MODELVIEW, + SW_TEXTURE = GL_TEXTURE +} SWmatrix; + +typedef enum { + SW_VERTEX_ARRAY = GL_VERTEX_ARRAY, + SW_TEXTURE_COORD_ARRAY = GL_TEXTURE_COORD_ARRAY, + SW_COLOR_ARRAY = GL_COLOR_ARRAY +} SWarray; + +typedef enum { + SW_POINTS = GL_POINTS, + SW_LINES = GL_LINES, + SW_TRIANGLES = GL_TRIANGLES, + SW_QUADS = GL_QUADS +} SWdraw; + +typedef enum { + SW_POINT = GL_POINT, + SW_LINE = GL_LINE, + SW_FILL = GL_FILL +} SWpoly; + +typedef enum { + SW_FRONT = GL_FRONT, + SW_BACK = GL_BACK, +} SWface; + +typedef enum { + SW_ZERO = GL_ZERO, + SW_ONE = GL_ONE, + SW_SRC_COLOR = GL_SRC_COLOR, + SW_ONE_MINUS_SRC_COLOR = GL_ONE_MINUS_SRC_COLOR, + SW_SRC_ALPHA = GL_SRC_ALPHA, + SW_ONE_MINUS_SRC_ALPHA = GL_ONE_MINUS_SRC_ALPHA, + SW_DST_ALPHA = GL_DST_ALPHA, + SW_ONE_MINUS_DST_ALPHA = GL_ONE_MINUS_DST_ALPHA, + SW_DST_COLOR = GL_DST_COLOR, + SW_ONE_MINUS_DST_COLOR = GL_ONE_MINUS_DST_COLOR, + SW_SRC_ALPHA_SATURATE = GL_SRC_ALPHA_SATURATE +} SWfactor; + +typedef enum { + SW_LUMINANCE = GL_LUMINANCE, + SW_LUMINANCE_ALPHA = GL_LUMINANCE_ALPHA, + SW_RGB = GL_RGB, + SW_RGBA = GL_RGBA, +} SWformat; + +typedef enum { + SW_UNSIGNED_BYTE = GL_UNSIGNED_BYTE, + SW_BYTE = GL_BYTE, + SW_UNSIGNED_SHORT = GL_UNSIGNED_SHORT, + SW_SHORT = GL_SHORT, + SW_UNSIGNED_INT = GL_UNSIGNED_INT, + SW_INT = GL_INT, + SW_FLOAT = GL_FLOAT +} SWtype; + +typedef enum { + SW_NEAREST = GL_NEAREST, + SW_LINEAR = GL_LINEAR +} SWfilter; + +typedef enum { + SW_REPEAT = GL_REPEAT, + SW_CLAMP = GL_CLAMP, +} SWwrap; + +typedef enum { + SW_TEXTURE_MIN_FILTER = GL_TEXTURE_MIN_FILTER, + SW_TEXTURE_MAG_FILTER = GL_TEXTURE_MAG_FILTER, + SW_TEXTURE_WRAP_S = GL_TEXTURE_WRAP_S, + SW_TEXTURE_WRAP_T = GL_TEXTURE_WRAP_T +} SWtexparam; + +typedef enum { + SW_NO_ERROR = GL_NO_ERROR, + SW_INVALID_ENUM = GL_INVALID_ENUM, + SW_INVALID_VALUE = GL_INVALID_VALUE, + SW_STACK_OVERFLOW = GL_STACK_OVERFLOW, + SW_STACK_UNDERFLOW = GL_STACK_UNDERFLOW, + SW_INVALID_OPERATION = GL_INVALID_OPERATION, +} SWerrcode; + +/* === Public API === */ + +bool swInit(int w, int h); +void swClose(void); + +bool swResizeFramebuffer(int w, int h); +void swCopyFramebuffer(int x, int y, int w, int h, SWformat format, SWtype type, void* pixels); +void swBlitFramebuffer(int xDst, int yDst, int wDst, int hDst, int xSrc, int ySrc, int wSrc, int hSrc, SWformat format, SWtype type, void* pixels); +void* swGetColorBuffer(int* w, int* h); + +void swEnable(SWstate state); +void swDisable(SWstate state); + +void swGetFloatv(SWget name, float* v); +const char* swGetString(SWget name); +SWerrcode swGetError(void); + +void swViewport(int x, int y, int width, int height); +void swScissor(int x, int y, int width, int height); + +void swClearColor(float r, float g, float b, float a); +void swClear(uint32_t bitmask); + +void swBlendFunc(SWfactor sfactor, SWfactor dfactor); +void swPolygonMode(SWpoly mode); +void swCullFace(SWface face); + +void swPointSize(float size); +void swLineWidth(float width); + +void swMatrixMode(SWmatrix mode); +void swPushMatrix(void); +void swPopMatrix(void); +void swLoadIdentity(void); +void swTranslatef(float x, float y, float z); +void swRotatef(float angle, float x, float y, float z); +void swScalef(float x, float y, float z); +void swMultMatrixf(const float* mat); +void swFrustum(double left, double right, double bottom, double top, double znear, double zfar); +void swOrtho(double left, double right, double bottom, double top, double znear, double zfar); + +void swBegin(SWdraw mode); +void swEnd(void); + +void swVertex2i(int x, int y); +void swVertex2f(float x, float y); +void swVertex2fv(const float* v); +void swVertex3i(int x, int y, int z); +void swVertex3f(float x, float y, float z); +void swVertex3fv(const float* v); +void swVertex4i(int x, int y, int z, int w); +void swVertex4f(float x, float y, float z, float w); +void swVertex4fv(const float* v); + +void swColor3ub(uint8_t r, uint8_t g, uint8_t b); +void swColor3ubv(const uint8_t* v); +void swColor3f(float r, float g, float b); +void swColor3fv(const float* v); +void swColor4ub(uint8_t r, uint8_t g, uint8_t b, uint8_t a); +void swColor4ubv(const uint8_t* v); +void swColor4f(float r, float g, float b, float a); +void swColor4fv(const float* v); + +void swTexCoord2f(float u, float v); +void swTexCoord2fv(const float* v); + +void swBindArray(SWarray type, void *buffer); +void swDrawArrays(SWdraw mode, int offset, int count); + +void swGenTextures(int count, uint32_t* textures); +void swDeleteTextures(int count, uint32_t* textures); + +void swTexImage2D(int width, int height, SWformat format, SWtype type, bool copy, const void* data); +void swTexParameteri(int param, int value); +void swBindTexture(uint32_t id); + +#endif // RLSW_H + +/* === RLSW Implementation === */ + +#ifdef RLSW_IMPL + +#include +#include +#include + +/* === Defines and Macros === */ + +#define SW_PI 3.14159265358979323846f +#define SW_DEG2RAD (SW_PI/180.0f) +#define SW_RAD2DEG (180.0f/SW_PI) + +#define SW_COLOR_PIXEL_SIZE (SW_COLOR_BUFFER_BITS / 8) +#define SW_DEPTH_PIXEL_SIZE (SW_DEPTH_BUFFER_BITS / 8) + +#define SW_STATE_CHECK(flags) ((RLSW.stateFlags & (flags)) == (flags)) + +#define SW_STATE_SCISSOR_TEST (1 << 0) +#define SW_STATE_TEXTURE_2D (1 << 1) +#define SW_STATE_DEPTH_TEST (1 << 2) +#define SW_STATE_CULL_FACE (1 << 3) +#define SW_STATE_BLEND (1 << 4) + +/* === Internal Structs === */ + +typedef enum { + SW_PIXELFORMAT_UNKNOWN = 0, + SW_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE, // 8 bit per pixel (no alpha) + SW_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA, // 8*2 bpp (2 channels) + SW_PIXELFORMAT_UNCOMPRESSED_R5G6B5, // 16 bpp + SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8, // 24 bpp + SW_PIXELFORMAT_UNCOMPRESSED_R5G5B5A1, // 16 bpp (1 bit alpha) + SW_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4, // 16 bpp (4 bit alpha) + SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8, // 32 bpp + SW_PIXELFORMAT_UNCOMPRESSED_R32, // 32 bpp (1 channel - float) + SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32, // 32*3 bpp (3 channels - float) + SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32, // 32*4 bpp (4 channels - float) + SW_PIXELFORMAT_UNCOMPRESSED_R16, // 16 bpp (1 channel - half float) + SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16, // 16*3 bpp (3 channels - half float) + SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16, // 16*4 bpp (4 channels - half float) +} sw_pixelformat_t; + +typedef void (*sw_factor_f)( + float* SW_RESTRICT factor, + const float* SW_RESTRICT src, + const float* SW_RESTRICT dst +); + +typedef float sw_matrix_t[4*4]; +typedef uint16_t sw_half_t; + +typedef struct { + + float position[4]; // Position coordinates + float texcoord[2]; // Texture coordinates + float color[4]; // Color + + float homogeneous[4]; // Homogeneous coordinates + float screen[2]; // Screen coordinates + +} sw_vertex_t; + +typedef struct { + + // Dirty hack for copied data + // TODO: Rework copied image handling + + union { + const void* cptr; //< NOTE: Is used for all data reads + void* ptr; //< WARNING: Should only be used to allocate and free data + } pixels; + + int width, height; //< Dimensions of the texture + int wMinus1, hMinus1; //< Dimensions minus one + sw_pixelformat_t format; //< Pixel format (internal representation) + + SWfilter minFilter; //< Minification filter + SWfilter magFilter; //< Magnification filter + + SWwrap sWrap; //< texcoord.x wrap mode + SWwrap tWrap; //< texcoord.y wrap mode + + float tx; //< Texel width + float ty; //< Texel height + + bool copy; //< Flag indicating whether memory has been allocated + +} sw_texture_t; + +typedef struct { + void *color; + void *depth; + int width; + int height; + int allocSz; +} sw_framebuffer_t; + +typedef struct { + + sw_framebuffer_t framebuffer; + float clearColor[4]; // Color used to clear the screen + float clearDepth; // Depth value used to clear the screen + + int vpCenter[2]; // Represents the center of the viewport + int vpHalfSize[2]; // Represents the half dimensions of the viewport + int vpSize[2]; // Represents the dimensions of the viewport (minus one) + int vpMin[2]; // Represents the minimum renderable point of the viewport (top-left) + int vpMax[2]; // Represents the maximum renderable point of the viewport (bottom-right) + + int scMin[2]; // Represents the minimum renderable point of the scissor rect (top-left) + int scMax[2]; // Represents the maximum renderable point of the scissor rect (bottom-right) + float scClipMin[2]; // Represents the minimum renderable point of the scissor rect in clip space + float scClipMax[2]; // Represents the maximum renderable point of the scissor rect in clip space + + uint32_t currentTexture; + + struct { + float* positions; + float* texcoords; + uint8_t* colors; + } array; + + struct { + float texcoord[2]; + float color[4]; + } current; + + sw_vertex_t vertexBuffer[SW_MAX_CLIPPED_POLYGON_VERTICES]; // Buffer used for storing primitive vertices, used for processing and rendering + int vertexCounter; // Number of vertices in 'ctx.vertexBuffer' + + SWdraw drawMode; // Current primitive mode (e.g., lines, triangles) + SWpoly polyMode; // Current polygon filling mode (e.g., lines, triangles) + int reqVertices; // Number of vertices required for the primitive being drawn + float pointRadius; // Rasterized point radius + float lineWidth; // Rasterized line width + + sw_matrix_t stackProjection[SW_MAX_PROJECTION_STACK_SIZE]; // Projection matrix stack for push/pop operations + sw_matrix_t stackModelview[SW_MAX_MODELVIEW_STACK_SIZE]; // Modelview matrix stack for push/pop operations + sw_matrix_t stackTexture[SW_MAX_TEXTURE_STACK_SIZE]; // Texture matrix stack for push/pop operations + uint32_t stackProjectionCounter; // Counter for matrix stack operations + uint32_t stackModelviewCounter; // Counter for matrix stack operations + uint32_t stackTextureCounter; // Counter for matrix stack operations + SWmatrix currentMatrixMode; // Current matrix mode (e.g., sw_MODELVIEW, sw_PROJECTION) + sw_matrix_t* currentMatrix; // Pointer to the currently used matrix according to the mode + sw_matrix_t matMVP; // Model view projection matrix, calculated and used internally + bool isDirtyMVP; // Indicates if the MVP matrix should be rebuilt + + SWfactor srcFactor; + SWfactor dstFactor; + + sw_factor_f srcFactorFunc; + sw_factor_f dstFactorFunc; + + SWface cullFace; // Faces to cull + SWerrcode errCode; // Last error code + + sw_texture_t* loadedTextures; + int loadedTextureCount; + + uint32_t* freeTextureIds; + int freeTextureIdCount; + + uint32_t stateFlags; + +} sw_context_t; + +/* === Global Data === */ + +static sw_context_t RLSW = { 0 }; + +/* === Helper Functions === */ + +static inline void sw_matrix_id(sw_matrix_t dst) +{ + dst[0] = 1, dst[1] = 0, dst[2] = 0, dst[3] = 0; + dst[4] = 0, dst[5] = 1, dst[6] = 0, dst[7] = 0; + dst[8] = 0, dst[9] = 0, dst[10] = 1, dst[11] = 0; + dst[12] = 0, dst[13] = 0, dst[14] = 0, dst[15] = 1; +} + +static inline void sw_matrix_mul_rst(float* SW_RESTRICT dst, const float* SW_RESTRICT left, const float* SW_RESTRICT right) +{ + float l00 = left[0], l01 = left[1], l02 = left[2], l03 = left[3]; + float l10 = left[4], l11 = left[5], l12 = left[6], l13 = left[7]; + float l20 = left[8], l21 = left[9], l22 = left[10], l23 = left[11]; + float l30 = left[12], l31 = left[13], l32 = left[14], l33 = left[15]; + + dst[0] = l00 * right[0] + l01 * right[4] + l02 * right[8] + l03 * right[12]; + dst[4] = l10 * right[0] + l11 * right[4] + l12 * right[8] + l13 * right[12]; + dst[8] = l20 * right[0] + l21 * right[4] + l22 * right[8] + l23 * right[12]; + dst[12] = l30 * right[0] + l31 * right[4] + l32 * right[8] + l33 * right[12]; + + dst[1] = l00 * right[1] + l01 * right[5] + l02 * right[9] + l03 * right[13]; + dst[5] = l10 * right[1] + l11 * right[5] + l12 * right[9] + l13 * right[13]; + dst[9] = l20 * right[1] + l21 * right[5] + l22 * right[9] + l23 * right[13]; + dst[13] = l30 * right[1] + l31 * right[5] + l32 * right[9] + l33 * right[13]; + + dst[2] = l00 * right[2] + l01 * right[6] + l02 * right[10] + l03 * right[14]; + dst[6] = l10 * right[2] + l11 * right[6] + l12 * right[10] + l13 * right[14]; + dst[10] = l20 * right[2] + l21 * right[6] + l22 * right[10] + l23 * right[14]; + dst[14] = l30 * right[2] + l31 * right[6] + l32 * right[10] + l33 * right[14]; + + dst[3] = l00 * right[3] + l01 * right[7] + l02 * right[11] + l03 * right[15]; + dst[7] = l10 * right[3] + l11 * right[7] + l12 * right[11] + l13 * right[15]; + dst[11] = l20 * right[3] + l21 * right[7] + l22 * right[11] + l23 * right[15]; + dst[15] = l30 * right[3] + l31 * right[7] + l32 * right[11] + l33 * right[15]; +} + +static inline void sw_matrix_mul(sw_matrix_t dst, const sw_matrix_t left, const sw_matrix_t right) +{ + float result[16]; + + sw_matrix_mul_rst(result, left, right); + + for (int i = 0; i < 16; i++) { + dst[i] = result[i]; + } +} + +static inline float sw_saturate(float x) +{ + union { float f; uint32_t u; } fb; + fb.f = x; + + // Check if x < 0.0f + // If sign bit is set (MSB), x is negative + if ((fb.u & 0x80000000) != 0) { + return 0.0f; + } + + // Check if x > 1.0f + // Works for positive floats: IEEE 754 ordering matches integer ordering + if (fb.u > 0x3F800000) { + return 1.0f; + } + + // x is in [0.0f, 1.0f] + return x; +} + +static inline float sw_fract(float x) +{ + return x - floorf(x); +} + +static inline int sw_clampi(int v, int min, int max) +{ + if (v < min) return min; + if (v > max) return max; + return v; +} + +static inline void sw_lerp_vertex_PTCH( + sw_vertex_t* SW_RESTRICT out, + const sw_vertex_t* SW_RESTRICT a, + const sw_vertex_t* SW_RESTRICT b, + float t) +{ + const float tInv = 1.0f - t; + + // Position interpolation (4 components) + out->position[0] = a->position[0] * tInv + b->position[0] * t; + out->position[1] = a->position[1] * tInv + b->position[1] * t; + out->position[2] = a->position[2] * tInv + b->position[2] * t; + out->position[3] = a->position[3] * tInv + b->position[3] * t; + + // Texture coordinate interpolation (2 components) + out->texcoord[0] = a->texcoord[0] * tInv + b->texcoord[0] * t; + out->texcoord[1] = a->texcoord[1] * tInv + b->texcoord[1] * t; + + // Color interpolation (4 components) + out->color[0] = a->color[0] * tInv + b->color[0] * t; + out->color[1] = a->color[1] * tInv + b->color[1] * t; + out->color[2] = a->color[2] * tInv + b->color[2] * t; + out->color[3] = a->color[3] * tInv + b->color[3] * t; + + // Homogeneous coordinate interpolation (4 components) + out->homogeneous[0] = a->homogeneous[0] * tInv + b->homogeneous[0] * t; + out->homogeneous[1] = a->homogeneous[1] * tInv + b->homogeneous[1] * t; + out->homogeneous[2] = a->homogeneous[2] * tInv + b->homogeneous[2] * t; + out->homogeneous[3] = a->homogeneous[3] * tInv + b->homogeneous[3] * t; +} + +static inline void sw_get_vertex_grad_PTCH( + sw_vertex_t* SW_RESTRICT out, + const sw_vertex_t* SW_RESTRICT a, + const sw_vertex_t* SW_RESTRICT b, + float scale) +{ + // Calculate gradients for Position + out->position[0] = (b->position[0] - a->position[0]) * scale; + out->position[1] = (b->position[1] - a->position[1]) * scale; + out->position[2] = (b->position[2] - a->position[2]) * scale; + out->position[3] = (b->position[3] - a->position[3]) * scale; + + // Calculate gradients for Texture coordinates + out->texcoord[0] = (b->texcoord[0] - a->texcoord[0]) * scale; + out->texcoord[1] = (b->texcoord[1] - a->texcoord[1]) * scale; + + // Calculate gradients for Color + out->color[0] = (b->color[0] - a->color[0]) * scale; + out->color[1] = (b->color[1] - a->color[1]) * scale; + out->color[2] = (b->color[2] - a->color[2]) * scale; + out->color[3] = (b->color[3] - a->color[3]) * scale; + + // Calculate gradients for Homogeneous coordinates + out->homogeneous[0] = (b->homogeneous[0] - a->homogeneous[0]) * scale; + out->homogeneous[1] = (b->homogeneous[1] - a->homogeneous[1]) * scale; + out->homogeneous[2] = (b->homogeneous[2] - a->homogeneous[2]) * scale; + out->homogeneous[3] = (b->homogeneous[3] - a->homogeneous[3]) * scale; +} + +static inline void sw_add_vertex_grad_PTCH( + sw_vertex_t* SW_RESTRICT out, + const sw_vertex_t* SW_RESTRICT gradients) +{ + // Add gradients to Position + out->position[0] += gradients->position[0]; + out->position[1] += gradients->position[1]; + out->position[2] += gradients->position[2]; + out->position[3] += gradients->position[3]; + + // Add gradients to Texture coordinates + out->texcoord[0] += gradients->texcoord[0]; + out->texcoord[1] += gradients->texcoord[1]; + + // Add gradients to Color + out->color[0] += gradients->color[0]; + out->color[1] += gradients->color[1]; + out->color[2] += gradients->color[2]; + out->color[3] += gradients->color[3]; + + // Add gradients to Homogeneous coordinates + out->homogeneous[0] += gradients->homogeneous[0]; + out->homogeneous[1] += gradients->homogeneous[1]; + out->homogeneous[2] += gradients->homogeneous[2]; + out->homogeneous[3] += gradients->homogeneous[3]; +} + +/* === Half Floating Point === */ + +static inline uint32_t sw_f16_to_f32_ui(uint16_t h) +{ + uint32_t s = (uint32_t)(h & 0x8000) << 16; + int32_t em = h & 0x7fff; + + // bias exponent and pad mantissa with 0; 112 is relative exponent bias (127-15) + int32_t r = (em + (112 << 10)) << 13; + + // denormal: flush to zero + r = (em < (1 << 10)) ? 0 : r; + + // infinity/NaN; note that we preserve NaN payload as a byproduct of unifying inf/nan cases + // 112 is an exponent bias fixup; since we already applied it once, applying it twice converts 31 to 255 + r += (em >= (31 << 10)) ? (112 << 23) : 0; + + return s | r; +} + +static inline float sw_f16_to_f32(sw_half_t y) +{ + union { float f; uint32_t i; } v = { + .i = sw_f16_to_f32_ui(y) + }; + return v.f; +} + +static inline uint16_t sw_f16_from_f32_ui(uint32_t ui) +{ + int32_t s = (ui >> 16) & 0x8000; + int32_t em = ui & 0x7fffffff; + + // bias exponent and round to nearest; 112 is relative exponent bias (127-15) + int32_t h = (em - (112 << 23) + (1 << 12)) >> 13; + + // underflow: flush to zero; 113 encodes exponent -14 + h = (em < (113 << 23)) ? 0 : h; + + // overflow: infinity; 143 encodes exponent 16 + h = (em >= (143 << 23)) ? 0x7c00 : h; + + // NaN; note that we convert all types of NaN to qNaN + h = (em > (255 << 23)) ? 0x7e00 : h; + + return (uint16_t)(s | h); +} + +static inline sw_half_t sw_f16_from_f32(float i) +{ + union { float f; uint32_t i; } v; + v.f = i; + return sw_f16_from_f32_ui(v.i); +} + +/* === Framebuffer Part === */ + +static inline bool sw_framebuffer_load(int w, int h) +{ + int size = w * h; + + RLSW.framebuffer.color = SW_MALLOC(SW_COLOR_PIXEL_SIZE * size); + if (RLSW.framebuffer.color == NULL) return false; + + RLSW.framebuffer.depth = SW_MALLOC(SW_DEPTH_PIXEL_SIZE * size); + if (RLSW.framebuffer.depth == NULL) return false; + + RLSW.framebuffer.width = w; + RLSW.framebuffer.height = h; + RLSW.framebuffer.allocSz = w * h; + + return true; +} + +static inline bool sw_framebuffer_resize(int w, int h) +{ + int newSize = w * h; + + if (newSize <= RLSW.framebuffer.allocSz) { + RLSW.framebuffer.width = w; + RLSW.framebuffer.height = h; + return true; + } + + void* newColor = SW_REALLOC(RLSW.framebuffer.color, newSize); + if (newColor == NULL) return false; + + void* newDepth = SW_REALLOC(RLSW.framebuffer.depth, newSize); + if (newDepth == NULL) return false; + + RLSW.framebuffer.color = newColor; + RLSW.framebuffer.depth = newDepth; + + RLSW.framebuffer.width = w; + RLSW.framebuffer.height = h; + RLSW.framebuffer.allocSz = newSize; + + return true; +} + +static inline void* sw_framebuffer_get_color_addr(const void* ptr, uint32_t offset) +{ + return (uint8_t*)ptr + offset * SW_COLOR_PIXEL_SIZE; +} + +static inline void sw_framebuffer_inc_color_addr(void** ptr) +{ + *ptr = (void*)(((uint8_t*)*ptr) + SW_COLOR_PIXEL_SIZE); +} + +static inline void sw_framebuffer_inc_const_color_addr(const void** ptr) +{ + *ptr = (const void*)(((const uint8_t*)*ptr) + SW_COLOR_PIXEL_SIZE); +} + +static inline void* sw_framebuffer_get_depth_addr(const void* ptr, uint32_t offset) +{ + return (uint8_t*)ptr + offset * SW_DEPTH_PIXEL_SIZE; +} + +static inline void sw_framebuffer_inc_depth_addr(void** ptr) +{ + *ptr = (void*)(((uint8_t*)*ptr) + SW_DEPTH_PIXEL_SIZE); +} + +#if (SW_COLOR_BUFFER_BITS == 8) // RGB - 332 + +static inline void sw_framebuffer_read_color(float dst[4], const void* src) +{ + uint8_t pixel = ((uint8_t*)src)[0]; + + dst[0] = ((pixel >> 5) & 0x07) * (1.0f / 7.0f); + dst[1] = ((pixel >> 2) & 0x07) * (1.0f / 7.0f); + dst[2] = (pixel & 0x03) * (1.0f / 3.0f); + dst[3] = 1.0f; +} + +static inline void sw_framebuffer_read_color8(uint8_t dst[4], const void* src) +{ + uint8_t pixel = ((const uint8_t*)src)[0]; + + uint8_t r = (pixel >> 5) & 0x07; + uint8_t g = (pixel >> 2) & 0x07; + uint8_t b = pixel & 0x03; + + dst[0] = (r * 255 + 3) / 7; + dst[1] = (g * 255 + 3) / 7; + dst[2] = (b * 255 + 1) / 3; + dst[3] = 255; +} + +static inline void sw_framebuffer_write_color(void* dst, const float color[3]) +{ + uint8_t r = ((uint8_t)(color[0] * UINT8_MAX) >> 5) & 0x07; + uint8_t g = ((uint8_t)(color[1] * UINT8_MAX) >> 5) & 0x07; + uint8_t b = ((uint8_t)(color[2] * UINT8_MAX) >> 6) & 0x03; + + ((uint8_t*)dst)[0] = (r << 5) | (g << 2) | b; +} + +static inline void sw_framebuffer_fill_color(void* ptr, int size, const float color[3]) +{ + uint8_t r8 = (uint8_t)(color[0] * 7.0f + 0.5f); + uint8_t g8 = (uint8_t)(color[1] * 7.0f + 0.5f); + uint8_t b8 = (uint8_t)(color[2] * 3.0f + 0.5f); + + uint8_t packedColor = ((r8 & 0x07) << 5) | ((g8 & 0x07) << 2) | (b8 & 0x03); + + uint8_t* p = (uint8_t*)ptr; + + if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) { + int wScissor = RLSW.scMax[0] - RLSW.scMin[0] + 1; + for (int y = RLSW.scMin[1]; y <= RLSW.scMax[1]; y++) { + uint8_t* curPtr = p + y * RLSW.framebuffer.width + RLSW.scMin[0]; + for (int xCount = 0; xCount < wScissor; xCount++) { + *curPtr++ = packedColor; + } + } + } + else { + for (int i = 0; i < size; i++) { + *p++ = packedColor; + } + } +} + +#elif (SW_COLOR_BUFFER_BITS == 16) // RGB - 565 + +static inline void sw_framebuffer_read_color(float dst[4], const void* src) +{ + uint16_t pixel = ((uint16_t*)src)[0]; + + dst[0] = ((pixel >> 11) & 0x1F) * (1.0f / 31.0f); + dst[1] = ((pixel >> 5) & 0x3F) * (1.0f / 63.0f); + dst[2] = (pixel & 0x1F) * (1.0f / 31.0f); + dst[3] = 1.0f; +} + +static inline void sw_framebuffer_read_color8(uint8_t dst[4], const void* src) +{ + uint16_t pixel = ((const uint16_t*)src)[0]; + + uint8_t r = (pixel >> 11) & 0x1F; + uint8_t g = (pixel >> 5) & 0x3F; + uint8_t b = pixel & 0x1F; + + dst[0] = (r * 255 + 15) / 31; + dst[1] = (g * 255 + 31) / 63; + dst[2] = (b * 255 + 15) / 31; + dst[3] = 255; +} + +static inline void sw_framebuffer_write_color(void* dst, const float color[3]) +{ + uint8_t r = (uint8_t)(color[0] * 31.0f + 0.5f) & 0x1F; + uint8_t g = (uint8_t)(color[1] * 63.0f + 0.5f) & 0x3F; + uint8_t b = (uint8_t)(color[2] * 31.0f + 0.5f) & 0x1F; + + ((uint16_t*)dst)[0] = (r << 11) | (g << 5) | b; +} + +static inline void sw_framebuffer_fill_color(void* ptr, int size, const float color[3]) +{ + uint16_t r16 = (uint16_t)(color[0] * 31.0f + 0.5f); + uint16_t g_16 = (uint16_t)(color[1] * 63.0f + 0.5f); + uint16_t b_16 = (uint16_t)(color[2] * 31.0f + 0.5f); + + uint16_t packedColor = ((r16 & 0x1F) << 11) | ((g_16 & 0x3F) << 5) | (b_16 & 0x1F); + + uint16_t* p = (uint16_t*)ptr; + + if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) { + int wScissor = RLSW.scMax[0] - RLSW.scMin[0] + 1; + for (int y = RLSW.scMin[1]; y <= RLSW.scMax[1]; y++) { + uint16_t* curPtr = p + y * RLSW.framebuffer.width + RLSW.scMin[0]; + for (int xCount = 0; xCount < wScissor; xCount++) { + *curPtr++ = packedColor; + } + } + } + else { + for (int i = 0; i < size; i++) { + *p++ = packedColor; + } + } +} + +#elif (SW_COLOR_BUFFER_BITS == 24) // RGB - 888 + +static inline void sw_framebuffer_read_color(float dst[4], const void* src) +{ + dst[0] = ((uint8_t*)src)[0] * (1.0f / 255.0f); + dst[1] = ((uint8_t*)src)[1] * (1.0f / 255.0f); + dst[2] = ((uint8_t*)src)[2] * (1.0f / 255.0f); + dst[3] = 1.0f; +} + +static inline void sw_framebuffer_read_color8(uint8_t dst[4], const void* src) +{ + dst[0] = ((uint8_t*)src)[0]; + dst[1] = ((uint8_t*)src)[1]; + dst[2] = ((uint8_t*)src)[2]; + dst[3] = 255; +} + +static inline void sw_framebuffer_write_color(void* dst, const float color[3]) +{ + ((uint8_t*)dst)[0] = (uint8_t)(color[0] * UINT8_MAX); + ((uint8_t*)dst)[1] = (uint8_t)(color[1] * UINT8_MAX); + ((uint8_t*)dst)[2] = (uint8_t)(color[2] * UINT8_MAX); +} + +static inline void sw_framebuffer_fill_color(void* ptr, int size, const float color[3]) +{ + uint8_t r = (uint8_t)(color[0] * 255.0f); + uint8_t g = (uint8_t)(color[1] * 255.0f); + uint8_t b = (uint8_t)(color[2] * 255.0f); + + uint8_t* p = (uint8_t*)ptr; + + if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) { + int wScissor = RLSW.scMax[0] - RLSW.scMin[0] + 1; + for (int y = RLSW.scMin[1]; y <= RLSW.scMax[1]; y++) { + uint8_t* curPtr = p + 3 * (y * RLSW.framebuffer.width + RLSW.scMin[0]); + for (int xCount = 0; xCount < wScissor; xCount++) { + *curPtr++ = r; + *curPtr++ = g; + *curPtr++ = b; + } + } + } + else { + for (int i = 0; i < size; i++) { + *p++ = r; + *p++ = g; + *p++ = b; + } + } +} + +#endif // SW_COLOR_BUFFER_BITS + +#if (SW_DEPTH_BUFFER_BITS == 8) + +static inline float sw_framebuffer_read_depth(const void* src) +{ + return (float)((uint8_t*)src)[0] * (1.0f / UINT8_MAX); +} + +static inline void sw_framebuffer_write_depth(void* dst, float depth) +{ + ((uint8_t*)dst)[0] = (uint8_t)(depth * UINT8_MAX); +} + +static inline void sw_framebuffer_fill_depth(void* ptr, int size, float value) +{ + uint8_t d8 = (uint8_t)(value * UINT8_MAX); + uint8_t* p = (uint8_t*)ptr; + + if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) { + int wScissor = RLSW.scMax[0] - RLSW.scMin[0] + 1; + for (int y = RLSW.scMin[1]; y <= RLSW.scMax[1]; y++) { + uint8_t* curPtr = p + y * RLSW.framebuffer.width + RLSW.scMin[0]; + for (int xCount = 0; xCount < wScissor; xCount++) { + *curPtr++ = d8; + } + } + } + else { + for (int i = 0; i < size; i++) { + *p++ = d8; + } + } +} + +#elif (SW_DEPTH_BUFFER_BITS == 16) + +static inline float sw_framebuffer_read_depth(const void* src) +{ + return (float)((uint16_t*)src)[0] * (1.0f / UINT16_MAX); +} + +static inline void sw_framebuffer_write_depth(void* dst, float depth) +{ + ((uint16_t*)dst)[0] = (uint16_t)(depth * UINT16_MAX); +} + +static inline void sw_framebuffer_fill_depth(void* ptr, int size, float value) +{ + uint16_t d16 = (uint16_t)(value * UINT16_MAX); + uint16_t* p = (uint16_t*)ptr; + + if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) { + int wScissor = RLSW.scMax[0] - RLSW.scMin[0] + 1; + for (int y = RLSW.scMin[1]; y <= RLSW.scMax[1]; y++) { + uint16_t* curPtr = p + y * RLSW.framebuffer.width + RLSW.scMin[0]; + for (int xCount = 0; xCount < wScissor; xCount++) { + *curPtr++ = d16; + } + } + } + else { + for (int i = 0; i < size; i++) { + *p++ = d16; + } + } +} + +#elif (SW_DEPTH_BUFFER_BITS == 24) + +static inline float sw_framebuffer_read_depth(const void* src) +{ + uint32_t depth24 = (((uint8_t*)src)[0] << 16) | + (((uint8_t*)src)[1] << 8) | + ((uint8_t*)src)[2]; + + return depth24 / (float)0xFFFFFF; +} + +static inline void sw_framebuffer_write_depth(void* dst, float depth) +{ + uint32_t depth24 = (uint32_t)(depth * 0xFFFFFF); + + ((uint8_t*)dst)[0] = (depth24 >> 16) & 0xFF; + ((uint8_t*)dst)[1] = (depth24 >> 8) & 0xFF; + ((uint8_t*)dst)[2] = depth24 & 0xFF; +} + +static inline void sw_framebuffer_fill_depth(void* ptr, int size, float value) +{ + uint32_t d32 = (uint32_t)(value * UINT32_MAX); + uint8_t d_byte0 = (uint8_t)((d32 >> 16) & 0xFF); + uint8_t d_byte1 = (uint8_t)((d32 >> 8) & 0xFF); + uint8_t d_byte2 = (uint8_t)(d32 & 0xFF); + + uint8_t* p = (uint8_t*)ptr; + + if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) { + int wScissor = RLSW.scMax[0] - RLSW.scMin[0] + 1; + for (int y = RLSW.scMin[1]; y <= RLSW.scMax[1]; y++) { + uint8_t* curPtr = p + 3 * (y * RLSW.framebuffer.width + RLSW.scMin[0]); + for (int xCount = 0; xCount < wScissor; xCount++) { + *curPtr++ = d_byte0; + *curPtr++ = d_byte1; + *curPtr++ = d_byte2; + } + } + } + else { + for (int i = 0; i < size; i++) { + *p++ = d_byte0; + *p++ = d_byte1; + *p++ = d_byte2; + } + } +} + +#endif // SW_DEPTH_BUFFER_BITS + +static inline void sw_framebuffer_fill(void* colorPtr, void* depthPtr, int size, float color[4], float depth_value) +{ +#if (SW_COLOR_BUFFER_BITS == 8) + // Calculate and pack 3:3:2 color + // Scale color components to the max value for each bit depth and round + uint8_t r8 = (uint8_t)(color[0] * 7.0f + 0.5f); + uint8_t g8 = (uint8_t)(color[1] * 7.0f + 0.5f); + uint8_t b8 = (uint8_t)(color[2] * 3.0f + 0.5f); + // Pack the components into a single byte + uint8_t packedColor = ((r8 & 0x07) << 5) | ((g8 & 0x07) << 2) | (b8 & 0x03); + uint8_t* cptr = (uint8_t*)colorPtr; +#elif (SW_COLOR_BUFFER_BITS == 16) + // Calculate and pack 5:6:5 color + // Scale color components to the max value for each bit depth and round + uint16_t r16 = (uint16_t)(color[0] * 31.0f + 0.5f); + uint16_t g16 = (uint16_t)(color[1] * 63.0f + 0.5f); + uint16_t b16 = (uint16_t)(color[2] * 31.0f + 0.5f); + // Pack the components into a 16-bit value + uint16_t packedColor = ((r16 & 0x1F) << 11) | ((g16 & 0x3F) << 5) | (b16 & 0x1F); + uint16_t* cptr = (uint16_t*)colorPtr; +#elif (SW_COLOR_BUFFER_BITS == 24) + // Calculate 8:8:8 color components + uint8_t r24 = (uint8_t)(color[0] * 255.0f); + uint8_t g24 = (uint8_t)(color[1] * 255.0f); + uint8_t b24 = (uint8_t)(color[2] * 255.0f); + uint8_t* cptr = (uint8_t*)colorPtr; +#endif + +#if (SW_DEPTH_BUFFER_BITS == 8) + // Calculate 8-bit depth + uint8_t d8 = (uint8_t)(depth_value * UINT8_MAX); + uint8_t* dptr = (uint8_t*)depthPtr; +#elif (SW_DEPTH_BUFFER_BITS == 16) + // Calculate 16-bit depth + uint16_t d16 = (uint16_t)(depth_value * UINT16_MAX); + uint16_t* dptr = (uint16_t*)depthPtr; +#elif (SW_DEPTH_BUFFER_BITS == 24) + // Calculate 24-bit depth and pre-calculate bytes + uint32_t d32 = (uint32_t)(depth_value * UINT32_MAX); + uint8_t dByte0 = (uint8_t)((d32 >> 16) & 0xFF); + uint8_t dByte1 = (uint8_t)((d32 >> 8) & 0xFF); + uint8_t dByte2 = (uint8_t)(d32 & 0xFF); + uint8_t* dptr = (uint8_t*)depthPtr; +#endif + + if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) { + int wScissor = RLSW.scMax[0] - RLSW.scMin[0] + 1; + for (int y = RLSW.scMin[1]; y <= RLSW.scMax[1]; y++) { + int rowStartIdx = y * RLSW.framebuffer.width + RLSW.scMin[0]; + + // Calculate starting pointers for the current row within the scissor rectangle +# if (SW_COLOR_BUFFER_BITS == 8) + uint8_t* curCPtr = cptr + rowStartIdx; +# elif (SW_COLOR_BUFFER_BITS == 16) + uint16_t* curCPtr = cptr + rowStartIdx; +# elif (SW_COLOR_BUFFER_BITS == 24) + uint8_t* curCPtr = cptr + 3 * rowStartIdx; +# endif + +# if (SW_DEPTH_BUFFER_BITS == 8) + uint8_t* curDPtr = dptr + rowStartIdx; +# elif (SW_DEPTH_BUFFER_BITS == 16) + uint16_t* curDPtr = dptr + rowStartIdx; +# elif (SW_DEPTH_BUFFER_BITS == 24) + uint8_t* curDPtr = dptr + 3 * rowStartIdx; +# endif + + // Fill the current row within the scissor rectangle + for (int xCount = 0; xCount < wScissor; xCount++) + { + // Write color +# if (SW_COLOR_BUFFER_BITS == 8) + *curCPtr++ = packedColor; +# elif (SW_COLOR_BUFFER_BITS == 16) + *curCPtr++ = packedColor; +# elif (SW_COLOR_BUFFER_BITS == 24) + *curCPtr++ = r24; + *curCPtr++ = g24; + *curCPtr++ = b24; +# endif + + // Write depth +# if (SW_DEPTH_BUFFER_BITS == 8) + *curDPtr++ = d8; +# elif (SW_DEPTH_BUFFER_BITS == 16) + *curDPtr++ = d16; +# elif (SW_DEPTH_BUFFER_BITS == 24) + *curDPtr++ = dByte0; + *curDPtr++ = dByte1; + *curDPtr++ = dByte2; +# endif + } + } + return; + } + + for (int i = 0; i < size; i++) + { + // Write color +# if (SW_COLOR_BUFFER_BITS == 8) + *cptr++ = packedColor; +# elif (SW_COLOR_BUFFER_BITS == 16) + *cptr++ = packedColor; +# elif (SW_COLOR_BUFFER_BITS == 24) + *cptr++ = r24; + *cptr++ = g24; + *cptr++ = b24; +# endif + + // Write depth +# if (SW_DEPTH_BUFFER_BITS == 8) + *dptr++ = d8; +# elif (SW_DEPTH_BUFFER_BITS == 16) + *dptr++ = d16; +# elif (SW_DEPTH_BUFFER_BITS == 24) + *dptr++ = dByte0; + *dptr++ = dByte1; + *dptr++ = dByte2; +# endif + } +} + +#define DEFINE_FRAMEBUFFER_COPY_U32_BEGIN(name, DST_PTR_T) \ +static inline void sw_framebuffer_copy_to_##name(int x, int y, int w, int h, DST_PTR_T* dst) \ +{ \ + const void* src = RLSW.framebuffer.color; \ + \ + for (int iy = y; iy < h; iy++) { \ + for (int ix = x; ix < w; ix++) { \ + uint8_t color[4]; \ + sw_framebuffer_read_color8(color, src); \ + +#define DEFINE_FRAMEBUFFER_COPY_F32_BEGIN(name, DST_PTR_T) \ +static inline void sw_framebuffer_copy_to_##name(int x, int y, int w, int h, DST_PTR_T* dst) \ +{ \ + const void* src = RLSW.framebuffer.color; \ + \ + for (int iy = y; iy < h; iy++) { \ + for (int ix = x; ix < w; ix++) { \ + float color[4]; \ + sw_framebuffer_read_color(color, src); \ + +#define DEFINE_FRAMEBUFFER_COPY_END() \ + sw_framebuffer_inc_const_color_addr(&src); \ + } \ + } \ +} + +DEFINE_FRAMEBUFFER_COPY_U32_BEGIN(GRAYSCALE, uint8_t) +{ + // NTSC grayscale conversion: Y = 0.299R + 0.587G + 0.114B + uint8_t gray = (uint8_t)((color[0] * 299 + color[1] * 587 + color[2] * 114 + 500) / 1000); + *dst++ = gray; +} +DEFINE_FRAMEBUFFER_COPY_END() + +DEFINE_FRAMEBUFFER_COPY_U32_BEGIN(GRAYALPHA, uint8_t) +{ + // Convert RGB to grayscale using NTSC formula + uint8_t gray = (uint8_t)((color[0] * 299 + color[1] * 587 + color[2] * 114 + 500) / 1000); + + dst[0] = gray; + dst[1] = color[3]; // alpha + + dst += 2; +} +DEFINE_FRAMEBUFFER_COPY_END() + +DEFINE_FRAMEBUFFER_COPY_U32_BEGIN(R5G6B5, uint16_t) +{ + // Convert 8-bit RGB to 5:6:5 format + uint8_t r5 = (color[0] * 31 + 127) / 255; + uint8_t g6 = (color[1] * 63 + 127) / 255; + uint8_t b5 = (color[2] * 31 + 127) / 255; + +#if SW_GL_FRAMEBUFFER_COPY_BGRA + uint16_t rgb565 = (b5 << 11) | (g6 << 5) | r5; +#else // RGBA + uint16_t rgb565 = (r5 << 11) | (g6 << 5) | b5; +#endif + + *dst++ = rgb565; +} +DEFINE_FRAMEBUFFER_COPY_END() + +DEFINE_FRAMEBUFFER_COPY_U32_BEGIN(R8G8B8, uint8_t) +{ +#if SW_GL_FRAMEBUFFER_COPY_BGRA + dst[0] = color[2]; + dst[1] = color[1]; + dst[2] = color[0]; +#else // RGBA + dst[0] = color[0]; + dst[1] = color[1]; + dst[2] = color[2]; +#endif + + dst += 3; +} +DEFINE_FRAMEBUFFER_COPY_END() + +DEFINE_FRAMEBUFFER_COPY_U32_BEGIN(R5G5B5A1, uint16_t) +{ + uint8_t r5 = (color[0] * 31 + 127) / 255; + uint8_t g5 = (color[1] * 31 + 127) / 255; + uint8_t b5 = (color[2] * 31 + 127) / 255; + uint8_t a1 = color[3] >= 128 ? 1 : 0; + +#if SW_GL_FRAMEBUFFER_COPY_BGRA + uint16_t pixel = (b5 << 11) | (g5 << 6) | (r5 << 1) | a1; +#else // RGBA + uint16_t pixel = (r5 << 11) | (g5 << 6) | (b5 << 1) | a1; +#endif + + *dst++ = pixel; +} +DEFINE_FRAMEBUFFER_COPY_END() + +DEFINE_FRAMEBUFFER_COPY_U32_BEGIN(R4G4B4A4, uint16_t) +{ + uint8_t r4 = (color[0] * 15 + 127) / 255; + uint8_t g4 = (color[1] * 15 + 127) / 255; + uint8_t b4 = (color[2] * 15 + 127) / 255; + uint8_t a4 = (color[3] * 15 + 127) / 255; + +#if SW_GL_FRAMEBUFFER_COPY_BGRA + uint16_t pixel = (b4 << 12) | (g4 << 8) | (r4 << 4) | a4; +#else // RGBA + uint16_t pixel = (r4 << 12) | (g4 << 8) | (b4 << 4) | a4; +#endif + + *dst++ = pixel; +} +DEFINE_FRAMEBUFFER_COPY_END() + +DEFINE_FRAMEBUFFER_COPY_U32_BEGIN(R8G8B8A8, uint8_t) +{ +#if SW_GL_FRAMEBUFFER_COPY_BGRA + dst[0] = color[2]; + dst[1] = color[1]; + dst[2] = color[0]; +#else // RGBA + dst[0] = color[0]; + dst[1] = color[1]; + dst[2] = color[2]; +#endif + dst[3] = color[3]; + + dst += 4; +} +DEFINE_FRAMEBUFFER_COPY_END() + +DEFINE_FRAMEBUFFER_COPY_F32_BEGIN(R32, float) +{ + dst[0] = color[0]; + dst++; +} +DEFINE_FRAMEBUFFER_COPY_END() + +DEFINE_FRAMEBUFFER_COPY_F32_BEGIN(R32G32B32, float) +{ +#if SW_GL_FRAMEBUFFER_COPY_BGRA + dst[0] = color[2]; + dst[1] = color[1]; + dst[2] = color[0]; +#else // RGBA + dst[0] = color[0]; + dst[1] = color[1]; + dst[2] = color[2]; +#endif + + dst += 3; +} +DEFINE_FRAMEBUFFER_COPY_END() + +DEFINE_FRAMEBUFFER_COPY_F32_BEGIN(R32G32B32A32, float) +{ +#if SW_GL_FRAMEBUFFER_COPY_BGRA + dst[0] = color[2]; + dst[1] = color[1]; + dst[2] = color[0]; +#else // RGBA + dst[0] = color[0]; + dst[1] = color[1]; + dst[2] = color[2]; +#endif + dst[3] = color[3]; + + dst += 4; +} +DEFINE_FRAMEBUFFER_COPY_END() + +DEFINE_FRAMEBUFFER_COPY_F32_BEGIN(R16, sw_half_t) +{ + dst[0] = sw_f16_from_f32(color[0]); + dst++; +} +DEFINE_FRAMEBUFFER_COPY_END() + +DEFINE_FRAMEBUFFER_COPY_F32_BEGIN(R16G16B16, sw_half_t) +{ +#if SW_GL_FRAMEBUFFER_COPY_BGRA + dst[0] = sw_f16_from_f32(color[2]); + dst[1] = sw_f16_from_f32(color[1]); + dst[2] = sw_f16_from_f32(color[0]); +#else // RGBA + dst[0] = sw_f16_from_f32(color[0]); + dst[1] = sw_f16_from_f32(color[1]); + dst[2] = sw_f16_from_f32(color[2]); +#endif + + dst += 3; +} +DEFINE_FRAMEBUFFER_COPY_END() + +DEFINE_FRAMEBUFFER_COPY_F32_BEGIN(R16G16B16A16, sw_half_t) +{ +#if SW_GL_FRAMEBUFFER_COPY_BGRA + dst[0] = sw_f16_from_f32(color[2]); + dst[1] = sw_f16_from_f32(color[1]); + dst[2] = sw_f16_from_f32(color[0]); +#else // RGBA + dst[0] = sw_f16_from_f32(color[0]); + dst[1] = sw_f16_from_f32(color[1]); + dst[2] = sw_f16_from_f32(color[2]); +#endif + dst[3] = sw_f16_from_f32(color[3]); + + dst += 4; +} +DEFINE_FRAMEBUFFER_COPY_END() + +#define DEFINE_FRAMEBUFFER_BLIT_U32_BEGIN(name, DST_PTR_T) \ +static inline void sw_framebuffer_blit_to_##name( \ + int xDst, int yDst, int wDst, int hDst, \ + int xSrc, int ySrc, int wSrc, int hSrc, \ + DST_PTR_T* dst) \ +{ \ + const uint8_t* srcBase = RLSW.framebuffer.color; \ + int fbWidth = RLSW.framebuffer.width; \ + \ + uint32_t xScale = ((uint32_t)wSrc << 16) / (uint32_t)wDst; \ + uint32_t yScale = ((uint32_t)hSrc << 16) / (uint32_t)hDst; \ + \ + for (int dy = 0; dy < hDst; dy++) { \ + uint32_t yFix = ((uint32_t)ySrc << 16) + dy * yScale; \ + int sy = yFix >> 16; \ + \ + for (int dx = 0; dx < wDst; dx++) { \ + uint32_t xFix = dx * xScale; \ + int sx = xFix >> 16; \ + const void* srcPtr = sw_framebuffer_get_color_addr(srcBase, sy * fbWidth + sx); \ + uint8_t color[4]; \ + sw_framebuffer_read_color8(color, srcPtr); \ + +#define DEFINE_FRAMEBUFFER_BLIT_F32_BEGIN(name, DST_PTR_T) \ +static inline void sw_framebuffer_blit_to_##name( \ + int xDst, int yDst, int wDst, int hDst, \ + int xSrc, int ySrc, int wSrc, int hSrc, \ + DST_PTR_T* dst) \ +{ \ + const uint8_t* srcBase = RLSW.framebuffer.color; \ + int fbWidth = RLSW.framebuffer.width; \ + \ + uint32_t xScale = ((uint32_t)wSrc << 16) / (uint32_t)wDst; \ + uint32_t yScale = ((uint32_t)hSrc << 16) / (uint32_t)hDst; \ + \ + for (int dy = 0; dy < hDst; dy++) { \ + uint32_t yFix = ((uint32_t)ySrc << 16) + dy * yScale; \ + int sy = yFix >> 16; \ + \ + for (int dx = 0; dx < wDst; dx++) { \ + uint32_t xFix = dx * xScale; \ + int sx = xFix >> 16; \ + const void* srcPtr = sw_framebuffer_get_color_addr(srcBase, sy * fbWidth + sx); \ + float color[4]; \ + sw_framebuffer_read_color(color, srcPtr); \ + +#define DEFINE_FRAMEBUFFER_BLIT_END() \ + } \ + } \ +} + +DEFINE_FRAMEBUFFER_BLIT_U32_BEGIN(GRAYSCALE, uint8_t) +{ + uint8_t gray = (uint8_t)((color[0] * 299 + color[1] * 587 + color[2] * 114 + 500) / 1000); + *dst++ = gray; +} +DEFINE_FRAMEBUFFER_BLIT_END() + +DEFINE_FRAMEBUFFER_BLIT_U32_BEGIN(GRAYALPHA, uint8_t) +{ + uint8_t gray = (uint8_t)((color[0] * 299 + color[1] * 587 + color[2] * 114 + 500) / 1000); + + dst[0] = gray; + dst[1] = color[3]; // alpha + + dst += 2; +} +DEFINE_FRAMEBUFFER_BLIT_END() + +DEFINE_FRAMEBUFFER_BLIT_U32_BEGIN(R5G6B5, uint16_t) +{ + uint8_t r5 = (color[0] * 31 + 127) / 255; + uint8_t g6 = (color[1] * 63 + 127) / 255; + uint8_t b5 = (color[2] * 31 + 127) / 255; + +#if SW_GL_FRAMEBUFFER_COPY_BGRA + uint16_t rgb565 = (b5 << 11) | (g6 << 5) | r5; +#else // RGBA + uint16_t rgb565 = (r5 << 11) | (g6 << 5) | b5; +#endif + + *dst++ = rgb565; +} +DEFINE_FRAMEBUFFER_BLIT_END() + +DEFINE_FRAMEBUFFER_BLIT_U32_BEGIN(R8G8B8, uint8_t) +{ +#if SW_GL_FRAMEBUFFER_COPY_BGRA + dst[0] = color[2]; + dst[1] = color[1]; + dst[2] = color[0]; +#else // RGBA + dst[0] = color[0]; + dst[1] = color[1]; + dst[2] = color[2]; +#endif + + dst += 3; +} +DEFINE_FRAMEBUFFER_BLIT_END() + +DEFINE_FRAMEBUFFER_BLIT_U32_BEGIN(R5G5B5A1, uint16_t) +{ + uint8_t r5 = (color[0] * 31 + 127) / 255; + uint8_t g5 = (color[1] * 31 + 127) / 255; + uint8_t b5 = (color[2] * 31 + 127) / 255; + uint8_t a1 = color[3] >= 128 ? 1 : 0; + +#if SW_GL_FRAMEBUFFER_COPY_BGRA + uint16_t pixel = (b5 << 11) | (g5 << 6) | (r5 << 1) | a1; +#else // RGBA + uint16_t pixel = (r5 << 11) | (g5 << 6) | (b5 << 1) | a1; +#endif + + *dst++ = pixel; +} +DEFINE_FRAMEBUFFER_BLIT_END() + +DEFINE_FRAMEBUFFER_BLIT_U32_BEGIN(R4G4B4A4, uint16_t) +{ + uint8_t r4 = (color[0] * 15 + 127) / 255; + uint8_t g4 = (color[1] * 15 + 127) / 255; + uint8_t b4 = (color[2] * 15 + 127) / 255; + uint8_t a4 = (color[3] * 15 + 127) / 255; + +#if SW_GL_FRAMEBUFFER_COPY_BGRA + uint16_t pixel = (b4 << 12) | (g4 << 8) | (r4 << 4) | a4; +#else // RGBA + uint16_t pixel = (r4 << 12) | (g4 << 8) | (b4 << 4) | a4; +#endif + + *dst++ = pixel; +} +DEFINE_FRAMEBUFFER_BLIT_END() + +DEFINE_FRAMEBUFFER_BLIT_U32_BEGIN(R8G8B8A8, uint8_t) +{ +#if SW_GL_FRAMEBUFFER_COPY_BGRA + dst[0] = color[2]; + dst[1] = color[1]; + dst[2] = color[0]; +#else // RGBA + dst[0] = color[0]; + dst[1] = color[1]; + dst[2] = color[2]; +#endif + dst[3] = color[3]; + + dst += 4; +} +DEFINE_FRAMEBUFFER_BLIT_END() + +DEFINE_FRAMEBUFFER_BLIT_F32_BEGIN(R32, uint8_t) +{ + dst[0] = color[0]; + dst++; +} +DEFINE_FRAMEBUFFER_BLIT_END() + +DEFINE_FRAMEBUFFER_BLIT_F32_BEGIN(R32G32B32, float) +{ +#if SW_GL_FRAMEBUFFER_COPY_BGRA + dst[0] = color[2]; + dst[1] = color[1]; + dst[2] = color[0]; +#else // RGBA + dst[0] = color[0]; + dst[1] = color[1]; + dst[2] = color[2]; +#endif + + dst += 3; +} +DEFINE_FRAMEBUFFER_BLIT_END() + +DEFINE_FRAMEBUFFER_BLIT_F32_BEGIN(R32G32B32A32, float) +{ +#if SW_GL_FRAMEBUFFER_COPY_BGRA + dst[0] = color[2]; + dst[1] = color[1]; + dst[2] = color[0]; +#else // RGBA + dst[0] = color[0]; + dst[1] = color[1]; + dst[2] = color[2]; +#endif + dst[3] = color[3]; + + dst += 4; +} +DEFINE_FRAMEBUFFER_BLIT_END() + +DEFINE_FRAMEBUFFER_BLIT_F32_BEGIN(R16, sw_half_t) +{ + dst[0] = sw_f16_from_f32(color[0]); + dst++; +} +DEFINE_FRAMEBUFFER_BLIT_END() + +DEFINE_FRAMEBUFFER_BLIT_F32_BEGIN(R16G16B16, sw_half_t) +{ +#if SW_GL_FRAMEBUFFER_COPY_BGRA + dst[0] = sw_f16_from_f32(color[2]); + dst[1] = sw_f16_from_f32(color[1]); + dst[2] = sw_f16_from_f32(color[0]); +#else // RGBA + dst[0] = sw_f16_from_f32(color[0]); + dst[1] = sw_f16_from_f32(color[1]); + dst[2] = sw_f16_from_f32(color[2]); +#endif + + dst += 3; +} +DEFINE_FRAMEBUFFER_BLIT_END() + +DEFINE_FRAMEBUFFER_BLIT_F32_BEGIN(R16G16B16A16, sw_half_t) +{ +#if SW_GL_FRAMEBUFFER_COPY_BGRA + dst[0] = sw_f16_from_f32(color[2]); + dst[1] = sw_f16_from_f32(color[1]); + dst[2] = sw_f16_from_f32(color[0]); +#else // RGBA + dst[0] = sw_f16_from_f32(color[0]); + dst[1] = sw_f16_from_f32(color[1]); + dst[2] = sw_f16_from_f32(color[2]); +#endif + dst[3] = sw_f16_from_f32(color[3]); + + dst += 4; +} +DEFINE_FRAMEBUFFER_BLIT_END() + +/* === Pixel Format Part === */ + +static inline int sw_get_pixel_format(SWformat format, SWtype type) +{ + int channels = 0; + int bitsPerChannel = 8; // Default: 8 bits per channel + + // Determine the number of channels (format) + switch (format) { + case SW_LUMINANCE: channels = 1; break; + case SW_LUMINANCE_ALPHA: channels = 2; break; + case SW_RGB: channels = 3; break; + case SW_RGBA: channels = 4; break; + default: + return SW_PIXELFORMAT_UNKNOWN; + } + + // Determine the depth of each channel (type) + switch (type) { + case SW_UNSIGNED_BYTE: bitsPerChannel = 8; break; + case SW_BYTE: bitsPerChannel = 8; break; + case SW_UNSIGNED_SHORT: bitsPerChannel = 16; break; + case SW_SHORT: bitsPerChannel = 16; break; + case SW_UNSIGNED_INT: bitsPerChannel = 32; break; + case SW_INT: bitsPerChannel = 32; break; + case SW_FLOAT: bitsPerChannel = 32; break; + default: + return SW_PIXELFORMAT_UNKNOWN; + } + + // Map the format and type to the correct internal format + if (bitsPerChannel == 8) { + if (channels == 1) return SW_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE; + if (channels == 2) return SW_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA; + if (channels == 3) return SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8; + if (channels == 4) return SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8; + } + else if (bitsPerChannel == 16) { + if (channels == 1) return SW_PIXELFORMAT_UNCOMPRESSED_R16; + if (channels == 3) return SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16; + if (channels == 4) return SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16; + } + else if (bitsPerChannel == 32) { + if (channels == 1) return SW_PIXELFORMAT_UNCOMPRESSED_R32; + if (channels == 3) return SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32; + if (channels == 4) return SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32; + } + + return SW_PIXELFORMAT_UNKNOWN; +} + +int sw_get_pixel_bytes(sw_pixelformat_t format) +{ + int bpp = 0; + + switch (format) { + case SW_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: bpp = 1; break; + case SW_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: + case SW_PIXELFORMAT_UNCOMPRESSED_R5G6B5: + case SW_PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: + case SW_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: bpp = 2; break; + case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: bpp = 4; break; + case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8: bpp = 3; break; + case SW_PIXELFORMAT_UNCOMPRESSED_R32: bpp = 4; break; + case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32: bpp = 4*3; break; + case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: bpp = 4*4; break; + case SW_PIXELFORMAT_UNCOMPRESSED_R16: bpp = 2; break; + case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16: bpp = 2*3; break; + case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: bpp = 2*4; break; + default: break; + } + + return bpp; +} + +static inline void sw_get_pixel_grayscale(float* color, const void* pixels, uint32_t offset) +{ + float gray = (float)((uint8_t*)pixels)[offset] * (1.0f / 255); + + color[0] = gray; + color[1] = gray; + color[2] = gray; + color[3] = 1.0f; +} + +static inline void sw_get_pixel_red_16(float* color, const void* pixels, uint32_t offset) +{ + float value = sw_f16_to_f32(((sw_half_t*)pixels)[offset]); + + color[0] = value; + color[1] = value; + color[2] = value; + color[3] = 1.0f; +} + +static inline void sw_get_pixel_red_32(float* color, const void* pixels, uint32_t offset) +{ + float value = ((float*)pixels)[offset]; + + color[0] = value; + color[1] = value; + color[2] = value; + color[3] = 1.0f; +} + +static inline void sw_get_pixel_grayscale_alpha(float* color, const void* pixels, uint32_t offset) +{ + const uint8_t* pixelData = (const uint8_t*)pixels + 2 * offset; + + color[0] = color[1] = color[2] = (float)pixelData[0] * (1.0f / 255); + color[3] = (float)pixelData[1] * (1.0f / 255); +} + +static inline void sw_get_pixel_rgb_565(float* color, const void* pixels, uint32_t offset) +{ + uint16_t pixel = ((uint16_t*)pixels)[offset]; + + color[0] = (float)((pixel & 0xF800) >> 11) / 31; + color[1] = (float)((pixel & 0x7E0) >> 5) / 63; + color[2] = (float)(pixel & 0x1F) / 31; + color[3] = 1.0f; +} + +static inline void sw_get_pixel_rgb_888(float* color, const void* pixels, uint32_t offset) +{ + const uint8_t* pixel = (const uint8_t*)pixels + 3 * offset; + + color[0] = (float)pixel[0] * (1.0f / 255); + color[1] = (float)pixel[1] * (1.0f / 255); + color[2] = (float)pixel[2] * (1.0f / 255); + color[3] = 1.0f; +} + +static inline void sw_get_pixel_rgb_161616(float* color, const void* pixels, uint32_t offset) +{ + const sw_half_t *pixel = (sw_half_t*)pixels + 3 * offset; + + color[0] = sw_f16_to_f32(pixel[0]); + color[1] = sw_f16_to_f32(pixel[1]); + color[2] = sw_f16_to_f32(pixel[2]); + color[3] = 1.0f; +} + +static inline void sw_get_pixel_rgb_323232(float* color, const void* pixels, uint32_t offset) +{ + const float *pixel = (float*)pixels + 3 * offset; + + color[0] = pixel[0]; + color[1] = pixel[1]; + color[2] = pixel[2]; + color[3] = 1.0f; +} + +static inline void sw_get_pixel_rgba_5551(float* color, const void* pixels, uint32_t offset) +{ + uint16_t pixel = ((uint16_t*)pixels)[offset]; + + color[0] = (float)((pixel & 0xF800) >> 11) / 31; + color[1] = (float)((pixel & 0x7C0) >> 6) / 31; + color[2] = (float)((pixel & 0x3E) >> 1) / 31; + color[3] = (float)(pixel & 0x1); +} + +static inline void sw_get_pixel_rgba_4444(float* color, const void* pixels, uint32_t offset) +{ + uint16_t pixel = ((uint16_t*)pixels)[offset]; + + color[0] = (float)((pixel & 0xF000) >> 12) / 15; + color[1] = (float)((pixel & 0xF00) >> 8) / 15; + color[2] = (float)((pixel & 0xF0) >> 4) / 15; + color[3] = (float)(pixel & 0xF) / 15; +} + +static inline void sw_get_pixel_rgba_8888(float* color, const void* pixels, uint32_t offset) +{ + const uint8_t *pixel = (uint8_t*)pixels + 4 * offset; + + color[0] = (float)pixel[0] * (1.0f / 255); + color[1] = (float)pixel[1] * (1.0f / 255); + color[2] = (float)pixel[2] * (1.0f / 255); + color[3] = (float)pixel[3] * (1.0f / 255); +} + +static inline void sw_get_pixel_rgba_16161616(float* color, const void* pixels, uint32_t offset) +{ + const sw_half_t *pixel = (sw_half_t*)pixels + 4 * offset; + + color[0] = sw_f16_to_f32(pixel[0]); + color[1] = sw_f16_to_f32(pixel[1]); + color[2] = sw_f16_to_f32(pixel[2]); + color[3] = sw_f16_to_f32(pixel[3]); +} + +static inline void sw_get_pixel_rgba_32323232(float* color, const void* pixels, uint32_t offset) +{ + const float *pixel = (float*)pixels + 4 * offset; + + color[0] = pixel[0]; + color[1] = pixel[1]; + color[2] = pixel[2]; + color[3] = pixel[3]; +} + +static inline void sw_get_pixel(float* color, const void* pixels, uint32_t offset, sw_pixelformat_t format) +{ + switch (format) { + case SW_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: + sw_get_pixel_grayscale(color, pixels, offset); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: + sw_get_pixel_grayscale_alpha(color, pixels, offset); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R5G6B5: + sw_get_pixel_rgb_565(color, pixels, offset); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8: + sw_get_pixel_rgb_888(color, pixels, offset); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: + sw_get_pixel_rgba_5551(color, pixels, offset); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: + sw_get_pixel_rgba_4444(color, pixels, offset); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: + sw_get_pixel_rgba_8888(color, pixels, offset); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R32: + sw_get_pixel_red_32(color, pixels, offset); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32: + sw_get_pixel_rgb_323232(color, pixels, offset); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: + sw_get_pixel_rgba_32323232(color, pixels, offset); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R16: + sw_get_pixel_red_16(color, pixels, offset); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16: + sw_get_pixel_rgb_161616(color, pixels, offset); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: + sw_get_pixel_rgba_16161616(color, pixels, offset); + break; + case SW_PIXELFORMAT_UNKNOWN: + break; + } +} + +/* === Texture Sampling Part === */ + +static inline void sw_texture_sample_nearest(float* color, const sw_texture_t* tex, float u, float v) +{ + u = (tex->sWrap == SW_REPEAT) ? sw_fract(u) : sw_saturate(u); + v = (tex->tWrap == SW_REPEAT) ? sw_fract(v) : sw_saturate(v); + + int x = u * tex->width, y = v * tex->height; + + sw_get_pixel(color, tex->pixels.cptr, y * tex->width + x, tex->format); +} + +static inline void sw_texture_sample_linear(float* color, const sw_texture_t* tex, float u, float v) +{ + // REVIEW: With a bit more cleverness we could clearly reduce the + // number of operations here, but for now it works fine. + + float xf = u * tex->width - 0.5f; + float yf = v * tex->height - 0.5f; + + int x0 = (int)floorf(xf); + int y0 = (int)floorf(yf); + + float fx = xf - x0; + float fy = yf - y0; + + int x1 = x0 + 1; + int y1 = y0 + 1; + + if (tex->sWrap == SW_CLAMP) { + x0 = x0 > tex->wMinus1 ? tex->wMinus1 : x0; + x1 = x1 > tex->wMinus1 ? tex->wMinus1 : x1; + } + else { + x0 = (x0 % tex->width + tex->width) % tex->width; + x1 = (x1 % tex->width + tex->width) % tex->width; + } + + if (tex->tWrap == SW_CLAMP) { + y0 = y0 > tex->hMinus1 ? tex->hMinus1 : y0; + y1 = y1 > tex->hMinus1 ? tex->hMinus1 : y1; + } + else { + y0 = (y0 % tex->height + tex->height) % tex->height; + y1 = (y1 % tex->height + tex->height) % tex->height; + } + + float c00[4], c10[4], c01[4], c11[4]; + sw_get_pixel(c00, tex->pixels.cptr, y0 * tex->width + x0, tex->format); + sw_get_pixel(c10, tex->pixels.cptr, y0 * tex->width + x1, tex->format); + sw_get_pixel(c01, tex->pixels.cptr, y1 * tex->width + x0, tex->format); + sw_get_pixel(c11, tex->pixels.cptr, y1 * tex->width + x1, tex->format); + + for (int i = 0; i < 4; i++) { + float t = c00[i] + fx * (c10[i] - c00[i]); + float b = c01[i] + fx * (c11[i] - c01[i]); + color[i] = t + fy * (b - t); + } +} + +static inline void sw_texture_sample(float* color, const sw_texture_t* tex, float u, float v, + float duDx, float duDy, float dvDx, float dvDy) +{ + // Previous method: There is no need to compute the square root + // because using the squared value, the comparison remains `L2 > 1.0f * 1.0f` + //float du = sqrtf(duDx * duDx + duDy * duDy); + //float dv = sqrtf(dvDx * dvDx + dvDy * dvDy); + //float L = (du > dv) ? du : dv; + + // Calculate the derivatives for each axis + float du2 = duDx * duDx + duDy * duDy; + float dv2 = dvDx * dvDx + dvDy * dvDy; + float L2 = (du2 > dv2) ? du2 : dv2; + + SWfilter filter = (L2 > 1.0f) + ? tex->minFilter : tex->magFilter; + + switch (filter) { + case SW_NEAREST: + sw_texture_sample_nearest(color, tex, u, v); + break; + case SW_LINEAR: + sw_texture_sample_linear(color, tex, u, v); + break; + } +} + +/* === Color Blending Functions === */ + +static inline void sw_factor_zero(float* SW_RESTRICT factor, const float* SW_RESTRICT src, const float* SW_RESTRICT dst) +{ + factor[0] = factor[1] = factor[2] = factor[3] = 0.0f; +} + +static inline void sw_factor_one(float* SW_RESTRICT factor, const float* SW_RESTRICT src, const float* SW_RESTRICT dst) +{ + factor[0] = factor[1] = factor[2] = factor[3] = 1.0f; +} + +static inline void sw_factor_src_color(float* SW_RESTRICT factor, const float* SW_RESTRICT src, const float* SW_RESTRICT dst) +{ + factor[0] = src[0]; factor[1] = src[1]; factor[2] = src[2]; factor[3] = src[3]; +} + +static inline void sw_factor_one_minus_src_color(float* SW_RESTRICT factor, const float* SW_RESTRICT src, const float* SW_RESTRICT dst) +{ + factor[0] = 1.0f - src[0]; factor[1] = 1.0f - src[1]; + factor[2] = 1.0f - src[2]; factor[3] = 1.0f - src[3]; +} + +static inline void sw_factor_src_alpha(float* SW_RESTRICT factor, const float* SW_RESTRICT src, const float* SW_RESTRICT dst) +{ + factor[0] = factor[1] = factor[2] = factor[3] = src[3]; +} + +static inline void sw_factor_one_minus_src_alpha(float* SW_RESTRICT factor, const float* SW_RESTRICT src, const float* SW_RESTRICT dst) +{ + float inv_alpha = 1.0f - src[3]; + factor[0] = factor[1] = factor[2] = factor[3] = inv_alpha; +} + +static inline void sw_factor_dst_alpha(float* SW_RESTRICT factor, const float* SW_RESTRICT src, const float* SW_RESTRICT dst) +{ + factor[0] = factor[1] = factor[2] = factor[3] = dst[3]; +} + +static inline void sw_factor_one_minus_dst_alpha(float* SW_RESTRICT factor, const float* SW_RESTRICT src, const float* SW_RESTRICT dst) +{ + float inv_alpha = 1.0f - dst[3]; + factor[0] = factor[1] = factor[2] = factor[3] = inv_alpha; +} + +static inline void sw_factor_dst_color(float* SW_RESTRICT factor, const float* SW_RESTRICT src, const float* SW_RESTRICT dst) +{ + factor[0] = dst[0]; factor[1] = dst[1]; factor[2] = dst[2]; factor[3] = dst[3]; +} + +static inline void sw_factor_one_minus_dst_color(float* SW_RESTRICT factor, const float* SW_RESTRICT src, const float* SW_RESTRICT dst) +{ + factor[0] = 1.0f - dst[0]; factor[1] = 1.0f - dst[1]; + factor[2] = 1.0f - dst[2]; factor[3] = 1.0f - dst[3]; +} + +static inline void sw_factor_src_alpha_saturate(float* SW_RESTRICT factor, const float* SW_RESTRICT src, const float* SW_RESTRICT dst) +{ + factor[0] = factor[1] = factor[2] = 1.0f; + factor[3] = (src[3] < 1.0f) ? src[3] : 1.0f; +} + +static inline void sw_blend_colors(float* SW_RESTRICT dst/*[4]*/, const float* SW_RESTRICT src/*[4]*/) +{ + float srcFactor[4], dstFactor[4]; + + RLSW.srcFactorFunc(srcFactor, src, dst); + RLSW.dstFactorFunc(dstFactor, src, dst); + + dst[0] = srcFactor[0] * src[0] + dstFactor[0] * dst[0]; + dst[1] = srcFactor[1] * src[1] + dstFactor[1] * dst[1]; + dst[2] = srcFactor[2] * src[2] + dstFactor[2] * dst[2]; + dst[3] = srcFactor[3] * src[3] + dstFactor[3] * dst[3]; +} + +/* === Projection Helper Functions === */ + +static inline void sw_project_ndc_to_screen(float screen[2], const float ndc[4]) +{ + screen[0] = RLSW.vpCenter[0] + ndc[0] * RLSW.vpHalfSize[0]; + screen[1] = RLSW.vpCenter[1] - ndc[1] * RLSW.vpHalfSize[1]; +} + +/* === Polygon Clipping Part === */ + +#define DEFINE_CLIP_FUNC(name, FUNC_IS_INSIDE, FUNC_COMPUTE_T) \ +static inline int sw_clip_##name( \ + sw_vertex_t output[SW_MAX_CLIPPED_POLYGON_VERTICES], \ + const sw_vertex_t input[SW_MAX_CLIPPED_POLYGON_VERTICES], \ + int n) \ +{ \ + const sw_vertex_t *prev = &input[n - 1]; \ + int prevInside = FUNC_IS_INSIDE(prev->homogeneous); \ + int outputCount = 0; \ + \ + for (int i = 0; i < n; i++) { \ + const sw_vertex_t *curr = &input[i]; \ + int currInside = FUNC_IS_INSIDE(curr->homogeneous); \ + \ + /* If transition between interior/exterior, calculate intersection point */ \ + if (prevInside != currInside) { \ + float t = FUNC_COMPUTE_T(prev->homogeneous, curr->homogeneous); \ + sw_lerp_vertex_PTCH(&output[outputCount++], prev, curr, t); \ + } \ + \ + /* If current vertex inside, add it */ \ + if (currInside) { \ + output[outputCount++] = *curr; \ + } \ + \ + prev = curr; \ + prevInside = currInside; \ + } \ + \ + return outputCount; \ +} + +// Frustum clip functions + +#define IS_INSIDE_PLANE_W(h) ((h)[3] >= SW_CLIP_EPSILON) +#define IS_INSIDE_PLANE_X_POS(h) ((h)[0] <= (h)[3]) +#define IS_INSIDE_PLANE_X_NEG(h) (-(h)[0] <= (h)[3]) +#define IS_INSIDE_PLANE_Y_POS(h) ((h)[1] <= (h)[3]) +#define IS_INSIDE_PLANE_Y_NEG(h) (-(h)[1] <= (h)[3]) +#define IS_INSIDE_PLANE_Z_POS(h) ((h)[2] <= (h)[3]) +#define IS_INSIDE_PLANE_Z_NEG(h) (-(h)[2] <= (h)[3]) + +#define COMPUTE_T_PLANE_W(hPrev, hCurr) ((SW_CLIP_EPSILON - (hPrev)[3]) / ((hCurr)[3] - (hPrev)[3])) +#define COMPUTE_T_PLANE_X_POS(hPrev, hCurr) (((hPrev)[3] - (hPrev)[0]) / (((hPrev)[3] - (hPrev)[0]) - ((hCurr)[3] - (hCurr)[0]))) +#define COMPUTE_T_PLANE_X_NEG(hPrev, hCurr) (((hPrev)[3] + (hPrev)[0]) / (((hPrev)[3] + (hPrev)[0]) - ((hCurr)[3] + (hCurr)[0]))) +#define COMPUTE_T_PLANE_Y_POS(hPrev, hCurr) (((hPrev)[3] - (hPrev)[1]) / (((hPrev)[3] - (hPrev)[1]) - ((hCurr)[3] - (hCurr)[1]))) +#define COMPUTE_T_PLANE_Y_NEG(hPrev, hCurr) (((hPrev)[3] + (hPrev)[1]) / (((hPrev)[3] + (hPrev)[1]) - ((hCurr)[3] + (hCurr)[1]))) +#define COMPUTE_T_PLANE_Z_POS(hPrev, hCurr) (((hPrev)[3] - (hPrev)[2]) / (((hPrev)[3] - (hPrev)[2]) - ((hCurr)[3] - (hCurr)[2]))) +#define COMPUTE_T_PLANE_Z_NEG(hPrev, hCurr) (((hPrev)[3] + (hPrev)[2]) / (((hPrev)[3] + (hPrev)[2]) - ((hCurr)[3] + (hCurr)[2]))) + +DEFINE_CLIP_FUNC(w, IS_INSIDE_PLANE_W, COMPUTE_T_PLANE_W) +DEFINE_CLIP_FUNC(x_pos, IS_INSIDE_PLANE_X_POS, COMPUTE_T_PLANE_X_POS) +DEFINE_CLIP_FUNC(x_neg, IS_INSIDE_PLANE_X_NEG, COMPUTE_T_PLANE_X_NEG) +DEFINE_CLIP_FUNC(y_pos, IS_INSIDE_PLANE_Y_POS, COMPUTE_T_PLANE_Y_POS) +DEFINE_CLIP_FUNC(y_neg, IS_INSIDE_PLANE_Y_NEG, COMPUTE_T_PLANE_Y_NEG) +DEFINE_CLIP_FUNC(z_pos, IS_INSIDE_PLANE_Z_POS, COMPUTE_T_PLANE_Z_POS) +DEFINE_CLIP_FUNC(z_neg, IS_INSIDE_PLANE_Z_NEG, COMPUTE_T_PLANE_Z_NEG) + +// Scissor clip functions + +#define COMPUTE_T_SCISSOR_X_MIN(hPrev, hCurr) (((RLSW.scClipMin[0]) * (hPrev)[3] - (hPrev)[0]) / (((hCurr)[0] - (RLSW.scClipMin[0]) * (hCurr)[3]) - ((hPrev)[0] - (RLSW.scClipMin[0]) * (hPrev)[3]))) +#define COMPUTE_T_SCISSOR_X_MAX(hPrev, hCurr) (((RLSW.scClipMax[0]) * (hPrev)[3] - (hPrev)[0]) / (((hCurr)[0] - (RLSW.scClipMax[0]) * (hCurr)[3]) - ((hPrev)[0] - (RLSW.scClipMax[0]) * (hPrev)[3]))) +#define COMPUTE_T_SCISSOR_Y_MIN(hPrev, hCurr) (((RLSW.scClipMin[1]) * (hPrev)[3] - (hPrev)[1]) / (((hCurr)[1] - (RLSW.scClipMin[1]) * (hCurr)[3]) - ((hPrev)[1] - (RLSW.scClipMin[1]) * (hPrev)[3]))) +#define COMPUTE_T_SCISSOR_Y_MAX(hPrev, hCurr) (((RLSW.scClipMax[1]) * (hPrev)[3] - (hPrev)[1]) / (((hCurr)[1] - (RLSW.scClipMax[1]) * (hCurr)[3]) - ((hPrev)[1] - (RLSW.scClipMax[1]) * (hPrev)[3]))) + +#define IS_INSIDE_SCISSOR_X_MIN(h) ((h)[0] >= (RLSW.scClipMin[0]) * (h)[3]) +#define IS_INSIDE_SCISSOR_X_MAX(h) ((h)[0] <= (RLSW.scClipMax[0]) * (h)[3]) +#define IS_INSIDE_SCISSOR_Y_MIN(h) ((h)[1] >= (RLSW.scClipMin[1]) * (h)[3]) +#define IS_INSIDE_SCISSOR_Y_MAX(h) ((h)[1] <= (RLSW.scClipMax[1]) * (h)[3]) + +DEFINE_CLIP_FUNC(scissor_x_min, IS_INSIDE_SCISSOR_X_MIN, COMPUTE_T_SCISSOR_X_MIN) +DEFINE_CLIP_FUNC(scissor_x_max, IS_INSIDE_SCISSOR_X_MAX, COMPUTE_T_SCISSOR_X_MAX) +DEFINE_CLIP_FUNC(scissor_y_min, IS_INSIDE_SCISSOR_Y_MIN, COMPUTE_T_SCISSOR_Y_MIN) +DEFINE_CLIP_FUNC(scissor_y_max, IS_INSIDE_SCISSOR_Y_MAX, COMPUTE_T_SCISSOR_Y_MAX) + +// Main clip function + +static inline bool sw_polygon_clip(sw_vertex_t polygon[SW_MAX_CLIPPED_POLYGON_VERTICES], int* vertexCounter) +{ + static sw_vertex_t tmp[SW_MAX_CLIPPED_POLYGON_VERTICES]; + + int n = *vertexCounter; + + #define CLIP_AGAINST_PLANE(FUNC_CLIP) \ + { \ + n = FUNC_CLIP(tmp, polygon, n); \ + if (n < 3) { \ + *vertexCounter = 0; \ + return false; \ + } \ + for (int i = 0; i < n; i++) { \ + polygon[i] = tmp[i]; \ + } \ + } + + CLIP_AGAINST_PLANE(sw_clip_w); + CLIP_AGAINST_PLANE(sw_clip_x_pos); + CLIP_AGAINST_PLANE(sw_clip_x_neg); + CLIP_AGAINST_PLANE(sw_clip_y_pos); + CLIP_AGAINST_PLANE(sw_clip_y_neg); + CLIP_AGAINST_PLANE(sw_clip_z_pos); + CLIP_AGAINST_PLANE(sw_clip_z_neg); + + if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) { + CLIP_AGAINST_PLANE(sw_clip_scissor_x_min); + CLIP_AGAINST_PLANE(sw_clip_scissor_x_max); + CLIP_AGAINST_PLANE(sw_clip_scissor_y_min); + CLIP_AGAINST_PLANE(sw_clip_scissor_y_max); + } + + *vertexCounter = n; + + return (n >= 3); +} + +/* === Triangle Rendering Part === */ + +static inline bool sw_triangle_face_culling(void) +{ + // NOTE: Face culling is done before clipping to avoid unnecessary computations. + // To handle triangles crossing the w=0 plane correctly, + // we perform the winding order test in homogeneous coordinates directly, + // before the perspective division (division by w). + // This test determines the orientation of the triangle in the (x,y,w) plane, + // which corresponds to the projected 2D winding order sign, + // even with negative w values. + + // Preload homogeneous coordinates into local variables + const float* h0 = RLSW.vertexBuffer[0].homogeneous; + const float* h1 = RLSW.vertexBuffer[1].homogeneous; + const float* h2 = RLSW.vertexBuffer[2].homogeneous; + + // Compute a value proportional to the signed area in the projected 2D plane, + // calculated directly using homogeneous coordinates BEFORE division by w. + // This is the determinant of the matrix formed by the (x, y, w) components + // of the vertices, which correctly captures the winding order in homogeneous + // space and its relationship to the projected 2D winding order, even with + // negative w values. + // The determinant formula used here is: + // h0.x * (h1.y * h2.w - h2.y * h1.w) + + // h1.x * (h2.y * h0.w - h0.y * h2.w) + + // h2.x * (h0.y * h1.w - h1.y * h0.w) + + const float hSgnArea = + h0[0] * (h1[1] * h2[3] - h2[1] * h1[3]) + + h1[0] * (h2[1] * h0[3] - h0[1] * h2[3]) + + h2[0] * (h0[1] * h1[3] - h1[1] * h0[3]); + + // Discard the triangle if its winding order (determined by the sign + // of the homogeneous area/determinant) matches the culled direction. + // A positive hSgnArea typically corresponds to a counter-clockwise + // winding in the projected space when all w > 0. + // This test is robust for points with w > 0 or w < 0, correctly + // capturing the change in orientation when crossing the w=0 plane. + + // The culling logic remains the same based on the signed area/determinant. + // A value of 0 for hSgnArea means the points are collinear in (x, y, w) + // space, which corresponds to a degenerate triangle projection. + // Such triangles are typically not culled by this test (0 < 0 is false, 0 > 0 is false) + // and should be handled by the clipper if necessary. + return (RLSW.cullFace == SW_FRONT) + ? (hSgnArea < 0) // Cull if winding is "clockwise" in the projected sense + : (hSgnArea > 0); // Cull if winding is "counter-clockwise" in the projected sense +} + +static inline void sw_triangle_clip_and_project(void) +{ + sw_vertex_t* polygon = RLSW.vertexBuffer; + int* vertexCounter = &RLSW.vertexCounter; + + if (sw_polygon_clip(polygon, vertexCounter)) { + + // Transformation to screen space and normalization + for (int i = 0; i < *vertexCounter; i++) { + sw_vertex_t *v = &polygon[i]; + + // Calculation of the reciprocal of W for normalization + // as well as perspective-correct attributes + const float invW = 1.0f / v->homogeneous[3]; + v->homogeneous[3] = invW; + + // Division of XYZ coordinates by weight + v->homogeneous[0] *= invW; + v->homogeneous[1] *= invW; + v->homogeneous[2] *= invW; + + // Division of texture coordinates (perspective-correct) + v->texcoord[0] *= invW; + v->texcoord[1] *= invW; + + // Division of colors (perspective-correct) + v->color[0] *= invW; + v->color[1] *= invW; + v->color[2] *= invW; + v->color[3] *= invW; + + // Transformation to screen space + sw_project_ndc_to_screen(v->screen, v->homogeneous); + } + } +} + +#define DEFINE_TRIANGLE_RASTER_SCANLINE(FUNC_NAME, ENABLE_TEXTURE, ENABLE_DEPTH_TEST, ENABLE_COLOR_BLEND) \ +static inline void FUNC_NAME(const sw_texture_t* tex, const sw_vertex_t* start, \ + const sw_vertex_t* end, float duDy, float dvDy) \ +{ \ + /* Convert and center the screen coordinates */ \ + \ + int xStart = (int)(start->screen[0] + 0.5f); \ + int xEnd = (int)(end->screen[0] + 0.5f); \ + int y = (int)start->screen[1]; \ + \ + /* Compute the inverse horizontal distance along the X axis */ \ + \ + float dx = end->screen[0] - start->screen[0]; \ + if (fabsf(dx) < 1e-6f) return; \ + float dxRcp = 1.0f / dx; \ + \ + /* Compute the interpolation steps along the X axis */ \ + \ + float dzDx = (end->homogeneous[2] - start->homogeneous[2]) * dxRcp; \ + float dwDx = (end->homogeneous[3] - start->homogeneous[3]) * dxRcp; \ + \ + float dcDx[4]; \ + dcDx[0] = (end->color[0] - start->color[0]) * dxRcp; \ + dcDx[1] = (end->color[1] - start->color[1]) * dxRcp; \ + dcDx[2] = (end->color[2] - start->color[2]) * dxRcp; \ + dcDx[3] = (end->color[3] - start->color[3]) * dxRcp; \ + \ + float duDx, dvDx; \ + if (ENABLE_TEXTURE) { \ + duDx = (end->texcoord[0] - start->texcoord[0]) * dxRcp; \ + dvDx = (end->texcoord[1] - start->texcoord[1]) * dxRcp; \ + } \ + \ + /* Initializing the interpolation starting values */ \ + \ + float z = start->homogeneous[2]; \ + float w = start->homogeneous[3]; \ + \ + float color[4]; \ + color[0] = start->color[0]; \ + color[1] = start->color[1]; \ + color[2] = start->color[2]; \ + color[3] = start->color[3]; \ + \ + float u, v; \ + if (ENABLE_TEXTURE) { \ + u = start->texcoord[0]; \ + v = start->texcoord[1]; \ + } \ + \ + /* Pre-calculate the starting pointers for the framebuffer row */ \ + \ + void* cptr = sw_framebuffer_get_color_addr( \ + RLSW.framebuffer.color, y * RLSW.framebuffer.width + xStart); \ + \ + void* dptr = sw_framebuffer_get_depth_addr( \ + RLSW.framebuffer.depth, y * RLSW.framebuffer.width + xStart); \ + \ + /* Scanline rasterization */ \ + \ + for (int x = xStart; x < xEnd; x++) \ + { \ + /* Test and write depth */ \ + \ + if (ENABLE_DEPTH_TEST) \ + { \ + /* TODO: Implement different depth funcs? */ \ + float depth = sw_framebuffer_read_depth(dptr); \ + if (z > depth) goto discard; \ + } \ + \ + sw_framebuffer_write_depth(dptr, z); \ + \ + /* Pixel color computation */ \ + \ + float wRcp = 1.0f / w; \ + \ + float srcColor[4] = { \ + color[0] * wRcp, \ + color[1] * wRcp, \ + color[2] * wRcp, \ + color[3] * wRcp \ + }; \ + \ + if (ENABLE_TEXTURE) \ + { \ + float texColor[4]; \ + float s = u * wRcp; \ + float t = v * wRcp; \ + sw_texture_sample(texColor, tex, s, t, duDx, duDy, dvDx, dvDy); \ + srcColor[0] *= texColor[0]; \ + srcColor[1] *= texColor[1]; \ + srcColor[2] *= texColor[2]; \ + srcColor[3] *= texColor[3]; \ + } \ + \ + if (ENABLE_COLOR_BLEND) \ + { \ + float dstColor[4]; \ + sw_framebuffer_read_color(dstColor, cptr); \ + \ + sw_blend_colors(dstColor, srcColor); \ + dstColor[0] = sw_saturate(dstColor[0]); \ + dstColor[1] = sw_saturate(dstColor[1]); \ + dstColor[2] = sw_saturate(dstColor[2]); \ + \ + sw_framebuffer_write_color(cptr, dstColor); \ + } \ + else \ + { \ + sw_framebuffer_write_color(cptr, srcColor); \ + } \ + \ + /* Increment the interpolation parameter, UVs, and pointers */ \ + \ + discard: \ + \ + z += dzDx; \ + w += dwDx; \ + color[0] += dcDx[0]; \ + color[1] += dcDx[1]; \ + color[2] += dcDx[2]; \ + color[3] += dcDx[3]; \ + if (ENABLE_TEXTURE) { \ + u += duDx; \ + v += dvDx; \ + } \ + \ + sw_framebuffer_inc_color_addr(&cptr); \ + sw_framebuffer_inc_depth_addr(&dptr); \ + } \ +} + +#define DEFINE_TRIANGLE_RASTER(FUNC_NAME, FUNC_SCANLINE, ENABLE_TEXTURE) \ +static inline void FUNC_NAME(const sw_vertex_t* v0, const sw_vertex_t* v1, const sw_vertex_t* v2, \ + const sw_texture_t* tex) \ +{ \ + /* Swap vertices by increasing y */ \ + \ + if (v0->screen[1] > v1->screen[1]) { const sw_vertex_t* tmp = v0; v0 = v1; v1 = tmp; } \ + if (v1->screen[1] > v2->screen[1]) { const sw_vertex_t* tmp = v1; v1 = v2; v2 = tmp; } \ + if (v0->screen[1] > v1->screen[1]) { const sw_vertex_t* tmp = v0; v0 = v1; v1 = tmp; } \ + \ + /* Extracting coordinates from the sorted vertices */ \ + \ + float x0 = v0->screen[0], y0 = v0->screen[1]; \ + float x1 = v1->screen[0], y1 = v1->screen[1]; \ + float x2 = v2->screen[0], y2 = v2->screen[1]; \ + \ + /* Compute height differences */ \ + \ + float h02 = y2 - y0; \ + float h01 = y1 - y0; \ + float h12 = y2 - y1; \ + \ + if (h02 < 1e-6f) { \ + return; \ + } \ + \ + /* Precompute the inverse values without additional checks */ \ + \ + float invH02 = 1.0f / h02; \ + float invH01 = (h01 > 1e-6f) ? 1.0f / h01 : 0.0f; \ + float invH12 = (h12 > 1e-6f) ? 1.0f / h12 : 0.0f; \ + \ + /* Pre-calculation of slopes */ \ + \ + float dx02 = (x2 - x0) * invH02; \ + float dx01 = (x1 - x0) * invH01; \ + float dx12 = (x2 - x1) * invH12; \ + \ + /* Y bounds (vertical clipping) */ \ + \ + int yTop = (int)(y0 + 0.5f); \ + int yMiddle = (int)(y1 + 0.5f); \ + int yBottom = (int)(y2 + 0.5f); \ + \ + /* Compute gradients for each side of the triangle */ \ + \ + sw_vertex_t vDy02, vDy01, vDy12; \ + sw_get_vertex_grad_PTCH(&vDy02, v0, v2, invH02); \ + sw_get_vertex_grad_PTCH(&vDy01, v0, v1, invH01); \ + sw_get_vertex_grad_PTCH(&vDy12, v1, v2, invH12); \ + \ + /* Initializing scanline variables */ \ + \ + sw_vertex_t vLeft = *v0; \ + vLeft.screen[0] = x0; \ + \ + sw_vertex_t vRight = *v0; \ + vRight.screen[0] = x0; \ + \ + /* Scanline for the upper part of the triangle */ \ + \ + for (int y = yTop; y < yMiddle; y++) \ + { \ + vLeft.screen[1] = vRight.screen[1] = y; \ + \ + if (vLeft.screen[0] < vRight.screen[0]) { \ + FUNC_SCANLINE(tex, &vLeft, &vRight, vDy02.texcoord[0], vDy02.texcoord[1]); \ + } \ + else { \ + FUNC_SCANLINE(tex, &vRight, &vLeft, vDy02.texcoord[0], vDy02.texcoord[1]); \ + } \ + \ + sw_add_vertex_grad_PTCH(&vLeft, &vDy02); \ + vLeft.screen[0] += dx02; \ + \ + sw_add_vertex_grad_PTCH(&vRight, &vDy01); \ + vRight.screen[0] += dx01; \ + } \ + \ + /* Scanline for the lower part of the triangle */ \ + \ + vRight = *v1, vRight.screen[0] = x1; \ + \ + for (int y = yMiddle; y < yBottom; y++) \ + { \ + vLeft.screen[1] = vRight.screen[1] = y; \ + \ + if (vLeft.screen[0] < vRight.screen[0]) { \ + FUNC_SCANLINE(tex, &vLeft, &vRight, vDy02.texcoord[0], vDy02.texcoord[1]); \ + } \ + else { \ + FUNC_SCANLINE(tex, &vRight, &vLeft, vDy02.texcoord[0], vDy02.texcoord[1]); \ + } \ + \ + sw_add_vertex_grad_PTCH(&vLeft, &vDy02); \ + vLeft.screen[0] += dx02; \ + \ + sw_add_vertex_grad_PTCH(&vRight, &vDy12); \ + vRight.screen[0] += dx12; \ + } \ +} + +DEFINE_TRIANGLE_RASTER_SCANLINE(sw_triangle_raster_scanline, 0, 0, 0) +DEFINE_TRIANGLE_RASTER_SCANLINE(sw_triangle_raster_scanline_TEX, 1, 0, 0) +DEFINE_TRIANGLE_RASTER_SCANLINE(sw_triangle_raster_scanline_DEPTH, 0, 1, 0) +DEFINE_TRIANGLE_RASTER_SCANLINE(sw_triangle_raster_scanline_BLEND, 0, 0, 1) +DEFINE_TRIANGLE_RASTER_SCANLINE(sw_triangle_raster_scanline_TEX_DEPTH, 1, 1, 0) +DEFINE_TRIANGLE_RASTER_SCANLINE(sw_triangle_raster_scanline_TEX_BLEND, 1, 0, 1) +DEFINE_TRIANGLE_RASTER_SCANLINE(sw_triangle_raster_scanline_DEPTH_BLEND, 0, 1, 1) +DEFINE_TRIANGLE_RASTER_SCANLINE(sw_triangle_raster_scanline_TEX_DEPTH_BLEND, 1, 1, 1) + +DEFINE_TRIANGLE_RASTER(sw_triangle_raster, sw_triangle_raster_scanline, false) +DEFINE_TRIANGLE_RASTER(sw_triangle_raster_TEX, sw_triangle_raster_scanline_TEX, true) +DEFINE_TRIANGLE_RASTER(sw_triangle_raster_DEPTH, sw_triangle_raster_scanline_DEPTH, false) +DEFINE_TRIANGLE_RASTER(sw_triangle_raster_BLEND, sw_triangle_raster_scanline_BLEND, false) +DEFINE_TRIANGLE_RASTER(sw_triangle_raster_TEX_DEPTH, sw_triangle_raster_scanline_TEX_DEPTH, true) +DEFINE_TRIANGLE_RASTER(sw_triangle_raster_TEX_BLEND, sw_triangle_raster_scanline_TEX_BLEND, true) +DEFINE_TRIANGLE_RASTER(sw_triangle_raster_DEPTH_BLEND, sw_triangle_raster_scanline_DEPTH_BLEND, false) +DEFINE_TRIANGLE_RASTER(sw_triangle_raster_TEX_DEPTH_BLEND, sw_triangle_raster_scanline_TEX_DEPTH_BLEND, true) + +static inline void sw_triangle_render(void) +{ + if (RLSW.stateFlags & SW_STATE_CULL_FACE) { + if (!sw_triangle_face_culling()) { + return; + } + } + + sw_triangle_clip_and_project(); + + if (RLSW.vertexCounter < 3) { + return; + } + +# define TRIANGLE_RASTER(RASTER_FUNC) \ + { \ + for (int i = 0; i < RLSW.vertexCounter - 2; i++) { \ + RASTER_FUNC( \ + &RLSW.vertexBuffer[0], \ + &RLSW.vertexBuffer[i + 1], \ + &RLSW.vertexBuffer[i + 2], \ + &RLSW.loadedTextures[RLSW.currentTexture] \ + ); \ + } \ + } + + if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) { + TRIANGLE_RASTER(sw_triangle_raster_TEX_DEPTH_BLEND) + } + else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) { + TRIANGLE_RASTER(sw_triangle_raster_DEPTH_BLEND) + } + else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_BLEND)) { + TRIANGLE_RASTER(sw_triangle_raster_TEX_BLEND) + } + else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_DEPTH_TEST)) { + TRIANGLE_RASTER(sw_triangle_raster_TEX_DEPTH) + } + else if (SW_STATE_CHECK(SW_STATE_BLEND)) { + TRIANGLE_RASTER(sw_triangle_raster_BLEND) + } + else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST)) { + TRIANGLE_RASTER(sw_triangle_raster_DEPTH) + } + else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D)) { + TRIANGLE_RASTER(sw_triangle_raster_TEX) + } + else { + TRIANGLE_RASTER(sw_triangle_raster) + } + +# undef TRIANGLE_RASTER +} + +/* === Quad Rendering Part === */ + +static inline bool sw_quad_face_culling(void) +{ + // NOTE: Face culling is done before clipping to avoid unnecessary computations. + // To handle quads crossing the w=0 plane correctly, + // we perform the winding order test in homogeneous coordinates directly, + // before the perspective division (division by w). + // For a convex quad with vertices P0, P1, P2, P3 in sequential order, + // the winding order of the quad is the same as the winding order + // of the triangle P0 P1 P2. We use the homogeneous triangle + // winding test on this first triangle. + + // Preload homogeneous coordinates into local variables + const float* h0 = RLSW.vertexBuffer[0].homogeneous; + const float* h1 = RLSW.vertexBuffer[1].homogeneous; + const float* h2 = RLSW.vertexBuffer[2].homogeneous; + + // NOTE: h3 is not needed for this test + // const float* h3 = RLSW.vertexBuffer[3].homogeneous; + + // Compute a value proportional to the signed area of the triangle P0 P1 P2 + // in the projected 2D plane, calculated directly using homogeneous coordinates + // BEFORE division by w. + // This is the determinant of the matrix formed by the (x, y, w) components + // of the vertices P0, P1, and P2. Its sign correctly indicates the winding order + // in homogeneous space and its relationship to the projected 2D winding order, + // even with negative w values. + // The determinant formula used here is: + // h0.x * (h1.y * h2.w - h2.y * h1.w) + + // h1.x * (h2.y * h0.w - h0.y * h2.w) + + // h2.x * (h0.y * h1.w - h1.y * h0.w) + + const float hSgnArea = + h0[0] * (h1[1] * h2[3] - h2[1] * h1[3]) + + h1[0] * (h2[1] * h0[3] - h0[1] * h2[3]) + + h2[0] * (h0[1] * h1[3] - h1[1] * h0[3]); + + // Perform face culling based on the winding order determined by the sign + // of the homogeneous area/determinant of triangle P0 P1 P2. + // This test is robust for points with w > 0 or w < 0 within the triangle, + // correctly capturing the change in orientation when crossing the w=0 plane. + + // A positive hSgnArea typically corresponds to a counter-clockwise + // winding in the projected space when all w > 0. + // A value of 0 for hSgnArea means P0, P1, P2 are collinear in (x, y, w) + // space, which corresponds to a degenerate triangle projection. + // Such quads might also be degenerate or non-planar. They are typically + // not culled by this test (0 < 0 is false, 0 > 0 is false) + // and should be handled by the clipper if necessary. + + return (RLSW.cullFace == SW_FRONT) + ? (hSgnArea < 0.0f) // Cull if winding is "clockwise" in the projected sense + : (hSgnArea > 0.0f); // Cull if winding is "counter-clockwise" in the projected sense +} + +static inline void sw_quad_clip_and_project(void) +{ + sw_vertex_t* polygon = RLSW.vertexBuffer; + int* vertexCounter = &RLSW.vertexCounter; + + if (sw_polygon_clip(polygon, vertexCounter)) { + + // Transformation to screen space and normalization + for (int i = 0; i < *vertexCounter; i++) { + sw_vertex_t *v = &polygon[i]; + + // Calculation of the reciprocal of W for normalization + // as well as perspective-correct attributes + const float invW = 1.0f / v->homogeneous[3]; + v->homogeneous[3] = invW; + + // Division of XYZ coordinates by weight + v->homogeneous[0] *= invW; + v->homogeneous[1] *= invW; + v->homogeneous[2] *= invW; + + // Division of texture coordinates (perspective-correct) + v->texcoord[0] *= invW; + v->texcoord[1] *= invW; + + // Division of colors (perspective-correct) + v->color[0] *= invW; + v->color[1] *= invW; + v->color[2] *= invW; + v->color[3] *= invW; + + // Transformation to screen space + sw_project_ndc_to_screen(v->screen, v->homogeneous); + } + } +} + +static inline bool sw_quad_is_axis_aligned(void) +{ + int horizontal = 0; + int vertical = 0; + + for (int i = 0; i < 4; i++) + { + if (RLSW.vertexBuffer[i].homogeneous[3] != 1.0f) { + return false; + } + + const float* v0 = RLSW.vertexBuffer[i].position; + const float* v1 = RLSW.vertexBuffer[(i + 1) % 4].position; + + float dx = v1[0] - v0[0]; + float dy = v1[1] - v0[1]; + + if (fabsf(dx) > 1e-6f && fabsf(dy) < 1e-6f) { + horizontal++; + } + else if (fabsf(dy) > 1e-6f && fabsf(dx) < 1e-6f) { + vertical++; + } + else { + // Diagonal edge -> not axis-aligned + return false; + } + } + + return (horizontal == 2 && vertical == 2); +} + +static inline void sw_quad_sort_cw(const sw_vertex_t** output) +{ + // Sort 4 quad vertices into clockwise order with fixed layout: + // + // v0 -- v1 + // | | + // v3 -- v2 + // + // The goal is: + // - v0: top-left (minimum Y, then minimum X) + // - v1: top-right (minimum Y row, maximum X) + // - v2: bottom-right (maximum Y, maximum X) + // - v3: bottom-left (maximum Y, minimum X) + + const sw_vertex_t* input = RLSW.vertexBuffer; + + // Separate vertices into top and bottom based on Y-coordinate + const sw_vertex_t* top[2] = {NULL, NULL}; + const sw_vertex_t* bottom[2] = {NULL, NULL}; + int topCount = 0, bottomCount = 0; + + // Find minimum and maximum Y + float minY = input[0].screen[1]; + float maxY = input[0].screen[1]; + + for (int i = 1; i < 4; i++) { + if (input[i].screen[1] < minY) minY = input[i].screen[1]; + if (input[i].screen[1] > maxY) maxY = input[i].screen[1]; + } + + // Separate vertices based on Y-coordinate + for (int i = 0; i < 4; i++) { + if (input[i].screen[1] == minY && topCount < 2) { + top[topCount++] = &input[i]; + } + else if (input[i].screen[1] == maxY && bottomCount < 2) { + bottom[bottomCount++] = &input[i]; + } + } + + // If we don't have enough top/bottom vertices (e.g., Y values are all different), + // classify vertices as top or bottom based on whether they're closer to minY or maxY + for (int i = 0; i < 4; i++) { + if (topCount < 2 && &input[i] != top[0] && &input[i] != bottom[0] && &input[i] != bottom[1]) { + if (fabs(input[i].screen[1] - minY) <= fabs(input[i].screen[1] - maxY)) { + top[topCount++] = &input[i]; + } + } + if (bottomCount < 2 && &input[i] != top[0] && &input[i] != top[1] && &input[i] != bottom[0]) { + if (fabs(input[i].screen[1] - maxY) < fabs(input[i].screen[1] - minY)) { + bottom[bottomCount++] = &input[i]; + } + } + } + + // Sort top vertices by X (left to right) + if (topCount == 2 && top[0]->screen[0] > top[1]->screen[0]) { + const sw_vertex_t* temp = top[0]; + top[0] = top[1]; + top[1] = temp; + } + + // Sort bottom vertices by X (left to right) + if (bottomCount == 2 && bottom[0]->screen[0] > bottom[1]->screen[0]) { + const sw_vertex_t* temp = bottom[0]; + bottom[0] = bottom[1]; + bottom[1] = temp; + } + + // Assign vertices in clockwise order as per the required layout + output[0] = top[0]; // v0: top-left + output[1] = top[topCount-1]; // v1: top-right + output[2] = bottom[bottomCount-1]; // v2: bottom-right + output[3] = bottom[0]; // v3: bottom-left +} + +// REVIEW: Could a perfectly aligned quad, where one of the four points has a different depth, still appear perfectly aligned from a certain point of view? +// Because in that case, we would still need to perform perspective division for textures and colors... +#define DEFINE_QUAD_RASTER_AXIS_ALIGNED(FUNC_NAME, ENABLE_TEXTURE, ENABLE_DEPTH_TEST, ENABLE_COLOR_BLEND) \ +static inline void FUNC_NAME(void) \ +{ \ + const sw_vertex_t* sortedVerts[4]; \ + sw_quad_sort_cw(sortedVerts); \ + \ + const sw_vertex_t* v0 = sortedVerts[0]; \ + const sw_vertex_t* v1 = sortedVerts[1]; \ + const sw_vertex_t* v2 = sortedVerts[2]; \ + const sw_vertex_t* v3 = sortedVerts[3]; \ + \ + /* Screen bounds (axis-aligned) */ \ + \ + int xMin = (int)(v0->screen[0] + 0.5f); \ + int yMin = (int)(v0->screen[1] + 0.5f); \ + int xMax = (int)(v2->screen[0] + 0.5f); \ + int yMax = (int)(v2->screen[1] + 0.5f); \ + \ + int width = xMax - xMin; \ + int height = yMax - yMin; \ + \ + if (width == 0 || height == 0) return; \ + \ + float wRcp = (width > 0.0f) ? 1.0f / width : 0.0f; \ + float hRcp = (height > 0.0f) ? 1.0f / height : 0.0f; \ + \ + /* Calculation of vertex gradients in X and Y */ \ + \ + float tcDx[2], tcDy[2]; \ + if (ENABLE_TEXTURE) { \ + tcDx[0] = (v1->texcoord[0] - v0->texcoord[0]) * wRcp; \ + tcDx[1] = (v1->texcoord[1] - v0->texcoord[1]) * wRcp; \ + tcDy[0] = (v3->texcoord[0] - v0->texcoord[0]) * hRcp; \ + tcDy[1] = (v3->texcoord[1] - v0->texcoord[1]) * hRcp; \ + } \ + \ + float cDx[4], cDy[4]; \ + cDx[0] = (v1->color[0] - v0->color[0]) * wRcp; \ + cDx[1] = (v1->color[1] - v0->color[1]) * wRcp; \ + cDx[2] = (v1->color[2] - v0->color[2]) * wRcp; \ + cDx[3] = (v1->color[3] - v0->color[3]) * wRcp; \ + cDy[0] = (v3->color[0] - v0->color[0]) * hRcp; \ + cDy[1] = (v3->color[1] - v0->color[1]) * hRcp; \ + cDy[2] = (v3->color[2] - v0->color[2]) * hRcp; \ + cDy[3] = (v3->color[3] - v0->color[3]) * hRcp; \ + \ + float zDx, zDy; \ + zDx = (v1->homogeneous[2] - v0->homogeneous[2]) * wRcp; \ + zDy = (v3->homogeneous[2] - v0->homogeneous[2]) * hRcp; \ + \ + /* Start of quad rasterization */ \ + \ + const sw_texture_t* tex; \ + if (ENABLE_TEXTURE) { \ + tex = &RLSW.loadedTextures[RLSW.currentTexture]; \ + } \ + \ + void* cDstBase = RLSW.framebuffer.color; \ + void* dDstBase = RLSW.framebuffer.depth; \ + int wDst = RLSW.framebuffer.width; \ + \ + float zScanline = v0->homogeneous[2]; \ + float uScanline = v0->texcoord[0]; \ + float vScanline = v0->texcoord[1]; \ + \ + float colorScanline[4] = { \ + v0->color[0], \ + v0->color[1], \ + v0->color[2], \ + v0->color[3] \ + }; \ + \ + for (int y = yMin; y < yMax; y++) \ + { \ + void* cptr = sw_framebuffer_get_color_addr(cDstBase, y * wDst + xMin); \ + void* dptr = sw_framebuffer_get_depth_addr(dDstBase, y * wDst + xMin); \ + \ + float z = zScanline; \ + float u = uScanline; \ + float v = vScanline; \ + \ + float color[4] = { \ + colorScanline[0], \ + colorScanline[1], \ + colorScanline[2], \ + colorScanline[3] \ + }; \ + \ + /* Scanline rasterization */ \ + \ + for (int x = xMin; x < xMax; x++) \ + { \ + /* Test and write depth */ \ + \ + if (ENABLE_DEPTH_TEST) \ + { \ + /* TODO: Implement different depth funcs? */ \ + float depth = sw_framebuffer_read_depth(dptr); \ + if (z > depth) goto discard; \ + } \ + \ + sw_framebuffer_write_depth(dptr, z); \ + \ + /* Pixel color computation */ \ + \ + float srcColor[4] = { \ + color[0], \ + color[1], \ + color[2], \ + color[3] \ + }; \ + \ + if (ENABLE_TEXTURE) \ + { \ + float texColor[4]; \ + sw_texture_sample(texColor, tex, u, v, tcDx[0], tcDy[0], tcDx[1], tcDy[1]); \ + srcColor[0] *= texColor[0]; \ + srcColor[1] *= texColor[1]; \ + srcColor[2] *= texColor[2]; \ + srcColor[3] *= texColor[3]; \ + } \ + \ + if (ENABLE_COLOR_BLEND) \ + { \ + float dstColor[4]; \ + sw_framebuffer_read_color(dstColor, cptr); \ + \ + sw_blend_colors(dstColor, srcColor); \ + dstColor[0] = sw_saturate(dstColor[0]); \ + dstColor[1] = sw_saturate(dstColor[1]); \ + dstColor[2] = sw_saturate(dstColor[2]); \ + dstColor[3] = sw_saturate(dstColor[3]); \ + \ + sw_framebuffer_write_color(cptr, dstColor); \ + } \ + else \ + { \ + sw_framebuffer_write_color(cptr, srcColor); \ + } \ + \ + discard: \ + \ + z += zDx; \ + \ + color[0] += cDx[0]; \ + color[1] += cDx[1]; \ + color[2] += cDx[2]; \ + color[3] += cDx[3]; \ + \ + if (ENABLE_TEXTURE) { \ + u += tcDx[0]; \ + v += tcDx[1]; \ + } \ + \ + sw_framebuffer_inc_color_addr(&cptr); \ + sw_framebuffer_inc_depth_addr(&dptr); \ + } \ + \ + zScanline += zDy; \ + \ + colorScanline[0] += cDy[0]; \ + colorScanline[1] += cDy[1]; \ + colorScanline[2] += cDy[2]; \ + colorScanline[3] += cDy[3]; \ + \ + if (ENABLE_TEXTURE) { \ + uScanline += tcDy[0]; \ + vScanline += tcDy[1]; \ + } \ + } \ +} + +DEFINE_QUAD_RASTER_AXIS_ALIGNED(sw_quad_raster_axis_aligned, 0, 0, 0) +DEFINE_QUAD_RASTER_AXIS_ALIGNED(sw_quad_raster_axis_aligned_TEX, 1, 0, 0) +DEFINE_QUAD_RASTER_AXIS_ALIGNED(sw_quad_raster_axis_aligned_DEPTH, 0, 1, 0) +DEFINE_QUAD_RASTER_AXIS_ALIGNED(sw_quad_raster_axis_aligned_BLEND, 0, 0, 1) +DEFINE_QUAD_RASTER_AXIS_ALIGNED(sw_quad_raster_axis_aligned_TEX_DEPTH, 1, 1, 0) +DEFINE_QUAD_RASTER_AXIS_ALIGNED(sw_quad_raster_axis_aligned_TEX_BLEND, 1, 0, 1) +DEFINE_QUAD_RASTER_AXIS_ALIGNED(sw_quad_raster_axis_aligned_DEPTH_BLEND, 0, 1, 1) +DEFINE_QUAD_RASTER_AXIS_ALIGNED(sw_quad_raster_axis_aligned_TEX_DEPTH_BLEND, 1, 1, 1) + +static inline void sw_quad_render(void) +{ + if (RLSW.stateFlags & SW_STATE_CULL_FACE) { + if (!sw_quad_face_culling()) { + return; + } + } + + sw_quad_clip_and_project(); + + if (RLSW.vertexCounter < 3) { + return; + } + + if (RLSW.vertexCounter == 4 && sw_quad_is_axis_aligned()) + { + if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) { + sw_quad_raster_axis_aligned_TEX_DEPTH_BLEND(); + } + else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) { + sw_quad_raster_axis_aligned_DEPTH_BLEND(); + } + else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_BLEND)) { + sw_quad_raster_axis_aligned_TEX_BLEND(); + } + else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_DEPTH_TEST)) { + sw_quad_raster_axis_aligned_TEX_DEPTH(); + } + else if (SW_STATE_CHECK(SW_STATE_BLEND)) { + sw_quad_raster_axis_aligned_BLEND(); + } + else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST)) { + sw_quad_raster_axis_aligned_DEPTH(); + } + else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D)) { + sw_quad_raster_axis_aligned_TEX(); + } + else { + sw_quad_raster_axis_aligned(); + } + return; + } + +# define TRIANGLE_RASTER(RASTER_FUNC) \ + { \ + for (int i = 0; i < RLSW.vertexCounter - 2; i++) { \ + RASTER_FUNC( \ + &RLSW.vertexBuffer[0], \ + &RLSW.vertexBuffer[i + 1], \ + &RLSW.vertexBuffer[i + 2], \ + &RLSW.loadedTextures[RLSW.currentTexture] \ + ); \ + } \ + } + + if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) { + TRIANGLE_RASTER(sw_triangle_raster_TEX_DEPTH_BLEND) + } + else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) { + TRIANGLE_RASTER(sw_triangle_raster_DEPTH_BLEND) + } + else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_BLEND)) { + TRIANGLE_RASTER(sw_triangle_raster_TEX_BLEND) + } + else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_DEPTH_TEST)) { + TRIANGLE_RASTER(sw_triangle_raster_TEX_DEPTH) + } + else if (SW_STATE_CHECK(SW_STATE_BLEND)) { + TRIANGLE_RASTER(sw_triangle_raster_BLEND) + } + else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST)) { + TRIANGLE_RASTER(sw_triangle_raster_DEPTH) + } + else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D)) { + TRIANGLE_RASTER(sw_triangle_raster_TEX) + } + else { + TRIANGLE_RASTER(sw_triangle_raster) + } + +# undef TRIANGLE_RASTER +} + +/* === Line Rendering Part === */ + +static inline bool sw_line_clip_coord(float q, float p, float* t0, float* t1) +{ + if (fabsf(p) < SW_CLIP_EPSILON) { + // Check if the line is entirely outside the window + if (q < -SW_CLIP_EPSILON) return 0; // Completely outside + return 1; // Completely inside or on the edges + } + + const float r = q / p; + + if (p < 0) { + if (r > *t1) return 0; + if (r > *t0) *t0 = r; + } + else { + if (r < *t0) return 0; + if (r < *t1) *t1 = r; + } + + return 1; +} + +static inline bool sw_line_clip(sw_vertex_t* v0, sw_vertex_t* v1) +{ + float t0 = 0.0f, t1 = 1.0f; + float dH[4], dC[4]; + + for (int i = 0; i < 4; i++) { + dH[i] = v1->homogeneous[i] - v0->homogeneous[i]; + dC[i] = v1->color[i] - v0->color[i]; + } + + // Clipping Liang-Barsky + if (!sw_line_clip_coord(v0->homogeneous[3] - v0->homogeneous[0], -dH[3] + dH[0], &t0, &t1)) return false; + if (!sw_line_clip_coord(v0->homogeneous[3] + v0->homogeneous[0], -dH[3] - dH[0], &t0, &t1)) return false; + if (!sw_line_clip_coord(v0->homogeneous[3] - v0->homogeneous[1], -dH[3] + dH[1], &t0, &t1)) return false; + if (!sw_line_clip_coord(v0->homogeneous[3] + v0->homogeneous[1], -dH[3] - dH[1], &t0, &t1)) return false; + if (!sw_line_clip_coord(v0->homogeneous[3] - v0->homogeneous[2], -dH[3] + dH[2], &t0, &t1)) return false; + if (!sw_line_clip_coord(v0->homogeneous[3] + v0->homogeneous[2], -dH[3] - dH[2], &t0, &t1)) return false; + + // Clipping Scissor + if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) { + if (!sw_line_clip_coord(v0->homogeneous[0] - RLSW.scClipMin[0] * v0->homogeneous[3], RLSW.scClipMin[0] * dH[3] - dH[0], &t0, &t1)) return false; + if (!sw_line_clip_coord(RLSW.scClipMax[0] * v0->homogeneous[3] - v0->homogeneous[0], dH[0] - RLSW.scClipMax[0] * dH[3], &t0, &t1)) return false; + if (!sw_line_clip_coord(v0->homogeneous[1] - RLSW.scClipMin[1] * v0->homogeneous[3], RLSW.scClipMin[1] * dH[3] - dH[1], &t0, &t1)) return false; + if (!sw_line_clip_coord(RLSW.scClipMax[1] * v0->homogeneous[3] - v0->homogeneous[1], dH[1] - RLSW.scClipMax[1] * dH[3], &t0, &t1)) return false; + } + + // Interpolation of new coordinates + if (t1 < 1.0f) { + for (int i = 0; i < 4; i++) { + v1->homogeneous[i] = v0->homogeneous[i] + t1 * dH[i]; + v1->color[i] = v0->color[i] + t1 * dC[i]; + } + } + if (t0 > 0.0f) { + for (int i = 0; i < 4; i++) { + v0->homogeneous[i] += t0 * dH[i]; + v0->color[i] += t0 * dC[i]; + } + } + + return true; +} + +static inline bool sw_line_clip_and_project(sw_vertex_t* v0, sw_vertex_t* v1) +{ + if (!sw_line_clip(v0, v1)) { + return false; + } + + // Convert homogeneous coordinates to NDC + v0->homogeneous[3] = 1.0f / v0->homogeneous[3]; + v1->homogeneous[3] = 1.0f / v1->homogeneous[3]; + for (int i = 0; i < 3; i++) { + v0->homogeneous[i] *= v0->homogeneous[3]; + v1->homogeneous[i] *= v1->homogeneous[3]; + } + + // Convert NDC coordinates to screen space + sw_project_ndc_to_screen(v0->screen, v0->homogeneous); + sw_project_ndc_to_screen(v1->screen, v1->homogeneous); + + return true; +} + +#define DEFINE_LINE_RASTER(FUNC_NAME, ENABLE_DEPTH_TEST, ENABLE_COLOR_BLEND) \ +static inline void FUNC_NAME(const sw_vertex_t* v0, const sw_vertex_t* v1) \ +{ \ + int x1 = (int)(v0->screen[0] + 0.5f); \ + int y1 = (int)(v0->screen[1] + 0.5f); \ + int x2 = (int)(v1->screen[0] + 0.5f); \ + int y2 = (int)(v1->screen[1] + 0.5f); \ + \ + int dx = x2 - x1; \ + int dy = y2 - y1; \ + \ + /* Handling of lines that are more horizontal or vertical */ \ + \ + if (dx == 0 && dy == 0) { \ + /* TODO: A point should be rendered here */ \ + return; \ + } \ + \ + bool yLonger = (abs(dy) > abs(dx)); \ + int longLen, shortLen; \ + \ + if (yLonger) { \ + longLen = dy; \ + shortLen = dx; \ + } \ + else { \ + longLen = dx; \ + shortLen = dy; \ + } \ + \ + /* Handling of traversal direction */ \ + \ + int sgnInc = (longLen < 0) ? -1 : 1; \ + int abslongLen = abs(longLen); \ + \ + /* Calculation of the increment step for the shorter coordinate */ \ + \ + int decInc = 0; \ + if (abslongLen != 0) { \ + decInc = (shortLen << 16) / abslongLen; \ + } \ + \ + float longLenRcp = (abslongLen != 0) ? (1.0f / abslongLen) : 0.0f; \ + \ + /* Calculation of interpolation steps */ \ + \ + const float zStep = (v1->homogeneous[2] - v0->homogeneous[2]) * longLenRcp; \ + const float rStep = (v1->color[0] - v0->color[0]) * longLenRcp; \ + const float gStep = (v1->color[1] - v0->color[1]) * longLenRcp; \ + const float bStep = (v1->color[2] - v0->color[2]) * longLenRcp; \ + const float aStep = (v1->color[3] - v0->color[3]) * longLenRcp; \ + \ + float z = v0->homogeneous[2]; \ + \ + float color[4] = { \ + v0->color[0], \ + v0->color[1], \ + v0->color[2], \ + v0->color[3] \ + }; \ + \ + const int fbWidth = RLSW.framebuffer.width; \ + void* cBuffer = RLSW.framebuffer.color; \ + void* dBuffer = RLSW.framebuffer.depth; \ + \ + int j = 0; \ + \ + if (yLonger) \ + { \ + for (int i = 0; i != longLen; i += sgnInc) \ + { \ + int offset = (y1 + i) * fbWidth + (x1 + (j >> 16)); \ + \ + void* dptr = sw_framebuffer_get_depth_addr(dBuffer, offset); \ + \ + if (ENABLE_DEPTH_TEST) { \ + float depth = sw_framebuffer_read_depth(dptr); \ + if (z > depth) goto discardA; \ + } \ + \ + sw_framebuffer_write_depth(dptr, z); \ + \ + void* cptr = sw_framebuffer_get_color_addr(cBuffer, offset); \ + \ + if (ENABLE_COLOR_BLEND) \ + { \ + float dstColor[4]; \ + sw_framebuffer_read_color(dstColor, cptr); \ + \ + sw_blend_colors(dstColor, color); \ + sw_framebuffer_write_color(cptr, dstColor); \ + } \ + else \ + { \ + sw_framebuffer_write_color(cptr, color); \ + } \ + \ + discardA: \ + j += decInc; \ + z += zStep; \ + color[0] += rStep; \ + color[1] += gStep; \ + color[2] += bStep; \ + color[3] += aStep; \ + } \ + } \ + else \ + { \ + for (int i = 0; i != longLen; i += sgnInc) \ + { \ + int offset = (y1 + (j >> 16)) * fbWidth + (x1 + i); \ + \ + void* dptr = sw_framebuffer_get_depth_addr(dBuffer, offset); \ + \ + if (ENABLE_DEPTH_TEST) { \ + float depth = sw_framebuffer_read_depth(dptr); \ + if (z > depth) goto discardB; \ + } \ + \ + sw_framebuffer_write_depth(dptr, z); \ + \ + void* cptr = sw_framebuffer_get_color_addr(cBuffer, offset); \ + \ + if (ENABLE_COLOR_BLEND) \ + { \ + float dstColor[4]; \ + sw_framebuffer_read_color(dstColor, cptr); \ + \ + sw_blend_colors(dstColor, color); \ + sw_framebuffer_write_color(cptr, dstColor); \ + } \ + else \ + { \ + sw_framebuffer_write_color(cptr, color); \ + } \ + \ + discardB: \ + j += decInc; \ + z += zStep; \ + color[0] += rStep; \ + color[1] += gStep; \ + color[2] += bStep; \ + color[3] += aStep; \ + } \ + } \ +} + +#define DEFINE_LINE_THICK_RASTER(FUNC_NAME, RASTER_FUNC) \ +void FUNC_NAME(const sw_vertex_t* v1, const sw_vertex_t* v2) \ +{ \ + sw_vertex_t tv1, tv2; \ + \ + int x1 = (int)v1->screen[0]; \ + int y1 = (int)v1->screen[1]; \ + int x2 = (int)v2->screen[0]; \ + int y2 = (int)v2->screen[1]; \ + \ + int dx = x2 - x1; \ + int dy = y2 - y1; \ + \ + RASTER_FUNC(v1, v2); \ + \ + if (dx != 0 && abs(dy / dx) < 1) { \ + int wy = (int)((RLSW.lineWidth - 1.0f) * abs(dx) / sqrtf(dx * dx + dy * dy)); \ + wy >>= 1; /* Division by 2 via bit shift */ \ + for (int i = 1; i <= wy; i++) { \ + tv1 = *v1, tv2 = *v2; \ + tv1.screen[1] -= i; \ + tv2.screen[1] -= i; \ + RASTER_FUNC(&tv1, &tv2); \ + tv1 = *v1, tv2 = *v2; \ + tv1.screen[1] += i; \ + tv2.screen[1] += i; \ + RASTER_FUNC(&tv1, &tv2); \ + } \ + } \ + else if (dy != 0) { \ + int wx = (int)((RLSW.lineWidth - 1.0f) * abs(dy) / sqrtf(dx * dx + dy * dy)); \ + wx >>= 1; /* Division by 2 via bit shift */ \ + for (int i = 1; i <= wx; i++) { \ + tv1 = *v1, tv2 = *v2; \ + tv1.screen[0] -= i; \ + tv2.screen[0] -= i; \ + RASTER_FUNC(&tv1, &tv2); \ + tv1 = *v1, tv2 = *v2; \ + tv1.screen[0] += i; \ + tv2.screen[0] += i; \ + RASTER_FUNC(&tv1, &tv2); \ + } \ + } \ +} + +DEFINE_LINE_RASTER(sw_line_raster, 0, 0) +DEFINE_LINE_RASTER(sw_line_raster_DEPTH, 1, 0) +DEFINE_LINE_RASTER(sw_line_raster_BLEND, 0, 1) +DEFINE_LINE_RASTER(sw_line_raster_DEPTH_BLEND, 1, 1) + +DEFINE_LINE_THICK_RASTER(sw_line_thick_raster, sw_line_raster) +DEFINE_LINE_THICK_RASTER(sw_line_thick_raster_DEPTH, sw_line_raster_DEPTH) +DEFINE_LINE_THICK_RASTER(sw_line_thick_raster_BLEND, sw_line_raster_BLEND) +DEFINE_LINE_THICK_RASTER(sw_line_thick_raster_DEPTH_BLEND, sw_line_raster_DEPTH_BLEND) + +static inline void sw_line_render(sw_vertex_t* vertices) +{ + if (!sw_line_clip_and_project(&vertices[0], &vertices[1])) { + return; + } + + if (RLSW.lineWidth >= 2.0f) { + if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) { + sw_line_thick_raster_DEPTH_BLEND(&vertices[0], &vertices[1]); + } + else if (SW_STATE_CHECK(SW_STATE_BLEND)) { + sw_line_thick_raster_BLEND(&vertices[0], &vertices[1]); + } + else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST)) { + sw_line_thick_raster_DEPTH(&vertices[0], &vertices[1]); + } + else { + sw_line_thick_raster(&vertices[0], &vertices[1]); + } + } + else { + if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) { + sw_line_raster_DEPTH_BLEND(&vertices[0], &vertices[1]); + } + else if (SW_STATE_CHECK(SW_STATE_BLEND)) { + sw_line_raster_BLEND(&vertices[0], &vertices[1]); + } + else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST)) { + sw_line_raster_DEPTH(&vertices[0], &vertices[1]); + } + else { + sw_line_raster(&vertices[0], &vertices[1]); + } + } +} + +/* === Point Rendering Part === */ + +static inline bool sw_point_clip_and_project(sw_vertex_t* v) +{ + if (v->homogeneous[3] != 1.0f) { + for (int_fast8_t i = 0; i < 3; i++) { + if (v->homogeneous[i] < -v->homogeneous[3] || v->homogeneous[i] > v->homogeneous[3]) { + return false; + } + } + v->homogeneous[3] = 1.0f / v->homogeneous[3]; + v->homogeneous[0] *= v->homogeneous[3]; + v->homogeneous[1] *= v->homogeneous[3]; + v->homogeneous[2] *= v->homogeneous[3]; + } + + sw_project_ndc_to_screen(v->screen, v->homogeneous); + + const int *min, *max; + + if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) { + min = RLSW.scMin; + max = RLSW.scMax; + } + else { + min = RLSW.vpMin; + max = RLSW.vpMax; + } + + bool insideX = v->screen[0] - RLSW.pointRadius < max[0] + && v->screen[0] + RLSW.pointRadius > min[0]; + + bool insideY = v->screen[1] - RLSW.pointRadius < max[1] + && v->screen[1] + RLSW.pointRadius > min[1]; + + return insideX && insideY; +} + +#define DEFINE_POINT_RASTER(FUNC_NAME, ENABLE_DEPTH_TEST, ENABLE_COLOR_BLEND, CHECK_BOUNDS) \ +static inline void FUNC_NAME(int x, int y, float z, const float color[4]) \ +{ \ + if (CHECK_BOUNDS == 1) \ + { \ + if (x < RLSW.vpMin[0] || x >= RLSW.vpMax[0]) return; \ + if (y < RLSW.vpMin[1] || y >= RLSW.vpMax[1]) return; \ + } \ + else if (CHECK_BOUNDS == SW_SCISSOR_TEST) \ + { \ + if (x < RLSW.scMin[0] || x >= RLSW.scMax[0]) return; \ + if (y < RLSW.scMin[1] || y >= RLSW.scMax[1]) return; \ + } \ + \ + int offset = y * RLSW.framebuffer.width + x; \ + \ + void* dptr = sw_framebuffer_get_depth_addr( \ + RLSW.framebuffer.depth, offset \ + ); \ + \ + if (ENABLE_DEPTH_TEST) \ + { \ + float depth = sw_framebuffer_read_depth(dptr); \ + if (z > depth) return; \ + } \ + \ + sw_framebuffer_write_depth(dptr, z); \ + \ + void* cptr = sw_framebuffer_get_color_addr( \ + RLSW.framebuffer.color, offset \ + ); \ + \ + if (ENABLE_COLOR_BLEND) \ + { \ + float dstColor[4]; \ + sw_framebuffer_read_color(dstColor, cptr); \ + \ + sw_blend_colors(dstColor, color); \ + sw_framebuffer_write_color(cptr, dstColor); \ + } \ + else \ + { \ + sw_framebuffer_write_color(cptr, color); \ + } \ +} + +#define DEFINE_POINT_THICK_RASTER(FUNC_NAME, RASTER_FUNC) \ +static inline void FUNC_NAME(sw_vertex_t* v) \ +{ \ + int cx = v->screen[0]; \ + int cy = v->screen[1]; \ + float cz = v->homogeneous[2]; \ + int radius = RLSW.pointRadius; \ + const float* color = v->color; \ + \ + int x = 0; \ + int y = radius; \ + int d = 3 - 2 * radius; \ + \ + while (x <= y) { \ + for (int i = -x; i <= x; i++) { \ + RASTER_FUNC(cx + i, cy + y, cz, color); \ + RASTER_FUNC(cx + i, cy - y, cz, color); \ + } \ + for (int i = -y; i <= y; i++) { \ + RASTER_FUNC(cx + i, cy + x, cz, color); \ + RASTER_FUNC(cx + i, cy - x, cz, color); \ + } \ + if (d > 0) { \ + y--; \ + d = d + 4 * (x - y) + 10; \ + } \ + else { \ + d = d + 4 * x + 6; \ + } \ + x++; \ + } \ +} + +DEFINE_POINT_RASTER(sw_point_raster, 0, 0, 0) +DEFINE_POINT_RASTER(sw_point_raster_DEPTH, 1, 0, 0) +DEFINE_POINT_RASTER(sw_point_raster_BLEND, 0, 1, 0) +DEFINE_POINT_RASTER(sw_point_raster_DEPTH_BLEND, 1, 1, 0) + +DEFINE_POINT_RASTER(sw_point_raster_CHECK, 0, 0, 1) +DEFINE_POINT_RASTER(sw_point_raster_DEPTH_CHECK, 1, 0, 1) +DEFINE_POINT_RASTER(sw_point_raster_BLEND_CHECK, 0, 1, 1) +DEFINE_POINT_RASTER(sw_point_raster_DEPTH_BLEND_CHECK, 1, 1, 1) + +DEFINE_POINT_RASTER(sw_point_raster_CHECK_SCISSOR, 0, 0, SW_SCISSOR_TEST) +DEFINE_POINT_RASTER(sw_point_raster_DEPTH_CHECK_SCISSOR, 1, 0, SW_SCISSOR_TEST) +DEFINE_POINT_RASTER(sw_point_raster_BLEND_CHECK_SCISSOR, 0, 1, SW_SCISSOR_TEST) +DEFINE_POINT_RASTER(sw_point_raster_DEPTH_BLEND_CHECK_SCISSOR, 1, 1, SW_SCISSOR_TEST) + +DEFINE_POINT_THICK_RASTER(sw_point_thick_raster, sw_point_raster_CHECK) +DEFINE_POINT_THICK_RASTER(sw_point_thick_raster_DEPTH, sw_point_raster_DEPTH_CHECK) +DEFINE_POINT_THICK_RASTER(sw_point_thick_raster_BLEND, sw_point_raster_BLEND_CHECK) +DEFINE_POINT_THICK_RASTER(sw_point_thick_raster_DEPTH_BLEND, sw_point_raster_DEPTH_BLEND_CHECK) + +DEFINE_POINT_THICK_RASTER(sw_point_thick_raster_SCISSOR, sw_point_raster_CHECK_SCISSOR) +DEFINE_POINT_THICK_RASTER(sw_point_thick_raster_DEPTH_SCISSOR, sw_point_raster_DEPTH_CHECK_SCISSOR) +DEFINE_POINT_THICK_RASTER(sw_point_thick_raster_BLEND_SCISSOR, sw_point_raster_BLEND_CHECK_SCISSOR) +DEFINE_POINT_THICK_RASTER(sw_point_thick_raster_DEPTH_BLEND_SCISSOR, sw_point_raster_DEPTH_BLEND_CHECK_SCISSOR) + +static inline void sw_point_render(sw_vertex_t* v) +{ + if (!sw_point_clip_and_project(v)) { + return; + } + + if (RLSW.pointRadius >= 1.0f) { + if (SW_STATE_CHECK(SW_STATE_SCISSOR_TEST)) { + if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) { + sw_point_thick_raster_DEPTH_BLEND_SCISSOR(v); + } + else if (SW_STATE_CHECK(SW_STATE_BLEND)) { + sw_point_thick_raster_BLEND_SCISSOR(v); + } + else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST)) { + sw_point_thick_raster_DEPTH_SCISSOR(v); + } + else { + sw_point_thick_raster_SCISSOR(v); + } + } + else { + if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) { + sw_point_thick_raster_DEPTH_BLEND(v); + } + else if (SW_STATE_CHECK(SW_STATE_BLEND)) { + sw_point_thick_raster_BLEND(v); + } + else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST)) { + sw_point_thick_raster_DEPTH(v); + } + else { + sw_point_thick_raster(v); + } + } + } + else { + if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) { + sw_point_raster_DEPTH_BLEND( + v->screen[0], v->screen[1], + v->homogeneous[2], v->color + ); + } + else if (SW_STATE_CHECK(SW_STATE_BLEND)) { + sw_point_raster_BLEND( + v->screen[0], v->screen[1], + v->homogeneous[2], v->color + ); + } + else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST)) { + sw_point_raster_DEPTH( + v->screen[0], v->screen[1], + v->homogeneous[2], v->color + ); + } + else { + sw_point_raster( + v->screen[0], v->screen[1], + v->homogeneous[2], v->color + ); + } + } +} + +/* === Polygon Modes Rendering Part === */ + +static inline void sw_poly_point_render(void) +{ + for (int i = 0; i < RLSW.vertexCounter; i++) { + sw_point_render(&RLSW.vertexBuffer[i]); + } +} + +static inline void sw_poly_line_render(void) +{ + const sw_vertex_t* vertices = RLSW.vertexBuffer; + int cm1 = RLSW.vertexCounter - 1; + + for (int i = 0; i < cm1; i++) { + sw_line_render((sw_vertex_t[2]){ + vertices[i], vertices[i + 1] + }); + } + + sw_line_render((sw_vertex_t[2]){ + vertices[cm1], vertices[0] + }); +} + +static inline void sw_poly_fill_render(void) +{ + switch (RLSW.drawMode) { + case SW_POINTS: + sw_point_render(&RLSW.vertexBuffer[0]); + break; + case SW_LINES: + sw_line_render(RLSW.vertexBuffer); + break; + case SW_TRIANGLES: + sw_triangle_render(); + break; + case SW_QUADS: + sw_quad_render(); + break; + } +} + +/* === Some Validity Check Helper === */ + +static inline bool sw_is_texture_valid(uint32_t id) +{ + bool valid = true; + + if (id == 0) valid = false; + else if (id >= SW_MAX_TEXTURES) valid = false; + else if (RLSW.loadedTextures[id].pixels.cptr == 0) valid = false; + + return true; +} + +static inline bool sw_is_texture_filter_valid(int filter) +{ + return (filter == SW_NEAREST || filter == SW_LINEAR); +} + +static inline bool sw_is_texture_wrap_valid(int wrap) +{ + return (wrap == SW_REPEAT || wrap == SW_CLAMP); +} + +static inline bool sw_is_draw_mode_valid(int mode) +{ + bool result = false; + + switch (mode) { + case SW_POINTS: + case SW_LINES: + case SW_TRIANGLES: + case SW_QUADS: + result = true; + break; + default: + break; + } + + return result; +} + +static inline bool sw_is_poly_mode_valid(int mode) +{ + bool result = false; + + switch (mode) { + case SW_POINT: + case SW_LINE: + case SW_FILL: + result = true; + break; + default: + break; + } + + return result; +} + +static inline bool sw_is_face_valid(int face) +{ + return (face == SW_FRONT || face == SW_BACK); +} + +static inline bool sw_is_blend_src_factor_valid(int blend) +{ + bool result = false; + + switch (blend) { + case SW_ZERO: + case SW_ONE: + case SW_SRC_COLOR: + case SW_ONE_MINUS_SRC_COLOR: + case SW_SRC_ALPHA: + case SW_ONE_MINUS_SRC_ALPHA: + case SW_DST_ALPHA: + case SW_ONE_MINUS_DST_ALPHA: + case SW_DST_COLOR: + case SW_ONE_MINUS_DST_COLOR: + case SW_SRC_ALPHA_SATURATE: + result = true; + break; + default: + break; + } + + return result; +} + +static inline bool sw_is_blend_dst_factor_valid(int blend) +{ + bool result = false; + + switch (blend) { + case SW_ZERO: + case SW_ONE: + case SW_SRC_COLOR: + case SW_ONE_MINUS_SRC_COLOR: + case SW_SRC_ALPHA: + case SW_ONE_MINUS_SRC_ALPHA: + case SW_DST_ALPHA: + case SW_ONE_MINUS_DST_ALPHA: + case SW_DST_COLOR: + case SW_ONE_MINUS_DST_COLOR: + result = true; + break; + default: + break; + } + + return result; +} + +/* === Public Implementation === */ + +bool swInit(int w, int h) +{ + if (!sw_framebuffer_load(w, h)) { + swClose(); return false; + } + + swViewport(0, 0, w, h); + swScissor(0, 0, w, h); + + RLSW.loadedTextures = SW_MALLOC(SW_MAX_TEXTURES * sizeof(sw_texture_t)); + if (RLSW.loadedTextures == NULL) { swClose(); return false; } + + RLSW.freeTextureIds = SW_MALLOC(SW_MAX_TEXTURES * sizeof(uint32_t)); + if (RLSW.loadedTextures == NULL) { swClose(); return false; } + + RLSW.clearColor[0] = 0.0f; + RLSW.clearColor[1] = 0.0f; + RLSW.clearColor[2] = 0.0f; + RLSW.clearColor[3] = 1.0f; + RLSW.clearDepth = 1.0f; + + RLSW.currentMatrixMode = SW_MODELVIEW; + RLSW.currentMatrix = &RLSW.stackModelview[0]; + + sw_matrix_id(RLSW.stackProjection[0]); + sw_matrix_id(RLSW.stackModelview[0]); + sw_matrix_id(RLSW.stackTexture[0]); + sw_matrix_id(RLSW.matMVP); + + RLSW.stackProjectionCounter = 1; + RLSW.stackModelviewCounter = 1; + RLSW.stackTextureCounter = 1; + RLSW.isDirtyMVP = false; + + RLSW.current.texcoord[0] = 0.0f; + RLSW.current.texcoord[1] = 0.0f; + + RLSW.current.color[0] = 1.0f; + RLSW.current.color[1] = 1.0f; + RLSW.current.color[2] = 1.0f; + RLSW.current.color[3] = 1.0f; + + RLSW.srcFactor = SW_SRC_ALPHA; + RLSW.dstFactor = SW_ONE_MINUS_SRC_ALPHA; + + RLSW.srcFactorFunc = sw_factor_src_alpha; + RLSW.dstFactorFunc = sw_factor_one_minus_src_alpha; + + RLSW.polyMode = SW_FILL; + RLSW.cullFace = SW_BACK; + + static const float defTex[3*2*2] = + { + 1.0f, 1.0f, 1.0f, + 1.0f, 1.0f, 1.0f, + 1.0f, 1.0f, 1.0f, + 1.0f, 1.0f, 1.0f, + }; + + RLSW.loadedTextures[0].pixels.cptr = defTex; + RLSW.loadedTextures[0].width = 2; + RLSW.loadedTextures[0].height = 2; + RLSW.loadedTextures[0].wMinus1 = 1; + RLSW.loadedTextures[0].hMinus1 = 1; + RLSW.loadedTextures[0].format = SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32; + RLSW.loadedTextures[0].minFilter = SW_NEAREST; + RLSW.loadedTextures[0].magFilter = SW_NEAREST; + RLSW.loadedTextures[0].sWrap = SW_REPEAT; + RLSW.loadedTextures[0].tWrap = SW_REPEAT; + RLSW.loadedTextures[0].tx = 0.5f; + RLSW.loadedTextures[0].ty = 0.5f; + RLSW.loadedTextures[0].copy = false; + + RLSW.loadedTextureCount = 1; + + return true; +} + +void swClose(void) +{ + for (int i = 1; i < RLSW.loadedTextureCount; i++) { + sw_texture_t* texture = &RLSW.loadedTextures[i]; + if (sw_is_texture_valid(i) && texture->copy) { + SW_FREE(texture->pixels.ptr); + } + } + + SW_FREE(RLSW.framebuffer.color); + SW_FREE(RLSW.framebuffer.depth); + SW_FREE(RLSW.loadedTextures); + SW_FREE(RLSW.freeTextureIds); + + RLSW = (sw_context_t) { 0 }; +} + +bool swResizeFramebuffer(int w, int h) +{ + return sw_framebuffer_resize(w, h); +} + +void swCopyFramebuffer(int x, int y, int w, int h, SWformat format, SWtype type, void* pixels) +{ + sw_pixelformat_t pFormat = sw_get_pixel_format(format, type); + + if (w <= 0) { + RLSW.errCode = SW_INVALID_VALUE; + return; + } + + if (h <= 0) { + RLSW.errCode = SW_INVALID_VALUE; + return; + } + + if (w > RLSW.framebuffer.width) + w = RLSW.framebuffer.width; + + if (h > RLSW.framebuffer.height) + h = RLSW.framebuffer.height; + + x = sw_clampi(x, 0, w); + y = sw_clampi(y, 0, h); + + switch (pFormat) { + case SW_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: + sw_framebuffer_copy_to_GRAYALPHA(x, y, w, h, pixels); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: + sw_framebuffer_copy_to_GRAYALPHA(x, y, w, h, pixels); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R5G6B5: + sw_framebuffer_copy_to_R5G6B5(x, y, w, h, pixels); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8: + sw_framebuffer_copy_to_R8G8B8(x, y, w, h, pixels); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: + sw_framebuffer_copy_to_R5G5B5A1(x, y, w, h, pixels); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: + sw_framebuffer_copy_to_R4G4B4A4(x, y, w, h, pixels); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: + sw_framebuffer_copy_to_R8G8B8A8(x, y, w, h, pixels); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R32: + sw_framebuffer_copy_to_R32(x, y, w, h, pixels); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32: + sw_framebuffer_copy_to_R32G32B32(x, y, w, h, pixels); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: + sw_framebuffer_copy_to_R32G32B32A32(x, y, w, h, pixels); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R16: + sw_framebuffer_copy_to_R16(x, y, w, h, pixels); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16: + sw_framebuffer_copy_to_R16G16B16(x, y, w, h, pixels); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: + sw_framebuffer_copy_to_R16G16B16A16(x, y, w, h, pixels); + break; + default: + RLSW.errCode = SW_INVALID_ENUM; + break; + } +} + +void swBlitFramebuffer(int xDst, int yDst, int wDst, int hDst, + int xSrc, int ySrc, int wSrc, int hSrc, + SWformat format, SWtype type, void* pixels) +{ + sw_pixelformat_t pFormat = sw_get_pixel_format(format, type); + + if (wSrc <= 0) { + RLSW.errCode = SW_INVALID_VALUE; + return; + } + + if (hSrc <= 0) { + RLSW.errCode = SW_INVALID_VALUE; + return; + } + + if (wSrc > RLSW.framebuffer.width) + wSrc = RLSW.framebuffer.width; + + if (hSrc > RLSW.framebuffer.height) + hSrc = RLSW.framebuffer.height; + + xSrc = sw_clampi(xSrc, 0, wSrc); + ySrc = sw_clampi(ySrc, 0, hSrc); + + switch (pFormat) { + case SW_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: + sw_framebuffer_blit_to_GRAYALPHA(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: + sw_framebuffer_blit_to_GRAYALPHA(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R5G6B5: + sw_framebuffer_blit_to_R5G6B5(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8: + sw_framebuffer_blit_to_R8G8B8(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: + sw_framebuffer_blit_to_R5G5B5A1(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: + sw_framebuffer_blit_to_R4G4B4A4(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: + sw_framebuffer_blit_to_R8G8B8A8(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R32: + sw_framebuffer_blit_to_R32(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32: + sw_framebuffer_blit_to_R32G32B32(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: + sw_framebuffer_blit_to_R32G32B32A32(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R16: + sw_framebuffer_blit_to_R16(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16: + sw_framebuffer_blit_to_R16G16B16(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); + break; + case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: + sw_framebuffer_blit_to_R16G16B16A16(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); + break; + default: + RLSW.errCode = SW_INVALID_ENUM; + break; + } +} + +void* swGetColorBuffer(int* w, int* h) +{ + if (w) *w = RLSW.framebuffer.width; + if (h) *h = RLSW.framebuffer.height; + + return RLSW.framebuffer.color; +} + +void swEnable(SWstate state) +{ + switch (state) { + case SW_SCISSOR_TEST: + RLSW.stateFlags |= SW_STATE_SCISSOR_TEST; + break; + case SW_TEXTURE_2D: + RLSW.stateFlags |= SW_STATE_TEXTURE_2D; + break; + case SW_DEPTH_TEST: + RLSW.stateFlags |= SW_STATE_DEPTH_TEST; + break; + case SW_CULL_FACE: + RLSW.stateFlags |= SW_STATE_CULL_FACE; + break; + case SW_BLEND: + RLSW.stateFlags |= SW_STATE_BLEND; + break; + default: + RLSW.errCode = SW_INVALID_ENUM; + break; + } +} + +void swDisable(SWstate state) +{ + switch (state) { + case SW_SCISSOR_TEST: + RLSW.stateFlags &= ~SW_STATE_SCISSOR_TEST; + break; + case SW_TEXTURE_2D: + RLSW.stateFlags &= ~SW_STATE_TEXTURE_2D; + break; + case SW_DEPTH_TEST: + RLSW.stateFlags &= ~SW_STATE_DEPTH_TEST; + break; + case SW_CULL_FACE: + RLSW.stateFlags &= ~SW_STATE_CULL_FACE; + break; + case SW_BLEND: + RLSW.stateFlags &= ~SW_STATE_BLEND; + break; + default: + RLSW.errCode = SW_INVALID_ENUM; + break; + } +} + +void swGetIntegerv(SWget name, int* v) +{ + switch (name) { + case SW_MODELVIEW_STACK_DEPTH: + *v = SW_MODELVIEW_STACK_DEPTH; + break; + case SW_PROJECTION_STACK_DEPTH: + *v = SW_PROJECTION_STACK_DEPTH; + break; + case SW_TEXTURE_STACK_DEPTH: + *v = SW_TEXTURE_STACK_DEPTH; + break; + default: + RLSW.errCode = SW_INVALID_ENUM; + break; + } +} + +void swGetFloatv(SWget name, float* v) +{ + switch (name) { + case SW_COLOR_CLEAR_VALUE: + v[0] = RLSW.clearColor[0]; + v[1] = RLSW.clearColor[1]; + v[2] = RLSW.clearColor[2]; + v[3] = RLSW.clearColor[3]; + break; + case SW_CURRENT_COLOR: + v[0] = RLSW.vertexBuffer[RLSW.vertexCounter - 1].color[0]; + v[1] = RLSW.vertexBuffer[RLSW.vertexCounter - 1].color[1]; + v[2] = RLSW.vertexBuffer[RLSW.vertexCounter - 1].color[2]; + v[3] = RLSW.vertexBuffer[RLSW.vertexCounter - 1].color[3]; + break; + case SW_CURRENT_TEXTURE_COORDS: + v[0] = RLSW.vertexBuffer[RLSW.vertexCounter - 1].texcoord[0]; + v[1] = RLSW.vertexBuffer[RLSW.vertexCounter - 1].texcoord[1]; + break; + case SW_POINT_SIZE: + v[0] = 2.0f * RLSW.pointRadius; + break; + case SW_LINE_WIDTH: + v[0] = RLSW.lineWidth; + break; + case SW_MODELVIEW_MATRIX: + for (int i = 0; i < 16; i++) { + v[i] = RLSW.stackModelview[RLSW.stackModelviewCounter - 1][i]; + } + break; + case SW_PROJECTION_MATRIX: + for (int i = 0; i < 16; i++) { + v[i] = RLSW.stackProjection[RLSW.stackProjectionCounter - 1][i]; + } + break; + case SW_TEXTURE_MATRIX: + for (int i = 0; i < 16; i++) { + v[i] = RLSW.stackTexture[RLSW.stackTextureCounter - 1][i]; + } + break; + default: + RLSW.errCode = SW_INVALID_ENUM; + break; + } +} + +const char* swGetString(SWget name) +{ + const char* result = NULL; + + switch (name) { + case SW_VENDOR: + result = "RLSW Header"; + break; + case SW_RENDERER: + result = "RLSW Software Renderer"; + break; + case SW_VERSION: + result = "RLSW 1.0"; + break; + case SW_EXTENSIONS: + result = "None"; + break; + default: + RLSW.errCode = SW_INVALID_ENUM; + break; + } + + return result; +} + +SWerrcode swGetError(void) +{ + SWerrcode ret = RLSW.errCode; + RLSW.errCode = SW_NO_ERROR; + return ret; +} + +void swViewport(int x, int y, int width, int height) +{ + if (width < 0 || height < 0) { + RLSW.errCode = SW_INVALID_VALUE; + return; + } + + RLSW.vpSize[0] = width; + RLSW.vpSize[1] = height; + + RLSW.vpHalfSize[0] = (int)(width / 2.0f + 0.5f); + RLSW.vpHalfSize[1] = (int)(height / 2.0f + 0.5f); + + RLSW.vpCenter[0] = x + RLSW.vpHalfSize[0]; + RLSW.vpCenter[1] = y + RLSW.vpHalfSize[1]; + + RLSW.vpMin[0] = sw_clampi(x, 0, RLSW.framebuffer.width - 1); + RLSW.vpMin[1] = sw_clampi(y, 0, RLSW.framebuffer.height - 1); + RLSW.vpMax[0] = sw_clampi(x + width, 0, RLSW.framebuffer.width - 1); + RLSW.vpMax[1] = sw_clampi(y + height, 0, RLSW.framebuffer.height - 1); +} + +void swScissor(int x, int y, int width, int height) +{ + if (width < 0 || height < 0) { + RLSW.errCode = SW_INVALID_VALUE; + return; + } + + RLSW.scMin[0] = sw_clampi(x, 0, RLSW.framebuffer.width - 1); + RLSW.scMin[1] = sw_clampi(y, 0, RLSW.framebuffer.height - 1); + RLSW.scMax[0] = sw_clampi(x + width, 0, RLSW.framebuffer.width - 1); + RLSW.scMax[1] = sw_clampi(y + height, 0, RLSW.framebuffer.height - 1); + + RLSW.scClipMin[0] = (2.0f * (float)RLSW.scMin[0] / (float)RLSW.vpSize[0]) - 1.0f; + RLSW.scClipMax[0] = (2.0f * (float)RLSW.scMax[0] / (float)RLSW.vpSize[0]) - 1.0f; + RLSW.scClipMax[1] = 1.0f - (2.0f * (float)RLSW.scMin[1] / (float)RLSW.vpSize[1]); + RLSW.scClipMin[1] = 1.0f - (2.0f * (float)RLSW.scMax[1] / (float)RLSW.vpSize[1]); +} + +void swClearColor(float r, float g, float b, float a) +{ + RLSW.clearColor[0] = r; + RLSW.clearColor[1] = g; + RLSW.clearColor[2] = b; + RLSW.clearColor[3] = a; +} + +void swClear(uint32_t bitmask) +{ + int size = RLSW.framebuffer.width * RLSW.framebuffer.height; + + if ((bitmask & (SW_COLOR_BUFFER_BIT | SW_DEPTH_BUFFER_BIT)) == (SW_COLOR_BUFFER_BIT | SW_DEPTH_BUFFER_BIT)) { + sw_framebuffer_fill( + RLSW.framebuffer.color, RLSW.framebuffer.depth, + size, RLSW.clearColor, RLSW.clearDepth + ); + } + else if (bitmask & (SW_COLOR_BUFFER_BIT)) { + sw_framebuffer_fill_color(RLSW.framebuffer.color, size, RLSW.clearColor); + } + else if (bitmask & SW_DEPTH_BUFFER_BIT) { + sw_framebuffer_fill_depth(RLSW.framebuffer.depth, size, RLSW.clearDepth); + } +} + +void swBlendFunc(SWfactor sfactor, SWfactor dfactor) +{ + if (!sw_is_blend_src_factor_valid(sfactor) + || !sw_is_blend_dst_factor_valid(dfactor)) { + RLSW.errCode = SW_INVALID_ENUM; + return; + } + RLSW.srcFactor = sfactor; + RLSW.dstFactor = dfactor; + + switch (sfactor) { + case SW_ZERO: + RLSW.srcFactorFunc = sw_factor_zero; + break; + case SW_ONE: + RLSW.srcFactorFunc = sw_factor_one; + break; + case SW_SRC_COLOR: + RLSW.srcFactorFunc = sw_factor_src_color; + break; + case SW_ONE_MINUS_SRC_COLOR: + RLSW.srcFactorFunc = sw_factor_one_minus_src_color; + break; + case SW_SRC_ALPHA: + RLSW.srcFactorFunc = sw_factor_src_alpha; + break; + case SW_ONE_MINUS_SRC_ALPHA: + RLSW.srcFactorFunc = sw_factor_one_minus_src_alpha; + break; + case SW_DST_ALPHA: + RLSW.srcFactorFunc = sw_factor_dst_alpha; + break; + case SW_ONE_MINUS_DST_ALPHA: + RLSW.srcFactorFunc = sw_factor_one_minus_dst_alpha; + break; + case SW_DST_COLOR: + RLSW.srcFactorFunc = sw_factor_dst_color; + break; + case SW_ONE_MINUS_DST_COLOR: + RLSW.srcFactorFunc = sw_factor_one_minus_dst_color; + break; + case SW_SRC_ALPHA_SATURATE: + RLSW.srcFactorFunc = sw_factor_src_alpha_saturate; + break; + } + + switch (dfactor) { + case SW_ZERO: + RLSW.dstFactorFunc = sw_factor_zero; + break; + case SW_ONE: + RLSW.dstFactorFunc = sw_factor_one; + break; + case SW_SRC_COLOR: + RLSW.dstFactorFunc = sw_factor_src_color; + break; + case SW_ONE_MINUS_SRC_COLOR: + RLSW.dstFactorFunc = sw_factor_one_minus_src_color; + break; + case SW_SRC_ALPHA: + RLSW.dstFactorFunc = sw_factor_src_alpha; + break; + case SW_ONE_MINUS_SRC_ALPHA: + RLSW.dstFactorFunc = sw_factor_one_minus_src_alpha; + break; + case SW_DST_ALPHA: + RLSW.dstFactorFunc = sw_factor_dst_alpha; + break; + case SW_ONE_MINUS_DST_ALPHA: + RLSW.dstFactorFunc = sw_factor_one_minus_dst_alpha; + break; + case SW_DST_COLOR: + RLSW.dstFactorFunc = sw_factor_dst_color; + break; + case SW_ONE_MINUS_DST_COLOR: + RLSW.dstFactorFunc = sw_factor_one_minus_dst_color; + break; + case SW_SRC_ALPHA_SATURATE: + // NOTE: Should never be reached + break; + } +} + +void swPolygonMode(SWpoly mode) +{ + if (!sw_is_poly_mode_valid(mode)) { + RLSW.errCode = SW_INVALID_ENUM; + return; + } + RLSW.polyMode = mode; +} + +void swCullFace(SWface face) +{ + if (!sw_is_face_valid(face)) { + RLSW.errCode = SW_INVALID_ENUM; + return; + } + RLSW.cullFace = face; +} + +void swPointSize(float size) +{ + RLSW.pointRadius = floorf(size * 0.5f); +} + +void swLineWidth(float width) +{ + RLSW.lineWidth = roundf(width); +} + +void swMatrixMode(SWmatrix mode) +{ + switch (mode) { + case SW_PROJECTION: + RLSW.currentMatrix = &RLSW.stackProjection[RLSW.stackProjectionCounter - 1]; + break; + case SW_MODELVIEW: + RLSW.currentMatrix = &RLSW.stackModelview[RLSW.stackModelviewCounter - 1]; + break; + case SW_TEXTURE: + RLSW.currentMatrix = &RLSW.stackTexture[RLSW.stackTextureCounter - 1]; + break; + default: + RLSW.errCode = SW_INVALID_ENUM; + return; + } + + RLSW.currentMatrixMode = mode; +} + +void swPushMatrix(void) +{ + switch (RLSW.currentMatrixMode) { + case SW_PROJECTION: + { + if (RLSW.stackProjectionCounter >= SW_MAX_PROJECTION_STACK_SIZE) { + RLSW.errCode = SW_STACK_OVERFLOW; + return; + } + + int iOld = RLSW.stackProjectionCounter - 1; + int iNew = RLSW.stackProjectionCounter++; + + for (int i = 0; i < 16; i++) { + RLSW.stackProjection[iNew][i] = RLSW.stackProjection[iOld][i]; + } + + RLSW.currentMatrix = &RLSW.stackProjection[iNew]; + } + break; + case SW_MODELVIEW: + { + if (RLSW.stackModelviewCounter >= SW_MAX_MODELVIEW_STACK_SIZE) { + RLSW.errCode = SW_STACK_OVERFLOW; + return; + } + + int iOld = RLSW.stackModelviewCounter - 1; + int iNew = RLSW.stackModelviewCounter++; + + for (int i = 0; i < 16; i++) { + RLSW.stackModelview[iNew][i] = RLSW.stackModelview[iOld][i]; + } + + RLSW.currentMatrix = &RLSW.stackModelview[iNew]; + } + break; + case SW_TEXTURE: + { + if (RLSW.stackTextureCounter >= SW_MAX_TEXTURE_STACK_SIZE) { + RLSW.errCode = SW_STACK_OVERFLOW; + return; + } + + int iOld = RLSW.stackTextureCounter - 1; + int iNew = RLSW.stackTextureCounter++; + + for (int i = 0; i < 16; i++) { + RLSW.stackTexture[iNew][i] = RLSW.stackTexture[iOld][i]; + } + + RLSW.currentMatrix = &RLSW.stackTexture[iNew]; + } + break; + } +} + +void swPopMatrix(void) +{ + switch (RLSW.currentMatrixMode) { + case SW_PROJECTION: + { + if (RLSW.stackProjectionCounter <= 0) { + RLSW.errCode = SW_STACK_UNDERFLOW; + return; + } + + RLSW.currentMatrix = &RLSW.stackProjection[--RLSW.stackProjectionCounter]; + RLSW.isDirtyMVP = true; //< The MVP is considered to have been changed + } + break; + case SW_MODELVIEW: + { + if (RLSW.stackModelviewCounter <= 0) { + RLSW.errCode = SW_STACK_UNDERFLOW; + return; + } + + RLSW.currentMatrix = &RLSW.stackModelview[--RLSW.stackModelviewCounter]; + RLSW.isDirtyMVP = true; //< The MVP is considered to have been changed + } + break; + case SW_TEXTURE: + { + if (RLSW.stackTextureCounter <= 0) { + RLSW.errCode = SW_STACK_UNDERFLOW; + return; + } + + RLSW.currentMatrix = &RLSW.stackTexture[--RLSW.stackTextureCounter]; + } + break; + } +} + +void swLoadIdentity(void) +{ + sw_matrix_id(*RLSW.currentMatrix); + if (RLSW.currentMatrixMode != SW_TEXTURE) { + RLSW.isDirtyMVP = true; + } +} + +void swTranslatef(float x, float y, float z) +{ + sw_matrix_t mat; + sw_matrix_id(mat); + + mat[12] = x; + mat[13] = y; + mat[14] = z; + + sw_matrix_mul(*RLSW.currentMatrix, mat, *RLSW.currentMatrix); + + if (RLSW.currentMatrixMode != SW_TEXTURE) { + RLSW.isDirtyMVP = true; + } +} + +void swRotatef(float angle, float x, float y, float z) +{ + angle *= SW_DEG2RAD; + + float lengthSq = x*x + y*y + z*z; + + if (lengthSq != 1.0f && lengthSq != 0.0f) { + float invLength = 1.0f/sqrtf(lengthSq); + x *= invLength; + y *= invLength; + z *= invLength; + } + + float sinres = sinf(angle); + float cosres = cosf(angle); + float t = 1.0f - cosres; + + sw_matrix_t mat; + + mat[0] = x*x*t + cosres; + mat[1] = y*x*t + z*sinres; + mat[2] = z*x*t - y*sinres; + mat[3] = 0.0f; + + mat[4] = x*y*t - z*sinres; + mat[5] = y*y*t + cosres; + mat[6] = z*y*t + x*sinres; + mat[7] = 0.0f; + + mat[8] = x*z*t + y*sinres; + mat[9] = y*z*t - x*sinres; + mat[10] = z*z*t + cosres; + mat[11] = 0.0f; + + mat[12] = 0.0f; + mat[13] = 0.0f; + mat[14] = 0.0f; + mat[15] = 1.0f; + + sw_matrix_mul(*RLSW.currentMatrix, mat, *RLSW.currentMatrix); + + if (RLSW.currentMatrixMode != SW_TEXTURE) { + RLSW.isDirtyMVP = true; + } +} + +void swScalef(float x, float y, float z) +{ + sw_matrix_t mat; + + mat[0] = x, mat[1] = 0, mat[2] = 0, mat[3] = 0; + mat[4] = 0, mat[5] = y, mat[6] = 0, mat[7] = 0; + mat[8] = 0, mat[9] = 0, mat[10] = z, mat[11] = 0; + mat[12] = 0, mat[13] = 0, mat[14] = 0, mat[15] = 1; + + sw_matrix_mul(*RLSW.currentMatrix, mat, *RLSW.currentMatrix); + + if (RLSW.currentMatrixMode != SW_TEXTURE) { + RLSW.isDirtyMVP = true; + } +} + +void swMultMatrixf(const float* mat) +{ + sw_matrix_mul(*RLSW.currentMatrix, mat, *RLSW.currentMatrix); + + if (RLSW.currentMatrixMode != SW_TEXTURE) { + RLSW.isDirtyMVP = true; + } +} + +void swFrustum(double left, double right, double bottom, double top, double znear, double zfar) +{ + sw_matrix_t mat; + + double rl = right - left; + double tb = top - bottom; + double fn = zfar - znear; + + mat[0] = (znear*2.0)/rl; + mat[1] = 0.0f; + mat[2] = 0.0f; + mat[3] = 0.0f; + + mat[4] = 0.0f; + mat[5] = (znear*2.0)/tb; + mat[6] = 0.0f; + mat[7] = 0.0f; + + mat[8] = (right + left)/rl; + mat[9] = (top + bottom)/tb; + mat[10] = -(zfar + znear)/fn; + mat[11] = -1.0f; + + mat[12] = 0.0f; + mat[13] = 0.0f; + mat[14] = -(zfar*znear*2.0)/fn; + mat[15] = 0.0f; + + sw_matrix_mul(*RLSW.currentMatrix, *RLSW.currentMatrix, mat); + + if (RLSW.currentMatrixMode != SW_TEXTURE) { + RLSW.isDirtyMVP = true; + } +} + +void swOrtho(double left, double right, double bottom, double top, double znear, double zfar) +{ + sw_matrix_t mat; + + double rl = right - left; + double tb = top - bottom; + double fn = zfar - znear; + + mat[0] = 2.0f/rl; + mat[1] = 0.0f; + mat[2] = 0.0f; + mat[3] = 0.0f; + + mat[4] = 0.0f; + mat[5] = 2.0f/tb; + mat[6] = 0.0f; + mat[7] = 0.0f; + + mat[8] = 0.0f; + mat[9] = 0.0f; + mat[10] = -2.0f/fn; + mat[11] = 0.0f; + + mat[12] = -(left + right)/rl; + mat[13] = -(top + bottom)/tb; + mat[14] = -(zfar + znear)/fn; + mat[15] = 1.0f; + + sw_matrix_mul(*RLSW.currentMatrix, *RLSW.currentMatrix, mat); + + if (RLSW.currentMatrixMode != SW_TEXTURE) { + RLSW.isDirtyMVP = true; + } +} + +void swBegin(SWdraw mode) +{ + /* --- Check if the draw mode is valid --- */ + + if (!sw_is_draw_mode_valid(mode)) { + RLSW.errCode = SW_INVALID_ENUM; + return; + } + + /* --- Recalculate the MVP if this is needed --- */ + + if (RLSW.isDirtyMVP) { + sw_matrix_mul_rst( + RLSW.matMVP, + RLSW.stackModelview[RLSW.stackModelviewCounter - 1], + RLSW.stackProjection[RLSW.stackProjectionCounter - 1] + ); + RLSW.isDirtyMVP = false; + } + + /* --- Obtaining the number of vertices needed for this primitive --- */ + + switch (mode) { + case SW_POINTS: + RLSW.reqVertices = 1; + break; + case SW_LINES: + RLSW.reqVertices = 2; + break; + case SW_TRIANGLES: + RLSW.reqVertices = 3; + break; + case SW_QUADS: + RLSW.reqVertices = 4; + break; + } + + /* --- Initialize some values --- */ + + RLSW.vertexCounter = 0; + RLSW.drawMode = mode; +} + +void swEnd(void) +{ + RLSW.drawMode = 0; +} + +void swVertex2i(int x, int y) +{ + const float v[4] = { (float)x, (float)y, 0.0f, 1.0f }; + swVertex4fv(v); +} + +void swVertex2f(float x, float y) +{ + const float v[4] = { x, y, 0.0f, 1.0f }; + swVertex4fv(v); +} + +void swVertex2fv(const float* v) +{ + const float v4[4] = { v[0], v[1], 0.0f, 1.0f }; + swVertex4fv(v4); +} + +void swVertex3i(int x, int y, int z) +{ + const float v[4] = { (float)x, (float)y, (float)z, 1.0f }; + swVertex4fv(v); +} + +void swVertex3f(float x, float y, float z) +{ + const float v[4] = { x, y, z, 1.0f }; + swVertex4fv(v); +} + +void swVertex3fv(const float* v) +{ + const float v4[4] = { v[0], v[1], v[2], 1.0f }; + swVertex4fv(v4); +} + +void swVertex4i(int x, int y, int z, int w) +{ + const float v[4] = { (float)x, (float)y, (float)z, (float)w }; + swVertex4fv(v); +} + +void swVertex4f(float x, float y, float z, float w) +{ + const float v[4] = { x, y, z, w }; + swVertex4fv(v); +} + +void swVertex4fv(const float* v) +{ + /* --- Copy the position in the current vertex --- */ + + sw_vertex_t* vertex = &RLSW.vertexBuffer[RLSW.vertexCounter++]; + + for (int i = 0; i < 4; i++) { + vertex->position[i] = v[i]; + } + + /* --- Copy additonal vertex data --- */ + + for (int i = 0; i < 2; i++) { + vertex->texcoord[i] = RLSW.current.texcoord[i]; + } + + for (int i = 0; i < 4; i++) { + vertex->color[i] = RLSW.current.color[i]; + } + + /* --- Calculation of homogeneous coordinates --- */ + + const float* m = RLSW.matMVP; + + vertex->homogeneous[0] = m[0] * v[0] + m[4] * v[1] + m[8] * v[2] + m[12] * v[3]; + vertex->homogeneous[1] = m[1] * v[0] + m[5] * v[1] + m[9] * v[2] + m[13] * v[3]; + vertex->homogeneous[2] = m[2] * v[0] + m[6] * v[1] + m[10] * v[2] + m[14] * v[3]; + vertex->homogeneous[3] = m[3] * v[0] + m[7] * v[1] + m[11] * v[2] + m[15] * v[3]; + + /* --- Immediate rendering of the primitive if the required number is reached --- */ + + if (RLSW.vertexCounter == RLSW.reqVertices) { + switch (RLSW.polyMode) { + case SW_FILL: + sw_poly_fill_render(); + break; + case SW_LINE: + sw_poly_line_render(); + break; + case SW_POINT: + sw_poly_point_render(); + break; + } + RLSW.vertexCounter = 0; + } +} + +void swColor3ub(uint8_t r, uint8_t g, uint8_t b) +{ + float cv[4]; + cv[0] = (float)r / 255; + cv[1] = (float)g / 255; + cv[2] = (float)b / 255; + cv[3] = 1.0f; + + swColor4fv(cv); +} + +void swColor3ubv(const uint8_t* v) +{ + float cv[4]; + cv[0] = (float)v[0] / 255; + cv[1] = (float)v[1] / 255; + cv[2] = (float)v[2] / 255; + cv[3] = 1.0f; + + swColor4fv(cv); +} + +void swColor3f(float r, float g, float b) +{ + float cv[4]; + cv[0] = r; + cv[1] = g; + cv[2] = b; + cv[3] = 1.0f; + + swColor4fv(cv); +} + +void swColor3fv(const float* v) +{ + float cv[4]; + cv[0] = v[0]; + cv[1] = v[1]; + cv[2] = v[2]; + cv[3] = 1.0f; + + swColor4fv(cv); +} + +void swColor4ub(uint8_t r, uint8_t g, uint8_t b, uint8_t a) +{ + float cv[4]; + cv[0] = (float)r / 255; + cv[1] = (float)g / 255; + cv[2] = (float)b / 255; + cv[3] = (float)a / 255; + + swColor4fv(cv); +} + +void swColor4ubv(const uint8_t* v) +{ + float cv[4]; + cv[0] = (float)v[0] / 255; + cv[1] = (float)v[1] / 255; + cv[2] = (float)v[2] / 255; + cv[3] = (float)v[3] / 255; + + swColor4fv(cv); +} + +void swColor4f(float r, float g, float b, float a) +{ + float cv[4]; + cv[0] = r; + cv[1] = g; + cv[2] = b; + cv[3] = a; + + swColor4fv(cv); +} + +void swColor4fv(const float* v) +{ + for (int i = 0; i < 4; i++) { + RLSW.current.color[i] = v[i]; + } +} + +void swTexCoord2f(float u, float v) +{ + const float* m = RLSW.stackTexture[RLSW.stackTextureCounter - 1]; + + RLSW.current.texcoord[0] = m[0] * u + m[4] * v + m[12]; + RLSW.current.texcoord[1] = m[1] * u + m[5] * v + m[13]; +} + +void swTexCoord2fv(const float* v) +{ + const float* m = RLSW.stackTexture[RLSW.stackTextureCounter - 1]; + + RLSW.current.texcoord[0] = m[0] * v[0] + m[4] * v[1] + m[12]; + RLSW.current.texcoord[1] = m[1] * v[0] + m[5] * v[1] + m[13]; +} + +void swBindArray(SWarray type, void *buffer) +{ + switch (type) { + case SW_VERTEX_ARRAY: + RLSW.array.positions = buffer; + break; + case SW_TEXTURE_COORD_ARRAY: + RLSW.array.texcoords = buffer; + break; + case SW_COLOR_ARRAY: + RLSW.array.colors = buffer; + break; + default: + break; + } +} + +void swDrawArrays(SWdraw mode, int offset, int count) +{ + if (RLSW.array.positions == 0) { + RLSW.errCode = SW_INVALID_OPERATION; + return; + } + + swBegin(mode); + { + swTexCoord2f(0.0f, 0.0f); + swColor4f(1.0f, 1.0f, 1.0f, 1.0f); + + for (int i = offset; i < count; i++) { + if (RLSW.array.texcoords) swTexCoord2fv(RLSW.array.texcoords + 2 * i); + if (RLSW.array.colors) swColor4ubv(RLSW.array.colors + 4 * i); + swVertex3fv(RLSW.array.positions + 3 * i); + } + } + swEnd(); +} + +void swGenTextures(int count, uint32_t* textures) +{ + if (count == 0 || textures == NULL) { + return; + } + + for (int i = 0; i < count; i++) { + if (RLSW.loadedTextureCount >= SW_MAX_TEXTURES) { + RLSW.errCode = SW_STACK_OVERFLOW; //< Out of memory, not really stack overflow + return; + } + uint32_t id = 0; + if (RLSW.freeTextureIdCount > 0) { + id = RLSW.freeTextureIds[--RLSW.freeTextureIdCount]; + } + else { + id = RLSW.loadedTextureCount++; + } + RLSW.loadedTextures[id] = RLSW.loadedTextures[0]; + textures[i] = id; + } +} + +void swDeleteTextures(int count, uint32_t* textures) +{ + if (count == 0 || textures == NULL) { + return; + } + + for (int i = 0; i < count; i++) { + if (!sw_is_texture_valid(textures[i])) { + RLSW.errCode = SW_INVALID_VALUE; + continue; + } + if (RLSW.loadedTextures[textures[i]].copy) { + SW_FREE(RLSW.loadedTextures[textures[i]].pixels.ptr); + } + RLSW.loadedTextures[textures[i]].pixels.cptr = NULL; + RLSW.freeTextureIds[RLSW.freeTextureIdCount++] = textures[i]; + } +} + +void swTexImage2D(int width, int height, SWformat format, SWtype type, bool copy, const void* data) +{ + uint32_t id = RLSW.currentTexture; + + if (!sw_is_texture_valid(id)) { + RLSW.errCode = SW_INVALID_VALUE; + return; + } + + int pixelFormat = sw_get_pixel_format(format, type); + + if (pixelFormat <= SW_PIXELFORMAT_UNKNOWN) { + RLSW.errCode = SW_INVALID_ENUM; + return; + } + + sw_texture_t* texture = &RLSW.loadedTextures[id]; + + if (copy) { + int bytes = sw_get_pixel_bytes(pixelFormat); + int size = bytes * width * height; + texture->pixels.ptr = SW_MALLOC(size); + if (texture->pixels.ptr == NULL) { + RLSW.errCode = SW_STACK_OVERFLOW; //< Out of memory... + return; + } + for (int i = 0; i < size; i++) { + ((uint8_t*)texture->pixels.ptr)[i] = ((uint8_t*)data)[i]; + } + } + else { + texture->pixels.cptr = data; + } + + texture->width = width; + texture->height = height; + texture->wMinus1 = width - 1; + texture->hMinus1 = height - 1; + texture->format = pixelFormat; + texture->tx = 1.0f / width; + texture->ty = 1.0f / height; + texture->copy = copy; +} + +void swTexParameteri(int param, int value) +{ + uint32_t id = RLSW.currentTexture; + + if (!sw_is_texture_valid(id)) { + RLSW.errCode = SW_INVALID_VALUE; + return; + } + + sw_texture_t* texture = &RLSW.loadedTextures[id]; + + switch (param) { + + case SW_TEXTURE_MIN_FILTER: + if (!sw_is_texture_filter_valid(value)) { + RLSW.errCode = SW_INVALID_ENUM; + return; + } + texture->minFilter = value; + break; + + case SW_TEXTURE_MAG_FILTER: + if (!sw_is_texture_filter_valid(value)) { + RLSW.errCode = SW_INVALID_ENUM; + return; + } + texture->magFilter = value; + break; + + case SW_TEXTURE_WRAP_S: + if (!sw_is_texture_wrap_valid(value)) { + RLSW.errCode = SW_INVALID_ENUM; + return; + } + texture->sWrap = value; + break; + + case SW_TEXTURE_WRAP_T: + if (!sw_is_texture_wrap_valid(value)) { + RLSW.errCode = SW_INVALID_ENUM; + return; + } + texture->tWrap = value; + break; + + default: + RLSW.errCode = SW_INVALID_ENUM; + return; + + } +} + +void swBindTexture(uint32_t id) +{ + if (id >= SW_MAX_TEXTURES) { + RLSW.errCode = SW_INVALID_VALUE; + return; + } + + if (RLSW.loadedTextures[id].pixels.cptr == NULL) { + RLSW.errCode = SW_INVALID_OPERATION; + return; + } + + RLSW.currentTexture = id; +} + +#endif // RLSW_IMPL diff --git a/src/platforms/rcore_desktop_sdl.c b/src/platforms/rcore_desktop_sdl.c index 71265e718..00a6ccc47 100644 --- a/src/platforms/rcore_desktop_sdl.c +++ b/src/platforms/rcore_desktop_sdl.c @@ -63,18 +63,20 @@ #include "SDL.h" #endif -#if defined(GRAPHICS_API_OPENGL_ES2) - // It seems it does not need to be included to work - //#include "SDL_opengles2.h" -#else - // SDL OpenGL functionality (if required, instead of internal renderer) - #ifdef USING_SDL3_PROJECT - #include "SDL3/SDL_opengl.h" - #elif USING_SDL2_PROJECT - #include "SDL2/SDL_opengl.h" - #else - #include "SDL_opengl.h" - #endif +#if !defined(GRAPHICS_API_OPENGL_11_SOFTWARE) + #if defined(GRAPHICS_API_OPENGL_ES2) + // It seems it does not need to be included to work + //#include "SDL_opengles2.h" + #else + // SDL OpenGL functionality (if required, instead of internal renderer) + #ifdef USING_SDL3_PROJECT + #include "SDL3/SDL_opengl.h" + #elif USING_SDL2_PROJECT + #include "SDL2/SDL_opengl.h" + #else + #include "SDL_opengl.h" + #endif + #endif #endif //---------------------------------------------------------------------------------- @@ -1229,7 +1231,14 @@ void DisableCursor(void) // Swap back buffer with front buffer (screen drawing) void SwapScreenBuffer(void) { +#if defined(GRAPHICS_API_OPENGL_11_SOFTWARE) + // NOTE: We use a preprocessor condition here because `rlCopyFramebuffer` is only declared for software rendering + SDL_Surface* surface = SDL_GetWindowSurface(platform.window); + rlCopyFramebuffer(0, 0, CORE.Window.render.width, CORE.Window.render.height, PIXELFORMAT_UNCOMPRESSED_R8G8B8A8, surface->pixels); + SDL_UpdateWindowSurface(platform.window); +#else SDL_GL_SwapWindow(platform.window); +#endif } //---------------------------------------------------------------------------------- @@ -1577,13 +1586,15 @@ void PollInputEvents(void) if (CORE.Input.Keyboard.charPressedQueueCount < MAX_CHAR_PRESSED_QUEUE) { // Add character (codepoint) to the queue - #if defined(USING_VERSION_SDL3) + + #if defined(USING_VERSION_SDL3) size_t textLen = strlen(event.text.text); unsigned int codepoint = (unsigned int)SDL_StepUTF8(&event.text.text, &textLen); - #else + #else int codepointSize = 0; int codepoint = GetCodepointNextSDL(event.text.text, &codepointSize); - #endif + #endif + CORE.Input.Keyboard.charPressedQueue[CORE.Input.Keyboard.charPressedQueueCount] = codepoint; CORE.Input.Keyboard.charPressedQueueCount++; } @@ -1887,7 +1898,6 @@ int InitPlatform(void) //---------------------------------------------------------------------------- unsigned int flags = 0; flags |= SDL_WINDOW_SHOWN; - flags |= SDL_WINDOW_OPENGL; flags |= SDL_WINDOW_INPUT_FOCUS; flags |= SDL_WINDOW_MOUSE_FOCUS; flags |= SDL_WINDOW_MOUSE_CAPTURE; // Window has mouse captured @@ -1922,44 +1932,50 @@ int InitPlatform(void) // NOTE: Some OpenGL context attributes must be set before window creation - // Check selection OpenGL version - if (rlGetVersion() == RL_OPENGL_21) + if (rlGetVersion() != RL_OPENGL_11_SOFTWARE) { - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1); - } - else if (rlGetVersion() == RL_OPENGL_33) - { - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE); - } - else if (rlGetVersion() == RL_OPENGL_43) - { - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 4); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE); -#if defined(RLGL_ENABLE_OPENGL_DEBUG_CONTEXT) - SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_DEBUG_FLAG); // Enable OpenGL Debug Context -#endif - } - else if (rlGetVersion() == RL_OPENGL_ES_20) // Request OpenGL ES 2.0 context - { - SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0); - } - else if (rlGetVersion() == RL_OPENGL_ES_30) // Request OpenGL ES 3.0 context - { - SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0); - } + // Add the flag telling the window to use an OpenGL context + flags |= SDL_WINDOW_OPENGL; - if (CORE.Window.flags & FLAG_MSAA_4X_HINT) - { - SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1); - SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 4); + // Check selection OpenGL version + if (rlGetVersion() == RL_OPENGL_21) + { + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1); + } + else if (rlGetVersion() == RL_OPENGL_33) + { + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE); + } + else if (rlGetVersion() == RL_OPENGL_43) + { + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 4); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE); + #if defined(RLGL_ENABLE_OPENGL_DEBUG_CONTEXT) + SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_DEBUG_FLAG); // Enable OpenGL Debug Context + #endif + } + else if (rlGetVersion() == RL_OPENGL_ES_20) // Request OpenGL ES 2.0 context + { + SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0); + } + else if (rlGetVersion() == RL_OPENGL_ES_30) // Request OpenGL ES 3.0 context + { + SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0); + } + + if (CORE.Window.flags & FLAG_MSAA_4X_HINT) + { + SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1); + SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 4); + } } // Init window @@ -1970,10 +1986,12 @@ int InitPlatform(void) #endif // Init OpenGL context - platform.glContext = SDL_GL_CreateContext(platform.window); + if (rlGetVersion() != RL_OPENGL_11_SOFTWARE) + { + platform.glContext = SDL_GL_CreateContext(platform.window); + } - // Check window and glContext have been initialized successfully - if ((platform.window != NULL) && (platform.glContext != NULL)) + if ((platform.window != NULL) && ((rlGetVersion() == RL_OPENGL_11_SOFTWARE) || (platform.glContext != NULL))) { CORE.Window.ready = true; @@ -1994,8 +2012,14 @@ int InitPlatform(void) TRACELOG(LOG_INFO, " > Render size: %i x %i", CORE.Window.render.width, CORE.Window.render.height); TRACELOG(LOG_INFO, " > Viewport offsets: %i, %i", CORE.Window.renderOffset.x, CORE.Window.renderOffset.y); - if (CORE.Window.flags & FLAG_VSYNC_HINT) SDL_GL_SetSwapInterval(1); - else SDL_GL_SetSwapInterval(0); + if (platform.glContext != NULL) + { + SDL_GL_SetSwapInterval((CORE.Window.flags & FLAG_VSYNC_HINT)? 1 : 0); + + // Load OpenGL extensions + // NOTE: GL procedures address loader is required to load extensions + rlLoadExtensions(SDL_GL_GetProcAddress); + } } else { @@ -2003,9 +2027,6 @@ int InitPlatform(void) return -1; } - // Load OpenGL extensions - // NOTE: GL procedures address loader is required to load extensions - rlLoadExtensions(SDL_GL_GetProcAddress); //---------------------------------------------------------------------------- // Initialize input events system @@ -2077,7 +2098,7 @@ int InitPlatform(void) void ClosePlatform(void) { SDL_FreeCursor(platform.cursor); // Free cursor - SDL_GL_DeleteContext(platform.glContext); // Deinitialize OpenGL context + if (platform.glContext != NULL) SDL_GL_DeleteContext(platform.glContext); // Deinitialize OpenGL context SDL_DestroyWindow(platform.window); SDL_Quit(); // Deinitialize SDL internal global state } diff --git a/src/platforms/rcore_drm.c b/src/platforms/rcore_drm.c index a399092ad..fe0ac5fd8 100644 --- a/src/platforms/rcore_drm.c +++ b/src/platforms/rcore_drm.c @@ -65,12 +65,17 @@ // so the enum KEY_F12 from raylib is used #undef KEY_F12 -#include // Generic Buffer Management (native platform for EGL on DRM) #include // Direct Rendering Manager user-level library interface #include // Direct Rendering Manager mode setting (KMS) interface -#include "EGL/egl.h" // Native platform windowing system interface -#include "EGL/eglext.h" // EGL extensions +#if !defined(GRAPHICS_API_OPENGL_11_SOFTWARE) + #include // Generic Buffer Management (native platform for EGL on DRM) + #include "EGL/egl.h" // Native platform windowing system interface + #include "EGL/eglext.h" // EGL extensions +#else + #include // For mmap when copying to the dumb buffer + #include // For the conversion of certain error messages +#endif // NOTE: DRM cache enables triple buffered DRM caching #if defined(SUPPORT_DRM_CACHE) @@ -103,15 +108,19 @@ typedef struct { drmModeConnector *connector; // Direct Rendering Manager (DRM) mode connector drmModeCrtc *crtc; // CRT Controller int modeIndex; // Index of the used mode of connector->modes + uint32_t prevFB; // Previous DRM framebufer (during frame swapping) + +#if !defined(GRAPHICS_API_OPENGL_11_SOFTWARE) struct gbm_device *gbmDevice; // GBM device struct gbm_surface *gbmSurface; // GBM surface struct gbm_bo *prevBO; // Previous GBM buffer object (during frame swapping) - uint32_t prevFB; // Previous GBM framebufer (during frame swapping) - EGLDisplay device; // Native display device (physical screen connection) EGLSurface surface; // Surface to draw on, framebuffers (connected to context) EGLContext context; // Graphic context, mode in which drawing can be done EGLConfig config; // Graphic config +#else + uint32_t prevDumbHandle; // Handle to the previous dumb buffer (during frame swapping) +#endif // Keyboard data int defaultKeyboardMode; // Default keyboard mode @@ -780,6 +789,8 @@ void SwapScreenBuffer() // Swap back buffer with front buffer (screen drawing) void SwapScreenBuffer(void) { +#if !defined(GRAPHICS_API_OPENGL_11_SOFTWARE) + // Hardware rendering buffer swap with EGL eglSwapBuffers(platform.device, platform.surface); if (!platform.gbmSurface || (-1 == platform.fd) || !platform.connector || !platform.crtc) TRACELOG(LOG_ERROR, "DISPLAY: DRM initialization failed to swap"); @@ -805,6 +816,209 @@ void SwapScreenBuffer(void) if (platform.prevBO) gbm_surface_release_buffer(platform.gbmSurface, platform.prevBO); platform.prevBO = bo; +#else + // Software rendering buffer swap + if ((-1 == platform.fd) || !platform.connector || (platform.modeIndex < 0)) + { + TRACELOG(LOG_ERROR, "DISPLAY: DRM initialization failed to swap"); + return; + } + + // Get the software rendered color buffer + int bufferWidth, bufferHeight; + void *colorBuffer = swGetColorBuffer(&bufferWidth, &bufferHeight); + if (!colorBuffer) + { + TRACELOG(LOG_ERROR, "DISPLAY: Failed to get software color buffer"); + return; + } + + // Retrieving the dimensions of the display mode used + drmModeModeInfo *mode = &platform.connector->modes[platform.modeIndex]; + uint32_t width = mode->hdisplay; + uint32_t height = mode->vdisplay; + + // Dumb buffers use a fixed format based on bpp +#if SW_COLOR_BUFFER_BITS == 24 + const uint32_t bpp = 32; // 32 bits per pixel (XRGB8888 format) + const uint32_t depth = 24; // Color depth, here only 24 bits, alpha is not used +#else + // REVIEW: Not sure how it will be interpreted (RGB or RGBA?) + const uint32_t bpp = SW_COLOR_BUFFER_BITS; + const uint32_t depth = SW_COLOR_BUFFER_BITS; +#endif + + // Create a dumb buffer for software rendering + struct drm_mode_create_dumb creq = {0}; + creq.width = width; + creq.height = height; + creq.bpp = bpp; + + int result = drmIoctl(platform.fd, DRM_IOCTL_MODE_CREATE_DUMB, &creq); + if (result < 0) + { + TRACELOG(LOG_ERROR, "DISPLAY: Failed to create dumb buffer: %s", strerror(errno)); + return; + } + + // Create framebuffer with the correct format + uint32_t fb = 0; + result = drmModeAddFB(platform.fd, + width, height, + depth, bpp, creq.pitch, + creq.handle, &fb); + if (result != 0) + { + TRACELOG(LOG_ERROR, "DISPLAY: drmModeAddFB() failed with result: %d (%s)", result, strerror(errno)); + struct drm_mode_destroy_dumb dreq = {0}; + dreq.handle = creq.handle; + drmIoctl(platform.fd, DRM_IOCTL_MODE_DESTROY_DUMB, &dreq); + return; + } + + // Map the dumb buffer to copy our software rendered buffer + struct drm_mode_map_dumb mreq = {0}; + mreq.handle = creq.handle; + result = drmIoctl(platform.fd, DRM_IOCTL_MODE_MAP_DUMB, &mreq); + if (result != 0) + { + TRACELOG(LOG_ERROR, "DISPLAY: Failed to map dumb buffer: %s", strerror(errno)); + drmModeRmFB(platform.fd, fb); + struct drm_mode_destroy_dumb dreq = {0}; + dreq.handle = creq.handle; + drmIoctl(platform.fd, DRM_IOCTL_MODE_DESTROY_DUMB, &dreq); + return; + } + + // Map the buffer into userspace + void *dumbBuffer = mmap(0, creq.size, PROT_READ | PROT_WRITE, MAP_SHARED, platform.fd, mreq.offset); + if (dumbBuffer == MAP_FAILED) + { + TRACELOG(LOG_ERROR, "DISPLAY: Failed to mmap dumb buffer: %s", strerror(errno)); + drmModeRmFB(platform.fd, fb); + struct drm_mode_destroy_dumb dreq = {0}; + dreq.handle = creq.handle; + drmIoctl(platform.fd, DRM_IOCTL_MODE_DESTROY_DUMB, &dreq); + return; + } + + // Copy the software rendered buffer to the dumb buffer with scaling if needed + if (bufferWidth == width && bufferHeight == height) + { + // Direct copy if sizes match + swCopyFramebuffer(0, 0, bufferWidth, bufferHeight, SW_RGBA, SW_UNSIGNED_BYTE, dumbBuffer); + } + else + { + // Scale the software buffer to match the display mode + swBlitFramebuffer(0, 0, width, height, 0, 0, bufferWidth, bufferHeight, SW_RGBA, SW_UNSIGNED_BYTE, dumbBuffer); + } + + // Unmap the buffer + munmap(dumbBuffer, creq.size); + + // Find a CRTC compatible with the connector + uint32_t crtcId = 0; + if (platform.crtc) + { + crtcId = platform.crtc->crtc_id; + } + else + { + // Find a CRTC that's compatible with this connector + drmModeRes *res = drmModeGetResources(platform.fd); + if (!res) + { + TRACELOG(LOG_ERROR, "DISPLAY: Failed to get DRM resources"); + drmModeRmFB(platform.fd, fb); + struct drm_mode_destroy_dumb dreq = {0}; + dreq.handle = creq.handle; + drmIoctl(platform.fd, DRM_IOCTL_MODE_DESTROY_DUMB, &dreq); + return; + } + + // Check which CRTCs are compatible with this connector + drmModeEncoder *encoder = NULL; + if (platform.connector->encoder_id) + { + encoder = drmModeGetEncoder(platform.fd, platform.connector->encoder_id); + } + + if (encoder && encoder->crtc_id) + { + crtcId = encoder->crtc_id; + platform.crtc = drmModeGetCrtc(platform.fd, crtcId); + } + else + { + // Find a free CRTC + for (int i = 0; i < res->count_crtcs; i++) + { + drmModeCrtc *crtc = drmModeGetCrtc(platform.fd, res->crtcs[i]); + if (crtc && !crtc->buffer_id) // CRTC is free + { + crtcId = res->crtcs[i]; + if (platform.crtc) drmModeFreeCrtc(platform.crtc); + platform.crtc = crtc; + break; + } + if (crtc) drmModeFreeCrtc(crtc); + } + } + + if (encoder) drmModeFreeEncoder(encoder); + drmModeFreeResources(res); + + if (!crtcId) + { + TRACELOG(LOG_ERROR, "DISPLAY: No compatible CRTC found"); + drmModeRmFB(platform.fd, fb); + struct drm_mode_destroy_dumb dreq = {0}; + dreq.handle = creq.handle; + drmIoctl(platform.fd, DRM_IOCTL_MODE_DESTROY_DUMB, &dreq); + return; + } + } + + // Set CRTC with better error handling + result = drmModeSetCrtc(platform.fd, crtcId, fb, 0, 0, + &platform.connector->connector_id, 1, + mode); + if (result != 0) + { + TRACELOG(LOG_ERROR, "DISPLAY: drmModeSetCrtc() failed with result: %d (%s)", result, strerror(errno)); + TRACELOG(LOG_ERROR, "DISPLAY: CRTC ID: %u, FB ID: %u, Connector ID: %u", crtcId, fb, platform.connector->connector_id); + TRACELOG(LOG_ERROR, "DISPLAY: Mode: %dx%d@%d", mode->hdisplay, mode->vdisplay, mode->vrefresh); + + drmModeRmFB(platform.fd, fb); + struct drm_mode_destroy_dumb dreq = {0}; + dreq.handle = creq.handle; + drmIoctl(platform.fd, DRM_IOCTL_MODE_DESTROY_DUMB, &dreq); + return; + } + + // Clean up previous framebuffer + if (platform.prevFB) + { + result = drmModeRmFB(platform.fd, platform.prevFB); + if (result != 0) + { + TRACELOG(LOG_WARNING, "DISPLAY: drmModeRmFB() failed with result: %d", result); + } + } + + platform.prevFB = fb; + + // Clean up previous dumb buffer + if (platform.prevDumbHandle) + { + struct drm_mode_destroy_dumb dreq = {0}; + dreq.handle = platform.prevDumbHandle; + drmIoctl(platform.fd, DRM_IOCTL_MODE_DESTROY_DUMB, &dreq); + } + + platform.prevDumbHandle = creq.handle; +#endif } #endif // SUPPORT_DRM_CACHE @@ -950,10 +1164,15 @@ int InitPlatform(void) platform.connector = NULL; platform.modeIndex = -1; platform.crtc = NULL; + platform.prevFB = 0; + +#if !defined(GRAPHICS_API_OPENGL_11_SOFTWARE) platform.gbmDevice = NULL; platform.gbmSurface = NULL; platform.prevBO = NULL; - platform.prevFB = 0; +#else + platform.prevDumbHandle = 0; +#endif // Initialize graphic device: display/window and graphic context //---------------------------------------------------------------------------- @@ -965,11 +1184,12 @@ int InitPlatform(void) if (platform.fd != -1) TRACELOG(LOG_INFO, "DISPLAY: Default graphic device DRM opened successfully"); #else TRACELOG(LOG_WARNING, "DISPLAY: No graphic card set, trying platform-gpu-card"); - platform.fd = open("/dev/dri/by-path/platform-gpu-card", O_RDWR); // VideoCore VI (Raspberry Pi 4) + platform.fd = open("/dev/dri/by-path/platform-gpu-card", O_RDWR); // VideoCore VI (Raspberry Pi 4) if (platform.fd != -1) TRACELOG(LOG_INFO, "DISPLAY: platform-gpu-card opened successfully"); if ((platform.fd == -1) || (drmModeGetResources(platform.fd) == NULL)) { + if (platform.fd != -1) close(platform.fd); TRACELOG(LOG_WARNING, "DISPLAY: Failed to open platform-gpu-card, trying card1"); platform.fd = open("/dev/dri/card1", O_RDWR); // Other Embedded if (platform.fd != -1) TRACELOG(LOG_INFO, "DISPLAY: card1 opened successfully"); @@ -977,10 +1197,19 @@ int InitPlatform(void) if ((platform.fd == -1) || (drmModeGetResources(platform.fd) == NULL)) { + if (platform.fd != -1) close(platform.fd); TRACELOG(LOG_WARNING, "DISPLAY: Failed to open graphic card1, trying card0"); platform.fd = open("/dev/dri/card0", O_RDWR); // VideoCore IV (Raspberry Pi 1-3) if (platform.fd != -1) TRACELOG(LOG_INFO, "DISPLAY: card0 opened successfully"); } + + if ((platform.fd == -1) || (drmModeGetResources(platform.fd) == NULL)) + { + if (platform.fd != -1) close(platform.fd); + TRACELOG(LOG_WARNING, "DISPLAY: Failed to open graphic card0, trying card2"); + platform.fd = open("/dev/dri/card2", O_RDWR); + if (platform.fd != -1) TRACELOG(LOG_INFO, "DISPLAY: card2 opened successfully"); + } #endif if (platform.fd == -1) @@ -993,29 +1222,58 @@ int InitPlatform(void) if (!res) { TRACELOG(LOG_WARNING, "DISPLAY: Failed get DRM resources"); + close(platform.fd); return -1; } TRACELOG(LOG_TRACE, "DISPLAY: Connectors found: %i", res->count_connectors); + // Connector detection for (size_t i = 0; i < res->count_connectors; i++) { TRACELOG(LOG_TRACE, "DISPLAY: Connector index %i", i); drmModeConnector *con = drmModeGetConnector(platform.fd, res->connectors[i]); - TRACELOG(LOG_TRACE, "DISPLAY: Connector modes detected: %i", con->count_modes); + if (!con) + { + TRACELOG(LOG_WARNING, "DISPLAY: Failed to get connector %i", i); + continue; + } + + TRACELOG(LOG_TRACE, "DISPLAY: Connector %i modes detected: %i", i, con->count_modes); + TRACELOG(LOG_TRACE, "DISPLAY: Connector %i status: %s", i, + (con->connection == DRM_MODE_CONNECTED) ? "CONNECTED" : + (con->connection == DRM_MODE_DISCONNECTED) ? "DISCONNECTED" : + (con->connection == DRM_MODE_UNKNOWNCONNECTION) ? "UNKNOWN" : "OTHER"); // In certain cases the status of the conneciton is reported as UKNOWN, but it is still connected // This might be a hardware or software limitation like on Raspberry Pi Zero with composite output - if (((con->connection == DRM_MODE_CONNECTED) || (con->connection == DRM_MODE_UNKNOWNCONNECTION)) && (con->encoder_id)) + // WARNING: Accept CONNECTED, UNKNOWN and even those without encoder_id connectors for software mode + if (((con->connection == DRM_MODE_CONNECTED) || (con->connection == DRM_MODE_UNKNOWNCONNECTION)) && (con->count_modes > 0)//(con->encoder_id)) { - TRACELOG(LOG_TRACE, "DISPLAY: DRM mode connected"); +#if !defined(GRAPHICS_API_OPENGL_11_SOFTWARE) + // For hardware rendering, we need an encoder_id + if (con->encoder_id) + { + TRACELOG(LOG_TRACE, "DISPLAY: DRM connector %i connected with encoder", i); + platform.connector = con; + break; + } + else + { + TRACELOG(LOG_TRACE, "DISPLAY: DRM connector %i connected but no encoder", i); + } +#else + // For software rendering, we can accept even without encoder_id + TRACELOG(LOG_TRACE, "DISPLAY: DRM connector %i suitable for software rendering", i); platform.connector = con; break; +#endif } - else + + if (!platform.connector) { - TRACELOG(LOG_TRACE, "DISPLAY: DRM mode NOT connected (deleting)"); + TRACELOG(LOG_TRACE, "DISPLAY: DRM connector %i NOT suitable (deleting)", i); drmModeFreeConnector(con); } } @@ -1024,14 +1282,18 @@ int InitPlatform(void) { TRACELOG(LOG_WARNING, "DISPLAY: No suitable DRM connector found"); drmModeFreeResources(res); + close(platform.fd); return -1; } +#if !defined(GRAPHICS_API_OPENGL_11_SOFTWARE) drmModeEncoder *enc = drmModeGetEncoder(platform.fd, platform.connector->encoder_id); if (!enc) { TRACELOG(LOG_WARNING, "DISPLAY: Failed to get DRM mode encoder"); + drmModeFreeConnector(platform.connector); drmModeFreeResources(res); + close(platform.fd); return -1; } @@ -1040,7 +1302,9 @@ int InitPlatform(void) { TRACELOG(LOG_WARNING, "DISPLAY: Failed to get DRM mode crtc"); drmModeFreeEncoder(enc); + drmModeFreeConnector(platform.connector); drmModeFreeResources(res); + close(platform.fd); return -1; } @@ -1055,7 +1319,9 @@ int InitPlatform(void) { TRACELOG(LOG_WARNING, "DISPLAY: No matching DRM connector mode found"); drmModeFreeEncoder(enc); + drmModeFreeConnector(platform.connector); drmModeFreeResources(res); + close(platform.fd); return -1; } @@ -1064,7 +1330,7 @@ int InitPlatform(void) } const bool allowInterlaced = CORE.Window.flags & FLAG_INTERLACED_HINT; - const int fps = (CORE.Time.target > 0)? (1.0/CORE.Time.target) : 60; + const int fps = (CORE.Time.target > 0) ? (1.0/CORE.Time.target) : 60; // Try to find an exact matching mode platform.modeIndex = FindExactConnectorMode(platform.connector, CORE.Window.screen.width, CORE.Window.screen.height, fps, allowInterlaced); @@ -1083,7 +1349,9 @@ int InitPlatform(void) { TRACELOG(LOG_WARNING, "DISPLAY: Failed to find a suitable DRM connector mode"); drmModeFreeEncoder(enc); + drmModeFreeConnector(platform.connector); drmModeFreeResources(res); + close(platform.fd); return -1; } @@ -1092,19 +1360,45 @@ int InitPlatform(void) TRACELOG(LOG_INFO, "DISPLAY: Selected DRM connector mode %s (%ux%u%c@%u)", platform.connector->modes[platform.modeIndex].name, platform.connector->modes[platform.modeIndex].hdisplay, platform.connector->modes[platform.modeIndex].vdisplay, - (platform.connector->modes[platform.modeIndex].flags & DRM_MODE_FLAG_INTERLACE)? 'i' : 'p', + (platform.connector->modes[platform.modeIndex].flags & DRM_MODE_FLAG_INTERLACE) ? 'i' : 'p', platform.connector->modes[platform.modeIndex].vrefresh); + drmModeFreeEncoder(enc); + enc = NULL; +#else + // For software rendering, the first available mode can be used + if (platform.connector->count_modes > 0) + { + platform.modeIndex = 0; + CORE.Window.display.width = platform.connector->modes[0].hdisplay; + CORE.Window.display.height = platform.connector->modes[0].vdisplay; + + TRACELOG(LOG_INFO, "DISPLAY: Selected DRM connector mode %s (%ux%u%c@%u) for software rendering", + platform.connector->modes[0].name, + platform.connector->modes[0].hdisplay, + platform.connector->modes[0].vdisplay, + (platform.connector->modes[0].flags & DRM_MODE_FLAG_INTERLACE) ? 'i' : 'p', + platform.connector->modes[0].vrefresh); + } + else + { + TRACELOG(LOG_WARNING, "DISPLAY: No modes available for connector"); + drmModeFreeConnector(platform.connector); + drmModeFreeResources(res); + close(platform.fd); + return -1; + } +#endif + // Use the width and height of the surface for render CORE.Window.render.width = CORE.Window.screen.width; CORE.Window.render.height = CORE.Window.screen.height; - drmModeFreeEncoder(enc); - enc = NULL; - drmModeFreeResources(res); res = NULL; +#if !defined(GRAPHICS_API_OPENGL_11_SOFTWARE) + // Hardware rendering initialization with EGL platform.gbmDevice = gbm_create_device(platform.fd); if (!platform.gbmDevice) { @@ -1273,6 +1567,32 @@ int InitPlatform(void) return -1; } + // Load OpenGL extensions + // NOTE: GL procedures address loader is required to load extensions + rlLoadExtensions(eglGetProcAddress); +#else + // At this point we need to manage render size vs screen size + // NOTE: This function use and modify global module variables: + // -> CORE.Window.screen.width/CORE.Window.screen.height + // -> CORE.Window.render.width/CORE.Window.render.height + // -> CORE.Window.screenScale + SetupFramebuffer(CORE.Window.display.width, CORE.Window.display.height); + + // Setup window ready state for software rendering + CORE.Window.ready = true; + + CORE.Window.render.width = CORE.Window.screen.width; + CORE.Window.render.height = CORE.Window.screen.height; + CORE.Window.currentFbo.width = CORE.Window.render.width; + CORE.Window.currentFbo.height = CORE.Window.render.height; + + TRACELOG(LOG_INFO, "DISPLAY: Device initialized successfully (Software Rendering)"); + TRACELOG(LOG_INFO, " > Display size: %i x %i", CORE.Window.display.width, CORE.Window.display.height); + TRACELOG(LOG_INFO, " > Screen size: %i x %i", CORE.Window.screen.width, CORE.Window.screen.height); + TRACELOG(LOG_INFO, " > Render size: %i x %i", CORE.Window.render.width, CORE.Window.render.height); + TRACELOG(LOG_INFO, " > Viewport offsets: %i, %i", CORE.Window.renderOffset.x, CORE.Window.renderOffset.y); +#endif + if ((CORE.Window.flags & FLAG_WINDOW_MINIMIZED) > 0) MinimizeWindow(); // If graphic device is no properly initialized, we end program @@ -1285,12 +1605,8 @@ int InitPlatform(void) CORE.Window.flags |= FLAG_WINDOW_MAXIMIZED; // true CORE.Window.flags &= ~FLAG_WINDOW_UNFOCUSED; // false - // Load OpenGL extensions - // NOTE: GL procedures address loader is required to load extensions - rlLoadExtensions(eglGetProcAddress); //---------------------------------------------------------------------------- - - // Initialize timming system + // Initialize timing system //---------------------------------------------------------------------------- // NOTE: timming system must be initialized before the input events system InitTimer(); @@ -1336,6 +1652,7 @@ void ClosePlatform(void) platform.prevFB = 0; } +#if !defined(GRAPHICS_API_OPENGL_11_SOFTWARE) if (platform.prevBO) { gbm_surface_release_buffer(platform.gbmSurface, platform.prevBO); @@ -1353,6 +1670,7 @@ void ClosePlatform(void) gbm_device_destroy(platform.gbmDevice); platform.gbmDevice = NULL; } +#endif if (platform.crtc) { @@ -1374,6 +1692,7 @@ void ClosePlatform(void) platform.fd = -1; } +#if !defined(GRAPHICS_API_OPENGL_11_SOFTWARE) // Close surface, context and display if (platform.device != EGL_NO_DISPLAY) { @@ -1392,6 +1711,7 @@ void ClosePlatform(void) eglTerminate(platform.device); platform.device = EGL_NO_DISPLAY; } +#endif CORE.Window.shouldClose = true; // Added to force threads to exit when the close window is called diff --git a/src/rlgl.h b/src/rlgl.h index 2a1a5d5f8..5e8cf2bfa 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -149,7 +149,8 @@ #endif // Security check in case no GRAPHICS_API_OPENGL_* defined -#if !defined(GRAPHICS_API_OPENGL_11) && \ +#if !defined(GRAPHICS_API_OPENGL_11_SOFTWARE) && \ + !defined(GRAPHICS_API_OPENGL_11) && \ !defined(GRAPHICS_API_OPENGL_21) && \ !defined(GRAPHICS_API_OPENGL_33) && \ !defined(GRAPHICS_API_OPENGL_43) && \ @@ -159,7 +160,7 @@ #endif // Security check in case multiple GRAPHICS_API_OPENGL_* defined -#if defined(GRAPHICS_API_OPENGL_11) +#if defined(GRAPHICS_API_OPENGL_11) || defined(GRAPHICS_API_OPENGL_11_SOFTWARE) #if defined(GRAPHICS_API_OPENGL_21) #undef GRAPHICS_API_OPENGL_21 #endif @@ -174,6 +175,11 @@ #endif #endif +// Software implementation uses OpenGL 1.1 functionality +#if defined(GRAPHICS_API_OPENGL_11_SOFTWARE) + #define GRAPHICS_API_OPENGL_11 +#endif + // OpenGL 2.1 uses most of OpenGL 3.3 Core functionality // WARNING: Specific parts are checked with #if defines #if defined(GRAPHICS_API_OPENGL_21) @@ -427,7 +433,8 @@ typedef struct rlRenderBatch { // OpenGL version typedef enum { - RL_OPENGL_11 = 1, // OpenGL 1.1 + RL_OPENGL_11_SOFTWARE = 0, // Software rendering + RL_OPENGL_11, // OpenGL 1.1 RL_OPENGL_21, // OpenGL 2.1 (GLSL 120) RL_OPENGL_33, // OpenGL 3.3 (GLSL 330) RL_OPENGL_43, // OpenGL 4.3 (using GLSL 330) @@ -768,6 +775,10 @@ RLAPI unsigned int rlLoadFramebuffer(void); // Loa RLAPI void rlFramebufferAttach(unsigned int fboId, unsigned int texId, int attachType, int texType, int mipLevel); // Attach texture/renderbuffer to a framebuffer RLAPI bool rlFramebufferComplete(unsigned int id); // Verify framebuffer is complete RLAPI void rlUnloadFramebuffer(unsigned int id); // Delete framebuffer from GPU +#if defined(GRAPHICS_API_OPENGL_11_SOFTWARE) +RLAPI void rlCopyFramebuffer(int x, int y, int w, int h, int format, void* pixels); +RLAPI void rlResizeFramebuffer(int width, int height); +#endif // Shaders management RLAPI unsigned int rlLoadShaderCode(const char *vsCode, const char *fsCode); // Load shader from code strings @@ -834,24 +845,32 @@ RLAPI void rlLoadDrawQuad(void); // Load and draw a quad #endif #if defined(GRAPHICS_API_OPENGL_11) - #if defined(__APPLE__) - #include // OpenGL 1.1 library for OSX - #include // OpenGL extensions library + #if defined(GRAPHICS_API_OPENGL_11_SOFTWARE) + #define RLSW_IMPL + #define SW_MALLOC(sz) RL_MALLOC(sz) + #define SW_REALLOC(ptr, newSz) RL_REALLOC(ptr, newSz) + #define SW_FREE(ptr) RL_FREE(ptr) + #include "external/rlsw.h" // OpenGL 1.1 software implementation #else - // APIENTRY for OpenGL function pointer declarations is required - #if !defined(APIENTRY) - #if defined(_WIN32) - #define APIENTRY __stdcall - #else - #define APIENTRY + #if defined(__APPLE__) + #include // OpenGL 1.1 library for OSX + #include // OpenGL extensions library + #else + // APIENTRY for OpenGL function pointer declarations is required + #if !defined(APIENTRY) + #if defined(_WIN32) + #define APIENTRY __stdcall + #else + #define APIENTRY + #endif + #endif + // WINGDIAPI definition. Some Windows OpenGL headers need it + #if !defined(WINGDIAPI) && defined(_WIN32) + #define WINGDIAPI __declspec(dllimport) #endif - #endif - // WINGDIAPI definition. Some Windows OpenGL headers need it - #if !defined(WINGDIAPI) && defined(_WIN32) - #define WINGDIAPI __declspec(dllimport) - #endif - #include // OpenGL 1.1 library + #include // OpenGL 1.1 library + #endif #endif #endif @@ -2337,6 +2356,14 @@ void rlglInit(int width, int height) glShadeModel(GL_SMOOTH); // Smooth shading between vertex (vertex colors interpolation) #endif +#if defined(GRAPHICS_API_OPENGL_11_SOFTWARE) + if (!swInit(width, height)) + { + TRACELOG(RL_LOG_ERROR, "RLGL: Software renderer initialization failed!"); + exit(-1); + } +#endif + #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) // Store screen size into global variables RLGL.State.framebufferWidth = width; @@ -2363,6 +2390,10 @@ void rlglClose(void) glDeleteTextures(1, &RLGL.State.defaultTextureId); // Unload default texture TRACELOG(RL_LOG_INFO, "TEXTURE: [ID %i] Default texture unloaded successfully", RLGL.State.defaultTextureId); #endif + +#if defined(GRAPHICS_API_OPENGL_11_SOFTWARE) + swClose(); +#endif } // Load OpenGL extensions @@ -2672,7 +2703,9 @@ void *rlGetProcAddress(const char *procName) int rlGetVersion(void) { int glVersion = 0; -#if defined(GRAPHICS_API_OPENGL_11) +#if defined(GRAPHICS_API_OPENGL_11_SOFTWARE) + glVersion = RL_OPENGL_11_SOFTWARE; +#elif defined(GRAPHICS_API_OPENGL_11) glVersion = RL_OPENGL_11; #endif #if defined(GRAPHICS_API_OPENGL_21) @@ -3713,6 +3746,20 @@ void *rlReadTexturePixels(unsigned int id, int width, int height, int format) return pixels; } +#if defined(GRAPHICS_API_OPENGL_11_SOFTWARE) +void rlCopyFramebuffer(int x, int y, int w, int h, int format, void* pixels) +{ + unsigned int glInternalFormat, glFormat, glType; + rlGetGlTextureFormats(format, &glInternalFormat, &glFormat, &glType); + swCopyFramebuffer(x, y, w, h, glFormat, glType, pixels); +} + +void rlResizeFramebuffer(int width, int height) +{ + swResizeFramebuffer(width, height); +} +#endif + // Read screen pixel data (color buffer) unsigned char *rlReadScreenPixels(int width, int height) { @@ -5313,4 +5360,4 @@ static Matrix rlMatrixInvert(Matrix mat) } #endif -#endif // RLGL_IMPLEMENTATION +#endif // RLGL_IMPLEMENTATION \ No newline at end of file diff --git a/src/rmodels.c b/src/rmodels.c index c54ef03fa..9ded580c3 100644 --- a/src/rmodels.c +++ b/src/rmodels.c @@ -1429,7 +1429,7 @@ void UpdateMeshBuffer(Mesh mesh, int index, const void *data, int dataSize, int // Draw a 3d mesh with material and transform void DrawMesh(Mesh mesh, Material material, Matrix transform) { -#if defined(GRAPHICS_API_OPENGL_11) +#if defined(GRAPHICS_API_OPENGL_11) || defined(GRAPHICS_API_OPENGL_11_SOFTWARE) #define GL_VERTEX_ARRAY 0x8074 #define GL_NORMAL_ARRAY 0x8075 #define GL_COLOR_ARRAY 0x8076 From 43c81d216c8c26839ce781d484d906a83e5341fc Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 29 Sep 2025 11:00:35 +0200 Subject: [PATCH 17/23] REVIEWED: VS2022: New example `core_input_actions` UUID --- .../examples/core_input_actions.vcxproj | 2 +- projects/VS2022/raylib.sln | 52 +++++++++---------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/projects/VS2022/examples/core_input_actions.vcxproj b/projects/VS2022/examples/core_input_actions.vcxproj index 8b64adc77..9b43826f8 100644 --- a/projects/VS2022/examples/core_input_actions.vcxproj +++ b/projects/VS2022/examples/core_input_actions.vcxproj @@ -51,7 +51,7 @@ - {6B1A933E-71B8-4C1F-9E79-02D98830E671} + {718FCBD0-591D-448C-B7D5-9F1CA8544E7B} Win32Proj core_input_actions 10.0 diff --git a/projects/VS2022/raylib.sln b/projects/VS2022/raylib.sln index faca55fa0..c0295d4c6 100644 --- a/projects/VS2022/raylib.sln +++ b/projects/VS2022/raylib.sln @@ -345,7 +345,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "text_inline_styling", "exam EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_undo_redo", "examples\core_undo_redo.vcxproj", "{3B27F358-2679-4F38-B297-17B536F580BB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_input_actions", "examples\core_input_actions.vcxproj", "{6B1A933E-71B8-4C1F-9E79-02D98830E671}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_input_actions", "examples\core_input_actions.vcxproj", "{718FCBD0-591D-448C-B7D5-9F1CA8544E7B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -4249,30 +4249,30 @@ Global {3B27F358-2679-4F38-B297-17B536F580BB}.Release|x64.Build.0 = Release|x64 {3B27F358-2679-4F38-B297-17B536F580BB}.Release|x86.ActiveCfg = Release|Win32 {3B27F358-2679-4F38-B297-17B536F580BB}.Release|x86.Build.0 = Release|Win32 - {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Debug.DLL|ARM64.ActiveCfg = Debug.DLL|ARM64 - {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Debug.DLL|ARM64.Build.0 = Debug.DLL|ARM64 - {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Debug.DLL|x64.ActiveCfg = Debug.DLL|x64 - {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Debug.DLL|x64.Build.0 = Debug.DLL|x64 - {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Debug.DLL|x86.ActiveCfg = Debug.DLL|Win32 - {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Debug.DLL|x86.Build.0 = Debug.DLL|Win32 - {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Debug|ARM64.Build.0 = Debug|ARM64 - {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Debug|x64.ActiveCfg = Debug|x64 - {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Debug|x64.Build.0 = Debug|x64 - {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Debug|x86.ActiveCfg = Debug|Win32 - {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Debug|x86.Build.0 = Debug|Win32 - {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Release.DLL|ARM64.ActiveCfg = Release.DLL|ARM64 - {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Release.DLL|ARM64.Build.0 = Release.DLL|ARM64 - {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Release.DLL|x64.ActiveCfg = Release.DLL|x64 - {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Release.DLL|x64.Build.0 = Release.DLL|x64 - {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Release.DLL|x86.ActiveCfg = Release.DLL|Win32 - {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Release.DLL|x86.Build.0 = Release.DLL|Win32 - {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Release|ARM64.ActiveCfg = Release|ARM64 - {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Release|ARM64.Build.0 = Release|ARM64 - {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Release|x64.ActiveCfg = Release|x64 - {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Release|x64.Build.0 = Release|x64 - {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Release|x86.ActiveCfg = Release|Win32 - {6B1A933E-71B8-4C1F-9E79-02D98830E671}.Release|x86.Build.0 = Release|Win32 + {718FCBD0-591D-448C-B7D5-9F1CA8544E7B}.Debug.DLL|ARM64.ActiveCfg = Debug.DLL|ARM64 + {718FCBD0-591D-448C-B7D5-9F1CA8544E7B}.Debug.DLL|ARM64.Build.0 = Debug.DLL|ARM64 + {718FCBD0-591D-448C-B7D5-9F1CA8544E7B}.Debug.DLL|x64.ActiveCfg = Debug.DLL|x64 + {718FCBD0-591D-448C-B7D5-9F1CA8544E7B}.Debug.DLL|x64.Build.0 = Debug.DLL|x64 + {718FCBD0-591D-448C-B7D5-9F1CA8544E7B}.Debug.DLL|x86.ActiveCfg = Debug.DLL|Win32 + {718FCBD0-591D-448C-B7D5-9F1CA8544E7B}.Debug.DLL|x86.Build.0 = Debug.DLL|Win32 + {718FCBD0-591D-448C-B7D5-9F1CA8544E7B}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {718FCBD0-591D-448C-B7D5-9F1CA8544E7B}.Debug|ARM64.Build.0 = Debug|ARM64 + {718FCBD0-591D-448C-B7D5-9F1CA8544E7B}.Debug|x64.ActiveCfg = Debug|x64 + {718FCBD0-591D-448C-B7D5-9F1CA8544E7B}.Debug|x64.Build.0 = Debug|x64 + {718FCBD0-591D-448C-B7D5-9F1CA8544E7B}.Debug|x86.ActiveCfg = Debug|Win32 + {718FCBD0-591D-448C-B7D5-9F1CA8544E7B}.Debug|x86.Build.0 = Debug|Win32 + {718FCBD0-591D-448C-B7D5-9F1CA8544E7B}.Release.DLL|ARM64.ActiveCfg = Release.DLL|ARM64 + {718FCBD0-591D-448C-B7D5-9F1CA8544E7B}.Release.DLL|ARM64.Build.0 = Release.DLL|ARM64 + {718FCBD0-591D-448C-B7D5-9F1CA8544E7B}.Release.DLL|x64.ActiveCfg = Release.DLL|x64 + {718FCBD0-591D-448C-B7D5-9F1CA8544E7B}.Release.DLL|x64.Build.0 = Release.DLL|x64 + {718FCBD0-591D-448C-B7D5-9F1CA8544E7B}.Release.DLL|x86.ActiveCfg = Release.DLL|Win32 + {718FCBD0-591D-448C-B7D5-9F1CA8544E7B}.Release.DLL|x86.Build.0 = Release.DLL|Win32 + {718FCBD0-591D-448C-B7D5-9F1CA8544E7B}.Release|ARM64.ActiveCfg = Release|ARM64 + {718FCBD0-591D-448C-B7D5-9F1CA8544E7B}.Release|ARM64.Build.0 = Release|ARM64 + {718FCBD0-591D-448C-B7D5-9F1CA8544E7B}.Release|x64.ActiveCfg = Release|x64 + {718FCBD0-591D-448C-B7D5-9F1CA8544E7B}.Release|x64.Build.0 = Release|x64 + {718FCBD0-591D-448C-B7D5-9F1CA8544E7B}.Release|x86.ActiveCfg = Release|Win32 + {718FCBD0-591D-448C-B7D5-9F1CA8544E7B}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -4447,7 +4447,7 @@ Global {49C67F03-1A56-4F96-B278-39B66EC93678} = {6C82BAAE-BDDF-457D-8FA8-7E2490B07035} {D496308F-3C3C-40B3-A3ED-EA327D244B3E} = {8D3C83B7-F1E0-4C2E-9E34-EE5F6AB2502A} {3B27F358-2679-4F38-B297-17B536F580BB} = {6C82BAAE-BDDF-457D-8FA8-7E2490B07035} - {6B1A933E-71B8-4C1F-9E79-02D98830E671} = {6C82BAAE-BDDF-457D-8FA8-7E2490B07035} + {718FCBD0-591D-448C-B7D5-9F1CA8544E7B} = {6C82BAAE-BDDF-457D-8FA8-7E2490B07035} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E926C768-6307-4423-A1EC-57E95B1FAB29} From 3da2fc1bf876e7a81a058a661bee7b627fca51ba Mon Sep 17 00:00:00 2001 From: Antonio Jose Ramos Marquez Date: Mon, 29 Sep 2025 17:16:51 +0200 Subject: [PATCH 18/23] [rtextures] fix initialization align in Image to avoid issues with some platforms (#5214) --- src/rtextures.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/rtextures.c b/src/rtextures.c index 6366e4645..a85467d8c 100644 --- a/src/rtextures.c +++ b/src/rtextures.c @@ -811,8 +811,8 @@ Image GenImageColor(int width, int height, Color color) .data = pixels, .width = width, .height = height, - .format = PIXELFORMAT_UNCOMPRESSED_R8G8B8A8, - .mipmaps = 1 + .mipmaps = 1, + .format = PIXELFORMAT_UNCOMPRESSED_R8G8B8A8 }; return image; @@ -863,8 +863,8 @@ Image GenImageGradientLinear(int width, int height, int direction, Color start, .data = pixels, .width = width, .height = height, - .format = PIXELFORMAT_UNCOMPRESSED_R8G8B8A8, - .mipmaps = 1 + .mipmaps = 1, + .format = PIXELFORMAT_UNCOMPRESSED_R8G8B8A8 }; return image; @@ -900,8 +900,8 @@ Image GenImageGradientRadial(int width, int height, float density, Color inner, .data = pixels, .width = width, .height = height, - .format = PIXELFORMAT_UNCOMPRESSED_R8G8B8A8, - .mipmaps = 1 + .mipmaps = 1, + .format = PIXELFORMAT_UNCOMPRESSED_R8G8B8A8 }; return image; @@ -949,8 +949,8 @@ Image GenImageGradientSquare(int width, int height, float density, Color inner, .data = pixels, .width = width, .height = height, - .format = PIXELFORMAT_UNCOMPRESSED_R8G8B8A8, - .mipmaps = 1 + .mipmaps = 1, + .format = PIXELFORMAT_UNCOMPRESSED_R8G8B8A8 }; return image; @@ -974,8 +974,8 @@ Image GenImageChecked(int width, int height, int checksX, int checksY, Color col .data = pixels, .width = width, .height = height, - .format = PIXELFORMAT_UNCOMPRESSED_R8G8B8A8, - .mipmaps = 1 + .mipmaps = 1, + .format = PIXELFORMAT_UNCOMPRESSED_R8G8B8A8 }; return image; @@ -997,8 +997,8 @@ Image GenImageWhiteNoise(int width, int height, float factor) .data = pixels, .width = width, .height = height, - .format = PIXELFORMAT_UNCOMPRESSED_R8G8B8A8, - .mipmaps = 1 + .mipmaps = 1, + .format = PIXELFORMAT_UNCOMPRESSED_R8G8B8A8 }; return image; @@ -1048,8 +1048,8 @@ Image GenImagePerlinNoise(int width, int height, int offsetX, int offsetY, float .data = pixels, .width = width, .height = height, - .format = PIXELFORMAT_UNCOMPRESSED_R8G8B8A8, - .mipmaps = 1 + .mipmaps = 1, + .format = PIXELFORMAT_UNCOMPRESSED_R8G8B8A8 }; return image; @@ -1113,8 +1113,8 @@ Image GenImageCellular(int width, int height, int tileSize) .data = pixels, .width = width, .height = height, - .format = PIXELFORMAT_UNCOMPRESSED_R8G8B8A8, - .mipmaps = 1 + .mipmaps = 1, + .format = PIXELFORMAT_UNCOMPRESSED_R8G8B8A8 }; return image; From 317c1eaeeb2bd67e54711639cbb13391dfa44c87 Mon Sep 17 00:00:00 2001 From: Maicon Santana Date: Mon, 29 Sep 2025 16:44:48 +0100 Subject: [PATCH 19/23] Add ascii post processing (#5213) --- .../resources/shaders/glsl100/ascii.fs | 67 ++++++++++ .../resources/shaders/glsl120/ascii.fs | 65 ++++++++++ .../resources/shaders/glsl330/ascii.fs | 66 ++++++++++ examples/shaders/shaders_ascii_effect.c | 119 ++++++++++++++++++ examples/shaders/shaders_ascii_effect.png | Bin 0 -> 45176 bytes 5 files changed, 317 insertions(+) create mode 100644 examples/shaders/resources/shaders/glsl100/ascii.fs create mode 100644 examples/shaders/resources/shaders/glsl120/ascii.fs create mode 100644 examples/shaders/resources/shaders/glsl330/ascii.fs create mode 100644 examples/shaders/shaders_ascii_effect.c create mode 100644 examples/shaders/shaders_ascii_effect.png diff --git a/examples/shaders/resources/shaders/glsl100/ascii.fs b/examples/shaders/resources/shaders/glsl100/ascii.fs new file mode 100644 index 000000000..a4a930c3c --- /dev/null +++ b/examples/shaders/resources/shaders/glsl100/ascii.fs @@ -0,0 +1,67 @@ +#version 100 + +precision mediump float; + +// Input from the vertex shader +varying vec2 fragTexCoord; + +// Output color for the screen +varying vec4 finalColor; + +uniform sampler2D texture0; +uniform vec2 resolution; +uniform float fontSize; + +float greyScale(in vec3 col) { + return dot(col, vec3(0.2126, 0.7152, 0.0722)); +} + +float character(float n, vec2 p) +{ + p = floor(p * vec2(4.0, -4.0) + 2.5); + + // Check if the coordinate is inside the 5x5 grid (0 to 4). + if (clamp(p.x, 0.0, 4.0) == p.x && clamp(p.y, 0.0, 4.0) == p.y) { + + if (int(mod(n / exp2(p.x + 5.0 * p.y), 2.0)) == 1) { + return 1.0; // The bit is on, so draw this part of the character. + } + } + + return 0.0; // The bit is off, or we are outside the grid. +} + +// ----------------------------------------------------------------------------- +// Main shader logic +// ----------------------------------------------------------------------------- +void main() +{ + vec2 charPixelSize = vec2(fontSize, fontSize * 1.8); + vec2 uvCellSize = charPixelSize / resolution; + + vec2 cellUV = floor(fragTexCoord / uvCellSize) * uvCellSize; + + vec3 cellColor = texture2D(texture0, cellUV).rgb; + float gray = greyScale(cellColor); + + float n = 4096; + + // limited character set + if (gray > 0.2) n = 65600.0; // : + if (gray > 0.3) n = 163153.0; // * + if (gray > 0.4) n = 15255086.0; // o + if (gray > 0.5) n = 13121101.0; // & + if (gray > 0.6) n = 15252014.0; // 8 + if (gray > 0.7) n = 13195790.0; // @ + if (gray > 0.8) n = 11512810.0; // # + + vec2 localUV = (fragTexCoord - cellUV) / uvCellSize; // Range [0.0, 1.0] + + vec2 p = localUV * 2.0 - 1.0; + + float charShape = character(n, p); + + vec3 final_col = cellColor * charShape; + + gl_FragColor = vec4(final_col, 1.0); +} \ No newline at end of file diff --git a/examples/shaders/resources/shaders/glsl120/ascii.fs b/examples/shaders/resources/shaders/glsl120/ascii.fs new file mode 100644 index 000000000..3521c8b33 --- /dev/null +++ b/examples/shaders/resources/shaders/glsl120/ascii.fs @@ -0,0 +1,65 @@ +#version 120 + +// Input from the vertex shader +varying vec2 fragTexCoord; + +// Output color for the screen +varying vec4 finalColor; + +uniform sampler2D texture0; +uniform vec2 resolution; +uniform float fontSize; + +float greyScale(in vec3 col) { + return dot(col, vec3(0.2126, 0.7152, 0.0722)); +} + +float character(float n, vec2 p) +{ + p = floor(p * vec2(4.0, -4.0) + 2.5); + + // Check if the coordinate is inside the 5x5 grid (0 to 4). + if (clamp(p.x, 0.0, 4.0) == p.x && clamp(p.y, 0.0, 4.0) == p.y) { + + if (int(mod(n / exp2(p.x + 5.0 * p.y), 2.0)) == 1) { + return 1.0; // The bit is on, so draw this part of the character. + } + } + + return 0.0; // The bit is off, or we are outside the grid. +} + +// ----------------------------------------------------------------------------- +// Main shader logic +// ----------------------------------------------------------------------------- +void main() +{ + vec2 charPixelSize = vec2(fontSize, fontSize * 1.8); + vec2 uvCellSize = charPixelSize / resolution; + + vec2 cellUV = floor(fragTexCoord / uvCellSize) * uvCellSize; + + vec3 cellColor = texture2D(texture0, cellUV).rgb; + float gray = greyScale(cellColor); + + float n = 4096; + + // limited character set + if (gray > 0.2) n = 65600.0; // : + if (gray > 0.3) n = 163153.0; // * + if (gray > 0.4) n = 15255086.0; // o + if (gray > 0.5) n = 13121101.0; // & + if (gray > 0.6) n = 15252014.0; // 8 + if (gray > 0.7) n = 13195790.0; // @ + if (gray > 0.8) n = 11512810.0; // # + + vec2 localUV = (fragTexCoord - cellUV) / uvCellSize; // Range [0.0, 1.0] + + vec2 p = localUV * 2.0 - 1.0; + + float charShape = character(n, p); + + vec3 final_col = cellColor * charShape; + + gl_FragColor = vec4(final_col, 1.0); +} \ No newline at end of file diff --git a/examples/shaders/resources/shaders/glsl330/ascii.fs b/examples/shaders/resources/shaders/glsl330/ascii.fs new file mode 100644 index 000000000..4477f948d --- /dev/null +++ b/examples/shaders/resources/shaders/glsl330/ascii.fs @@ -0,0 +1,66 @@ +#version 330 + +// Input from the vertex shader +in vec2 fragTexCoord; + +// Output color for the screen +out vec4 finalColor; + +uniform sampler2D texture0; +uniform vec2 resolution; +uniform float fontSize; + +float greyScale(in vec3 col) { + return dot(col, vec3(0.2126, 0.7152, 0.0722)); +} + +float character(float n, vec2 p) +{ + p = floor(p * vec2(4.0, -4.0) + 2.5); + + // Check if the coordinate is inside the 5x5 grid (0 to 4). + if (clamp(p.x, 0.0, 4.0) == p.x && clamp(p.y, 0.0, 4.0) == p.y) { + + if (int(mod(n / exp2(p.x + 5.0 * p.y), 2.0)) == 1) { + return 1.0; // The bit is on, so draw this part of the character. + } + } + + return 0.0; // The bit is off, or we are outside the grid. +} + +// ----------------------------------------------------------------------------- +// Main shader logic +// ----------------------------------------------------------------------------- + +void main() +{ + vec2 charPixelSize = vec2(fontSize, fontSize * 1.8); + vec2 uvCellSize = charPixelSize / resolution; + + vec2 cellUV = floor(fragTexCoord / uvCellSize) * uvCellSize; + + vec3 cellColor = texture(texture0, cellUV).rgb; + float gray = greyScale(cellColor); + + float n = 4096; + + // limited character set + if (gray > 0.2) n = 65600.0; // : + if (gray > 0.3) n = 163153.0; // * + if (gray > 0.4) n = 15255086.0; // o + if (gray > 0.5) n = 13121101.0; // & + if (gray > 0.6) n = 15252014.0; // 8 + if (gray > 0.7) n = 13195790.0; // @ + if (gray > 0.8) n = 11512810.0; // # + + vec2 localUV = (fragTexCoord - cellUV) / uvCellSize; // Range [0.0, 1.0] + + vec2 p = localUV * 2.0 - 1.0; + + float charShape = character(n, p); + + vec3 final_col = cellColor * charShape; + + finalColor = vec4(final_col, 1.0); +} \ No newline at end of file diff --git a/examples/shaders/shaders_ascii_effect.c b/examples/shaders/shaders_ascii_effect.c new file mode 100644 index 000000000..c505d8516 --- /dev/null +++ b/examples/shaders/shaders_ascii_effect.c @@ -0,0 +1,119 @@ +/******************************************************************************************* +* +* raylib [shaders] example - ascii effect +* +* Example complexity rating: [★☆☆☆] 1/4 +* +* Example originally created with raylib 5.5, last time updated with raylib 5.6 +* +* Example contributed by Maicon Santana (@maiconpintoabreu) and reviewed by Ramon Santamaria (@raysan5) +* +* Example licensed under an unmodified zlib/libpng license, which is an OSI-certified, +* BSD-like license that allows static linking with closed source software +* +* Copyright (c) 2025-2025 Maicon Santana (@maiconpintoabreu) +* +********************************************************************************************/ + +#include "raylib.h" + +#if defined(PLATFORM_DESKTOP) + #define GLSL_VERSION 330 +#else // PLATFORM_ANDROID, PLATFORM_WEB + #define GLSL_VERSION 100 +#endif + +//------------------------------------------------------------------------------------ +// Program main entry point +//------------------------------------------------------------------------------------ +int main(void) +{ + // Initialization + //-------------------------------------------------------------------------------------- + const int screenWidth = 800; + const int screenHeight = 450; + + InitWindow(screenWidth, screenHeight, "raylib [shaders] example - ascii effect"); + + // Texture to test static drawing + Texture2D fudesumi = LoadTexture("resources/fudesumi.png"); + // Texture to test moving drawing + Texture2D raysan = LoadTexture("resources/raysan.png"); + + // Load shader to be used on postprocessing + Shader shader = LoadShader(0, TextFormat("resources/shaders/glsl%i/ascii.fs", GLSL_VERSION)); + + // These locations are used to send data to the GPU. + int resolutionLoc = GetShaderLocation(shader, "resolution"); + int fontSizeLoc = GetShaderLocation(shader, "fontSize"); + + // Set the character size for the ASCII effect + float fontSize = 4.0f; + + // Send the updated values to the shader + float resolution[2] = { (float)screenWidth, (float)screenHeight }; + SetShaderValue(shader, resolutionLoc, resolution, SHADER_UNIFORM_VEC2); + SetShaderValue(shader, fontSizeLoc, &fontSize, SHADER_UNIFORM_FLOAT); + + Vector2 circlePos = (Vector2){40.0f, (float)screenHeight * 0.5f}; + float circleSpeed = 1.0f; + + // RenderTexture to apply the postprocessing later + RenderTexture2D target = LoadRenderTexture(screenWidth, screenHeight); + + SetTargetFPS(60); // Set our game to run at 60 frames-per-second + //-------------------------------------------------------------------------------------- + + // Main game loop + while (!WindowShouldClose()) // Detect window close button or ESC key + { + // Update + //---------------------------------------------------------------------------------- + if (circlePos.x > 200.0f || circlePos.x < 40.0f) { + circleSpeed *= -1; + } + circlePos.x += circleSpeed; + + // Draw + //---------------------------------------------------------------------------------- + + BeginTextureMode(target); + ClearBackground(WHITE); // The background of the scene itself + + DrawTexture(fudesumi, 500, -30, WHITE); // Using custom shader + DrawTextureV(raysan, circlePos, WHITE); + + EndTextureMode(); + BeginDrawing(); + + ClearBackground(RAYWHITE); + + BeginShaderMode(shader); + + // Draw the scene texture (that we rendered earlier) to the screen. + // The shader will process every pixel of this texture. + DrawTextureRec(target.texture, + (Rectangle){ 0, 0, (float)target.texture.width, (float)-target.texture.height }, + (Vector2){ 0, 0 }, + WHITE); + EndShaderMode(); + + DrawRectangle(0, 0, screenWidth, 40, BLACK); + DrawText("Ascii effect", 120, 10, 20, LIGHTGRAY); + DrawFPS(10, 10); + + EndDrawing(); + //---------------------------------------------------------------------------------- + } + + // De-Initialization + //-------------------------------------------------------------------------------------- + UnloadShader(shader); // Unload shader + UnloadTexture(fudesumi); // Unload texture + UnloadTexture(raysan); // Unload texture + + CloseWindow(); // Close window and OpenGL context + //-------------------------------------------------------------------------------------- + + return 0; +} diff --git a/examples/shaders/shaders_ascii_effect.png b/examples/shaders/shaders_ascii_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..eee5cc90b620c14cc111bb9a8348765cb77e827d GIT binary patch literal 45176 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 literal 0 HcmV?d00001 From 218a806ec240de4500a020838a27c9cb289d019d Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 29 Sep 2025 18:01:42 +0200 Subject: [PATCH 20/23] REVIEWED: example: `shaders_ascii_rendering` --- .../resources/shaders/glsl330/ascii.fs | 43 ++++++++---------- ...cii_effect.c => shaders_ascii_rendering.c} | 36 +++++++-------- ...effect.png => shaders_ascii_rendering.png} | Bin 3 files changed, 37 insertions(+), 42 deletions(-) rename examples/shaders/{shaders_ascii_effect.c => shaders_ascii_rendering.c} (81%) rename examples/shaders/{shaders_ascii_effect.png => shaders_ascii_rendering.png} (100%) diff --git a/examples/shaders/resources/shaders/glsl330/ascii.fs b/examples/shaders/resources/shaders/glsl330/ascii.fs index 4477f948d..014966835 100644 --- a/examples/shaders/resources/shaders/glsl330/ascii.fs +++ b/examples/shaders/resources/shaders/glsl330/ascii.fs @@ -10,42 +10,42 @@ uniform sampler2D texture0; uniform vec2 resolution; uniform float fontSize; -float greyScale(in vec3 col) { +float GreyScale(in vec3 col) +{ return dot(col, vec3(0.2126, 0.7152, 0.0722)); } -float character(float n, vec2 p) +float GetCharacter(float n, vec2 p) { - p = floor(p * vec2(4.0, -4.0) + 2.5); + p = floor(p*vec2(4.0, -4.0) + 2.5); - // Check if the coordinate is inside the 5x5 grid (0 to 4). - if (clamp(p.x, 0.0, 4.0) == p.x && clamp(p.y, 0.0, 4.0) == p.y) { - - if (int(mod(n / exp2(p.x + 5.0 * p.y), 2.0)) == 1) { - return 1.0; // The bit is on, so draw this part of the character. + // Check if the coordinate is inside the 5x5 grid (0 to 4) + if (clamp(p.x, 0.0, 4.0) == p.x && clamp(p.y, 0.0, 4.0) == p.y) + { + if (int(mod(n/exp2(p.x + 5.0 * p.y), 2.0)) == 1) + { + return 1.0; // The bit is on, so draw this part of the character } } - return 0.0; // The bit is off, or we are outside the grid. + return 0.0; // The bit is off, or we are outside the grid } // ----------------------------------------------------------------------------- // Main shader logic // ----------------------------------------------------------------------------- - void main() { - vec2 charPixelSize = vec2(fontSize, fontSize * 1.8); - vec2 uvCellSize = charPixelSize / resolution; - - vec2 cellUV = floor(fragTexCoord / uvCellSize) * uvCellSize; + vec2 charPixelSize = vec2(fontSize, fontSize*1.8); + vec2 uvCellSize = charPixelSize/resolution; + vec2 cellUV = floor(fragTexCoord/uvCellSize)*uvCellSize; vec3 cellColor = texture(texture0, cellUV).rgb; - float gray = greyScale(cellColor); + float gray = GreyScale(cellColor); float n = 4096; - // limited character set + // Limited character set if (gray > 0.2) n = 65600.0; // : if (gray > 0.3) n = 163153.0; // * if (gray > 0.4) n = 15255086.0; // o @@ -54,13 +54,10 @@ void main() if (gray > 0.7) n = 13195790.0; // @ if (gray > 0.8) n = 11512810.0; // # - vec2 localUV = (fragTexCoord - cellUV) / uvCellSize; // Range [0.0, 1.0] + vec2 localUV = (fragTexCoord - cellUV)/uvCellSize; // Range [0.0, 1.0] + vec2 p = localUV*2.0 - 1.0; - vec2 p = localUV * 2.0 - 1.0; + float charShape = GetCharacter(n, p); - float charShape = character(n, p); - - vec3 final_col = cellColor * charShape; - - finalColor = vec4(final_col, 1.0); + finalColor = vec4(cellColor*charShape, 1.0); } \ No newline at end of file diff --git a/examples/shaders/shaders_ascii_effect.c b/examples/shaders/shaders_ascii_rendering.c similarity index 81% rename from examples/shaders/shaders_ascii_effect.c rename to examples/shaders/shaders_ascii_rendering.c index c505d8516..5444caeee 100644 --- a/examples/shaders/shaders_ascii_effect.c +++ b/examples/shaders/shaders_ascii_rendering.c @@ -1,8 +1,8 @@ /******************************************************************************************* * -* raylib [shaders] example - ascii effect +* raylib [shaders] example - ascii rendering * -* Example complexity rating: [★☆☆☆] 1/4 +* Example complexity rating: [★★☆☆] 2/4 * * Example originally created with raylib 5.5, last time updated with raylib 5.6 * @@ -33,7 +33,7 @@ int main(void) const int screenWidth = 800; const int screenHeight = 450; - InitWindow(screenWidth, screenHeight, "raylib [shaders] example - ascii effect"); + InitWindow(screenWidth, screenHeight, "raylib [shaders] example - ascii rendering"); // Texture to test static drawing Texture2D fudesumi = LoadTexture("resources/fudesumi.png"); @@ -43,7 +43,7 @@ int main(void) // Load shader to be used on postprocessing Shader shader = LoadShader(0, TextFormat("resources/shaders/glsl%i/ascii.fs", GLSL_VERSION)); - // These locations are used to send data to the GPU. + // These locations are used to send data to the GPU int resolutionLoc = GetShaderLocation(shader, "resolution"); int fontSizeLoc = GetShaderLocation(shader, "fontSize"); @@ -69,33 +69,31 @@ int main(void) { // Update //---------------------------------------------------------------------------------- - if (circlePos.x > 200.0f || circlePos.x < 40.0f) { - circleSpeed *= -1; - } circlePos.x += circleSpeed; + + if ((circlePos.x > 200.0f) || (circlePos.x < 40.0f)) circleSpeed *= -1; + //---------------------------------------------------------------------------------- // Draw //---------------------------------------------------------------------------------- - + // Draw our scene to a render texture first BeginTextureMode(target); - ClearBackground(WHITE); // The background of the scene itself + ClearBackground(WHITE); - DrawTexture(fudesumi, 500, -30, WHITE); // Using custom shader + DrawTexture(fudesumi, 500, -30, WHITE); DrawTextureV(raysan, circlePos, WHITE); - + EndTextureMode(); + BeginDrawing(); - ClearBackground(RAYWHITE); BeginShaderMode(shader); - - // Draw the scene texture (that we rendered earlier) to the screen. - // The shader will process every pixel of this texture. - DrawTextureRec(target.texture, - (Rectangle){ 0, 0, (float)target.texture.width, (float)-target.texture.height }, - (Vector2){ 0, 0 }, - WHITE); + // Draw the render texture containing scene + // The shader will process every pixel on the screen + DrawTextureRec(target.texture, + (Rectangle){ 0, 0, (float)target.texture.width, (float)-target.texture.height }, + (Vector2){ 0, 0 }, WHITE); EndShaderMode(); DrawRectangle(0, 0, screenWidth, 40, BLACK); diff --git a/examples/shaders/shaders_ascii_effect.png b/examples/shaders/shaders_ascii_rendering.png similarity index 100% rename from examples/shaders/shaders_ascii_effect.png rename to examples/shaders/shaders_ascii_rendering.png From beabb1300d859b8503bdbec098956df3e3843b48 Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 29 Sep 2025 18:03:42 +0200 Subject: [PATCH 21/23] Revert "Update miniaudio to v0.11.23 (#5208)" This reverts commit 4cd131cf292bf4f5e06c7db89e9224fe36894330. --- src/external/miniaudio.h | 6147 ++++++++++++-------------------------- 1 file changed, 1983 insertions(+), 4164 deletions(-) diff --git a/src/external/miniaudio.h b/src/external/miniaudio.h index 1e4e2c655..c74bebeb3 100644 --- a/src/external/miniaudio.h +++ b/src/external/miniaudio.h @@ -1,6 +1,6 @@ /* Audio playback and capture library. Choice of public domain or MIT-0. See license statements at the end of this file. -miniaudio - v0.11.23 - 2025-09-11 +miniaudio - v0.11.22 - 2025-02-24 David Reid - mackron@gmail.com @@ -12,10 +12,18 @@ GitHub: https://github.com/mackron/miniaudio /* 1. Introduction =============== -To use miniaudio, just include "miniaudio.h" like any other header and add "miniaudio.c" to your -source tree. If you don't want to add it to your source tree you can compile and link to it like -any other library. Note that ABI compatibility is not guaranteed between versions, even with bug -fix releases, so take care if compiling as a shared object. +To use miniaudio, include "miniaudio.h": + + ```c + #include "miniaudio.h" + ``` + +The implementation is contained in "miniaudio.c". Just compile this like any other source file. You +can include miniaudio.c if you want to compile your project as a single translation unit: + + ```c + #include "miniaudio.c" + ``` miniaudio includes both low level and high level APIs. The low level API is good for those who want to do all of their mixing themselves and only require a light weight interface to the underlying @@ -295,7 +303,7 @@ The engine encapsulates both the resource manager and the node graph to create a use high level API. The resource manager and node graph APIs are covered in more later sections of this manual. -The code below shows how you can initialize an engine using its default configuration. +The code below shows how you can initialize an engine using it's default configuration. ```c ma_result result; @@ -383,7 +391,7 @@ Sounds are not started by default. Start a sound with `ma_sound_start()` and sto `ma_sound_stop()`. When a sound is stopped, it is not rewound to the start. Use `ma_sound_seek_to_pcm_frame(&sound, 0)` to seek back to the start of a sound. By default, starting and stopping sounds happens immediately, but sometimes it might be convenient to schedule the sound -to be started and/or stopped at a specific time. This can be done with the following functions: +the be started and/or stopped at a specific time. This can be done with the following functions: ```c ma_sound_set_start_time_in_pcm_frames() @@ -455,11 +463,6 @@ is at the end, use `ma_sound_at_end()`. Looping of a sound can be controlled wit miniaudio should work cleanly out of the box without the need to download or install any dependencies. See below for platform-specific details. -This library has been designed to be added directly to your source tree which is the preferred way -of using it, but you can compile it as a normal library if that's your preference. Be careful if -compiling as a shared object because miniaudio is not ABI compatible between any release, including -bug fix releases. It's recommended you link statically. - Note that GCC and Clang require `-msse2`, `-mavx2`, etc. for SIMD optimizations. If you get errors about undefined references to `__sync_val_compare_and_swap_8`, `__atomic_load_8`, @@ -529,7 +532,7 @@ you'll need to disable run-time linking with `MA_NO_RUNTIME_LINKING` and link wi The Emscripten build emits Web Audio JavaScript directly and should compile cleanly out of the box. You cannot use `-std=c*` compiler flags, nor `-ansi`. -You can enable the use of AudioWorklets by defining `MA_ENABLE_AUDIO_WORKLETS` and then compiling +You can enable the use of AudioWorkets by defining `MA_ENABLE_AUDIO_WORKLETS` and then compiling with the following options: -sAUDIO_WORKLET=1 -sWASM_WORKERS=1 -sASYNCIFY @@ -878,7 +881,7 @@ read data within a certain range of the underlying data. To do this you can use This is useful if you have a sound bank where many sounds are stored in the same file and you want the data source to only play one of those sub-sounds. Note that once the range is set, everything -that takes a position, such as cursors and loop points, should always be relative to the start of +that takes a position, such as cursors and loop points, should always be relatvie to the start of the range. When the range is set, any previously defined loop point will be reset. Custom loop points can also be used with data sources. By default, data sources will loop after @@ -886,7 +889,7 @@ they reach the end of the data source, but if you need to loop at a specific loc the following: ```c - result = ma_data_source_set_loop_point_in_pcm_frames(pDataSource, loopBegInFrames, loopEndInFrames); + result = ma_data_set_loop_point_in_pcm_frames(pDataSource, loopBegInFrames, loopEndInFrames); if (result != MA_SUCCESS) { return result; // Failed to set the loop point. } @@ -3747,7 +3750,7 @@ extern "C" { #define MA_VERSION_MAJOR 0 #define MA_VERSION_MINOR 11 -#define MA_VERSION_REVISION 23 +#define MA_VERSION_REVISION 22 #define MA_VERSION_STRING MA_XSTRINGIFY(MA_VERSION_MAJOR) "." MA_XSTRINGIFY(MA_VERSION_MINOR) "." MA_XSTRINGIFY(MA_VERSION_REVISION) #if defined(_MSC_VER) && !defined(__clang__) @@ -3854,8 +3857,6 @@ typedef ma_uint16 wchar_t; #define MA_SIZE_MAX 0xFFFFFFFF /* When SIZE_MAX is not defined by the standard library just default to the maximum 32-bit unsigned integer. */ #endif -#define MA_UINT64_MAX (((ma_uint64)0xFFFFFFFF << 32) | (ma_uint64)0xFFFFFFFF) /* Weird shifting syntax is for VC6 compatibility. */ - /* Platform/backend detection. */ #if defined(_WIN32) || defined(__COSMOPOLITAN__) @@ -3864,55 +3865,29 @@ typedef ma_uint16 wchar_t; #define MA_WIN32_UWP #elif defined(WINAPI_FAMILY) && (defined(WINAPI_FAMILY_GAMES) && WINAPI_FAMILY == WINAPI_FAMILY_GAMES) #define MA_WIN32_GDK - #elif defined(NXDK) - #define MA_WIN32_NXDK #else #define MA_WIN32_DESKTOP #endif - - /* The original Xbox. */ - #if defined(NXDK) /* <-- Add other Xbox compiler toolchains here, and then add a toolchain-specific define in case we need to discriminate between them later. */ - #define MA_XBOX - - #if defined(NXDK) - #define MA_XBOX_NXDK - #endif - #endif #endif -#if defined(__MSDOS__) || defined(MSDOS) || defined(_MSDOS) || defined(__DOS__) - #define MA_DOS - - /* No threading allowed on DOS. */ - #ifndef MA_NO_THREADING - #define MA_NO_THREADING - #endif - - /* No runtime linking allowed on DOS. */ - #ifndef MA_NO_RUNTIME_LINKING - #define MA_NO_RUNTIME_LINKING - #endif -#endif -#if !defined(MA_WIN32) && !defined(MA_DOS) /* If it's not Win32, assume POSIX. */ +#if !defined(_WIN32) /* If it's not Win32, assume POSIX. */ #define MA_POSIX - #if !defined(MA_NO_THREADING) - /* - Use the MA_NO_PTHREAD_IN_HEADER option at your own risk. This is intentionally undocumented. - You can use this to avoid including pthread.h in the header section. The downside is that it - results in some fixed sized structures being declared for the various types that are used in - miniaudio. The risk here is that these types might be too small for a given platform. This - risk is yours to take and no support will be offered if you enable this option. - */ - #ifndef MA_NO_PTHREAD_IN_HEADER - #include /* Unfortunate #include, but needed for pthread_t, pthread_mutex_t and pthread_cond_t types. */ - typedef pthread_t ma_pthread_t; - typedef pthread_mutex_t ma_pthread_mutex_t; - typedef pthread_cond_t ma_pthread_cond_t; - #else - typedef ma_uintptr ma_pthread_t; - typedef union ma_pthread_mutex_t { char __data[40]; ma_uint64 __alignment; } ma_pthread_mutex_t; - typedef union ma_pthread_cond_t { char __data[48]; ma_uint64 __alignment; } ma_pthread_cond_t; - #endif + /* + Use the MA_NO_PTHREAD_IN_HEADER option at your own risk. This is intentionally undocumented. + You can use this to avoid including pthread.h in the header section. The downside is that it + results in some fixed sized structures being declared for the various types that are used in + miniaudio. The risk here is that these types might be too small for a given platform. This + risk is yours to take and no support will be offered if you enable this option. + */ + #ifndef MA_NO_PTHREAD_IN_HEADER + #include /* Unfortunate #include, but needed for pthread_t, pthread_mutex_t and pthread_cond_t types. */ + typedef pthread_t ma_pthread_t; + typedef pthread_mutex_t ma_pthread_mutex_t; + typedef pthread_cond_t ma_pthread_cond_t; + #else + typedef ma_uintptr ma_pthread_t; + typedef union ma_pthread_mutex_t { char __data[40]; ma_uint64 __alignment; } ma_pthread_mutex_t; + typedef union ma_pthread_cond_t { char __data[48]; ma_uint64 __alignment; } ma_pthread_cond_t; #endif #if defined(__unix__) @@ -3939,11 +3914,8 @@ typedef ma_uint16 wchar_t; #if defined(__PROSPERO__) #define MA_PROSPERO #endif - #if defined(__3DS__) - #define MA_3DS - #endif - #if defined(__SWITCH__) || defined(__NX__) - #define MA_SWITCH + #if defined(__NX__) + #define MA_NX #endif #if defined(__BEOS__) || defined(__HAIKU__) #define MA_BEOS @@ -3953,13 +3925,12 @@ typedef ma_uint16 wchar_t; #endif #endif -#if !defined(MA_FALLTHROUGH) && defined(__cplusplus) && __cplusplus >= 201703L - #define MA_FALLTHROUGH [[fallthrough]] +#if defined(__has_c_attribute) + #if __has_c_attribute(fallthrough) + #define MA_FALLTHROUGH [[fallthrough]] + #endif #endif -#if !defined(MA_FALLTHROUGH) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202000L - #define MA_FALLTHROUGH [[fallthrough]] -#endif -#if !defined(MA_FALLTHROUGH) && defined(__has_attribute) +#if !defined(MA_FALLTHROUGH) && defined(__has_attribute) && (defined(__clang__) || defined(__GNUC__)) #if __has_attribute(fallthrough) #define MA_FALLTHROUGH __attribute__((fallthrough)) #endif @@ -3996,7 +3967,7 @@ typedef ma_uint16 wchar_t; #define MA_NO_INLINE __attribute__((noinline)) #else #define MA_INLINE MA_GNUC_INLINE_HINT - #define MA_NO_INLINE + #define MA_NO_INLINE __attribute__((noinline)) #endif #elif defined(__WATCOMC__) #define MA_INLINE __inline @@ -4379,7 +4350,7 @@ typedef struct typedef struct { - ma_uint32 state; + ma_int32 state; } ma_lcg; @@ -6598,7 +6569,7 @@ This section contains the APIs for device playback and capture. Here is where yo ************************************************************************************************************************************************************/ #ifndef MA_NO_DEVICE_IO /* Some backends are only supported on certain platforms. */ -#if defined(MA_WIN32) && !defined(MA_XBOX) +#if defined(MA_WIN32) #define MA_SUPPORT_WASAPI #if defined(MA_WIN32_DESKTOP) /* DirectSound and WinMM backends are only supported on desktops. */ @@ -7455,7 +7426,6 @@ struct ma_context ma_proc snd_pcm_hw_params_set_rate_resample; ma_proc snd_pcm_hw_params_set_rate; ma_proc snd_pcm_hw_params_set_rate_near; - ma_proc snd_pcm_hw_params_set_rate_minmax; ma_proc snd_pcm_hw_params_set_buffer_size_near; ma_proc snd_pcm_hw_params_set_periods_near; ma_proc snd_pcm_hw_params_set_access; @@ -8016,7 +7986,6 @@ struct ma_device /*AAudioStream**/ ma_ptr pStreamPlayback; /*AAudioStream**/ ma_ptr pStreamCapture; ma_mutex rerouteLock; - ma_atomic_bool32 isTearingDown; ma_aaudio_usage usage; ma_aaudio_content_type contentType; ma_aaudio_input_preset inputPreset; @@ -11286,7 +11255,7 @@ typedef struct ma_log* pLog; /* When set to NULL, will use the context's log. */ ma_uint32 listenerCount; /* Must be between 1 and MA_ENGINE_MAX_LISTENERS. */ ma_uint32 channels; /* The number of channels to use when mixing and spatializing. When set to 0, will use the native channel count of the device. */ - ma_uint32 sampleRate; /* The sample rate. When set to 0 will use the native sample rate of the device. */ + ma_uint32 sampleRate; /* The sample rate. When set to 0 will use the native channel count of the device. */ ma_uint32 periodSizeInFrames; /* If set to something other than 0, updates will always be exactly this size. The underlying device may be a different size, but from the perspective of the mixer that won't matter.*/ ma_uint32 periodSizeInMilliseconds; /* Used if periodSizeInFrames is unset. */ ma_uint32 gainSmoothTimeInFrames; /* The number of frames to interpolate the gain of spatialized sounds across. If set to 0, will use gainSmoothTimeInMilliseconds. */ @@ -11450,11 +11419,11 @@ MA_API ma_bool32 ma_sound_is_looping(const ma_sound* pSound); MA_API ma_bool32 ma_sound_at_end(const ma_sound* pSound); MA_API ma_result ma_sound_seek_to_pcm_frame(ma_sound* pSound, ma_uint64 frameIndex); /* Just a wrapper around ma_data_source_seek_to_pcm_frame(). */ MA_API ma_result ma_sound_seek_to_second(ma_sound* pSound, float seekPointInSeconds); /* Abstraction to ma_sound_seek_to_pcm_frame() */ -MA_API ma_result ma_sound_get_data_format(const ma_sound* pSound, ma_format* pFormat, ma_uint32* pChannels, ma_uint32* pSampleRate, ma_channel* pChannelMap, size_t channelMapCap); -MA_API ma_result ma_sound_get_cursor_in_pcm_frames(const ma_sound* pSound, ma_uint64* pCursor); -MA_API ma_result ma_sound_get_length_in_pcm_frames(const ma_sound* pSound, ma_uint64* pLength); -MA_API ma_result ma_sound_get_cursor_in_seconds(const ma_sound* pSound, float* pCursor); -MA_API ma_result ma_sound_get_length_in_seconds(const ma_sound* pSound, float* pLength); +MA_API ma_result ma_sound_get_data_format(ma_sound* pSound, ma_format* pFormat, ma_uint32* pChannels, ma_uint32* pSampleRate, ma_channel* pChannelMap, size_t channelMapCap); +MA_API ma_result ma_sound_get_cursor_in_pcm_frames(ma_sound* pSound, ma_uint64* pCursor); +MA_API ma_result ma_sound_get_length_in_pcm_frames(ma_sound* pSound, ma_uint64* pLength); +MA_API ma_result ma_sound_get_cursor_in_seconds(ma_sound* pSound, float* pCursor); +MA_API ma_result ma_sound_get_length_in_seconds(ma_sound* pSound, float* pLength); MA_API ma_result ma_sound_set_end_callback(ma_sound* pSound, ma_sound_end_proc callback, void* pUserData); MA_API ma_result ma_sound_group_init(ma_engine* pEngine, ma_uint32 flags, ma_sound_group* pParentGroup, ma_sound_group* pGroup); @@ -11575,23 +11544,17 @@ IMPLEMENTATION #endif #if !defined(MA_WIN32) - #if !defined(MA_NO_THREADING) - #include - #include /* For pthreads. */ - #endif - - #include /* select() (used for ma_sleep()). */ - #include /* For nanosleep() */ - #include +#include +#include /* select() (used for ma_sleep()). */ +#include #endif -/* For fstat(), etc. */ -#if defined(MA_XBOX_NXDK) - #include /* Suggestion for NXDK: Add a sys/stat.h wrapper for compatibility. */ -#else - #include +#ifdef MA_NX +#include /* For nanosleep() */ #endif +#include /* For fstat(), etc. */ + #ifdef MA_EMSCRIPTEN #include #endif @@ -11898,7 +11861,7 @@ static MA_INLINE ma_bool32 ma_has_neon(void) #endif #ifndef MA_RESTRICT - #if defined(__clang__) || defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))) + #if defined(__clang__) || defined(__GNUC__) || defined(_MSC_VER) #define MA_RESTRICT __restrict #else #define MA_RESTRICT @@ -11992,7 +11955,7 @@ static void ma_sleep__posix(ma_uint32 milliseconds) (void)milliseconds; MA_ASSERT(MA_FALSE); /* The Emscripten build should never sleep. */ #else - #if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199309L) || defined(MA_SWITCH) + #if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199309L) || defined(MA_NX) struct timespec ts; ts.tv_sec = milliseconds / 1000; ts.tv_nsec = milliseconds % 1000 * 1000000; @@ -12034,7 +11997,7 @@ static MA_INLINE void ma_yield(void) #endif #endif #else - __asm__ __volatile__ ("rep; nop"); + __asm__ __volatile__ ("pause"); #endif #elif (defined(__arm__) && defined(__ARM_ARCH) && __ARM_ARCH >= 7) || defined(_M_ARM64) || (defined(_M_ARM) && _M_ARM >= 7) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) /* ARM */ @@ -12057,7 +12020,7 @@ static MA_INLINE unsigned int ma_disable_denormals(void) { unsigned int prevState; - #if defined(_MSC_VER) && !defined(MA_XBOX_NXDK) + #if defined(_MSC_VER) { /* Older versions of Visual Studio don't support the "safe" versions of _controlfp_s(). I don't @@ -12080,7 +12043,7 @@ static MA_INLINE unsigned int ma_disable_denormals(void) } #elif defined(MA_X86) || defined(MA_X64) { - #if defined(MA_SUPPORT_SSE2) && defined(__SSE2__) && !(defined(__TINYC__) || defined(__WATCOMC__) || defined(__COSMOPOLITAN__)) /* <-- Add compilers that lack support for _mm_getcsr() and _mm_setcsr() to this list. */ + #if defined(__SSE2__) && !(defined(__TINYC__) || defined(__WATCOMC__) || defined(__COSMOPOLITAN__)) /* <-- Add compilers that lack support for _mm_getcsr() and _mm_setcsr() to this list. */ { prevState = _mm_getcsr(); _mm_setcsr(prevState | MA_MM_DENORMALS_ZERO_MASK | MA_MM_FLUSH_ZERO_MASK); @@ -12104,7 +12067,7 @@ static MA_INLINE unsigned int ma_disable_denormals(void) static MA_INLINE void ma_restore_denormals(unsigned int prevState) { - #if defined(_MSC_VER) && !defined(MA_XBOX_NXDK) + #if defined(_MSC_VER) { /* Older versions of Visual Studio do not support _controlfp_s(). See ma_disable_denormals(). */ #if _MSC_VER <= 1200 @@ -12120,7 +12083,7 @@ static MA_INLINE void ma_restore_denormals(unsigned int prevState) } #elif defined(MA_X86) || defined(MA_X64) { - #if defined(MA_SUPPORT_SSE2) && defined(__SSE2__) && !(defined(__TINYC__) || defined(__WATCOMC__) || defined(__COSMOPOLITAN__)) /* <-- Add compilers that lack support for _mm_getcsr() and _mm_setcsr() to this list. */ + #if defined(__SSE2__) && !(defined(__TINYC__) || defined(__WATCOMC__) || defined(__COSMOPOLITAN__)) /* <-- Add compilers that lack support for _mm_getcsr() and _mm_setcsr() to this list. */ { _mm_setcsr(prevState); } @@ -12756,29 +12719,6 @@ MA_API MA_NO_INLINE int ma_strcmp(const char* str1, const char* str2) return ((unsigned char*)str1)[0] - ((unsigned char*)str2)[0]; } -MA_API MA_NO_INLINE int ma_wcscmp(const wchar_t* str1, const wchar_t* str2) -{ - if (str1 == str2) return 0; - - /* These checks differ from the standard implementation. It's not important, but I prefer it just for sanity. */ - if (str1 == NULL) return -1; - if (str2 == NULL) return 1; - - for (;;) { - if (str1[0] == L'\0') { - break; - } - if (str1[0] != str2[0]) { - break; - } - - str1 += 1; - str2 += 1; - } - - return ((unsigned short*)str1)[0] - ((unsigned short*)str2)[0]; -} - MA_API MA_NO_INLINE int ma_strappend(char* dst, size_t dstSize, const char* srcA, const char* srcB) { int result; @@ -12796,22 +12736,6 @@ MA_API MA_NO_INLINE int ma_strappend(char* dst, size_t dstSize, const char* srcA return result; } -MA_API MA_NO_INLINE size_t ma_wcslen(const wchar_t* str) -{ - const wchar_t* end; - - if (str == NULL) { - return 0; - } - - end = str; - while (end[0] != '\0') { - end += 1; - } - - return end - str; -} - MA_API MA_NO_INLINE char* ma_copy_string(const char* src, const ma_allocation_callbacks* pAllocationCallbacks) { size_t sz; @@ -12834,7 +12758,7 @@ MA_API MA_NO_INLINE char* ma_copy_string(const char* src, const ma_allocation_ca MA_API MA_NO_INLINE wchar_t* ma_copy_string_w(const wchar_t* src, const ma_allocation_callbacks* pAllocationCallbacks) { - size_t sz = ma_wcslen(src)+1; + size_t sz = wcslen(src)+1; wchar_t* dst = (wchar_t*)ma_malloc(sz * sizeof(*dst), pAllocationCallbacks); if (dst == NULL) { return NULL; @@ -13265,7 +13189,7 @@ MA_API ma_result ma_fopen(FILE** ppFile, const char* pFilePath, const char* pOpe return MA_INVALID_ARGS; } -#if (defined(_MSC_VER) && _MSC_VER >= 1400) && !defined(MA_XBOX_NXDK) +#if defined(_MSC_VER) && _MSC_VER >= 1400 err = fopen_s(ppFile, pFilePath, pOpenMode); if (err != 0) { return ma_result_from_errno(err); @@ -13307,7 +13231,7 @@ _wfopen() isn't always available in all compilation environments. This can be reviewed as compatibility issues arise. The preference is to use _wfopen_s() and _wfopen() as opposed to the wcsrtombs() fallback, so if you notice your compiler not detecting this properly I'm happy to look at adding support. */ -#if defined(_WIN32) && !defined(MA_XBOX_NXDK) +#if defined(_WIN32) #if defined(_MSC_VER) || defined(__MINGW64__) || (!defined(__STRICT_ANSI__) && !defined(_NO_EXT_KEYS)) #define MA_HAS_WFOPEN #endif @@ -13323,34 +13247,29 @@ MA_API ma_result ma_wfopen(FILE** ppFile, const wchar_t* pFilePath, const wchar_ return MA_INVALID_ARGS; } - #if defined(MA_HAS_WFOPEN) +#if defined(MA_HAS_WFOPEN) { /* Use _wfopen() on Windows. */ - #if defined(_MSC_VER) && _MSC_VER >= 1400 - { - errno_t err = _wfopen_s(ppFile, pFilePath, pOpenMode); - if (err != 0) { - return ma_result_from_errno(err); - } + #if defined(_MSC_VER) && _MSC_VER >= 1400 + errno_t err = _wfopen_s(ppFile, pFilePath, pOpenMode); + if (err != 0) { + return ma_result_from_errno(err); } - #else - { - *ppFile = _wfopen(pFilePath, pOpenMode); - if (*ppFile == NULL) { - return ma_result_from_errno(errno); - } + #else + *ppFile = _wfopen(pFilePath, pOpenMode); + if (*ppFile == NULL) { + return ma_result_from_errno(errno); } - #endif - + #endif (void)pAllocationCallbacks; } - #elif !defined(MA_XBOX_NXDK) && !defined(MA_DOS) /* If your compiler does not support wcsrtombs(), add it here. */ +#else + /* + Use fopen() on anything other than Windows. Requires a conversion. This is annoying because fopen() is locale specific. The only real way I can + think of to do this is with wcsrtombs(). Note that wcstombs() is apparently not thread-safe because it uses a static global mbstate_t object for + maintaining state. I've checked this with -std=c89 and it works, but if somebody get's a compiler error I'll look into improving compatibility. + */ { - /* - Use fopen() on anything other than Windows. Requires a conversion. This is annoying because fopen() is locale specific. The only real way I can - think of to do this is with wcsrtombs(). Note that wcstombs() is apparently not thread-safe because it uses a static global mbstate_t object for - maintaining state. I've checked this with -std=c89 and it works, but if somebody get's a compiler error I'll look into improving compatibility. - */ mbstate_t mbs; size_t lenMB; const wchar_t* pFilePathTemp = pFilePath; @@ -13391,16 +13310,11 @@ MA_API ma_result ma_wfopen(FILE** ppFile, const wchar_t* pFilePath, const wchar_ ma_free(pFilePathMB, pAllocationCallbacks); } - #else - { - /* Getting here means there is no way to open the file with a wide character string. */ - *ppFile = NULL; - } - #endif if (*ppFile == NULL) { return MA_ERROR; } +#endif return MA_SUCCESS; } @@ -13409,7 +13323,7 @@ MA_API ma_result ma_wfopen(FILE** ppFile, const wchar_t* pFilePath, const wchar_ static MA_INLINE void ma_copy_memory_64(void* dst, const void* src, ma_uint64 sizeInBytes) { -#if MA_SIZE_MAX > 0xFFFFFFFF +#if 0xFFFFFFFFFFFFFFFF <= MA_SIZE_MAX MA_COPY_MEMORY(dst, src, (size_t)sizeInBytes); #else while (sizeInBytes > 0) { @@ -13429,7 +13343,7 @@ static MA_INLINE void ma_copy_memory_64(void* dst, const void* src, ma_uint64 si static MA_INLINE void ma_zero_memory_64(void* dst, ma_uint64 sizeInBytes) { -#if MA_SIZE_MAX > 0xFFFFFFFF +#if 0xFFFFFFFFFFFFFFFF <= MA_SIZE_MAX MA_ZERO_MEMORY(dst, (size_t)sizeInBytes); #else while (sizeInBytes > 0) { @@ -13558,18 +13472,6 @@ static ma_result ma_allocation_callbacks_init_copy(ma_allocation_callbacks* pDst Logging **************************************************************************************************************************************************************/ -#ifndef ma_va_copy - #if !defined(_MSC_VER) || _MSC_VER >= 1800 - #if (defined(__GNUC__) && __GNUC__ < 3) - #define ma_va_copy(dst, src) ((dst) = (src)) /* This is untested. Not sure if this is correct for old GCC. */ - #else - #define ma_va_copy(dst, src) va_copy((dst), (src)) - #endif - #else - #define ma_va_copy(dst, src) ((dst) = (src)) - #endif -#endif - MA_API const char* ma_log_level_to_string(ma_uint32 logLevel) { switch (logLevel) @@ -13810,15 +13712,9 @@ MA_API ma_result ma_log_postv(ma_log* pLog, ma_uint32 level, const char* pFormat int length; char pFormattedMessageStack[1024]; char* pFormattedMessageHeap = NULL; - va_list args2; /* First try formatting into our fixed sized stack allocated buffer. If this is too small we'll fallback to a heap allocation. */ - ma_va_copy(args2, args); - { - length = vsnprintf(pFormattedMessageStack, sizeof(pFormattedMessageStack), pFormat, args2); - } - va_end(args2); - + length = vsnprintf(pFormattedMessageStack, sizeof(pFormattedMessageStack), pFormat, args); if (length < 0) { return MA_INVALID_OPERATION; /* An error occurred when trying to convert the buffer. */ } @@ -13859,10 +13755,17 @@ MA_API ma_result ma_log_postv(ma_log* pLog, ma_uint32 level, const char* pFormat char* pFormattedMessage = NULL; va_list args2; - ma_va_copy(args2, args); + #if _MSC_VER >= 1800 { - formattedLen = ma_vscprintf(&pLog->allocationCallbacks, pFormat, args2); + va_copy(args2, args); } + #else + { + args2 = args; + } + #endif + + formattedLen = ma_vscprintf(&pLog->allocationCallbacks, pFormat, args2); va_end(args2); if (formattedLen <= 0) { @@ -14061,7 +13964,7 @@ miniaudio's purposes. #define MA_LCG_A 48271 #define MA_LCG_C 0 -static ma_lcg g_maLCG = {MA_DEFAULT_LCG_SEED}; /* Non-zero initial seed. Use ma_lcg_seed() to use an explicit seed. */ +static ma_lcg g_maLCG = {MA_DEFAULT_LCG_SEED}; /* Non-zero initial seed. Use ma_seed() to use an explicit seed. */ static MA_INLINE void ma_lcg_seed(ma_lcg* pLCG, ma_int32 seed) { @@ -14110,7 +14013,7 @@ static MA_INLINE ma_int32 ma_lcg_rand_range_s32(ma_lcg* pLCG, ma_int32 lo, ma_in } -#if 0 /* Currently unused. */ + static MA_INLINE void ma_seed(ma_int32 seed) { ma_lcg_seed(&g_maLCG, seed); @@ -14135,7 +14038,6 @@ static MA_INLINE float ma_rand_f32(void) { return ma_lcg_rand_f32(&g_maLCG); } -#endif static MA_INLINE float ma_rand_range_f32(float lo, float hi) { @@ -14195,7 +14097,6 @@ Atomics **************************************************************************************************************************************************************/ /* c89atomic.h begin */ #ifndef ma_atomic_h -#define ma_atomic_h #if defined(__cplusplus) extern "C" { #endif @@ -14207,40 +14108,11 @@ extern "C" { #endif #endif typedef int ma_atomic_memory_order; -#if !defined(MA_ATOMIC_MODERN_MSVC) && \ - !defined(MA_ATOMIC_LEGACY_MSVC) && \ - !defined(MA_ATOMIC_LEGACY_MSVC_ASM) && \ - !defined(MA_ATOMIC_MODERN_GCC) && \ - !defined(MA_ATOMIC_LEGACY_GCC) && \ - !defined(MA_ATOMIC_LEGACY_GCC_ASM) - #if defined(_MSC_VER) || defined(__WATCOMC__) || defined(__DMC__) || defined(__BORLANDC__) - #if (defined(_MSC_VER) && _MSC_VER > 1600) - #define MA_ATOMIC_MODERN_MSVC - #else - #if defined(MA_X64) - #define MA_ATOMIC_LEGACY_MSVC - #else - #define MA_ATOMIC_LEGACY_MSVC_ASM - #endif - #endif - #elif (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))) || defined(__clang__) - #define MA_ATOMIC_MODERN_GCC - #else - #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) - #define MA_ATOMIC_LEGACY_GCC - #else - #define MA_ATOMIC_LEGACY_GCC_ASM - #endif - #endif -#endif -#if defined(MA_ATOMIC_MODERN_MSVC) || defined(MA_ATOMIC_LEGACY_MSVC) - #include - #define ma_atomic_memory_order_relaxed 1 - #define ma_atomic_memory_order_consume 2 - #define ma_atomic_memory_order_acquire 3 - #define ma_atomic_memory_order_release 4 - #define ma_atomic_memory_order_acq_rel 5 - #define ma_atomic_memory_order_seq_cst 6 +#define MA_ATOMIC_HAS_8 +#define MA_ATOMIC_HAS_16 +#define MA_ATOMIC_HAS_32 +#define MA_ATOMIC_HAS_64 +#if (defined(_MSC_VER) ) || defined(__WATCOMC__) || defined(__DMC__) #define MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, intrin, ma_atomicType, msvcType) \ ma_atomicType result; \ switch (order) \ @@ -14266,1501 +14138,720 @@ typedef int ma_atomic_memory_order; } break; \ } \ return result; - typedef ma_uint32 ma_atomic_flag; - static MA_INLINE ma_atomic_flag ma_atomic_flag_test_and_set_explicit(volatile ma_atomic_flag* dst, ma_atomic_memory_order order) - { - #if defined(MA_ARM) - { - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, 1, order, _InterlockedExchange, ma_atomic_flag, long); - } - #else - { - (void)order; - return (ma_atomic_flag)_InterlockedExchange((volatile long*)dst, (long)1); - } - #endif - } - static MA_INLINE void ma_atomic_flag_clear_explicit(volatile ma_atomic_flag* dst, ma_atomic_memory_order order) - { - #if defined(MA_ARM) - { - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, 0, order, _InterlockedExchange, ma_atomic_flag, long); - } - #else - { - (void)order; - _InterlockedExchange((volatile long*)dst, (long)0); - } - #endif - } - static MA_INLINE ma_atomic_flag ma_atomic_flag_load_explicit(volatile const ma_atomic_flag* dst, ma_atomic_memory_order order) - { - (void)order; - return (ma_uint32)_InterlockedCompareExchange((volatile long*)dst, 0, 0); - } -#endif -#if defined(MA_ATOMIC_LEGACY_MSVC_ASM) - #define ma_atomic_memory_order_relaxed 1 - #define ma_atomic_memory_order_consume 2 - #define ma_atomic_memory_order_acquire 3 - #define ma_atomic_memory_order_release 4 - #define ma_atomic_memory_order_acq_rel 5 - #define ma_atomic_memory_order_seq_cst 6 - typedef ma_uint32 ma_atomic_flag; - static MA_INLINE ma_atomic_flag ma_atomic_flag_test_and_set_explicit(volatile ma_atomic_flag* dst, ma_atomic_memory_order order) - { - ma_atomic_flag result = 0; - (void)order; - __asm { - mov ecx, dst - mov eax, 1 - xchg [ecx], eax - mov result, eax - } - return result; - } - static MA_INLINE void ma_atomic_flag_clear_explicit(volatile ma_atomic_flag* dst, ma_atomic_memory_order order) - { - if (order == ma_atomic_memory_order_relaxed) { - __asm { - mov esi, dst - mov dword ptr [esi], 0 - } - } else { - __asm { - mov esi, dst - mov eax, 0 - xchg [esi], eax - } - } - } - static MA_INLINE ma_atomic_flag ma_atomic_flag_load_explicit(volatile const ma_atomic_flag* dst, ma_atomic_memory_order order) - { - ma_atomic_flag result = 0; - if (order == ma_atomic_memory_order_relaxed) { - __asm { - mov esi, dst - mov eax, [esi] - mov result, eax - } - } else if (order <= ma_atomic_memory_order_release) { - __asm { - mov esi, dst - mov eax, [esi] - lock add dword ptr [esp], 0 - mov result, eax - } - } else { - __asm { - lock add dword ptr [esp], 0 - mov esi, dst - mov eax, [esi] - mov result, eax - lock add dword ptr [esp], 0 - } - } - return result; - } -#endif -#if defined(MA_ATOMIC_MODERN_GCC) - #define ma_atomic_memory_order_relaxed __ATOMIC_RELAXED - #define ma_atomic_memory_order_consume __ATOMIC_CONSUME - #define ma_atomic_memory_order_acquire __ATOMIC_ACQUIRE - #define ma_atomic_memory_order_release __ATOMIC_RELEASE - #define ma_atomic_memory_order_acq_rel __ATOMIC_ACQ_REL - #define ma_atomic_memory_order_seq_cst __ATOMIC_SEQ_CST - typedef ma_uint32 ma_atomic_flag; - #define ma_atomic_flag_test_and_set_explicit(dst, order) __atomic_exchange_n(dst, 1, order) - #define ma_atomic_flag_clear_explicit(dst, order) __atomic_store_n(dst, 0, order) - #define ma_atomic_flag_load_explicit(dst, order) __atomic_load_n(dst, order) -#endif -#if defined(MA_ATOMIC_LEGACY_GCC) - #define ma_atomic_memory_order_relaxed 1 - #define ma_atomic_memory_order_consume 2 - #define ma_atomic_memory_order_acquire 3 - #define ma_atomic_memory_order_release 4 - #define ma_atomic_memory_order_acq_rel 5 - #define ma_atomic_memory_order_seq_cst 6 - typedef ma_uint32 ma_atomic_flag; - static MA_INLINE ma_atomic_flag ma_atomic_flag_test_and_set_explicit(volatile ma_atomic_flag* dst, ma_atomic_memory_order order) - { - if (order > ma_atomic_memory_order_acquire) { - __sync_synchronize(); - } - return __sync_lock_test_and_set(dst, 1); - } - static MA_INLINE void ma_atomic_flag_clear_explicit(volatile ma_atomic_flag* dst, ma_atomic_memory_order order) - { - if (order > ma_atomic_memory_order_release) { - __sync_synchronize(); - } - __sync_lock_release(dst); - } - static MA_INLINE ma_atomic_flag ma_atomic_flag_load_explicit(volatile const ma_atomic_flag* dst, ma_atomic_memory_order order) - { - (void)order; - return __sync_val_compare_and_swap((ma_atomic_flag*)dst, 0, 0); - } -#endif -#if defined(MA_ATOMIC_LEGACY_GCC_ASM) - #define ma_atomic_memory_order_relaxed 1 - #define ma_atomic_memory_order_consume 2 - #define ma_atomic_memory_order_acquire 3 - #define ma_atomic_memory_order_release 4 - #define ma_atomic_memory_order_acq_rel 5 - #define ma_atomic_memory_order_seq_cst 6 - #if defined(MA_X86) - #define ma_atomic_thread_fence(order) __asm__ __volatile__("lock; addl $0, (%%esp)" ::: "memory") - #elif defined(MA_X64) - #define ma_atomic_thread_fence(order) __asm__ __volatile__("lock; addq $0, (%%rsp)" ::: "memory") - #else - #error Unsupported architecture. - #endif - #define MA_ATOMIC_XCHG_GCC_X86(instructionSizeSuffix, result, dst, src) \ - __asm__ __volatile__( \ - "xchg"instructionSizeSuffix" %0, %1" \ - : "=r"(result), \ - "=m"(*dst) \ - : "0"(src), \ - "m"(*dst) \ - : "memory" \ - ) - #define MA_ATOMIC_LOAD_RELAXED_GCC_X86(instructionSizeSuffix, result, dst) \ - __asm__ __volatile__( \ - "mov"instructionSizeSuffix" %1, %0" \ - : "=r"(result) \ - : "m"(*dst) \ - ) - #define MA_ATOMIC_LOAD_RELEASE_GCC_X86(instructionSizeSuffix, result, dst) \ - ma_atomic_thread_fence(ma_atomic_memory_order_release); \ - __asm__ __volatile__( \ - "mov"instructionSizeSuffix" %1, %0" \ - : "=r"(result) \ - : "m"(*dst) \ - : "memory" \ - ) - #define MA_ATOMIC_LOAD_SEQ_CST_GCC_X86(instructionSizeSuffix, result, dst) \ - ma_atomic_thread_fence(ma_atomic_memory_order_seq_cst); \ - __asm__ __volatile__( \ - "mov"instructionSizeSuffix" %1, %0" \ - : "=r"(result) \ - : "m"(*dst) \ - : "memory" \ - ); \ - ma_atomic_thread_fence(ma_atomic_memory_order_seq_cst) - typedef ma_uint32 ma_atomic_flag; - static MA_INLINE ma_atomic_flag ma_atomic_flag_test_and_set_explicit(volatile ma_atomic_flag* dst, ma_atomic_memory_order order) - { - ma_atomic_flag result; - #if defined(MA_X86) || defined(MA_X64) - { - (void)order; - MA_ATOMIC_XCHG_GCC_X86("l", result, dst, 1); - } - #else - { - #error Unsupported architecture. - } - #endif - return result; - } - static MA_INLINE void ma_atomic_flag_clear_explicit(volatile ma_atomic_flag* dst, ma_atomic_memory_order order) - { - #if defined(MA_X86) || defined(MA_X64) - { - if (order == ma_atomic_memory_order_relaxed) { - __asm__ __volatile__( - "movl $0, %0" - : "=m"(*dst) - ); - } else if (order == ma_atomic_memory_order_release) { - __asm__ __volatile__( - "movl $0, %0" - : "=m"(*dst) - : - : "memory" - ); - } else { - ma_atomic_flag tmp = 0; - __asm__ __volatile__( - "xchgl %0, %1" - : "=r"(tmp), - "=m"(*dst) - : "0"(tmp), - "m"(*dst) - : "memory" - ); - } - } - #else - { - #error Unsupported architecture. - } - #endif - } - static MA_INLINE ma_atomic_flag ma_atomic_flag_load_explicit(volatile const ma_atomic_flag* dst, ma_atomic_memory_order order) - { - #if defined(MA_X86) || defined(MA_X64) - { - ma_atomic_flag result; - if (order == ma_atomic_memory_order_relaxed) { - MA_ATOMIC_LOAD_RELAXED_GCC_X86("l", result, dst); - } else if (order <= ma_atomic_memory_order_release) { - MA_ATOMIC_LOAD_RELEASE_GCC_X86("l", result, dst); - } else { - MA_ATOMIC_LOAD_SEQ_CST_GCC_X86("l", result, dst); - } - return result; - } - #else - { - #error Unsupported architecture. - } - #endif - } -#endif -#define ma_atomic_flag_test_and_set(dst) ma_atomic_flag_test_and_set_explicit(dst, ma_atomic_memory_order_acquire) -#define ma_atomic_flag_clear(dst) ma_atomic_flag_clear_explicit(dst, ma_atomic_memory_order_release) -typedef ma_atomic_flag ma_atomic_spinlock; -static MA_INLINE void ma_atomic_spinlock_lock(volatile ma_atomic_spinlock* pSpinlock) -{ - for (;;) { - if (ma_atomic_flag_test_and_set_explicit(pSpinlock, ma_atomic_memory_order_acquire) == 0) { - break; - } - while (ma_atomic_flag_load_explicit(pSpinlock, ma_atomic_memory_order_relaxed) == 1) { - } - } -} -static MA_INLINE void ma_atomic_spinlock_unlock(volatile ma_atomic_spinlock* pSpinlock) -{ - ma_atomic_flag_clear_explicit(pSpinlock, ma_atomic_memory_order_release); -} -ma_atomic_spinlock ma_atomic_global_lock; -#if defined(MA_ATOMIC_MODERN_MSVC) || defined(MA_ATOMIC_LEGACY_MSVC) || defined(MA_ATOMIC_LEGACY_MSVC_ASM) || defined(MA_ATOMIC_LEGACY_GCC) || defined(MA_ATOMIC_LEGACY_GCC_ASM) - #if defined(MA_X64) || (defined(MA_X86) && ((defined(__GNUC__) && defined(__i486__)) || (defined(_M_IX86) && _M_IX86 >= 400))) - #if defined(MA_ATOMIC_LEGACY_MSVC) && defined(MA_X64) - #else - #define MA_ATOMIC_IS_LOCK_FREE_8 1 - #define MA_ATOMIC_IS_LOCK_FREE_16 1 - #endif - #define MA_ATOMIC_IS_LOCK_FREE_32 1 - #if defined(MA_X64) || (defined(MA_X86) && ((defined(__GNUC__) && defined(__i586__)) || (defined(_M_IX86) && _M_IX86 >= 500))) - #define MA_ATOMIC_IS_LOCK_FREE_64 1 - #else - #endif - #else - #endif - #if defined(MA_ARM32) || defined(MA_ARM64) - #define MA_ATOMIC_IS_LOCK_FREE_8 1 - #define MA_ATOMIC_IS_LOCK_FREE_16 1 - #define MA_ATOMIC_IS_LOCK_FREE_32 1 - #if defined(MA_ARM64) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) - #define MA_ATOMIC_IS_LOCK_FREE_64 1 - #endif - #endif - #if defined(MA_ATOMIC_PPC32) || defined(MA_ATOMIC_PPC64) - #if (defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7))) && !defined(__clang__) - #else - #define MA_ATOMIC_IS_LOCK_FREE_8 1 - #define MA_ATOMIC_IS_LOCK_FREE_16 1 - #endif - #define MA_ATOMIC_IS_LOCK_FREE_32 1 - #if defined(MA_ATOMIC_PPC64) - #define MA_ATOMIC_IS_LOCK_FREE_64 1 - #endif - #endif - static MA_INLINE ma_bool32 ma_atomic_is_lock_free_8(volatile void* ptr) - { - (void)ptr; - #if defined(MA_ATOMIC_IS_LOCK_FREE_8) - return 1; - #else - return 0; - #endif - } - static MA_INLINE ma_bool32 ma_atomic_is_lock_free_16(volatile void* ptr) - { - (void)ptr; - #if defined(MA_ATOMIC_IS_LOCK_FREE_16) - return 1; - #else - return 0; - #endif - } - static MA_INLINE ma_bool32 ma_atomic_is_lock_free_32(volatile void* ptr) - { - (void)ptr; - #if defined(MA_ATOMIC_IS_LOCK_FREE_32) - return 1; - #else - return 0; - #endif - } - static MA_INLINE ma_bool32 ma_atomic_is_lock_free_64(volatile void* ptr) - { - (void)ptr; - #if defined(MA_ATOMIC_IS_LOCK_FREE_64) - return 1; - #else - return 0; - #endif - } -#endif -#define MA_ATOMIC_COMPARE_AND_SWAP_LOCK(sizeInBits, dst, expected, replacement) \ - ma_uint##sizeInBits result; \ - ma_atomic_spinlock_lock(&ma_atomic_global_lock); \ - { \ - result = *dst; \ - if (result == expected) { \ - *dst = replacement; \ - } \ - } \ - ma_atomic_spinlock_unlock(&ma_atomic_global_lock); \ - return result -#define MA_ATOMIC_LOAD_EXPLICIT_LOCK(sizeInBits, ptr, order) \ - ma_uint##sizeInBits result; \ - ma_atomic_spinlock_lock(&ma_atomic_global_lock); \ - { \ - result = *ptr; \ - (void)order; \ - } \ - ma_atomic_spinlock_unlock(&ma_atomic_global_lock); \ - return result -#define MA_ATOMIC_STORE_EXPLICIT_LOCK(sizeInBits, dst, src, order) \ - ma_atomic_spinlock_lock(&ma_atomic_global_lock); \ - { \ - *dst = src; \ - (void)order; \ - } \ - ma_atomic_spinlock_unlock(&ma_atomic_global_lock) -#define MA_ATOMIC_STORE_EXPLICIT_CAS(sizeInBits, dst, src, order) \ - ma_uint##sizeInBits oldValue; \ - do { \ - oldValue = ma_atomic_load_explicit_##sizeInBits(dst, ma_atomic_memory_order_relaxed); \ - } while (ma_atomic_compare_and_swap_##sizeInBits(dst, oldValue, src) != oldValue); \ - (void)order -#define MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(sizeInBits, dst, src, order) \ - ma_uint##sizeInBits result; \ - ma_atomic_spinlock_lock(&ma_atomic_global_lock); \ - { \ - result = *dst; \ - *dst = src; \ - (void)order; \ - } \ - ma_atomic_spinlock_unlock(&ma_atomic_global_lock); \ - return result -#define MA_ATOMIC_EXCHANGE_EXPLICIT_CAS(sizeInBits, dst, src, order) \ - ma_uint##sizeInBits oldValue; \ - do { \ - oldValue = ma_atomic_load_explicit_##sizeInBits(dst, ma_atomic_memory_order_relaxed); \ - } while (ma_atomic_compare_and_swap_##sizeInBits(dst, oldValue, src) != oldValue); \ - (void)order; \ - return oldValue -#define MA_ATOMIC_FETCH_ADD_LOCK(sizeInBits, dst, src, order) \ - ma_uint##sizeInBits result; \ - ma_atomic_spinlock_lock(&ma_atomic_global_lock); \ - { \ - result = *dst; \ - *dst += src; \ - (void)order; \ - } \ - ma_atomic_spinlock_unlock(&ma_atomic_global_lock); \ - return result -#define MA_ATOMIC_FETCH_ADD_CAS(sizeInBits, dst, src, order) \ - ma_uint##sizeInBits oldValue; \ - ma_uint##sizeInBits newValue; \ - do { \ - oldValue = ma_atomic_load_explicit_##sizeInBits(dst, ma_atomic_memory_order_relaxed); \ - newValue = oldValue + src; \ - } while (ma_atomic_compare_and_swap_##sizeInBits(dst, oldValue, newValue) != oldValue); \ - (void)order; \ - return oldValue -#define MA_ATOMIC_FETCH_AND_CAS(sizeInBits, dst, src, order) \ - ma_uint##sizeInBits oldValue; \ - ma_uint##sizeInBits newValue; \ - do { \ - oldValue = ma_atomic_load_explicit_##sizeInBits(dst, ma_atomic_memory_order_relaxed); \ - newValue = (ma_uint##sizeInBits)(oldValue & src); \ - } while (ma_atomic_compare_and_swap_##sizeInBits(dst, oldValue, newValue) != oldValue); \ - (void)order; \ - return oldValue -#define MA_ATOMIC_FETCH_OR_CAS(sizeInBits, dst, src, order) \ - ma_uint##sizeInBits oldValue; \ - ma_uint##sizeInBits newValue; \ - do { \ - oldValue = ma_atomic_load_explicit_##sizeInBits(dst, ma_atomic_memory_order_relaxed); \ - newValue = (ma_uint##sizeInBits)(oldValue | src); \ - } while (ma_atomic_compare_and_swap_##sizeInBits(dst, oldValue, newValue) != oldValue); \ - (void)order; \ - return oldValue -#define MA_ATOMIC_FETCH_XOR_CAS(sizeInBits, dst, src, order) \ - ma_uint##sizeInBits oldValue; \ - ma_uint##sizeInBits newValue; \ - do { \ - oldValue = ma_atomic_load_explicit_##sizeInBits(dst, ma_atomic_memory_order_relaxed); \ - newValue = (ma_uint##sizeInBits)(oldValue ^ src); \ - } while (ma_atomic_compare_and_swap_##sizeInBits(dst, oldValue, newValue) != oldValue); \ - (void)order; \ - return oldValue -#if defined(MA_ATOMIC_MODERN_MSVC) || defined(MA_ATOMIC_LEGACY_MSVC) - #define MA_ATOMIC_MSVC_ARM_INTRINSIC_COMPARE_EXCHANGE(ptr, expected, replacement, order, intrin, ma_atomicType, msvcType) \ + #define MA_ATOMIC_MSVC_ARM_INTRINSIC_COMPARE_EXCHANGE(ptr, expected, desired, order, intrin, ma_atomicType, msvcType) \ ma_atomicType result; \ switch (order) \ { \ case ma_atomic_memory_order_relaxed: \ { \ - result = (ma_atomicType)intrin##_nf((volatile msvcType*)ptr, (msvcType)expected, (msvcType)replacement); \ + result = (ma_atomicType)intrin##_nf((volatile msvcType*)ptr, (msvcType)expected, (msvcType)desired); \ } break; \ case ma_atomic_memory_order_consume: \ case ma_atomic_memory_order_acquire: \ { \ - result = (ma_atomicType)intrin##_acq((volatile msvcType*)ptr, (msvcType)expected, (msvcType)replacement); \ + result = (ma_atomicType)intrin##_acq((volatile msvcType*)ptr, (msvcType)expected, (msvcType)desired); \ } break; \ case ma_atomic_memory_order_release: \ { \ - result = (ma_atomicType)intrin##_rel((volatile msvcType*)ptr, (msvcType)expected, (msvcType)replacement); \ + result = (ma_atomicType)intrin##_rel((volatile msvcType*)ptr, (msvcType)expected, (msvcType)desired); \ } break; \ case ma_atomic_memory_order_acq_rel: \ case ma_atomic_memory_order_seq_cst: \ default: \ { \ - result = (ma_atomicType)intrin((volatile msvcType*)ptr, (msvcType)expected, (msvcType)replacement); \ + result = (ma_atomicType)intrin((volatile msvcType*)ptr, (msvcType)expected, (msvcType)desired); \ } break; \ } \ return result; - #if defined(MA_ATOMIC_IS_LOCK_FREE_8) - #define ma_atomic_compare_and_swap_8( dst, expected, replacement) (ma_uint8 )_InterlockedCompareExchange8((volatile char*)dst, (char)replacement, (char)expected) - #else - static MA_INLINE ma_uint8 __stdcall ma_atomic_compare_and_swap_8(volatile ma_uint8* dst, ma_uint8 expected, ma_uint8 replacement) - { - MA_ATOMIC_COMPARE_AND_SWAP_LOCK(8, dst, expected, replacement); - } + #define ma_atomic_memory_order_relaxed 0 + #define ma_atomic_memory_order_consume 1 + #define ma_atomic_memory_order_acquire 2 + #define ma_atomic_memory_order_release 3 + #define ma_atomic_memory_order_acq_rel 4 + #define ma_atomic_memory_order_seq_cst 5 + #if _MSC_VER < 1600 && defined(MA_X86) + #define MA_ATOMIC_MSVC_USE_INLINED_ASSEMBLY #endif - #if defined(MA_ATOMIC_IS_LOCK_FREE_16) - #define ma_atomic_compare_and_swap_16(dst, expected, replacement) (ma_uint16)_InterlockedCompareExchange16((volatile short*)dst, (short)replacement, (short)expected) - #else - static MA_INLINE ma_uint16 __stdcall ma_atomic_compare_and_swap_16(volatile ma_uint16* dst, ma_uint16 expected, ma_uint16 replacement) - { - MA_ATOMIC_COMPARE_AND_SWAP_LOCK(16, dst, expected, replacement); - } + #if _MSC_VER < 1600 + #undef MA_ATOMIC_HAS_8 + #undef MA_ATOMIC_HAS_16 #endif - #if defined(MA_ATOMIC_IS_LOCK_FREE_32) - #define ma_atomic_compare_and_swap_32(dst, expected, replacement) (ma_uint32)_InterlockedCompareExchange((volatile long*)dst, (long)replacement, (long)expected) - #else - static MA_INLINE ma_uint32 __stdcall ma_atomic_compare_and_swap_32(volatile ma_uint32* dst, ma_uint32 expected, ma_uint32 replacement) - { - MA_ATOMIC_COMPARE_AND_SWAP_LOCK(32, dst, expected, replacement); - } + #if !defined(MA_ATOMIC_MSVC_USE_INLINED_ASSEMBLY) + #include #endif - #if defined(MA_ATOMIC_IS_LOCK_FREE_32) - #define ma_atomic_compare_and_swap_64(dst, expected, replacement) (ma_uint64)_InterlockedCompareExchange64((volatile ma_int64*)dst, (ma_int64)replacement, (ma_int64)expected) + #if defined(MA_ATOMIC_MSVC_USE_INLINED_ASSEMBLY) + #if defined(MA_ATOMIC_HAS_8) + static MA_INLINE ma_uint8 __stdcall ma_atomic_compare_and_swap_8(volatile ma_uint8* dst, ma_uint8 expected, ma_uint8 desired) + { + ma_uint8 result = 0; + __asm { + mov ecx, dst + mov al, expected + mov dl, desired + lock cmpxchg [ecx], dl + mov result, al + } + return result; + } + #endif + #if defined(MA_ATOMIC_HAS_16) + static MA_INLINE ma_uint16 __stdcall ma_atomic_compare_and_swap_16(volatile ma_uint16* dst, ma_uint16 expected, ma_uint16 desired) + { + ma_uint16 result = 0; + __asm { + mov ecx, dst + mov ax, expected + mov dx, desired + lock cmpxchg [ecx], dx + mov result, ax + } + return result; + } + #endif + #if defined(MA_ATOMIC_HAS_32) + static MA_INLINE ma_uint32 __stdcall ma_atomic_compare_and_swap_32(volatile ma_uint32* dst, ma_uint32 expected, ma_uint32 desired) + { + ma_uint32 result = 0; + __asm { + mov ecx, dst + mov eax, expected + mov edx, desired + lock cmpxchg [ecx], edx + mov result, eax + } + return result; + } + #endif + #if defined(MA_ATOMIC_HAS_64) + static MA_INLINE ma_uint64 __stdcall ma_atomic_compare_and_swap_64(volatile ma_uint64* dst, ma_uint64 expected, ma_uint64 desired) + { + ma_uint32 resultEAX = 0; + ma_uint32 resultEDX = 0; + __asm { + mov esi, dst + mov eax, dword ptr expected + mov edx, dword ptr expected + 4 + mov ebx, dword ptr desired + mov ecx, dword ptr desired + 4 + lock cmpxchg8b qword ptr [esi] + mov resultEAX, eax + mov resultEDX, edx + } + return ((ma_uint64)resultEDX << 32) | resultEAX; + } + #endif #else - static MA_INLINE ma_uint64 __stdcall ma_atomic_compare_and_swap_64(volatile ma_uint64* dst, ma_uint64 expected, ma_uint64 replacement) - { - MA_ATOMIC_COMPARE_AND_SWAP_LOCK(64, dst, expected, replacement); - } + #if defined(MA_ATOMIC_HAS_8) + #define ma_atomic_compare_and_swap_8( dst, expected, desired) (ma_uint8 )_InterlockedCompareExchange8((volatile char*)dst, (char)desired, (char)expected) + #endif + #if defined(MA_ATOMIC_HAS_16) + #define ma_atomic_compare_and_swap_16(dst, expected, desired) (ma_uint16)_InterlockedCompareExchange16((volatile short*)dst, (short)desired, (short)expected) + #endif + #if defined(MA_ATOMIC_HAS_32) + #define ma_atomic_compare_and_swap_32(dst, expected, desired) (ma_uint32)_InterlockedCompareExchange((volatile long*)dst, (long)desired, (long)expected) + #endif + #if defined(MA_ATOMIC_HAS_64) + #define ma_atomic_compare_and_swap_64(dst, expected, desired) (ma_uint64)_InterlockedCompareExchange64((volatile ma_int64*)dst, (ma_int64)desired, (ma_int64)expected) + #endif #endif - static MA_INLINE ma_uint8 ma_atomic_load_explicit_8(volatile const ma_uint8* ptr, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_8) - { - #if defined(MA_ARM) - { - MA_ATOMIC_MSVC_ARM_INTRINSIC_COMPARE_EXCHANGE(ptr, 0, 0, order, _InterlockedCompareExchange8, ma_uint8, char); - } - #else + #if defined(MA_ATOMIC_MSVC_USE_INLINED_ASSEMBLY) + #if defined(MA_ATOMIC_HAS_8) + static MA_INLINE ma_uint8 __stdcall ma_atomic_exchange_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) { + ma_uint8 result = 0; (void)order; - return ma_atomic_compare_and_swap_8((volatile ma_uint8*)ptr, 0, 0); + __asm { + mov ecx, dst + mov al, src + lock xchg [ecx], al + mov result, al + } + return result; } - #endif - } - #else - { - MA_ATOMIC_LOAD_EXPLICIT_LOCK(8, ptr, order); - } #endif - } - static MA_INLINE ma_uint16 ma_atomic_load_explicit_16(volatile const ma_uint16* ptr, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_16) - { - #if defined(MA_ARM) - { - MA_ATOMIC_MSVC_ARM_INTRINSIC_COMPARE_EXCHANGE(ptr, 0, 0, order, _InterlockedCompareExchange16, ma_uint16, short); - } - #else + #if defined(MA_ATOMIC_HAS_16) + static MA_INLINE ma_uint16 __stdcall ma_atomic_exchange_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) { + ma_uint16 result = 0; (void)order; - return ma_atomic_compare_and_swap_16((volatile ma_uint16*)ptr, 0, 0); + __asm { + mov ecx, dst + mov ax, src + lock xchg [ecx], ax + mov result, ax + } + return result; } - #endif - } - #else - { - MA_ATOMIC_LOAD_EXPLICIT_LOCK(16, ptr, order); - } #endif - } - static MA_INLINE ma_uint32 ma_atomic_load_explicit_32(volatile const ma_uint32* ptr, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_32) - { - #if defined(MA_ARM) - { - MA_ATOMIC_MSVC_ARM_INTRINSIC_COMPARE_EXCHANGE(ptr, 0, 0, order, _InterlockedCompareExchange, ma_uint32, long); - } - #else + #if defined(MA_ATOMIC_HAS_32) + static MA_INLINE ma_uint32 __stdcall ma_atomic_exchange_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) { + ma_uint32 result = 0; (void)order; - return ma_atomic_compare_and_swap_32((volatile ma_uint32*)ptr, 0, 0); + __asm { + mov ecx, dst + mov eax, src + lock xchg [ecx], eax + mov result, eax + } + return result; } - #endif - } - #else - { - MA_ATOMIC_LOAD_EXPLICIT_LOCK(32, ptr, order); - } #endif - } - static MA_INLINE ma_uint64 ma_atomic_load_explicit_64(volatile const ma_uint64* ptr, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_32) - { + #else + #if defined(MA_ATOMIC_HAS_8) + static MA_INLINE ma_uint8 __stdcall ma_atomic_exchange_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { #if defined(MA_ARM) - { - MA_ATOMIC_MSVC_ARM_INTRINSIC_COMPARE_EXCHANGE(ptr, 0, 0, order, _InterlockedCompareExchange64, ma_uint64, long long); - } - #else - { - (void)order; - return ma_atomic_compare_and_swap_64((volatile ma_uint64*)ptr, 0, 0); - } - #endif - } - #else - { - MA_ATOMIC_LOAD_EXPLICIT_LOCK(64, ptr, order); - } - #endif - } - static MA_INLINE ma_uint8 __stdcall ma_atomic_exchange_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_8) - { - #if defined(MA_ARM) - { MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchange8, ma_uint8, char); - } #else - { (void)order; return (ma_uint8)_InterlockedExchange8((volatile char*)dst, (char)src); - } #endif - } - #else - { - MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(8, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint16 __stdcall ma_atomic_exchange_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_16) - { - #if defined(MA_ARM) - { - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchange16, ma_uint16, short); } - #else + #endif + #if defined(MA_ATOMIC_HAS_16) + static MA_INLINE ma_uint16 __stdcall ma_atomic_exchange_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) { + #if defined(MA_ARM) + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchange16, ma_uint16, short); + #else (void)order; return (ma_uint16)_InterlockedExchange16((volatile short*)dst, (short)src); - } #endif - } - #else - { - MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(16, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint32 __stdcall ma_atomic_exchange_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_32) - { - #if defined(MA_ARM) - { - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchange, ma_uint32, long); } - #else + #endif + #if defined(MA_ATOMIC_HAS_32) + static MA_INLINE ma_uint32 __stdcall ma_atomic_exchange_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) { + #if defined(MA_ARM) + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchange, ma_uint32, long); + #else (void)order; return (ma_uint32)_InterlockedExchange((volatile long*)dst, (long)src); - } #endif - } - #else - { - MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(32, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint64 __stdcall ma_atomic_exchange_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_64) - { - #if defined(MA_32BIT) - { - MA_ATOMIC_EXCHANGE_EXPLICIT_CAS(64, dst, src, order); } - #else - { - #if defined(MA_ARM) - { - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchange64, ma_uint64, long long); - } - #else - { - (void)order; - return (ma_uint64)_InterlockedExchange64((volatile long long*)dst, (long long)src); - } - #endif - } - #endif - } - #else - { - MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(64, dst, src, order); - } #endif - } - static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_add_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_8) - { + #if defined(MA_ATOMIC_HAS_64) && defined(MA_64BIT) + static MA_INLINE ma_uint64 __stdcall ma_atomic_exchange_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { #if defined(MA_ARM) - { - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchangeAdd8, ma_uint8, char); - } + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchange64, ma_uint64, long long); #else - { (void)order; - return (ma_uint8)_InterlockedExchangeAdd8((volatile char*)dst, (char)src); - } + return (ma_uint64)_InterlockedExchange64((volatile long long*)dst, (long long)src); #endif - } - #else - { - MA_ATOMIC_FETCH_ADD_LOCK(8, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_add_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_16) - { - #if defined(MA_ARM) - { - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchangeAdd16, ma_uint16, short); } - #else - { - (void)order; - return (ma_uint16)_InterlockedExchangeAdd16((volatile short*)dst, (short)src); - } - #endif - } #else - { - MA_ATOMIC_FETCH_ADD_LOCK(16, dst, src, order); - } #endif - } - static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_add_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_32) + #endif + #if defined(MA_ATOMIC_HAS_64) && !defined(MA_64BIT) + static MA_INLINE ma_uint64 __stdcall ma_atomic_exchange_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) { - #if defined(MA_ARM) - { - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchangeAdd, ma_uint32, long); - } - #else - { - (void)order; - return (ma_uint32)_InterlockedExchangeAdd((volatile long*)dst, (long)src); - } - #endif - } - #else - { - MA_ATOMIC_FETCH_ADD_LOCK(32, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_add_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_64) - { - #if defined(MA_32BIT) - { - MA_ATOMIC_FETCH_ADD_CAS(64, dst, src, order); - } - #else - { - #if defined(MA_ARM) - { - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchangeAdd64, ma_uint64, long long); - } - #else - { - (void)order; - return (ma_uint64)_InterlockedExchangeAdd64((volatile long long*)dst, (long long)src); - } - #endif - } - #endif - } - #else - { - MA_ATOMIC_FETCH_ADD_LOCK(64, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_sub_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - return ma_atomic_fetch_add_explicit_8(dst, (ma_uint8)(-(ma_int8)src), order); - } - static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_sub_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - return ma_atomic_fetch_add_explicit_16(dst, (ma_uint16)(-(ma_int16)src), order); - } - static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_sub_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - return ma_atomic_fetch_add_explicit_32(dst, (ma_uint32)(-(ma_int32)src), order); - } - static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_sub_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - return ma_atomic_fetch_add_explicit_64(dst, (ma_uint64)(-(ma_int64)src), order); - } - static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_and_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - #if defined(MA_ARM) - { - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedAnd8, ma_uint8, char); - } - #else - { - MA_ATOMIC_FETCH_AND_CAS(8, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_and_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - #if defined(MA_ARM) - { - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedAnd16, ma_uint16, short); - } - #else - { - MA_ATOMIC_FETCH_AND_CAS(16, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_and_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - #if defined(MA_ARM) - { - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedAnd, ma_uint32, long); - } - #else - { - MA_ATOMIC_FETCH_AND_CAS(32, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_and_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - #if defined(MA_ARM) - { - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedAnd64, ma_uint64, long long); - } - #else - { - MA_ATOMIC_FETCH_AND_CAS(64, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_or_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - #if defined(MA_ARM) - { - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedOr8, ma_uint8, char); - } - #else - { - MA_ATOMIC_FETCH_OR_CAS(8, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_or_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - #if defined(MA_ARM) - { - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedOr16, ma_uint16, short); - } - #else - { - MA_ATOMIC_FETCH_OR_CAS(16, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_or_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - #if defined(MA_ARM) - { - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedOr, ma_uint32, long); - } - #else - { - MA_ATOMIC_FETCH_OR_CAS(32, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_or_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - #if defined(MA_ARM) - { - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedOr64, ma_uint64, long long); - } - #else - { - MA_ATOMIC_FETCH_OR_CAS(64, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_xor_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - #if defined(MA_ARM) - { - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedXor8, ma_uint8, char); - } - #else - { - MA_ATOMIC_FETCH_XOR_CAS(8, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_xor_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - #if defined(MA_ARM) - { - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedXor16, ma_uint16, short); - } - #else - { - MA_ATOMIC_FETCH_XOR_CAS(16, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_xor_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - #if defined(MA_ARM) - { - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedXor, ma_uint32, long); - } - #else - { - MA_ATOMIC_FETCH_XOR_CAS(32, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_xor_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - #if defined(MA_ARM) - { - MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedXor64, ma_uint64, long long); - } - #else - { - MA_ATOMIC_FETCH_XOR_CAS(64, dst, src, order); - } - #endif - } - #define ma_atomic_store_explicit_8( dst, src, order) (void)ma_atomic_exchange_explicit_8 (dst, src, order) - #define ma_atomic_store_explicit_16(dst, src, order) (void)ma_atomic_exchange_explicit_16(dst, src, order) - #define ma_atomic_store_explicit_32(dst, src, order) (void)ma_atomic_exchange_explicit_32(dst, src, order) - #define ma_atomic_store_explicit_64(dst, src, order) (void)ma_atomic_exchange_explicit_64(dst, src, order) - #if defined(MA_X64) - #define ma_atomic_thread_fence(order) __faststorefence(), (void)order - #elif defined(MA_ARM64) - #define ma_atomic_thread_fence(order) __dmb(_ARM64_BARRIER_ISH), (void)order - #else - static MA_INLINE void ma_atomic_thread_fence(ma_atomic_memory_order order) - { - volatile ma_uint32 barrier = 0; - ma_atomic_fetch_add_explicit_32(&barrier, 0, order); + ma_uint64 oldValue; + do { + oldValue = *dst; + } while (ma_atomic_compare_and_swap_64(dst, oldValue, src) != oldValue); + (void)order; + return oldValue; } #endif - #define ma_atomic_signal_fence(order) _ReadWriteBarrier(), (void)order -#endif -#if defined(MA_ATOMIC_LEGACY_MSVC_ASM) - static MA_INLINE ma_uint8 __stdcall ma_atomic_compare_and_swap_8(volatile ma_uint8* dst, ma_uint8 expected, ma_uint8 replacement) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_8) - { - ma_uint8 result = 0; - __asm { - mov ecx, dst - mov al, expected - mov dl, replacement - lock cmpxchg [ecx], dl - mov result, al - } - return result; - } - #else - { - MA_ATOMIC_COMPARE_AND_SWAP_LOCK(8, dst, expected, replacement); - } - #endif - } - static MA_INLINE ma_uint16 __stdcall ma_atomic_compare_and_swap_16(volatile ma_uint16* dst, ma_uint16 expected, ma_uint16 replacement) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_16) - { - ma_uint16 result = 0; - __asm { - mov ecx, dst - mov ax, expected - mov dx, replacement - lock cmpxchg [ecx], dx - mov result, ax - } - return result; - } - #else - { - MA_ATOMIC_COMPARE_AND_SWAP_LOCK(16, dst, expected, replacement); - } - #endif - } - static MA_INLINE ma_uint32 __stdcall ma_atomic_compare_and_swap_32(volatile ma_uint32* dst, ma_uint32 expected, ma_uint32 replacement) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_32) - { - ma_uint32 result = 0; - __asm { - mov ecx, dst - mov eax, expected - mov edx, replacement - lock cmpxchg [ecx], edx - mov result, eax - } - return result; - } - #else - { - MA_ATOMIC_COMPARE_AND_SWAP_LOCK(32, dst, expected, replacement); - } - #endif - } - static MA_INLINE ma_uint64 __stdcall ma_atomic_compare_and_swap_64(volatile ma_uint64* dst, ma_uint64 expected, ma_uint64 replacement) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_64) - { - ma_uint32 resultEAX = 0; - ma_uint32 resultEDX = 0; - __asm { - mov esi, dst - mov eax, dword ptr expected - mov edx, dword ptr expected + 4 - mov ebx, dword ptr replacement - mov ecx, dword ptr replacement + 4 - lock cmpxchg8b qword ptr [esi] - mov resultEAX, eax - mov resultEDX, edx - } - return ((ma_uint64)resultEDX << 32) | resultEAX; - } - #else - { - MA_ATOMIC_COMPARE_AND_SWAP_LOCK(64, dst, expected, replacement); - } - #endif - } - static MA_INLINE ma_uint8 ma_atomic_load_explicit_8(volatile const ma_uint8* dst, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_8) - { - ma_uint8 result = 0; - if (order == ma_atomic_memory_order_relaxed) { + #if defined(MA_ATOMIC_MSVC_USE_INLINED_ASSEMBLY) + #if defined(MA_ATOMIC_HAS_8) + static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_add_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + ma_uint8 result = 0; + (void)order; __asm { - mov esi, dst - mov al, [esi] + mov ecx, dst + mov al, src + lock xadd [ecx], al mov result, al } - } else if (order <= ma_atomic_memory_order_release) { - __asm { - mov esi, dst - mov al, [esi] - lock add dword ptr [esp], 0 - mov result, al - } - } else { - __asm { - lock add dword ptr [esp], 0 - mov esi, dst - mov al, [esi] - mov result, al - lock add dword ptr [esp], 0 - } + return result; } - return result; - } - #else - { - MA_ATOMIC_LOAD_EXPLICIT_LOCK(8, dst, order); - } #endif - } - static MA_INLINE ma_uint16 ma_atomic_load_explicit_16(volatile const ma_uint16* dst, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_16) - { - ma_uint16 result = 0; - if (order == ma_atomic_memory_order_relaxed) { + #if defined(MA_ATOMIC_HAS_16) + static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_add_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + ma_uint16 result = 0; + (void)order; __asm { - mov esi, dst - mov ax, [esi] + mov ecx, dst + mov ax, src + lock xadd [ecx], ax mov result, ax } - } else if (order <= ma_atomic_memory_order_release) { - __asm { - mov esi, dst - mov ax, [esi] - lock add dword ptr [esp], 0 - mov result, ax - } - } else { - __asm { - lock add dword ptr [esp], 0 - mov esi, dst - mov ax, [esi] - mov result, ax - lock add dword ptr [esp], 0 - } + return result; } - return result; - } - #else - { - MA_ATOMIC_LOAD_EXPLICIT_LOCK(16, dst, order); - } #endif - } - static MA_INLINE ma_uint32 ma_atomic_load_explicit_32(volatile const ma_uint32* dst, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_32) - { - ma_uint32 result = 0; - if (order == ma_atomic_memory_order_relaxed) { - __asm { - mov esi, dst - mov eax, [esi] - mov result, eax - } - } else if (order <= ma_atomic_memory_order_release) { - __asm { - mov esi, dst - mov eax, [esi] - lock add dword ptr [esp], 0 - mov result, eax - } - } else { - __asm { - lock add dword ptr [esp], 0 - mov esi, dst - mov eax, [esi] - mov result, eax - lock add dword ptr [esp], 0 - } - } - return result; - } - #else - { - MA_ATOMIC_LOAD_EXPLICIT_LOCK(32, dst, order); - } - #endif - } - static MA_INLINE ma_uint64 ma_atomic_load_explicit_64(volatile const ma_uint64* dst, ma_atomic_memory_order order) - { - (void)order; - return ma_atomic_compare_and_swap_64((volatile ma_uint64*)dst, 0, 0); - } - static MA_INLINE void __stdcall ma_atomic_store_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - if (order == ma_atomic_memory_order_relaxed) { - __asm { - mov esi, dst - mov al, src - mov [esi], al - } - } else { - #if defined(MA_ATOMIC_IS_LOCK_FREE_8) + #if defined(MA_ATOMIC_HAS_32) + static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_add_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) { + ma_uint32 result = 0; + (void)order; __asm { - mov esi, dst - mov al, src - xchg [esi], al - } - } - #else - { - MA_ATOMIC_STORE_EXPLICIT_LOCK(8, dst, src, order); - } - #endif - } - } - static MA_INLINE void __stdcall ma_atomic_store_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - if (order == ma_atomic_memory_order_relaxed) { - __asm { - mov esi, dst - mov ax, src - mov [esi], ax - } - } else { - #if defined(MA_ATOMIC_IS_LOCK_FREE_16) - { - __asm { - mov esi, dst - mov ax, src - xchg [esi], ax - } - } - #else - { - MA_ATOMIC_STORE_EXPLICIT_LOCK(16, dst, src, order); - } - #endif - } - } - static MA_INLINE void __stdcall ma_atomic_store_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - if (order == ma_atomic_memory_order_relaxed) { - __asm { - mov esi, dst - mov eax, src - mov [esi], eax - } - } else { - #if defined(MA_ATOMIC_IS_LOCK_FREE_32) - { - __asm { - mov esi, dst + mov ecx, dst mov eax, src - xchg [esi], eax + lock xadd [ecx], eax + mov result, eax } + return result; } - #else + #endif + #else + #if defined(MA_ATOMIC_HAS_8) + static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_add_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) { - MA_ATOMIC_STORE_EXPLICIT_LOCK(32, dst, src, order); - } + #if defined(MA_ARM) + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchangeAdd8, ma_uint8, char); + #else + (void)order; + return (ma_uint8)_InterlockedExchangeAdd8((volatile char*)dst, (char)src); #endif - } - } - static MA_INLINE void __stdcall ma_atomic_store_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_64) - { - MA_ATOMIC_STORE_EXPLICIT_CAS(64, dst, src, order); - } - #else - { - MA_ATOMIC_STORE_EXPLICIT_LOCK(64, dst, src, order); - } + } #endif - } - static MA_INLINE ma_uint8 __stdcall ma_atomic_exchange_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_8) + #if defined(MA_ATOMIC_HAS_16) + static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_add_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchangeAdd16, ma_uint16, short); + #else + (void)order; + return (ma_uint16)_InterlockedExchangeAdd16((volatile short*)dst, (short)src); + #endif + } + #endif + #if defined(MA_ATOMIC_HAS_32) + static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_add_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchangeAdd, ma_uint32, long); + #else + (void)order; + return (ma_uint32)_InterlockedExchangeAdd((volatile long*)dst, (long)src); + #endif + } + #endif + #if defined(MA_ATOMIC_HAS_64) && defined(MA_64BIT) + static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_add_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedExchangeAdd64, ma_uint64, long long); + #else + (void)order; + return (ma_uint64)_InterlockedExchangeAdd64((volatile long long*)dst, (long long)src); + #endif + } + #else + #endif + #endif + #if defined(MA_ATOMIC_HAS_64) && !defined(MA_64BIT) + static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_add_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + ma_uint64 oldValue; + ma_uint64 newValue; + do { + oldValue = *dst; + newValue = oldValue + src; + } while (ma_atomic_compare_and_swap_64(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + } + #endif + #if defined(MA_ATOMIC_MSVC_USE_INLINED_ASSEMBLY) + static MA_INLINE void __stdcall ma_atomic_thread_fence(ma_atomic_memory_order order) { - ma_uint8 result = 0; (void)order; __asm { - mov ecx, dst - mov al, src - lock xchg [ecx], al - mov result, al + lock add [esp], 0 } - return result; } + #else + #if defined(MA_X64) + #define ma_atomic_thread_fence(order) __faststorefence(), (void)order + #elif defined(MA_ARM64) + #define ma_atomic_thread_fence(order) __dmb(_ARM64_BARRIER_ISH), (void)order #else - { - MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(8, dst, src, order); - } + static MA_INLINE void ma_atomic_thread_fence(ma_atomic_memory_order order) + { + volatile ma_uint32 barrier = 0; + ma_atomic_fetch_add_explicit_32(&barrier, 0, order); + } #endif - } - static MA_INLINE ma_uint16 __stdcall ma_atomic_exchange_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_16) + #endif + #define ma_atomic_compiler_fence() ma_atomic_thread_fence(ma_atomic_memory_order_seq_cst) + #define ma_atomic_signal_fence(order) ma_atomic_thread_fence(order) + #if defined(MA_ATOMIC_HAS_8) + static MA_INLINE ma_uint8 ma_atomic_load_explicit_8(volatile const ma_uint8* ptr, ma_atomic_memory_order order) { - ma_uint16 result = 0; + #if defined(MA_ARM) + MA_ATOMIC_MSVC_ARM_INTRINSIC_COMPARE_EXCHANGE(ptr, 0, 0, order, _InterlockedCompareExchange8, ma_uint8, char); + #else (void)order; - __asm { - mov ecx, dst - mov ax, src - lock xchg [ecx], ax - mov result, ax - } - return result; - } - #else - { - MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(16, dst, src, order); - } + return ma_atomic_compare_and_swap_8((volatile ma_uint8*)ptr, 0, 0); #endif - } - static MA_INLINE ma_uint32 __stdcall ma_atomic_exchange_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_32) + } + #endif + #if defined(MA_ATOMIC_HAS_16) + static MA_INLINE ma_uint16 ma_atomic_load_explicit_16(volatile const ma_uint16* ptr, ma_atomic_memory_order order) { - ma_uint32 result = 0; + #if defined(MA_ARM) + MA_ATOMIC_MSVC_ARM_INTRINSIC_COMPARE_EXCHANGE(ptr, 0, 0, order, _InterlockedCompareExchange16, ma_uint16, short); + #else (void)order; - __asm { - mov ecx, dst - mov eax, src - xchg [ecx], eax - mov result, eax - } - return result; - } - #else - { - MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(32, dst, src, order); - } + return ma_atomic_compare_and_swap_16((volatile ma_uint16*)ptr, 0, 0); #endif - } - static MA_INLINE ma_uint64 __stdcall ma_atomic_exchange_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_64) - { - MA_ATOMIC_EXCHANGE_EXPLICIT_CAS(64, dst, src, order); } + #endif + #if defined(MA_ATOMIC_HAS_32) + static MA_INLINE ma_uint32 ma_atomic_load_explicit_32(volatile const ma_uint32* ptr, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + MA_ATOMIC_MSVC_ARM_INTRINSIC_COMPARE_EXCHANGE(ptr, 0, 0, order, _InterlockedCompareExchange, ma_uint32, long); #else - { - MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(64, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_add_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_8) - { - ma_uint8 result = 0; (void)order; - __asm { - mov ecx, dst - mov al, src - lock xadd [ecx], al - mov result, al - } - return result; - } - #else - { - MA_ATOMIC_FETCH_ADD_LOCK(8, dst, src, order); - } + return ma_atomic_compare_and_swap_32((volatile ma_uint32*)ptr, 0, 0); #endif - } - static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_add_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_16) + } + #endif + #if defined(MA_ATOMIC_HAS_64) + static MA_INLINE ma_uint64 ma_atomic_load_explicit_64(volatile const ma_uint64* ptr, ma_atomic_memory_order order) { - ma_uint16 result = 0; + #if defined(MA_ARM) + MA_ATOMIC_MSVC_ARM_INTRINSIC_COMPARE_EXCHANGE(ptr, 0, 0, order, _InterlockedCompareExchange64, ma_uint64, long long); + #else (void)order; - __asm { - mov ecx, dst - mov ax, src - lock xadd [ecx], ax - mov result, ax - } - return result; - } - #else - { - MA_ATOMIC_FETCH_ADD_LOCK(16, dst, src, order); - } + return ma_atomic_compare_and_swap_64((volatile ma_uint64*)ptr, 0, 0); #endif - } - static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_add_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_32) + } + #endif + #if defined(MA_ATOMIC_HAS_8) + #define ma_atomic_store_explicit_8( dst, src, order) (void)ma_atomic_exchange_explicit_8 (dst, src, order) + #endif + #if defined(MA_ATOMIC_HAS_16) + #define ma_atomic_store_explicit_16(dst, src, order) (void)ma_atomic_exchange_explicit_16(dst, src, order) + #endif + #if defined(MA_ATOMIC_HAS_32) + #define ma_atomic_store_explicit_32(dst, src, order) (void)ma_atomic_exchange_explicit_32(dst, src, order) + #endif + #if defined(MA_ATOMIC_HAS_64) + #define ma_atomic_store_explicit_64(dst, src, order) (void)ma_atomic_exchange_explicit_64(dst, src, order) + #endif + #if defined(MA_ATOMIC_HAS_8) + static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_sub_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) { - ma_uint32 result = 0; + ma_uint8 oldValue; + ma_uint8 newValue; + do { + oldValue = *dst; + newValue = (ma_uint8)(oldValue - src); + } while (ma_atomic_compare_and_swap_8(dst, oldValue, newValue) != oldValue); (void)order; - __asm { - mov ecx, dst - mov eax, src - lock xadd [ecx], eax - mov result, eax - } - return result; + return oldValue; } - #else + #endif + #if defined(MA_ATOMIC_HAS_16) + static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_sub_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) { - MA_ATOMIC_FETCH_ADD_LOCK(32, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_add_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_64) - { - MA_ATOMIC_FETCH_ADD_CAS(64, dst, src, order); - } - #else - { - MA_ATOMIC_FETCH_ADD_LOCK(64, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_sub_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_8) - { - ma_uint8 result = 0; + ma_uint16 oldValue; + ma_uint16 newValue; + do { + oldValue = *dst; + newValue = (ma_uint16)(oldValue - src); + } while (ma_atomic_compare_and_swap_16(dst, oldValue, newValue) != oldValue); (void)order; - __asm { - mov ecx, dst - mov al, src - neg al - lock xadd [ecx], al - mov result, al - } - return result; + return oldValue; } - #else + #endif + #if defined(MA_ATOMIC_HAS_32) + static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_sub_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) { - MA_ATOMIC_FETCH_ADD_LOCK(8, dst, (ma_uint8)(-(ma_int8)src), order); - } - #endif - } - static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_sub_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_16) - { - ma_uint16 result = 0; + ma_uint32 oldValue; + ma_uint32 newValue; + do { + oldValue = *dst; + newValue = oldValue - src; + } while (ma_atomic_compare_and_swap_32(dst, oldValue, newValue) != oldValue); (void)order; - __asm { - mov ecx, dst - mov ax, src - neg ax - lock xadd [ecx], ax - mov result, ax - } - return result; + return oldValue; } - #else + #endif + #if defined(MA_ATOMIC_HAS_64) + static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_sub_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) { - MA_ATOMIC_FETCH_ADD_LOCK(16, dst, (ma_uint16)(-(ma_int16)src), order); - } - #endif - } - static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_sub_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_32) - { - ma_uint32 result = 0; + ma_uint64 oldValue; + ma_uint64 newValue; + do { + oldValue = *dst; + newValue = oldValue - src; + } while (ma_atomic_compare_and_swap_64(dst, oldValue, newValue) != oldValue); (void)order; - __asm { - mov ecx, dst - mov eax, src - neg eax - lock xadd [ecx], eax - mov result, eax - } - return result; + return oldValue; } - #else + #endif + #if defined(MA_ATOMIC_HAS_8) + static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_and_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) { - MA_ATOMIC_FETCH_ADD_LOCK(32, dst, (ma_uint32)(-(ma_int32)src), order); - } + #if defined(MA_ARM) + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedAnd8, ma_uint8, char); + #else + ma_uint8 oldValue; + ma_uint8 newValue; + do { + oldValue = *dst; + newValue = (ma_uint8)(oldValue & src); + } while (ma_atomic_compare_and_swap_8(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; #endif - } - static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_sub_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - MA_ATOMIC_FETCH_ADD_CAS(64, dst, (ma_uint64)(-(ma_int64)src), order); - } - static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_and_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - MA_ATOMIC_FETCH_AND_CAS(8, dst, src, order); - } - static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_and_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - MA_ATOMIC_FETCH_AND_CAS(16, dst, src, order); - } - static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_and_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - MA_ATOMIC_FETCH_AND_CAS(32, dst, src, order); - } - static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_and_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - MA_ATOMIC_FETCH_AND_CAS(64, dst, src, order); - } - static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_or_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - MA_ATOMIC_FETCH_OR_CAS(8, dst, src, order); - } - static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_or_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - MA_ATOMIC_FETCH_OR_CAS(16, dst, src, order); - } - static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_or_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - MA_ATOMIC_FETCH_OR_CAS(32, dst, src, order); - } - static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_or_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - MA_ATOMIC_FETCH_OR_CAS(64, dst, src, order); - } - static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_xor_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - MA_ATOMIC_FETCH_XOR_CAS(8, dst, src, order); - } - static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_xor_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - MA_ATOMIC_FETCH_XOR_CAS(16, dst, src, order); - } - static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_xor_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - MA_ATOMIC_FETCH_XOR_CAS(32, dst, src, order); - } - static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_xor_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - MA_ATOMIC_FETCH_XOR_CAS(64, dst, src, order); - } - static MA_INLINE void __stdcall ma_atomic_thread_fence(ma_atomic_memory_order order) - { - (void)order; - __asm { - lock add dword ptr [esp], 0 } - } - #define ma_atomic_signal_fence(order) __asm {}; (void)order -#endif -#if defined(MA_ATOMIC_MODERN_GCC) + #endif + #if defined(MA_ATOMIC_HAS_16) + static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_and_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedAnd16, ma_uint16, short); + #else + ma_uint16 oldValue; + ma_uint16 newValue; + do { + oldValue = *dst; + newValue = (ma_uint16)(oldValue & src); + } while (ma_atomic_compare_and_swap_16(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + #endif + } + #endif + #if defined(MA_ATOMIC_HAS_32) + static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_and_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedAnd, ma_uint32, long); + #else + ma_uint32 oldValue; + ma_uint32 newValue; + do { + oldValue = *dst; + newValue = oldValue & src; + } while (ma_atomic_compare_and_swap_32(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + #endif + } + #endif + #if defined(MA_ATOMIC_HAS_64) + static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_and_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedAnd64, ma_uint64, long long); + #else + ma_uint64 oldValue; + ma_uint64 newValue; + do { + oldValue = *dst; + newValue = oldValue & src; + } while (ma_atomic_compare_and_swap_64(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + #endif + } + #endif + #if defined(MA_ATOMIC_HAS_8) + static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_xor_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedXor8, ma_uint8, char); + #else + ma_uint8 oldValue; + ma_uint8 newValue; + do { + oldValue = *dst; + newValue = (ma_uint8)(oldValue ^ src); + } while (ma_atomic_compare_and_swap_8(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + #endif + } + #endif + #if defined(MA_ATOMIC_HAS_16) + static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_xor_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedXor16, ma_uint16, short); + #else + ma_uint16 oldValue; + ma_uint16 newValue; + do { + oldValue = *dst; + newValue = (ma_uint16)(oldValue ^ src); + } while (ma_atomic_compare_and_swap_16(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + #endif + } + #endif + #if defined(MA_ATOMIC_HAS_32) + static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_xor_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedXor, ma_uint32, long); + #else + ma_uint32 oldValue; + ma_uint32 newValue; + do { + oldValue = *dst; + newValue = oldValue ^ src; + } while (ma_atomic_compare_and_swap_32(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + #endif + } + #endif + #if defined(MA_ATOMIC_HAS_64) + static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_xor_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedXor64, ma_uint64, long long); + #else + ma_uint64 oldValue; + ma_uint64 newValue; + do { + oldValue = *dst; + newValue = oldValue ^ src; + } while (ma_atomic_compare_and_swap_64(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + #endif + } + #endif + #if defined(MA_ATOMIC_HAS_8) + static MA_INLINE ma_uint8 __stdcall ma_atomic_fetch_or_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedOr8, ma_uint8, char); + #else + ma_uint8 oldValue; + ma_uint8 newValue; + do { + oldValue = *dst; + newValue = (ma_uint8)(oldValue | src); + } while (ma_atomic_compare_and_swap_8(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + #endif + } + #endif + #if defined(MA_ATOMIC_HAS_16) + static MA_INLINE ma_uint16 __stdcall ma_atomic_fetch_or_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedOr16, ma_uint16, short); + #else + ma_uint16 oldValue; + ma_uint16 newValue; + do { + oldValue = *dst; + newValue = (ma_uint16)(oldValue | src); + } while (ma_atomic_compare_and_swap_16(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + #endif + } + #endif + #if defined(MA_ATOMIC_HAS_32) + static MA_INLINE ma_uint32 __stdcall ma_atomic_fetch_or_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedOr, ma_uint32, long); + #else + ma_uint32 oldValue; + ma_uint32 newValue; + do { + oldValue = *dst; + newValue = oldValue | src; + } while (ma_atomic_compare_and_swap_32(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + #endif + } + #endif + #if defined(MA_ATOMIC_HAS_64) + static MA_INLINE ma_uint64 __stdcall ma_atomic_fetch_or_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + #if defined(MA_ARM) + MA_ATOMIC_MSVC_ARM_INTRINSIC(dst, src, order, _InterlockedOr64, ma_uint64, long long); + #else + ma_uint64 oldValue; + ma_uint64 newValue; + do { + oldValue = *dst; + newValue = oldValue | src; + } while (ma_atomic_compare_and_swap_64(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + #endif + } + #endif + #if defined(MA_ATOMIC_HAS_8) + #define ma_atomic_test_and_set_explicit_8( dst, order) ma_atomic_exchange_explicit_8 (dst, 1, order) + #endif + #if defined(MA_ATOMIC_HAS_16) + #define ma_atomic_test_and_set_explicit_16(dst, order) ma_atomic_exchange_explicit_16(dst, 1, order) + #endif + #if defined(MA_ATOMIC_HAS_32) + #define ma_atomic_test_and_set_explicit_32(dst, order) ma_atomic_exchange_explicit_32(dst, 1, order) + #endif + #if defined(MA_ATOMIC_HAS_64) + #define ma_atomic_test_and_set_explicit_64(dst, order) ma_atomic_exchange_explicit_64(dst, 1, order) + #endif + #if defined(MA_ATOMIC_HAS_8) + #define ma_atomic_clear_explicit_8( dst, order) ma_atomic_store_explicit_8 (dst, 0, order) + #endif + #if defined(MA_ATOMIC_HAS_16) + #define ma_atomic_clear_explicit_16(dst, order) ma_atomic_store_explicit_16(dst, 0, order) + #endif + #if defined(MA_ATOMIC_HAS_32) + #define ma_atomic_clear_explicit_32(dst, order) ma_atomic_store_explicit_32(dst, 0, order) + #endif + #if defined(MA_ATOMIC_HAS_64) + #define ma_atomic_clear_explicit_64(dst, order) ma_atomic_store_explicit_64(dst, 0, order) + #endif + #if defined(MA_ATOMIC_HAS_8) + typedef ma_uint8 ma_atomic_flag; + #define ma_atomic_flag_test_and_set_explicit(ptr, order) (ma_bool32)ma_atomic_test_and_set_explicit_8(ptr, order) + #define ma_atomic_flag_clear_explicit(ptr, order) ma_atomic_clear_explicit_8(ptr, order) + #define ma_atomic_flag_load_explicit(ptr, order) ma_atomic_load_explicit_8(ptr, order) + #else + typedef ma_uint32 ma_atomic_flag; + #define ma_atomic_flag_test_and_set_explicit(ptr, order) (ma_bool32)ma_atomic_test_and_set_explicit_32(ptr, order) + #define ma_atomic_flag_clear_explicit(ptr, order) ma_atomic_clear_explicit_32(ptr, order) + #define ma_atomic_flag_load_explicit(ptr, order) ma_atomic_load_explicit_32(ptr, order) + #endif +#elif defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))) #define MA_ATOMIC_HAS_NATIVE_COMPARE_EXCHANGE + #define MA_ATOMIC_HAS_NATIVE_IS_LOCK_FREE + #define ma_atomic_memory_order_relaxed __ATOMIC_RELAXED + #define ma_atomic_memory_order_consume __ATOMIC_CONSUME + #define ma_atomic_memory_order_acquire __ATOMIC_ACQUIRE + #define ma_atomic_memory_order_release __ATOMIC_RELEASE + #define ma_atomic_memory_order_acq_rel __ATOMIC_ACQ_REL + #define ma_atomic_memory_order_seq_cst __ATOMIC_SEQ_CST + #define ma_atomic_compiler_fence() __asm__ __volatile__("":::"memory") #define ma_atomic_thread_fence(order) __atomic_thread_fence(order) #define ma_atomic_signal_fence(order) __atomic_signal_fence(order) #define ma_atomic_is_lock_free_8(ptr) __atomic_is_lock_free(1, ptr) #define ma_atomic_is_lock_free_16(ptr) __atomic_is_lock_free(2, ptr) #define ma_atomic_is_lock_free_32(ptr) __atomic_is_lock_free(4, ptr) #define ma_atomic_is_lock_free_64(ptr) __atomic_is_lock_free(8, ptr) + #define ma_atomic_test_and_set_explicit_8( dst, order) __atomic_exchange_n(dst, 1, order) + #define ma_atomic_test_and_set_explicit_16(dst, order) __atomic_exchange_n(dst, 1, order) + #define ma_atomic_test_and_set_explicit_32(dst, order) __atomic_exchange_n(dst, 1, order) + #define ma_atomic_test_and_set_explicit_64(dst, order) __atomic_exchange_n(dst, 1, order) + #define ma_atomic_clear_explicit_8( dst, order) __atomic_store_n(dst, 0, order) + #define ma_atomic_clear_explicit_16(dst, order) __atomic_store_n(dst, 0, order) + #define ma_atomic_clear_explicit_32(dst, order) __atomic_store_n(dst, 0, order) + #define ma_atomic_clear_explicit_64(dst, order) __atomic_store_n(dst, 0, order) #define ma_atomic_store_explicit_8( dst, src, order) __atomic_store_n(dst, src, order) #define ma_atomic_store_explicit_16(dst, src, order) __atomic_store_n(dst, src, order) #define ma_atomic_store_explicit_32(dst, src, order) __atomic_store_n(dst, src, order) @@ -15773,14 +14864,14 @@ ma_atomic_spinlock ma_atomic_global_lock; #define ma_atomic_exchange_explicit_16(dst, src, order) __atomic_exchange_n(dst, src, order) #define ma_atomic_exchange_explicit_32(dst, src, order) __atomic_exchange_n(dst, src, order) #define ma_atomic_exchange_explicit_64(dst, src, order) __atomic_exchange_n(dst, src, order) - #define ma_atomic_compare_exchange_strong_explicit_8( dst, expected, replacement, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, replacement, 0, successOrder, failureOrder) - #define ma_atomic_compare_exchange_strong_explicit_16(dst, expected, replacement, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, replacement, 0, successOrder, failureOrder) - #define ma_atomic_compare_exchange_strong_explicit_32(dst, expected, replacement, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, replacement, 0, successOrder, failureOrder) - #define ma_atomic_compare_exchange_strong_explicit_64(dst, expected, replacement, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, replacement, 0, successOrder, failureOrder) - #define ma_atomic_compare_exchange_weak_explicit_8( dst, expected, replacement, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, replacement, 1, successOrder, failureOrder) - #define ma_atomic_compare_exchange_weak_explicit_16(dst, expected, replacement, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, replacement, 1, successOrder, failureOrder) - #define ma_atomic_compare_exchange_weak_explicit_32(dst, expected, replacement, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, replacement, 1, successOrder, failureOrder) - #define ma_atomic_compare_exchange_weak_explicit_64(dst, expected, replacement, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, replacement, 1, successOrder, failureOrder) + #define ma_atomic_compare_exchange_strong_explicit_8( dst, expected, desired, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, desired, 0, successOrder, failureOrder) + #define ma_atomic_compare_exchange_strong_explicit_16(dst, expected, desired, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, desired, 0, successOrder, failureOrder) + #define ma_atomic_compare_exchange_strong_explicit_32(dst, expected, desired, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, desired, 0, successOrder, failureOrder) + #define ma_atomic_compare_exchange_strong_explicit_64(dst, expected, desired, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, desired, 0, successOrder, failureOrder) + #define ma_atomic_compare_exchange_weak_explicit_8( dst, expected, desired, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, desired, 1, successOrder, failureOrder) + #define ma_atomic_compare_exchange_weak_explicit_16(dst, expected, desired, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, desired, 1, successOrder, failureOrder) + #define ma_atomic_compare_exchange_weak_explicit_32(dst, expected, desired, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, desired, 1, successOrder, failureOrder) + #define ma_atomic_compare_exchange_weak_explicit_64(dst, expected, desired, successOrder, failureOrder) __atomic_compare_exchange_n(dst, expected, desired, 1, successOrder, failureOrder) #define ma_atomic_fetch_add_explicit_8( dst, src, order) __atomic_fetch_add(dst, src, order) #define ma_atomic_fetch_add_explicit_16(dst, src, order) __atomic_fetch_add(dst, src, order) #define ma_atomic_fetch_add_explicit_32(dst, src, order) __atomic_fetch_add(dst, src, order) @@ -15801,19 +14892,19 @@ ma_atomic_spinlock ma_atomic_global_lock; #define ma_atomic_fetch_and_explicit_16(dst, src, order) __atomic_fetch_and(dst, src, order) #define ma_atomic_fetch_and_explicit_32(dst, src, order) __atomic_fetch_and(dst, src, order) #define ma_atomic_fetch_and_explicit_64(dst, src, order) __atomic_fetch_and(dst, src, order) - static MA_INLINE ma_uint8 ma_atomic_compare_and_swap_8(volatile ma_uint8* dst, ma_uint8 expected, ma_uint8 replacement) + static MA_INLINE ma_uint8 ma_atomic_compare_and_swap_8(volatile ma_uint8* dst, ma_uint8 expected, ma_uint8 desired) { - __atomic_compare_exchange_n(dst, &expected, replacement, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); + __atomic_compare_exchange_n(dst, &expected, desired, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); return expected; } - static MA_INLINE ma_uint16 ma_atomic_compare_and_swap_16(volatile ma_uint16* dst, ma_uint16 expected, ma_uint16 replacement) + static MA_INLINE ma_uint16 ma_atomic_compare_and_swap_16(volatile ma_uint16* dst, ma_uint16 expected, ma_uint16 desired) { - __atomic_compare_exchange_n(dst, &expected, replacement, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); + __atomic_compare_exchange_n(dst, &expected, desired, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); return expected; } - static MA_INLINE ma_uint32 ma_atomic_compare_and_swap_32(volatile ma_uint32* dst, ma_uint32 expected, ma_uint32 replacement) + static MA_INLINE ma_uint32 ma_atomic_compare_and_swap_32(volatile ma_uint32* dst, ma_uint32 expected, ma_uint32 desired) { - __atomic_compare_exchange_n(dst, &expected, replacement, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); + __atomic_compare_exchange_n(dst, &expected, desired, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); return expected; } #if defined(__clang__) @@ -15822,1134 +14913,636 @@ ma_atomic_spinlock ma_atomic_global_lock; #pragma clang diagnostic ignored "-Watomic-alignment" #endif #endif - static MA_INLINE ma_uint64 ma_atomic_compare_and_swap_64(volatile ma_uint64* dst, ma_uint64 expected, ma_uint64 replacement) + static MA_INLINE ma_uint64 ma_atomic_compare_and_swap_64(volatile ma_uint64* dst, ma_uint64 expected, ma_uint64 desired) { - __atomic_compare_exchange_n(dst, &expected, replacement, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); + __atomic_compare_exchange_n(dst, &expected, desired, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); return expected; } #if defined(__clang__) #pragma clang diagnostic pop #endif -#endif -#if defined(MA_ATOMIC_LEGACY_GCC) || defined(MA_ATOMIC_LEGACY_GCC_ASM) - #define ma_atomic_signal_fence(order) __asm__ __volatile__("":::"memory") - #if defined(MA_ATOMIC_LEGACY_GCC) + typedef ma_uint8 ma_atomic_flag; + #define ma_atomic_flag_test_and_set_explicit(dst, order) (ma_bool32)__atomic_test_and_set(dst, order) + #define ma_atomic_flag_clear_explicit(dst, order) __atomic_clear(dst, order) + #define ma_atomic_flag_load_explicit(ptr, order) ma_atomic_load_explicit_8(ptr, order) +#else + #define ma_atomic_memory_order_relaxed 1 + #define ma_atomic_memory_order_consume 2 + #define ma_atomic_memory_order_acquire 3 + #define ma_atomic_memory_order_release 4 + #define ma_atomic_memory_order_acq_rel 5 + #define ma_atomic_memory_order_seq_cst 6 + #define ma_atomic_compiler_fence() __asm__ __volatile__("":::"memory") + #if defined(__GNUC__) #define ma_atomic_thread_fence(order) __sync_synchronize(), (void)order - static MA_INLINE ma_uint8 ma_atomic_compare_and_swap_8(volatile ma_uint8* dst, ma_uint8 expected, ma_uint8 replacement) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_8) - { - return __sync_val_compare_and_swap(dst, expected, replacement); - } - #else - { - MA_ATOMIC_COMPARE_AND_SWAP_LOCK(8, dst, expected, replacement); - } - #endif - } - static MA_INLINE ma_uint16 ma_atomic_compare_and_swap_16(volatile ma_uint16* dst, ma_uint16 expected, ma_uint16 replacement) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_16) - { - return __sync_val_compare_and_swap(dst, expected, replacement); - } - #else - { - MA_ATOMIC_COMPARE_AND_SWAP_LOCK(16, dst, expected, replacement); - } - #endif - } - static MA_INLINE ma_uint32 ma_atomic_compare_and_swap_32(volatile ma_uint32* dst, ma_uint32 expected, ma_uint32 replacement) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_32) - { - return __sync_val_compare_and_swap(dst, expected, replacement); - } - #else - { - MA_ATOMIC_COMPARE_AND_SWAP_LOCK(32, dst, expected, replacement); - } - #endif - } - static MA_INLINE ma_uint64 ma_atomic_compare_and_swap_64(volatile ma_uint64* dst, ma_uint64 expected, ma_uint64 replacement) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_64) - { - return __sync_val_compare_and_swap(dst, expected, replacement); - } - #else - { - MA_ATOMIC_COMPARE_AND_SWAP_LOCK(64, dst, expected, replacement); - } - #endif - } - static MA_INLINE ma_uint8 ma_atomic_load_explicit_8(volatile const ma_uint8* ptr, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_8) - { - (void)order; - return ma_atomic_compare_and_swap_8((ma_uint8*)ptr, 0, 0); - } - #else - { - MA_ATOMIC_LOAD_EXPLICIT_LOCK(8, ptr, order); - } - #endif - } - static MA_INLINE ma_uint16 ma_atomic_load_explicit_16(volatile const ma_uint16* ptr, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_16) - { - (void)order; - return ma_atomic_compare_and_swap_16((ma_uint16*)ptr, 0, 0); - } - #else - { - MA_ATOMIC_LOAD_EXPLICIT_LOCK(16, ptr, order); - } - #endif - } - static MA_INLINE ma_uint32 ma_atomic_load_explicit_32(volatile const ma_uint32* ptr, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_32) - { - (void)order; - return ma_atomic_compare_and_swap_32((ma_uint32*)ptr, 0, 0); - } - #else - { - MA_ATOMIC_LOAD_EXPLICIT_LOCK(32, ptr, order); - } - #endif - } - static MA_INLINE ma_uint64 ma_atomic_load_explicit_64(volatile const ma_uint64* ptr, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_64) - { - (void)order; - return ma_atomic_compare_and_swap_64((ma_uint64*)ptr, 0, 0); - } - #else - { - MA_ATOMIC_LOAD_EXPLICIT_LOCK(64, ptr, order); - } - #endif - } static MA_INLINE ma_uint8 ma_atomic_exchange_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) { - #if defined(MA_ATOMIC_IS_LOCK_FREE_8) - { - if (order > ma_atomic_memory_order_acquire) { - __sync_synchronize(); - } - return __sync_lock_test_and_set(dst, src); + if (order > ma_atomic_memory_order_acquire) { + __sync_synchronize(); } - #else - { - MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(8, dst, src, order); - } - #endif + return __sync_lock_test_and_set(dst, src); } static MA_INLINE ma_uint16 ma_atomic_exchange_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) { - #if defined(MA_ATOMIC_IS_LOCK_FREE_16) - { - if (order > ma_atomic_memory_order_acquire) { - __sync_synchronize(); - } - return __sync_lock_test_and_set(dst, src); - } - #else - { - MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(16, dst, src, order); - } - #endif + ma_uint16 oldValue; + do { + oldValue = *dst; + } while (__sync_val_compare_and_swap(dst, oldValue, src) != oldValue); + (void)order; + return oldValue; } static MA_INLINE ma_uint32 ma_atomic_exchange_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) { - #if defined(MA_ATOMIC_IS_LOCK_FREE_32) - { - if (order > ma_atomic_memory_order_acquire) { - __sync_synchronize(); - } - return __sync_lock_test_and_set(dst, src); - } - #else - { - MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(32, dst, src, order); - } - #endif + ma_uint32 oldValue; + do { + oldValue = *dst; + } while (__sync_val_compare_and_swap(dst, oldValue, src) != oldValue); + (void)order; + return oldValue; } static MA_INLINE ma_uint64 ma_atomic_exchange_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) { - #if defined(MA_ATOMIC_IS_LOCK_FREE_64) - { - if (order > ma_atomic_memory_order_acquire) { - __sync_synchronize(); - } - return __sync_lock_test_and_set(dst, src); - } - #else - { - MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(64, dst, src, order); - } - #endif - } - #define ma_atomic_store_explicit_8( dst, src, order) (void)ma_atomic_exchange_explicit_8 (dst, src, order) - #define ma_atomic_store_explicit_16(dst, src, order) (void)ma_atomic_exchange_explicit_16(dst, src, order) - #define ma_atomic_store_explicit_32(dst, src, order) (void)ma_atomic_exchange_explicit_32(dst, src, order) - #define ma_atomic_store_explicit_64(dst, src, order) (void)ma_atomic_exchange_explicit_64(dst, src, order) - static MA_INLINE ma_uint8 ma_atomic_fetch_add_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_8) - { - (void)order; - return __sync_fetch_and_add(dst, src); - } - #else - { - MA_ATOMIC_FETCH_ADD_LOCK(8, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint16 ma_atomic_fetch_add_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_16) - { - (void)order; - return __sync_fetch_and_add(dst, src); - } - #else - { - MA_ATOMIC_FETCH_ADD_LOCK(16, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint32 ma_atomic_fetch_add_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_32) - { - (void)order; - return __sync_fetch_and_add(dst, src); - } - #else - { - MA_ATOMIC_FETCH_ADD_LOCK(32, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint64 ma_atomic_fetch_add_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_64) - { - (void)order; - return __sync_fetch_and_add(dst, src); - } - #else - { - MA_ATOMIC_FETCH_ADD_LOCK(64, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint8 ma_atomic_fetch_sub_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_8) - { - (void)order; - return __sync_fetch_and_sub(dst, src); - } - #else - { - MA_ATOMIC_FETCH_ADD_LOCK(8, dst, (ma_uint8)(-(ma_int8)src), order); - } - #endif - } - static MA_INLINE ma_uint16 ma_atomic_fetch_sub_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_16) - { - (void)order; - return __sync_fetch_and_sub(dst, src); - } - #else - { - MA_ATOMIC_FETCH_ADD_LOCK(16, dst, (ma_uint16)(-(ma_int16)src), order); - } - #endif - } - static MA_INLINE ma_uint32 ma_atomic_fetch_sub_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_32) - { - (void)order; - return __sync_fetch_and_sub(dst, src); - } - #else - { - MA_ATOMIC_FETCH_ADD_LOCK(32, dst, (ma_uint32)(-(ma_int32)src), order); - } - #endif - } - static MA_INLINE ma_uint64 ma_atomic_fetch_sub_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_64) - { - (void)order; - return __sync_fetch_and_sub(dst, src); - } - #else - { - MA_ATOMIC_FETCH_ADD_LOCK(64, dst, (ma_uint64)(-(ma_int64)src), order); - } - #endif - } - static MA_INLINE ma_uint8 ma_atomic_fetch_and_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_8) - { - (void)order; - return __sync_fetch_and_and(dst, src); - } - #else - { - MA_ATOMIC_FETCH_AND_CAS(8, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint16 ma_atomic_fetch_and_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_16) - { - (void)order; - return __sync_fetch_and_and(dst, src); - } - #else - { - MA_ATOMIC_FETCH_AND_CAS(16, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint32 ma_atomic_fetch_and_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_32) - { - (void)order; - return __sync_fetch_and_and(dst, src); - } - #else - { - MA_ATOMIC_FETCH_AND_CAS(32, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint64 ma_atomic_fetch_and_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_64) - { - (void)order; - return __sync_fetch_and_and(dst, src); - } - #else - { - MA_ATOMIC_FETCH_AND_CAS(64, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint8 ma_atomic_fetch_or_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_8) - { - (void)order; - return __sync_fetch_and_or(dst, src); - } - #else - { - MA_ATOMIC_FETCH_OR_CAS(8, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint16 ma_atomic_fetch_or_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_16) - { - (void)order; - return __sync_fetch_and_or(dst, src); - } - #else - { - MA_ATOMIC_FETCH_OR_CAS(16, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint32 ma_atomic_fetch_or_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_32) - { - (void)order; - return __sync_fetch_and_or(dst, src); - } - #else - { - MA_ATOMIC_FETCH_OR_CAS(32, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint64 ma_atomic_fetch_or_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_64) - { - (void)order; - return __sync_fetch_and_or(dst, src); - } - #else - { - MA_ATOMIC_FETCH_OR_CAS(64, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint8 ma_atomic_fetch_xor_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_8) - { - (void)order; - return __sync_fetch_and_xor(dst, src); - } - #else - { - MA_ATOMIC_FETCH_XOR_CAS(8, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint16 ma_atomic_fetch_xor_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_16) - { - (void)order; - return __sync_fetch_and_xor(dst, src); - } - #else - { - MA_ATOMIC_FETCH_XOR_CAS(16, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint32 ma_atomic_fetch_xor_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_32) - { - (void)order; - return __sync_fetch_and_xor(dst, src); - } - #else - { - MA_ATOMIC_FETCH_XOR_CAS(32, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint64 ma_atomic_fetch_xor_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_64) - { - (void)order; - return __sync_fetch_and_xor(dst, src); - } - #else - { - MA_ATOMIC_FETCH_XOR_CAS(64, dst, src, order); - } - #endif - } - #elif defined(MA_ATOMIC_LEGACY_GCC_ASM) - #define MA_ATOMIC_CMPXCHG_GCC_X86(instructionSizeSuffix, result, dst, expected, replacement) \ - __asm__ __volatile__( \ - "lock; cmpxchg"instructionSizeSuffix" %2, %1" \ - : "=a"(result), \ - "=m"(*dst) \ - : "r"(replacement), \ - "0"(expected), \ - "m"(*dst) \ - : "cc", "memory") - #define MA_ATOMIC_XADD_GCC_X86(instructionSizeSuffix, result, dst, src) \ - __asm__ __volatile__( \ - "lock; xadd"instructionSizeSuffix" %0, %1" \ - : "=a"(result), \ - "=m"(*dst) \ - : "0"(src), \ - "m"(*dst) \ - : "cc", "memory") - static MA_INLINE ma_uint8 ma_atomic_compare_and_swap_8(volatile ma_uint8* dst, ma_uint8 expected, ma_uint8 replacement) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_8) && (defined(MA_X86) || defined(MA_X64)) - { - ma_uint8 result; - #if defined(MA_X86) || defined(MA_X64) - { - MA_ATOMIC_CMPXCHG_GCC_X86("b", result, dst, expected, replacement); - } - #else - { - #error Unsupported architecture. - } - #endif - return result; - } - #else - { - MA_ATOMIC_COMPARE_AND_SWAP_LOCK(8, dst, expected, replacement); - } - #endif - } - static MA_INLINE ma_uint16 ma_atomic_compare_and_swap_16(volatile ma_uint16* dst, ma_uint16 expected, ma_uint16 replacement) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_16) && (defined(MA_X86) || defined(MA_X64)) - { - ma_uint16 result; - #if defined(MA_X86) || defined(MA_X64) - { - MA_ATOMIC_CMPXCHG_GCC_X86("w", result, dst, expected, replacement); - } - #else - { - #error Unsupported architecture. - } - #endif - return result; - } - #else - { - MA_ATOMIC_COMPARE_AND_SWAP_LOCK(16, dst, expected, replacement); - } - #endif - } - static MA_INLINE ma_uint32 ma_atomic_compare_and_swap_32(volatile ma_uint32* dst, ma_uint32 expected, ma_uint32 replacement) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_32) && (defined(MA_X86) || defined(MA_X64)) - { - ma_uint32 result; - #if defined(MA_X86) || defined(MA_X64) - { - MA_ATOMIC_CMPXCHG_GCC_X86("l", result, dst, expected, replacement); - } - #else - { - #error Unsupported architecture. - } - #endif - return result; - } - #else - { - MA_ATOMIC_COMPARE_AND_SWAP_LOCK(32, dst, expected, replacement); - } - #endif - } - static MA_INLINE ma_uint64 ma_atomic_compare_and_swap_64(volatile ma_uint64* dst, ma_uint64 expected, ma_uint64 replacement) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_64) && (defined(MA_X86) || defined(MA_X64)) - { - ma_uint64 result; - #if defined(MA_X86) - { - ma_uint32 resultEAX; - ma_uint32 resultEDX; - __asm__ __volatile__( - "pushl %%ebx\n" - "movl %4, %%ebx\n" - "lock cmpxchg8b (%%edi)\n" - "popl %%ebx\n" - : "=a"(resultEAX), - "=d"(resultEDX) - : "a"((ma_uint32)(expected & 0xFFFFFFFF)), - "d"((ma_uint32)(expected >> 32)), - "r"((ma_uint32)(replacement & 0xFFFFFFFF)), - "c"((ma_uint32)(replacement >> 32)), - "D"(dst) - : "memory", "cc"); - result = ((ma_uint64)resultEDX << 32) | resultEAX; - } - #elif defined(MA_X64) - { - MA_ATOMIC_CMPXCHG_GCC_X86("q", result, dst, expected, replacement); - } - #else - { - #error Unsupported architecture. - } - #endif - return result; - } - #else - { - MA_ATOMIC_COMPARE_AND_SWAP_LOCK(64, dst, expected, replacement); - } - #endif - } - static MA_INLINE ma_uint8 ma_atomic_load_explicit_8(volatile const ma_uint8* dst, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_8) && (defined(MA_X86) || defined(MA_X64)) - { - ma_uint8 result; - #if defined(MA_X86) || defined(MA_X64) - { - if (order == ma_atomic_memory_order_relaxed) { - MA_ATOMIC_LOAD_RELAXED_GCC_X86("b", result, dst); - } else if (order <= ma_atomic_memory_order_release) { - MA_ATOMIC_LOAD_RELEASE_GCC_X86("b", result, dst); - } else { - MA_ATOMIC_LOAD_SEQ_CST_GCC_X86("b", result, dst); - } - } - #else - { - #error Unsupported architecture. - } - #endif - return result; - } - #else - { - MA_ATOMIC_LOAD_EXPLICIT_LOCK(8, dst, order); - } - #endif - } - static MA_INLINE ma_uint16 ma_atomic_load_explicit_16(volatile const ma_uint16* dst, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_16) && (defined(MA_X86) || defined(MA_X64)) - { - ma_uint16 result; - #if defined(MA_X86) || defined(MA_X64) - { - if (order == ma_atomic_memory_order_relaxed) { - MA_ATOMIC_LOAD_RELAXED_GCC_X86("w", result, dst); - } else if (order <= ma_atomic_memory_order_release) { - MA_ATOMIC_LOAD_RELEASE_GCC_X86("w", result, dst); - } else { - MA_ATOMIC_LOAD_SEQ_CST_GCC_X86("w", result, dst); - } - } - #else - { - #error Unsupported architecture. - } - #endif - return result; - } - #else - { - MA_ATOMIC_LOAD_EXPLICIT_LOCK(16, dst, order); - } - #endif - } - static MA_INLINE ma_uint32 ma_atomic_load_explicit_32(volatile const ma_uint32* dst, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_32) && (defined(MA_X86) || defined(MA_X64)) - { - ma_uint32 result; - #if defined(MA_X86) || defined(MA_X64) - { - if (order == ma_atomic_memory_order_relaxed) { - MA_ATOMIC_LOAD_RELAXED_GCC_X86("l", result, dst); - } else if (order <= ma_atomic_memory_order_release) { - MA_ATOMIC_LOAD_RELEASE_GCC_X86("l", result, dst); - } else { - MA_ATOMIC_LOAD_SEQ_CST_GCC_X86("l", result, dst); - } - } - #else - { - #error Unsupported architecture. - } - #endif - return result; - } - #else - { - MA_ATOMIC_LOAD_EXPLICIT_LOCK(32, dst, order); - } - #endif - } - static MA_INLINE ma_uint64 ma_atomic_load_explicit_64(volatile const ma_uint64* dst, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_64) && (defined(MA_X86) || defined(MA_X64)) - { - ma_uint64 result; - #if defined(MA_X64) - { - if (order == ma_atomic_memory_order_relaxed) { - MA_ATOMIC_LOAD_RELAXED_GCC_X86("q", result, dst); - } else if (order <= ma_atomic_memory_order_release) { - MA_ATOMIC_LOAD_RELEASE_GCC_X86("q", result, dst); - } else { - MA_ATOMIC_LOAD_SEQ_CST_GCC_X86("q", result, dst); - } - } - #elif defined(MA_X86) - { - (void)order; - return ma_atomic_compare_and_swap_64((volatile ma_uint64*)dst, 0, 0); - } - #else - { - #error Unsupported architecture. - } - #endif - return result; - } - #else - { - MA_ATOMIC_LOAD_EXPLICIT_LOCK(64, dst, order); - } - #endif - } - static MA_INLINE ma_uint8 ma_atomic_exchange_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_8) && (defined(MA_X86) || defined(MA_X64)) - { - ma_uint8 result; - (void)order; - #if defined(MA_X86) || defined(MA_X64) - { - MA_ATOMIC_XCHG_GCC_X86("b", result, dst, src); - } - #else - { - #error Unsupported architecture. - } - #endif - return result; - } - #else - { - MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(8, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint16 ma_atomic_exchange_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_16) && (defined(MA_X86) || defined(MA_X64)) - { - ma_uint16 result; - (void)order; - #if defined(MA_X86) || defined(MA_X64) - { - MA_ATOMIC_XCHG_GCC_X86("w", result, dst, src); - } - #else - { - #error Unsupported architecture. - } - #endif - return result; - } - #else - { - MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(16, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint32 ma_atomic_exchange_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_32) && (defined(MA_X86) || defined(MA_X64)) - { - ma_uint32 result; - (void)order; - #if defined(MA_X86) || defined(MA_X64) - { - MA_ATOMIC_XCHG_GCC_X86("l", result, dst, src); - } - #else - { - #error Unsupported architecture. - } - #endif - return result; - } - #else - { - MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(32, dst, src, order); - } - #endif - } - static MA_INLINE ma_uint64 ma_atomic_exchange_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_64) && (defined(MA_X86) || defined(MA_X64)) - { - ma_uint64 result; - (void)order; - #if defined(MA_X86) - { - MA_ATOMIC_EXCHANGE_EXPLICIT_CAS(64, dst, src, order); - } - #elif defined(MA_X64) - { - MA_ATOMIC_XCHG_GCC_X86("q", result, dst, src); - } - #else - { - #error Unsupported architecture. - } - #endif - return result; - } - #else - { - MA_ATOMIC_EXCHANGE_EXPLICIT_LOCK(64, dst, src, order); - } - #endif - } - static MA_INLINE void ma_atomic_store_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_8) && (defined(MA_X86) || defined(MA_X64)) - { - #if defined(MA_X86) || defined(MA_X64) - { - if (order == ma_atomic_memory_order_relaxed) { - __asm__ __volatile__ ( - "movb %1, %0" - : "=m"(*dst) - : "r"(src) - ); - } else { - __asm__ __volatile__ ( - "xchgb %1, %0" - : "=m"(*dst) - : "r"(src) - : "memory" - ); - } - } - #else - { - #error Unsupported architecture. - } - #endif - } - #else - { - MA_ATOMIC_STORE_EXPLICIT_LOCK(8, dst, src, order); - } - #endif - } - static MA_INLINE void ma_atomic_store_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_16) && (defined(MA_X86) || defined(MA_X64)) - { - #if defined(MA_X86) || defined(MA_X64) - { - if (order == ma_atomic_memory_order_relaxed) { - __asm__ __volatile__ ( - "movw %1, %0" - : "=m"(*dst) - : "r"(src) - ); - } else { - __asm__ __volatile__ ( - "xchgw %1, %0" - : "=m"(*dst) - : "r"(src) - : "memory" - ); - } - } - #else - { - #error Unsupported architecture. - } - #endif - } - #else - { - MA_ATOMIC_STORE_EXPLICIT_LOCK(16, dst, src, order); - } - #endif - } - static MA_INLINE void ma_atomic_store_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_32) && (defined(MA_X86) || defined(MA_X64)) - { - #if defined(MA_X86) || defined(MA_X64) - { - if (order == ma_atomic_memory_order_relaxed) { - __asm__ __volatile__ ( - "movl %1, %0" - : "=m"(*dst) - : "r"(src) - ); - } else { - __asm__ __volatile__ ( - "xchgl %1, %0" - : "=m"(*dst) - : "r"(src) - : "memory" - ); - } - } - #else - { - #error Unsupported architecture. - } - #endif - } - #else - { - MA_ATOMIC_STORE_EXPLICIT_LOCK(32, dst, src, order); - } - #endif - } - static MA_INLINE void ma_atomic_store_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - #if defined(MA_ATOMIC_IS_LOCK_FREE_64) && (defined(MA_X86) || defined(MA_X64)) - { - #if defined(MA_X64) - { - if (order == ma_atomic_memory_order_relaxed) { - __asm__ __volatile__ ( - "movq %1, %0" - : "=m"(*dst) - : "r"(src) - ); - } else { - __asm__ __volatile__ ( - "xchgq %1, %0" - : "=m"(*dst) - : "r"(src) - : "memory" - ); - } - } - #else - { - MA_ATOMIC_STORE_EXPLICIT_CAS(64, dst, src, order); - } - #endif - } - #else - { - MA_ATOMIC_STORE_EXPLICIT_LOCK(64, dst, src, order); - } - #endif + ma_uint64 oldValue; + do { + oldValue = *dst; + } while (__sync_val_compare_and_swap(dst, oldValue, src) != oldValue); + (void)order; + return oldValue; } static MA_INLINE ma_uint8 ma_atomic_fetch_add_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) { - #if defined(MA_ATOMIC_IS_LOCK_FREE_8) && (defined(MA_X86) || defined(MA_X64)) - { - #if defined(MA_X86) || defined(MA_X64) - { - ma_uint8 result; - (void)order; - MA_ATOMIC_XADD_GCC_X86("b", result, dst, src); - return result; - } - #else - { - #error Unsupported architecture. - } - #endif - } - #else - { - MA_ATOMIC_FETCH_ADD_LOCK(8, dst, src, order); - } - #endif + (void)order; + return __sync_fetch_and_add(dst, src); } static MA_INLINE ma_uint16 ma_atomic_fetch_add_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) { - #if defined(MA_ATOMIC_IS_LOCK_FREE_16) && (defined(MA_X86) || defined(MA_X64)) - { - #if defined(MA_X86) || defined(MA_X64) - { - ma_uint16 result; - (void)order; - MA_ATOMIC_XADD_GCC_X86("w", result, dst, src); - return result; - } - #else - { - #error Unsupported architecture. - } - #endif - } - #else - { - MA_ATOMIC_FETCH_ADD_LOCK(16, dst, src, order); - } - #endif + (void)order; + return __sync_fetch_and_add(dst, src); } static MA_INLINE ma_uint32 ma_atomic_fetch_add_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) { - #if defined(MA_ATOMIC_IS_LOCK_FREE_32) && (defined(MA_X86) || defined(MA_X64)) - { - #if defined(MA_X86) || defined(MA_X64) - { - ma_uint32 result; - (void)order; - MA_ATOMIC_XADD_GCC_X86("l", result, dst, src); - return result; - } - #else - { - #error Unsupported architecture. - } - #endif - } - #else - { - MA_ATOMIC_FETCH_ADD_LOCK(32, dst, src, order); - } - #endif + (void)order; + return __sync_fetch_and_add(dst, src); } static MA_INLINE ma_uint64 ma_atomic_fetch_add_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) { - #if defined(MA_ATOMIC_IS_LOCK_FREE_64) && (defined(MA_X86) || defined(MA_X64)) - { - #if defined(MA_X86) - { - MA_ATOMIC_FETCH_ADD_CAS(64, dst, src, order); - } - #elif defined(MA_X64) - { - ma_uint64 result; - MA_ATOMIC_XADD_GCC_X86("q", result, dst, src); - (void)order; - return result; - } - #else - { - #error Unsupported architecture. - } - #endif - } - #else - { - MA_ATOMIC_FETCH_ADD_LOCK(64, dst, src, order); - } - #endif + (void)order; + return __sync_fetch_and_add(dst, src); } static MA_INLINE ma_uint8 ma_atomic_fetch_sub_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) { - return ma_atomic_fetch_add_explicit_8(dst, (ma_uint8)(-(ma_int8)src), order); + (void)order; + return __sync_fetch_and_sub(dst, src); } static MA_INLINE ma_uint16 ma_atomic_fetch_sub_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) { - return ma_atomic_fetch_add_explicit_16(dst, (ma_uint16)(-(ma_int16)src), order); + (void)order; + return __sync_fetch_and_sub(dst, src); } static MA_INLINE ma_uint32 ma_atomic_fetch_sub_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) { - return ma_atomic_fetch_add_explicit_32(dst, (ma_uint32)(-(ma_int32)src), order); + (void)order; + return __sync_fetch_and_sub(dst, src); } static MA_INLINE ma_uint64 ma_atomic_fetch_sub_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) { - return ma_atomic_fetch_add_explicit_64(dst, (ma_uint64)(-(ma_int64)src), order); - } - static MA_INLINE ma_uint8 ma_atomic_fetch_and_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) - { - MA_ATOMIC_FETCH_AND_CAS(8, dst, src, order); - } - static MA_INLINE ma_uint16 ma_atomic_fetch_and_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) - { - MA_ATOMIC_FETCH_AND_CAS(16, dst, src, order); - } - static MA_INLINE ma_uint32 ma_atomic_fetch_and_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) - { - MA_ATOMIC_FETCH_AND_CAS(32, dst, src, order); - } - static MA_INLINE ma_uint64 ma_atomic_fetch_and_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) - { - MA_ATOMIC_FETCH_AND_CAS(64, dst, src, order); + (void)order; + return __sync_fetch_and_sub(dst, src); } static MA_INLINE ma_uint8 ma_atomic_fetch_or_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) { - MA_ATOMIC_FETCH_OR_CAS(8, dst, src, order); + (void)order; + return __sync_fetch_and_or(dst, src); } static MA_INLINE ma_uint16 ma_atomic_fetch_or_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) { - MA_ATOMIC_FETCH_OR_CAS(16, dst, src, order); + (void)order; + return __sync_fetch_and_or(dst, src); } static MA_INLINE ma_uint32 ma_atomic_fetch_or_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) { - MA_ATOMIC_FETCH_OR_CAS(32, dst, src, order); + (void)order; + return __sync_fetch_and_or(dst, src); } static MA_INLINE ma_uint64 ma_atomic_fetch_or_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) { - MA_ATOMIC_FETCH_OR_CAS(64, dst, src, order); + (void)order; + return __sync_fetch_and_or(dst, src); } static MA_INLINE ma_uint8 ma_atomic_fetch_xor_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) { - MA_ATOMIC_FETCH_XOR_CAS(8, dst, src, order); + (void)order; + return __sync_fetch_and_xor(dst, src); } static MA_INLINE ma_uint16 ma_atomic_fetch_xor_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) { - MA_ATOMIC_FETCH_XOR_CAS(16, dst, src, order); + (void)order; + return __sync_fetch_and_xor(dst, src); } static MA_INLINE ma_uint32 ma_atomic_fetch_xor_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) { - MA_ATOMIC_FETCH_XOR_CAS(32, dst, src, order); + (void)order; + return __sync_fetch_and_xor(dst, src); } static MA_INLINE ma_uint64 ma_atomic_fetch_xor_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) { - MA_ATOMIC_FETCH_XOR_CAS(64, dst, src, order); + (void)order; + return __sync_fetch_and_xor(dst, src); } + static MA_INLINE ma_uint8 ma_atomic_fetch_and_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + (void)order; + return __sync_fetch_and_and(dst, src); + } + static MA_INLINE ma_uint16 ma_atomic_fetch_and_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + (void)order; + return __sync_fetch_and_and(dst, src); + } + static MA_INLINE ma_uint32 ma_atomic_fetch_and_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + (void)order; + return __sync_fetch_and_and(dst, src); + } + static MA_INLINE ma_uint64 ma_atomic_fetch_and_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + (void)order; + return __sync_fetch_and_and(dst, src); + } + #define ma_atomic_compare_and_swap_8( dst, expected, desired) __sync_val_compare_and_swap(dst, expected, desired) + #define ma_atomic_compare_and_swap_16(dst, expected, desired) __sync_val_compare_and_swap(dst, expected, desired) + #define ma_atomic_compare_and_swap_32(dst, expected, desired) __sync_val_compare_and_swap(dst, expected, desired) + #define ma_atomic_compare_and_swap_64(dst, expected, desired) __sync_val_compare_and_swap(dst, expected, desired) #else - #error Unsupported compiler. + #if defined(MA_X86) + #define ma_atomic_thread_fence(order) __asm__ __volatile__("lock; addl $0, (%%esp)" ::: "memory", "cc") + #elif defined(MA_X64) + #define ma_atomic_thread_fence(order) __asm__ __volatile__("lock; addq $0, (%%rsp)" ::: "memory", "cc") + #else + #error Unsupported architecture. Please submit a feature request. + #endif + static MA_INLINE ma_uint8 ma_atomic_compare_and_swap_8(volatile ma_uint8* dst, ma_uint8 expected, ma_uint8 desired) + { + ma_uint8 result; + #if defined(MA_X86) || defined(MA_X64) + __asm__ __volatile__("lock; cmpxchg %3, %0" : "+m"(*dst), "=a"(result) : "a"(expected), "d"(desired) : "cc"); + #else + #error Unsupported architecture. Please submit a feature request. + #endif + return result; + } + static MA_INLINE ma_uint16 ma_atomic_compare_and_swap_16(volatile ma_uint16* dst, ma_uint16 expected, ma_uint16 desired) + { + ma_uint16 result; + #if defined(MA_X86) || defined(MA_X64) + __asm__ __volatile__("lock; cmpxchg %3, %0" : "+m"(*dst), "=a"(result) : "a"(expected), "d"(desired) : "cc"); + #else + #error Unsupported architecture. Please submit a feature request. + #endif + return result; + } + static MA_INLINE ma_uint32 ma_atomic_compare_and_swap_32(volatile ma_uint32* dst, ma_uint32 expected, ma_uint32 desired) + { + ma_uint32 result; + #if defined(MA_X86) || defined(MA_X64) + __asm__ __volatile__("lock; cmpxchg %3, %0" : "+m"(*dst), "=a"(result) : "a"(expected), "d"(desired) : "cc"); + #else + #error Unsupported architecture. Please submit a feature request. + #endif + return result; + } + static MA_INLINE ma_uint64 ma_atomic_compare_and_swap_64(volatile ma_uint64* dst, ma_uint64 expected, ma_uint64 desired) + { + volatile ma_uint64 result; + #if defined(MA_X86) + ma_uint32 resultEAX; + ma_uint32 resultEDX; + __asm__ __volatile__("push %%ebx; xchg %5, %%ebx; lock; cmpxchg8b %0; pop %%ebx" : "+m"(*dst), "=a"(resultEAX), "=d"(resultEDX) : "a"(expected & 0xFFFFFFFF), "d"(expected >> 32), "r"(desired & 0xFFFFFFFF), "c"(desired >> 32) : "cc"); + result = ((ma_uint64)resultEDX << 32) | resultEAX; + #elif defined(MA_X64) + __asm__ __volatile__("lock; cmpxchg %3, %0" : "+m"(*dst), "=a"(result) : "a"(expected), "d"(desired) : "cc"); + #else + #error Unsupported architecture. Please submit a feature request. + #endif + return result; + } + static MA_INLINE ma_uint8 ma_atomic_exchange_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + ma_uint8 result = 0; + (void)order; + #if defined(MA_X86) || defined(MA_X64) + __asm__ __volatile__("lock; xchg %1, %0" : "+m"(*dst), "=a"(result) : "a"(src)); + #else + #error Unsupported architecture. Please submit a feature request. + #endif + return result; + } + static MA_INLINE ma_uint16 ma_atomic_exchange_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + ma_uint16 result = 0; + (void)order; + #if defined(MA_X86) || defined(MA_X64) + __asm__ __volatile__("lock; xchg %1, %0" : "+m"(*dst), "=a"(result) : "a"(src)); + #else + #error Unsupported architecture. Please submit a feature request. + #endif + return result; + } + static MA_INLINE ma_uint32 ma_atomic_exchange_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + ma_uint32 result; + (void)order; + #if defined(MA_X86) || defined(MA_X64) + __asm__ __volatile__("lock; xchg %1, %0" : "+m"(*dst), "=a"(result) : "a"(src)); + #else + #error Unsupported architecture. Please submit a feature request. + #endif + return result; + } + static MA_INLINE ma_uint64 ma_atomic_exchange_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + ma_uint64 result; + (void)order; + #if defined(MA_X86) + do { + result = *dst; + } while (ma_atomic_compare_and_swap_64(dst, result, src) != result); + #elif defined(MA_X64) + __asm__ __volatile__("lock; xchg %1, %0" : "+m"(*dst), "=a"(result) : "a"(src)); + #else + #error Unsupported architecture. Please submit a feature request. + #endif + return result; + } + static MA_INLINE ma_uint8 ma_atomic_fetch_add_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + ma_uint8 result; + (void)order; + #if defined(MA_X86) || defined(MA_X64) + __asm__ __volatile__("lock; xadd %1, %0" : "+m"(*dst), "=a"(result) : "a"(src) : "cc"); + #else + #error Unsupported architecture. Please submit a feature request. + #endif + return result; + } + static MA_INLINE ma_uint16 ma_atomic_fetch_add_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + ma_uint16 result; + (void)order; + #if defined(MA_X86) || defined(MA_X64) + __asm__ __volatile__("lock; xadd %1, %0" : "+m"(*dst), "=a"(result) : "a"(src) : "cc"); + #else + #error Unsupported architecture. Please submit a feature request. + #endif + return result; + } + static MA_INLINE ma_uint32 ma_atomic_fetch_add_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + ma_uint32 result; + (void)order; + #if defined(MA_X86) || defined(MA_X64) + __asm__ __volatile__("lock; xadd %1, %0" : "+m"(*dst), "=a"(result) : "a"(src) : "cc"); + #else + #error Unsupported architecture. Please submit a feature request. + #endif + return result; + } + static MA_INLINE ma_uint64 ma_atomic_fetch_add_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + #if defined(MA_X86) + ma_uint64 oldValue; + ma_uint64 newValue; + (void)order; + do { + oldValue = *dst; + newValue = oldValue + src; + } while (ma_atomic_compare_and_swap_64(dst, oldValue, newValue) != oldValue); + return oldValue; + #elif defined(MA_X64) + ma_uint64 result; + (void)order; + __asm__ __volatile__("lock; xadd %1, %0" : "+m"(*dst), "=a"(result) : "a"(src) : "cc"); + return result; + #endif + } + static MA_INLINE ma_uint8 ma_atomic_fetch_sub_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + ma_uint8 oldValue; + ma_uint8 newValue; + do { + oldValue = *dst; + newValue = (ma_uint8)(oldValue - src); + } while (ma_atomic_compare_and_swap_8(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + } + static MA_INLINE ma_uint16 ma_atomic_fetch_sub_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + ma_uint16 oldValue; + ma_uint16 newValue; + do { + oldValue = *dst; + newValue = (ma_uint16)(oldValue - src); + } while (ma_atomic_compare_and_swap_16(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + } + static MA_INLINE ma_uint32 ma_atomic_fetch_sub_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + ma_uint32 oldValue; + ma_uint32 newValue; + do { + oldValue = *dst; + newValue = oldValue - src; + } while (ma_atomic_compare_and_swap_32(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + } + static MA_INLINE ma_uint64 ma_atomic_fetch_sub_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + ma_uint64 oldValue; + ma_uint64 newValue; + do { + oldValue = *dst; + newValue = oldValue - src; + } while (ma_atomic_compare_and_swap_64(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + } + static MA_INLINE ma_uint8 ma_atomic_fetch_and_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + ma_uint8 oldValue; + ma_uint8 newValue; + do { + oldValue = *dst; + newValue = (ma_uint8)(oldValue & src); + } while (ma_atomic_compare_and_swap_8(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + } + static MA_INLINE ma_uint16 ma_atomic_fetch_and_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + ma_uint16 oldValue; + ma_uint16 newValue; + do { + oldValue = *dst; + newValue = (ma_uint16)(oldValue & src); + } while (ma_atomic_compare_and_swap_16(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + } + static MA_INLINE ma_uint32 ma_atomic_fetch_and_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + ma_uint32 oldValue; + ma_uint32 newValue; + do { + oldValue = *dst; + newValue = oldValue & src; + } while (ma_atomic_compare_and_swap_32(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + } + static MA_INLINE ma_uint64 ma_atomic_fetch_and_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + ma_uint64 oldValue; + ma_uint64 newValue; + do { + oldValue = *dst; + newValue = oldValue & src; + } while (ma_atomic_compare_and_swap_64(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + } + static MA_INLINE ma_uint8 ma_atomic_fetch_xor_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + ma_uint8 oldValue; + ma_uint8 newValue; + do { + oldValue = *dst; + newValue = (ma_uint8)(oldValue ^ src); + } while (ma_atomic_compare_and_swap_8(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + } + static MA_INLINE ma_uint16 ma_atomic_fetch_xor_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + ma_uint16 oldValue; + ma_uint16 newValue; + do { + oldValue = *dst; + newValue = (ma_uint16)(oldValue ^ src); + } while (ma_atomic_compare_and_swap_16(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + } + static MA_INLINE ma_uint32 ma_atomic_fetch_xor_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + ma_uint32 oldValue; + ma_uint32 newValue; + do { + oldValue = *dst; + newValue = oldValue ^ src; + } while (ma_atomic_compare_and_swap_32(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + } + static MA_INLINE ma_uint64 ma_atomic_fetch_xor_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + ma_uint64 oldValue; + ma_uint64 newValue; + do { + oldValue = *dst; + newValue = oldValue ^ src; + } while (ma_atomic_compare_and_swap_64(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + } + static MA_INLINE ma_uint8 ma_atomic_fetch_or_explicit_8(volatile ma_uint8* dst, ma_uint8 src, ma_atomic_memory_order order) + { + ma_uint8 oldValue; + ma_uint8 newValue; + do { + oldValue = *dst; + newValue = (ma_uint8)(oldValue | src); + } while (ma_atomic_compare_and_swap_8(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + } + static MA_INLINE ma_uint16 ma_atomic_fetch_or_explicit_16(volatile ma_uint16* dst, ma_uint16 src, ma_atomic_memory_order order) + { + ma_uint16 oldValue; + ma_uint16 newValue; + do { + oldValue = *dst; + newValue = (ma_uint16)(oldValue | src); + } while (ma_atomic_compare_and_swap_16(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + } + static MA_INLINE ma_uint32 ma_atomic_fetch_or_explicit_32(volatile ma_uint32* dst, ma_uint32 src, ma_atomic_memory_order order) + { + ma_uint32 oldValue; + ma_uint32 newValue; + do { + oldValue = *dst; + newValue = oldValue | src; + } while (ma_atomic_compare_and_swap_32(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + } + static MA_INLINE ma_uint64 ma_atomic_fetch_or_explicit_64(volatile ma_uint64* dst, ma_uint64 src, ma_atomic_memory_order order) + { + ma_uint64 oldValue; + ma_uint64 newValue; + do { + oldValue = *dst; + newValue = oldValue | src; + } while (ma_atomic_compare_and_swap_64(dst, oldValue, newValue) != oldValue); + (void)order; + return oldValue; + } #endif + #define ma_atomic_signal_fence(order) ma_atomic_thread_fence(order) + static MA_INLINE ma_uint8 ma_atomic_load_explicit_8(volatile const ma_uint8* ptr, ma_atomic_memory_order order) + { + (void)order; + return ma_atomic_compare_and_swap_8((ma_uint8*)ptr, 0, 0); + } + static MA_INLINE ma_uint16 ma_atomic_load_explicit_16(volatile const ma_uint16* ptr, ma_atomic_memory_order order) + { + (void)order; + return ma_atomic_compare_and_swap_16((ma_uint16*)ptr, 0, 0); + } + static MA_INLINE ma_uint32 ma_atomic_load_explicit_32(volatile const ma_uint32* ptr, ma_atomic_memory_order order) + { + (void)order; + return ma_atomic_compare_and_swap_32((ma_uint32*)ptr, 0, 0); + } + static MA_INLINE ma_uint64 ma_atomic_load_explicit_64(volatile const ma_uint64* ptr, ma_atomic_memory_order order) + { + (void)order; + return ma_atomic_compare_and_swap_64((ma_uint64*)ptr, 0, 0); + } + #define ma_atomic_store_explicit_8( dst, src, order) (void)ma_atomic_exchange_explicit_8 (dst, src, order) + #define ma_atomic_store_explicit_16(dst, src, order) (void)ma_atomic_exchange_explicit_16(dst, src, order) + #define ma_atomic_store_explicit_32(dst, src, order) (void)ma_atomic_exchange_explicit_32(dst, src, order) + #define ma_atomic_store_explicit_64(dst, src, order) (void)ma_atomic_exchange_explicit_64(dst, src, order) + #define ma_atomic_test_and_set_explicit_8( dst, order) ma_atomic_exchange_explicit_8 (dst, 1, order) + #define ma_atomic_test_and_set_explicit_16(dst, order) ma_atomic_exchange_explicit_16(dst, 1, order) + #define ma_atomic_test_and_set_explicit_32(dst, order) ma_atomic_exchange_explicit_32(dst, 1, order) + #define ma_atomic_test_and_set_explicit_64(dst, order) ma_atomic_exchange_explicit_64(dst, 1, order) + #define ma_atomic_clear_explicit_8( dst, order) ma_atomic_store_explicit_8 (dst, 0, order) + #define ma_atomic_clear_explicit_16(dst, order) ma_atomic_store_explicit_16(dst, 0, order) + #define ma_atomic_clear_explicit_32(dst, order) ma_atomic_store_explicit_32(dst, 0, order) + #define ma_atomic_clear_explicit_64(dst, order) ma_atomic_store_explicit_64(dst, 0, order) + typedef ma_uint8 ma_atomic_flag; + #define ma_atomic_flag_test_and_set_explicit(ptr, order) (ma_bool32)ma_atomic_test_and_set_explicit_8(ptr, order) + #define ma_atomic_flag_clear_explicit(ptr, order) ma_atomic_clear_explicit_8(ptr, order) + #define ma_atomic_flag_load_explicit(ptr, order) ma_atomic_load_explicit_8(ptr, order) #endif #if !defined(MA_ATOMIC_HAS_NATIVE_COMPARE_EXCHANGE) - static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_8(volatile ma_uint8* dst, ma_uint8* expected, ma_uint8 replacement, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) - { - ma_uint8 result; - (void)successOrder; - (void)failureOrder; - result = ma_atomic_compare_and_swap_8(dst, *expected, replacement); - if (result == *expected) { - return 1; - } else { - *expected = result; - return 0; + #if defined(MA_ATOMIC_HAS_8) + static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_8(volatile ma_uint8* dst, ma_uint8* expected, ma_uint8 desired, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) + { + ma_uint8 expectedValue; + ma_uint8 result; + (void)successOrder; + (void)failureOrder; + expectedValue = ma_atomic_load_explicit_8(expected, ma_atomic_memory_order_seq_cst); + result = ma_atomic_compare_and_swap_8(dst, expectedValue, desired); + if (result == expectedValue) { + return 1; + } else { + ma_atomic_store_explicit_8(expected, result, failureOrder); + return 0; + } } - } - static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_16(volatile ma_uint16* dst, ma_uint16* expected, ma_uint16 replacement, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) - { - ma_uint16 result; - (void)successOrder; - (void)failureOrder; - result = ma_atomic_compare_and_swap_16(dst, *expected, replacement); - if (result == *expected) { - return 1; - } else { - *expected = result; - return 0; + #endif + #if defined(MA_ATOMIC_HAS_16) + static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_16(volatile ma_uint16* dst, ma_uint16* expected, ma_uint16 desired, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) + { + ma_uint16 expectedValue; + ma_uint16 result; + (void)successOrder; + (void)failureOrder; + expectedValue = ma_atomic_load_explicit_16(expected, ma_atomic_memory_order_seq_cst); + result = ma_atomic_compare_and_swap_16(dst, expectedValue, desired); + if (result == expectedValue) { + return 1; + } else { + ma_atomic_store_explicit_16(expected, result, failureOrder); + return 0; + } } - } - static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_32(volatile ma_uint32* dst, ma_uint32* expected, ma_uint32 replacement, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) - { - ma_uint32 result; - (void)successOrder; - (void)failureOrder; - result = ma_atomic_compare_and_swap_32(dst, *expected, replacement); - if (result == *expected) { - return 1; - } else { - *expected = result; - return 0; + #endif + #if defined(MA_ATOMIC_HAS_32) + static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_32(volatile ma_uint32* dst, ma_uint32* expected, ma_uint32 desired, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) + { + ma_uint32 expectedValue; + ma_uint32 result; + (void)successOrder; + (void)failureOrder; + expectedValue = ma_atomic_load_explicit_32(expected, ma_atomic_memory_order_seq_cst); + result = ma_atomic_compare_and_swap_32(dst, expectedValue, desired); + if (result == expectedValue) { + return 1; + } else { + ma_atomic_store_explicit_32(expected, result, failureOrder); + return 0; + } } - } - static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_64(volatile ma_uint64* dst, volatile ma_uint64* expected, ma_uint64 replacement, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) - { - ma_uint64 result; - (void)successOrder; - (void)failureOrder; - result = ma_atomic_compare_and_swap_64(dst, *expected, replacement); - if (result == *expected) { - return 1; - } else { - *expected = result; - return 0; + #endif + #if defined(MA_ATOMIC_HAS_64) + static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_64(volatile ma_uint64* dst, volatile ma_uint64* expected, ma_uint64 desired, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) + { + ma_uint64 expectedValue; + ma_uint64 result; + (void)successOrder; + (void)failureOrder; + expectedValue = ma_atomic_load_explicit_64(expected, ma_atomic_memory_order_seq_cst); + result = ma_atomic_compare_and_swap_64(dst, expectedValue, desired); + if (result == expectedValue) { + return 1; + } else { + ma_atomic_store_explicit_64(expected, result, failureOrder); + return 0; + } } + #endif + #define ma_atomic_compare_exchange_weak_explicit_8( dst, expected, desired, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_8 (dst, expected, desired, successOrder, failureOrder) + #define ma_atomic_compare_exchange_weak_explicit_16(dst, expected, desired, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_16(dst, expected, desired, successOrder, failureOrder) + #define ma_atomic_compare_exchange_weak_explicit_32(dst, expected, desired, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_32(dst, expected, desired, successOrder, failureOrder) + #define ma_atomic_compare_exchange_weak_explicit_64(dst, expected, desired, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_64(dst, expected, desired, successOrder, failureOrder) +#endif +#if !defined(MA_ATOMIC_HAS_NATIVE_IS_LOCK_FREE) + static MA_INLINE ma_bool32 ma_atomic_is_lock_free_8(volatile void* ptr) + { + (void)ptr; + return 1; + } + static MA_INLINE ma_bool32 ma_atomic_is_lock_free_16(volatile void* ptr) + { + (void)ptr; + return 1; + } + static MA_INLINE ma_bool32 ma_atomic_is_lock_free_32(volatile void* ptr) + { + (void)ptr; + return 1; + } + static MA_INLINE ma_bool32 ma_atomic_is_lock_free_64(volatile void* ptr) + { + (void)ptr; + #if defined(MA_64BIT) + return 1; + #else + #if defined(MA_X86) || defined(MA_X64) + return 1; + #else + return 0; + #endif + #endif } - #define ma_atomic_compare_exchange_weak_explicit_8( dst, expected, replacement, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_8 (dst, expected, replacement, successOrder, failureOrder) - #define ma_atomic_compare_exchange_weak_explicit_16(dst, expected, replacement, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_16(dst, expected, replacement, successOrder, failureOrder) - #define ma_atomic_compare_exchange_weak_explicit_32(dst, expected, replacement, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_32(dst, expected, replacement, successOrder, failureOrder) - #define ma_atomic_compare_exchange_weak_explicit_64(dst, expected, replacement, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_64(dst, expected, replacement, successOrder, failureOrder) #endif #if defined(MA_64BIT) static MA_INLINE ma_bool32 ma_atomic_is_lock_free_ptr(volatile void** ptr) @@ -16968,17 +15561,17 @@ ma_atomic_spinlock ma_atomic_global_lock; { return (void*)ma_atomic_exchange_explicit_64((volatile ma_uint64*)dst, (ma_uint64)src, order); } - static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_ptr(volatile void** dst, void** expected, void* replacement, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) + static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_ptr(volatile void** dst, void** expected, void* desired, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) { - return ma_atomic_compare_exchange_strong_explicit_64((volatile ma_uint64*)dst, (ma_uint64*)expected, (ma_uint64)replacement, successOrder, failureOrder); + return ma_atomic_compare_exchange_strong_explicit_64((volatile ma_uint64*)dst, (ma_uint64*)expected, (ma_uint64)desired, successOrder, failureOrder); } - static MA_INLINE ma_bool32 ma_atomic_compare_exchange_weak_explicit_ptr(volatile void** dst, void** expected, void* replacement, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) + static MA_INLINE ma_bool32 ma_atomic_compare_exchange_weak_explicit_ptr(volatile void** dst, void** expected, void* desired, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) { - return ma_atomic_compare_exchange_weak_explicit_64((volatile ma_uint64*)dst, (ma_uint64*)expected, (ma_uint64)replacement, successOrder, failureOrder); + return ma_atomic_compare_exchange_weak_explicit_64((volatile ma_uint64*)dst, (ma_uint64*)expected, (ma_uint64)desired, successOrder, failureOrder); } - static MA_INLINE void* ma_atomic_compare_and_swap_ptr(volatile void** dst, void* expected, void* replacement) + static MA_INLINE void* ma_atomic_compare_and_swap_ptr(volatile void** dst, void* expected, void* desired) { - return (void*)ma_atomic_compare_and_swap_64((volatile ma_uint64*)dst, (ma_uint64)expected, (ma_uint64)replacement); + return (void*)ma_atomic_compare_and_swap_64((volatile ma_uint64*)dst, (ma_uint64)expected, (ma_uint64)desired); } #elif defined(MA_32BIT) static MA_INLINE ma_bool32 ma_atomic_is_lock_free_ptr(volatile void** ptr) @@ -16997,26 +15590,36 @@ ma_atomic_spinlock ma_atomic_global_lock; { return (void*)ma_atomic_exchange_explicit_32((volatile ma_uint32*)dst, (ma_uint32)src, order); } - static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_ptr(volatile void** dst, void** expected, void* replacement, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) + static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_ptr(volatile void** dst, void** expected, void* desired, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) { - return ma_atomic_compare_exchange_strong_explicit_32((volatile ma_uint32*)dst, (ma_uint32*)expected, (ma_uint32)replacement, successOrder, failureOrder); + return ma_atomic_compare_exchange_strong_explicit_32((volatile ma_uint32*)dst, (ma_uint32*)expected, (ma_uint32)desired, successOrder, failureOrder); } - static MA_INLINE ma_bool32 ma_atomic_compare_exchange_weak_explicit_ptr(volatile void** dst, void** expected, void* replacement, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) + static MA_INLINE ma_bool32 ma_atomic_compare_exchange_weak_explicit_ptr(volatile void** dst, void** expected, void* desired, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) { - return ma_atomic_compare_exchange_weak_explicit_32((volatile ma_uint32*)dst, (ma_uint32*)expected, (ma_uint32)replacement, successOrder, failureOrder); + return ma_atomic_compare_exchange_weak_explicit_32((volatile ma_uint32*)dst, (ma_uint32*)expected, (ma_uint32)desired, successOrder, failureOrder); } - static MA_INLINE void* ma_atomic_compare_and_swap_ptr(volatile void** dst, void* expected, void* replacement) + static MA_INLINE void* ma_atomic_compare_and_swap_ptr(volatile void** dst, void* expected, void* desired) { - return (void*)ma_atomic_compare_and_swap_32((volatile ma_uint32*)dst, (ma_uint32)expected, (ma_uint32)replacement); + return (void*)ma_atomic_compare_and_swap_32((volatile ma_uint32*)dst, (ma_uint32)expected, (ma_uint32)desired); } #else #error Unsupported architecture. #endif -#define ma_atomic_store_ptr(dst, src) ma_atomic_store_explicit_ptr((volatile void**)dst, (void*)src, ma_atomic_memory_order_seq_cst) -#define ma_atomic_load_ptr(ptr) ma_atomic_load_explicit_ptr((volatile void**)ptr, ma_atomic_memory_order_seq_cst) -#define ma_atomic_exchange_ptr(dst, src) ma_atomic_exchange_explicit_ptr((volatile void**)dst, (void*)src, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_strong_ptr(dst, expected, replacement) ma_atomic_compare_exchange_strong_explicit_ptr((volatile void**)dst, (void**)expected, (void*)replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_weak_ptr(dst, expected, replacement) ma_atomic_compare_exchange_weak_explicit_ptr((volatile void**)dst, (void**)expected, (void*)replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_flag_test_and_set(ptr) ma_atomic_flag_test_and_set_explicit(ptr, ma_atomic_memory_order_seq_cst) +#define ma_atomic_flag_clear(ptr) ma_atomic_flag_clear_explicit(ptr, ma_atomic_memory_order_seq_cst) +#define ma_atomic_store_ptr(dst, src) ma_atomic_store_explicit_ptr((volatile void**)dst, (void*)src, ma_atomic_memory_order_seq_cst) +#define ma_atomic_load_ptr(ptr) ma_atomic_load_explicit_ptr((volatile void**)ptr, ma_atomic_memory_order_seq_cst) +#define ma_atomic_exchange_ptr(dst, src) ma_atomic_exchange_explicit_ptr((volatile void**)dst, (void*)src, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_strong_ptr(dst, expected, desired) ma_atomic_compare_exchange_strong_explicit_ptr((volatile void**)dst, (void**)expected, (void*)desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_weak_ptr(dst, expected, desired) ma_atomic_compare_exchange_weak_explicit_ptr((volatile void**)dst, (void**)expected, (void*)desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_test_and_set_8( ptr) ma_atomic_test_and_set_explicit_8( ptr, ma_atomic_memory_order_seq_cst) +#define ma_atomic_test_and_set_16(ptr) ma_atomic_test_and_set_explicit_16(ptr, ma_atomic_memory_order_seq_cst) +#define ma_atomic_test_and_set_32(ptr) ma_atomic_test_and_set_explicit_32(ptr, ma_atomic_memory_order_seq_cst) +#define ma_atomic_test_and_set_64(ptr) ma_atomic_test_and_set_explicit_64(ptr, ma_atomic_memory_order_seq_cst) +#define ma_atomic_clear_8( ptr) ma_atomic_clear_explicit_8( ptr, ma_atomic_memory_order_seq_cst) +#define ma_atomic_clear_16(ptr) ma_atomic_clear_explicit_16(ptr, ma_atomic_memory_order_seq_cst) +#define ma_atomic_clear_32(ptr) ma_atomic_clear_explicit_32(ptr, ma_atomic_memory_order_seq_cst) +#define ma_atomic_clear_64(ptr) ma_atomic_clear_explicit_64(ptr, ma_atomic_memory_order_seq_cst) #define ma_atomic_store_8( dst, src) ma_atomic_store_explicit_8( dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_store_16(dst, src) ma_atomic_store_explicit_16(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_store_32(dst, src) ma_atomic_store_explicit_32(dst, src, ma_atomic_memory_order_seq_cst) @@ -17029,14 +15632,14 @@ ma_atomic_spinlock ma_atomic_global_lock; #define ma_atomic_exchange_16(dst, src) ma_atomic_exchange_explicit_16(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_exchange_32(dst, src) ma_atomic_exchange_explicit_32(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_exchange_64(dst, src) ma_atomic_exchange_explicit_64(dst, src, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_strong_8( dst, expected, replacement) ma_atomic_compare_exchange_strong_explicit_8( dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_strong_16(dst, expected, replacement) ma_atomic_compare_exchange_strong_explicit_16(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_strong_32(dst, expected, replacement) ma_atomic_compare_exchange_strong_explicit_32(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_strong_64(dst, expected, replacement) ma_atomic_compare_exchange_strong_explicit_64(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_weak_8( dst, expected, replacement) ma_atomic_compare_exchange_weak_explicit_8( dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_weak_16( dst, expected, replacement) ma_atomic_compare_exchange_weak_explicit_16(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_weak_32( dst, expected, replacement) ma_atomic_compare_exchange_weak_explicit_32(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_weak_64( dst, expected, replacement) ma_atomic_compare_exchange_weak_explicit_64(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_strong_8( dst, expected, desired) ma_atomic_compare_exchange_strong_explicit_8( dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_strong_16(dst, expected, desired) ma_atomic_compare_exchange_strong_explicit_16(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_strong_32(dst, expected, desired) ma_atomic_compare_exchange_strong_explicit_32(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_strong_64(dst, expected, desired) ma_atomic_compare_exchange_strong_explicit_64(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_weak_8( dst, expected, desired) ma_atomic_compare_exchange_weak_explicit_8( dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_weak_16( dst, expected, desired) ma_atomic_compare_exchange_weak_explicit_16(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_weak_32( dst, expected, desired) ma_atomic_compare_exchange_weak_explicit_32(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_weak_64( dst, expected, desired) ma_atomic_compare_exchange_weak_explicit_64(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) #define ma_atomic_fetch_add_8( dst, src) ma_atomic_fetch_add_explicit_8( dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_fetch_add_16(dst, src) ma_atomic_fetch_add_explicit_16(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_fetch_add_32(dst, src) ma_atomic_fetch_add_explicit_32(dst, src, ma_atomic_memory_order_seq_cst) @@ -17057,6 +15660,14 @@ ma_atomic_spinlock ma_atomic_global_lock; #define ma_atomic_fetch_and_16(dst, src) ma_atomic_fetch_and_explicit_16(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_fetch_and_32(dst, src) ma_atomic_fetch_and_explicit_32(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_fetch_and_64(dst, src) ma_atomic_fetch_and_explicit_64(dst, src, ma_atomic_memory_order_seq_cst) +#define ma_atomic_test_and_set_explicit_i8( ptr, order) (ma_int8 )ma_atomic_test_and_set_explicit_8( (ma_uint8* )ptr, order) +#define ma_atomic_test_and_set_explicit_i16(ptr, order) (ma_int16)ma_atomic_test_and_set_explicit_16((ma_uint16*)ptr, order) +#define ma_atomic_test_and_set_explicit_i32(ptr, order) (ma_int32)ma_atomic_test_and_set_explicit_32((ma_uint32*)ptr, order) +#define ma_atomic_test_and_set_explicit_i64(ptr, order) (ma_int64)ma_atomic_test_and_set_explicit_64((ma_uint64*)ptr, order) +#define ma_atomic_clear_explicit_i8( ptr, order) ma_atomic_clear_explicit_8( (ma_uint8* )ptr, order) +#define ma_atomic_clear_explicit_i16(ptr, order) ma_atomic_clear_explicit_16((ma_uint16*)ptr, order) +#define ma_atomic_clear_explicit_i32(ptr, order) ma_atomic_clear_explicit_32((ma_uint32*)ptr, order) +#define ma_atomic_clear_explicit_i64(ptr, order) ma_atomic_clear_explicit_64((ma_uint64*)ptr, order) #define ma_atomic_store_explicit_i8( dst, src, order) ma_atomic_store_explicit_8( (ma_uint8* )dst, (ma_uint8 )src, order) #define ma_atomic_store_explicit_i16(dst, src, order) ma_atomic_store_explicit_16((ma_uint16*)dst, (ma_uint16)src, order) #define ma_atomic_store_explicit_i32(dst, src, order) ma_atomic_store_explicit_32((ma_uint32*)dst, (ma_uint32)src, order) @@ -17069,14 +15680,14 @@ ma_atomic_spinlock ma_atomic_global_lock; #define ma_atomic_exchange_explicit_i16(dst, src, order) (ma_int16)ma_atomic_exchange_explicit_16((ma_uint16*)dst, (ma_uint16)src, order) #define ma_atomic_exchange_explicit_i32(dst, src, order) (ma_int32)ma_atomic_exchange_explicit_32((ma_uint32*)dst, (ma_uint32)src, order) #define ma_atomic_exchange_explicit_i64(dst, src, order) (ma_int64)ma_atomic_exchange_explicit_64((ma_uint64*)dst, (ma_uint64)src, order) -#define ma_atomic_compare_exchange_strong_explicit_i8( dst, expected, replacement, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_8( (ma_uint8* )dst, (ma_uint8* )expected, (ma_uint8 )replacement, successOrder, failureOrder) -#define ma_atomic_compare_exchange_strong_explicit_i16(dst, expected, replacement, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_16((ma_uint16*)dst, (ma_uint16*)expected, (ma_uint16)replacement, successOrder, failureOrder) -#define ma_atomic_compare_exchange_strong_explicit_i32(dst, expected, replacement, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_32((ma_uint32*)dst, (ma_uint32*)expected, (ma_uint32)replacement, successOrder, failureOrder) -#define ma_atomic_compare_exchange_strong_explicit_i64(dst, expected, replacement, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_64((ma_uint64*)dst, (ma_uint64*)expected, (ma_uint64)replacement, successOrder, failureOrder) -#define ma_atomic_compare_exchange_weak_explicit_i8( dst, expected, replacement, successOrder, failureOrder) ma_atomic_compare_exchange_weak_explicit_8( (ma_uint8* )dst, (ma_uint8* )expected, (ma_uint8 )replacement, successOrder, failureOrder) -#define ma_atomic_compare_exchange_weak_explicit_i16(dst, expected, replacement, successOrder, failureOrder) ma_atomic_compare_exchange_weak_explicit_16((ma_uint16*)dst, (ma_uint16*)expected, (ma_uint16)replacement, successOrder, failureOrder) -#define ma_atomic_compare_exchange_weak_explicit_i32(dst, expected, replacement, successOrder, failureOrder) ma_atomic_compare_exchange_weak_explicit_32((ma_uint32*)dst, (ma_uint32*)expected, (ma_uint32)replacement, successOrder, failureOrder) -#define ma_atomic_compare_exchange_weak_explicit_i64(dst, expected, replacement, successOrder, failureOrder) ma_atomic_compare_exchange_weak_explicit_64((ma_uint64*)dst, (ma_uint64*)expected, (ma_uint64)replacement, successOrder, failureOrder) +#define ma_atomic_compare_exchange_strong_explicit_i8( dst, expected, desired, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_8( (ma_uint8* )dst, (ma_uint8* )expected, (ma_uint8 )desired, successOrder, failureOrder) +#define ma_atomic_compare_exchange_strong_explicit_i16(dst, expected, desired, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_16((ma_uint16*)dst, (ma_uint16*)expected, (ma_uint16)desired, successOrder, failureOrder) +#define ma_atomic_compare_exchange_strong_explicit_i32(dst, expected, desired, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_32((ma_uint32*)dst, (ma_uint32*)expected, (ma_uint32)desired, successOrder, failureOrder) +#define ma_atomic_compare_exchange_strong_explicit_i64(dst, expected, desired, successOrder, failureOrder) ma_atomic_compare_exchange_strong_explicit_64((ma_uint64*)dst, (ma_uint64*)expected, (ma_uint64)desired, successOrder, failureOrder) +#define ma_atomic_compare_exchange_weak_explicit_i8( dst, expected, desired, successOrder, failureOrder) ma_atomic_compare_exchange_weak_explicit_8( (ma_uint8* )dst, (ma_uint8* )expected, (ma_uint8 )desired, successOrder, failureOrder) +#define ma_atomic_compare_exchange_weak_explicit_i16(dst, expected, desired, successOrder, failureOrder) ma_atomic_compare_exchange_weak_explicit_16((ma_uint16*)dst, (ma_uint16*)expected, (ma_uint16)desired, successOrder, failureOrder) +#define ma_atomic_compare_exchange_weak_explicit_i32(dst, expected, desired, successOrder, failureOrder) ma_atomic_compare_exchange_weak_explicit_32((ma_uint32*)dst, (ma_uint32*)expected, (ma_uint32)desired, successOrder, failureOrder) +#define ma_atomic_compare_exchange_weak_explicit_i64(dst, expected, desired, successOrder, failureOrder) ma_atomic_compare_exchange_weak_explicit_64((ma_uint64*)dst, (ma_uint64*)expected, (ma_uint64)desired, successOrder, failureOrder) #define ma_atomic_fetch_add_explicit_i8( dst, src, order) (ma_int8 )ma_atomic_fetch_add_explicit_8( (ma_uint8* )dst, (ma_uint8 )src, order) #define ma_atomic_fetch_add_explicit_i16(dst, src, order) (ma_int16)ma_atomic_fetch_add_explicit_16((ma_uint16*)dst, (ma_uint16)src, order) #define ma_atomic_fetch_add_explicit_i32(dst, src, order) (ma_int32)ma_atomic_fetch_add_explicit_32((ma_uint32*)dst, (ma_uint32)src, order) @@ -17097,6 +15708,14 @@ ma_atomic_spinlock ma_atomic_global_lock; #define ma_atomic_fetch_and_explicit_i16(dst, src, order) (ma_int16)ma_atomic_fetch_and_explicit_16((ma_uint16*)dst, (ma_uint16)src, order) #define ma_atomic_fetch_and_explicit_i32(dst, src, order) (ma_int32)ma_atomic_fetch_and_explicit_32((ma_uint32*)dst, (ma_uint32)src, order) #define ma_atomic_fetch_and_explicit_i64(dst, src, order) (ma_int64)ma_atomic_fetch_and_explicit_64((ma_uint64*)dst, (ma_uint64)src, order) +#define ma_atomic_test_and_set_i8( ptr) ma_atomic_test_and_set_explicit_i8( ptr, ma_atomic_memory_order_seq_cst) +#define ma_atomic_test_and_set_i16(ptr) ma_atomic_test_and_set_explicit_i16(ptr, ma_atomic_memory_order_seq_cst) +#define ma_atomic_test_and_set_i32(ptr) ma_atomic_test_and_set_explicit_i32(ptr, ma_atomic_memory_order_seq_cst) +#define ma_atomic_test_and_set_i64(ptr) ma_atomic_test_and_set_explicit_i64(ptr, ma_atomic_memory_order_seq_cst) +#define ma_atomic_clear_i8( ptr) ma_atomic_clear_explicit_i8( ptr, ma_atomic_memory_order_seq_cst) +#define ma_atomic_clear_i16(ptr) ma_atomic_clear_explicit_i16(ptr, ma_atomic_memory_order_seq_cst) +#define ma_atomic_clear_i32(ptr) ma_atomic_clear_explicit_i32(ptr, ma_atomic_memory_order_seq_cst) +#define ma_atomic_clear_i64(ptr) ma_atomic_clear_explicit_i64(ptr, ma_atomic_memory_order_seq_cst) #define ma_atomic_store_i8( dst, src) ma_atomic_store_explicit_i8( dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_store_i16(dst, src) ma_atomic_store_explicit_i16(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_store_i32(dst, src) ma_atomic_store_explicit_i32(dst, src, ma_atomic_memory_order_seq_cst) @@ -17109,14 +15728,14 @@ ma_atomic_spinlock ma_atomic_global_lock; #define ma_atomic_exchange_i16(dst, src) ma_atomic_exchange_explicit_i16(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_exchange_i32(dst, src) ma_atomic_exchange_explicit_i32(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_exchange_i64(dst, src) ma_atomic_exchange_explicit_i64(dst, src, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_strong_i8( dst, expected, replacement) ma_atomic_compare_exchange_strong_explicit_i8( dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_strong_i16(dst, expected, replacement) ma_atomic_compare_exchange_strong_explicit_i16(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_strong_i32(dst, expected, replacement) ma_atomic_compare_exchange_strong_explicit_i32(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_strong_i64(dst, expected, replacement) ma_atomic_compare_exchange_strong_explicit_i64(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_weak_i8( dst, expected, replacement) ma_atomic_compare_exchange_weak_explicit_i8( dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_weak_i16(dst, expected, replacement) ma_atomic_compare_exchange_weak_explicit_i16(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_weak_i32(dst, expected, replacement) ma_atomic_compare_exchange_weak_explicit_i32(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_weak_i64(dst, expected, replacement) ma_atomic_compare_exchange_weak_explicit_i64(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_strong_i8( dst, expected, desired) ma_atomic_compare_exchange_strong_explicit_i8( dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_strong_i16(dst, expected, desired) ma_atomic_compare_exchange_strong_explicit_i16(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_strong_i32(dst, expected, desired) ma_atomic_compare_exchange_strong_explicit_i32(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_strong_i64(dst, expected, desired) ma_atomic_compare_exchange_strong_explicit_i64(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_weak_i8( dst, expected, desired) ma_atomic_compare_exchange_weak_explicit_i8( dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_weak_i16(dst, expected, desired) ma_atomic_compare_exchange_weak_explicit_i16(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_weak_i32(dst, expected, desired) ma_atomic_compare_exchange_weak_explicit_i32(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_weak_i64(dst, expected, desired) ma_atomic_compare_exchange_weak_explicit_i64(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) #define ma_atomic_fetch_add_i8( dst, src) ma_atomic_fetch_add_explicit_i8( dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_fetch_add_i16(dst, src) ma_atomic_fetch_add_explicit_i16(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_fetch_add_i32(dst, src) ma_atomic_fetch_add_explicit_i32(dst, src, ma_atomic_memory_order_seq_cst) @@ -17193,28 +15812,28 @@ static MA_INLINE double ma_atomic_exchange_explicit_f64(volatile double* dst, do r.i = ma_atomic_exchange_explicit_64((volatile ma_uint64*)dst, x.i, order); return r.f; } -static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_f32(volatile float* dst, float* expected, float replacement, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) +static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_f32(volatile float* dst, float* expected, float desired, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) { ma_atomic_if32 d; - d.f = replacement; + d.f = desired; return ma_atomic_compare_exchange_strong_explicit_32((volatile ma_uint32*)dst, (ma_uint32*)expected, d.i, successOrder, failureOrder); } -static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_f64(volatile double* dst, double* expected, double replacement, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) +static MA_INLINE ma_bool32 ma_atomic_compare_exchange_strong_explicit_f64(volatile double* dst, double* expected, double desired, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) { ma_atomic_if64 d; - d.f = replacement; + d.f = desired; return ma_atomic_compare_exchange_strong_explicit_64((volatile ma_uint64*)dst, (ma_uint64*)expected, d.i, successOrder, failureOrder); } -static MA_INLINE ma_bool32 ma_atomic_compare_exchange_weak_explicit_f32(volatile float* dst, float* expected, float replacement, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) +static MA_INLINE ma_bool32 ma_atomic_compare_exchange_weak_explicit_f32(volatile float* dst, float* expected, float desired, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) { ma_atomic_if32 d; - d.f = replacement; + d.f = desired; return ma_atomic_compare_exchange_weak_explicit_32((volatile ma_uint32*)dst, (ma_uint32*)expected, d.i, successOrder, failureOrder); } -static MA_INLINE ma_bool32 ma_atomic_compare_exchange_weak_explicit_f64(volatile double* dst, double* expected, double replacement, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) +static MA_INLINE ma_bool32 ma_atomic_compare_exchange_weak_explicit_f64(volatile double* dst, double* expected, double desired, ma_atomic_memory_order successOrder, ma_atomic_memory_order failureOrder) { ma_atomic_if64 d; - d.f = replacement; + d.f = desired; return ma_atomic_compare_exchange_weak_explicit_64((volatile ma_uint64*)dst, (ma_uint64*)expected, d.i, successOrder, failureOrder); } static MA_INLINE float ma_atomic_fetch_add_explicit_f32(volatile float* dst, float src, ma_atomic_memory_order order) @@ -17305,10 +15924,10 @@ static MA_INLINE double ma_atomic_fetch_and_explicit_f64(volatile double* dst, d #define ma_atomic_load_f64(ptr) (double)ma_atomic_load_explicit_f64(ptr, ma_atomic_memory_order_seq_cst) #define ma_atomic_exchange_f32(dst, src) (float )ma_atomic_exchange_explicit_f32(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_exchange_f64(dst, src) (double)ma_atomic_exchange_explicit_f64(dst, src, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_strong_f32(dst, expected, replacement) ma_atomic_compare_exchange_strong_explicit_f32(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_strong_f64(dst, expected, replacement) ma_atomic_compare_exchange_strong_explicit_f64(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_weak_f32(dst, expected, replacement) ma_atomic_compare_exchange_weak_explicit_f32(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) -#define ma_atomic_compare_exchange_weak_f64(dst, expected, replacement) ma_atomic_compare_exchange_weak_explicit_f64(dst, expected, replacement, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_strong_f32(dst, expected, desired) ma_atomic_compare_exchange_strong_explicit_f32(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_strong_f64(dst, expected, desired) ma_atomic_compare_exchange_strong_explicit_f64(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_weak_f32(dst, expected, desired) ma_atomic_compare_exchange_weak_explicit_f32(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) +#define ma_atomic_compare_exchange_weak_f64(dst, expected, desired) ma_atomic_compare_exchange_weak_explicit_f64(dst, expected, desired, ma_atomic_memory_order_seq_cst, ma_atomic_memory_order_seq_cst) #define ma_atomic_fetch_add_f32(dst, src) ma_atomic_fetch_add_explicit_f32(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_fetch_add_f64(dst, src) ma_atomic_fetch_add_explicit_f64(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_fetch_sub_f32(dst, src) ma_atomic_fetch_sub_explicit_f32(dst, src, ma_atomic_memory_order_seq_cst) @@ -17319,24 +15938,39 @@ static MA_INLINE double ma_atomic_fetch_and_explicit_f64(volatile double* dst, d #define ma_atomic_fetch_xor_f64(dst, src) ma_atomic_fetch_xor_explicit_f64(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_fetch_and_f32(dst, src) ma_atomic_fetch_and_explicit_f32(dst, src, ma_atomic_memory_order_seq_cst) #define ma_atomic_fetch_and_f64(dst, src) ma_atomic_fetch_and_explicit_f64(dst, src, ma_atomic_memory_order_seq_cst) -static MA_INLINE float ma_atomic_compare_and_swap_f32(volatile float* dst, float expected, float replacement) +static MA_INLINE float ma_atomic_compare_and_swap_f32(volatile float* dst, float expected, float desired) { ma_atomic_if32 r; ma_atomic_if32 e, d; e.f = expected; - d.f = replacement; + d.f = desired; r.i = ma_atomic_compare_and_swap_32((volatile ma_uint32*)dst, e.i, d.i); return r.f; } -static MA_INLINE double ma_atomic_compare_and_swap_f64(volatile double* dst, double expected, double replacement) +static MA_INLINE double ma_atomic_compare_and_swap_f64(volatile double* dst, double expected, double desired) { ma_atomic_if64 r; ma_atomic_if64 e, d; e.f = expected; - d.f = replacement; + d.f = desired; r.i = ma_atomic_compare_and_swap_64((volatile ma_uint64*)dst, e.i, d.i); return r.f; } +typedef ma_atomic_flag ma_atomic_spinlock; +static MA_INLINE void ma_atomic_spinlock_lock(volatile ma_atomic_spinlock* pSpinlock) +{ + for (;;) { + if (ma_atomic_flag_test_and_set_explicit(pSpinlock, ma_atomic_memory_order_acquire) == 0) { + break; + } + while (ma_atomic_flag_load_explicit(pSpinlock, ma_atomic_memory_order_relaxed) == 1) { + } + } +} +static MA_INLINE void ma_atomic_spinlock_unlock(volatile ma_atomic_spinlock* pSpinlock) +{ + ma_atomic_flag_clear_explicit(pSpinlock, ma_atomic_memory_order_release); +} #if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))) #pragma GCC diagnostic pop #endif @@ -17542,7 +16176,7 @@ static ma_result ma_thread_create__posix(ma_thread* pThread, ma_thread_priority int result; pthread_attr_t* pAttr = NULL; -#if !defined(MA_EMSCRIPTEN) && !defined(MA_3DS) && !defined(MA_SWITCH) +#if !defined(__EMSCRIPTEN__) && !defined(__3DS__) /* Try setting the thread priority. It's not critical if anything fails here. */ pthread_attr_t attr; if (pthread_attr_init(&attr) == 0) { @@ -17574,18 +16208,9 @@ static ma_result ma_thread_create__posix(ma_thread* pThread, ma_thread_priority } #endif - #if defined(_POSIX_THREAD_ATTR_STACKSIZE) && _POSIX_THREAD_ATTR_STACKSIZE >= 0 - { - if (stackSize > 0) { - pthread_attr_setstacksize(&attr, stackSize); - } + if (stackSize > 0) { + pthread_attr_setstacksize(&attr, stackSize); } - #else - { - (void)stackSize; /* Suppress unused parameter warning. */ - } - #endif - if (scheduler != -1) { int priorityMin = sched_get_priority_min(scheduler); @@ -17642,21 +16267,6 @@ static ma_result ma_thread_create__posix(ma_thread* pThread, ma_thread_priority } if (result != 0) { - /* - There have been reports that attempting to create a realtime thread can sometimes fail. In this case, - fall back to a normal priority thread. - - I'm including a compile-time option here to disable this functionality for those who have a hard - requirement on realtime threads and would rather an explicit failure. - */ - #ifndef MA_NO_PTHREAD_REALTIME_PRIORITY_FALLBACK - { - if(result == EPERM && priority == ma_thread_priority_realtime) { - return ma_thread_create__posix(pThread, ma_thread_priority_normal, stackSize, entryProc, pData); - } - } - #endif - return ma_result_from_errno(result); } @@ -17928,7 +16538,7 @@ static ma_result ma_event_signal__win32(ma_event* pEvent) static ma_result ma_semaphore_init__win32(int initialValue, ma_semaphore* pSemaphore) { - *pSemaphore = CreateSemaphore(NULL, (LONG)initialValue, LONG_MAX, NULL); + *pSemaphore = CreateSemaphoreW(NULL, (LONG)initialValue, LONG_MAX, NULL); if (*pSemaphore == NULL) { return ma_result_from_GetLastError(GetLastError()); } @@ -18822,12 +17432,10 @@ static MA_INLINE ma_uint16 ma_job_extract_slot(ma_uint64 toc) return (ma_uint16)(toc & 0x0000FFFF); } -#if 0 /* Currently unused, but might make use of this later. */ static MA_INLINE ma_uint16 ma_job_extract_code(ma_uint64 toc) { return (ma_uint16)((toc & 0xFFFF0000) >> 16); } -#endif static MA_INLINE ma_uint64 ma_job_toc_to_allocation(ma_uint64 toc) { @@ -19292,13 +17900,6 @@ MA_API ma_result ma_job_queue_next(ma_job_queue* pQueue, ma_job* pJob) Dynamic Linking *******************************************************************************/ -/* Disable run-time linking on certain backends and platforms. */ -#ifndef MA_NO_RUNTIME_LINKING - #if defined(MA_EMSCRIPTEN) || defined(MA_ORBIS) || defined(MA_PROSPERO) || defined(MA_SWITCH) || defined(MA_DOS) - #define MA_NO_RUNTIME_LINKING - #endif -#endif - #ifdef MA_POSIX /* No need for dlfcn.h if we're not using runtime linking. */ #ifndef MA_NO_RUNTIME_LINKING @@ -19308,124 +17909,104 @@ Dynamic Linking MA_API ma_handle ma_dlopen(ma_log* pLog, const char* filename) { - #ifndef MA_NO_RUNTIME_LINKING - { - ma_handle handle; +#ifndef MA_NO_RUNTIME_LINKING + ma_handle handle; - ma_log_postf(pLog, MA_LOG_LEVEL_DEBUG, "Loading library: %s\n", filename); + ma_log_postf(pLog, MA_LOG_LEVEL_DEBUG, "Loading library: %s\n", filename); - #ifdef MA_WIN32 - /* From MSDN: Desktop applications cannot use LoadPackagedLibrary; if a desktop application calls this function it fails with APPMODEL_ERROR_NO_PACKAGE.*/ - #if !defined(MA_WIN32_UWP) || !(defined(WINAPI_FAMILY) && ((defined(WINAPI_FAMILY_PHONE_APP) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP))) - handle = (ma_handle)LoadLibraryA(filename); - #else - /* *sigh* It appears there is no ANSI version of LoadPackagedLibrary()... */ - WCHAR filenameW[4096]; - if (MultiByteToWideChar(CP_UTF8, 0, filename, -1, filenameW, sizeof(filenameW)) == 0) { - handle = NULL; - } else { - handle = (ma_handle)LoadPackagedLibrary(filenameW, 0); - } - #endif + #ifdef MA_WIN32 + /* From MSDN: Desktop applications cannot use LoadPackagedLibrary; if a desktop application calls this function it fails with APPMODEL_ERROR_NO_PACKAGE.*/ + #if !defined(MA_WIN32_UWP) || !(defined(WINAPI_FAMILY) && ((defined(WINAPI_FAMILY_PHONE_APP) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP))) + handle = (ma_handle)LoadLibraryA(filename); #else - handle = (ma_handle)dlopen(filename, RTLD_NOW); + /* *sigh* It appears there is no ANSI version of LoadPackagedLibrary()... */ + WCHAR filenameW[4096]; + if (MultiByteToWideChar(CP_UTF8, 0, filename, -1, filenameW, sizeof(filenameW)) == 0) { + handle = NULL; + } else { + handle = (ma_handle)LoadPackagedLibrary(filenameW, 0); + } #endif - - /* - I'm not considering failure to load a library an error nor a warning because seamlessly falling through to a lower-priority - backend is a deliberate design choice. Instead I'm logging it as an informational message. - */ - if (handle == NULL) { - ma_log_postf(pLog, MA_LOG_LEVEL_INFO, "Failed to load library: %s\n", filename); - } - - return handle; - } #else - { - /* Runtime linking is disabled. */ - (void)pLog; - (void)filename; - return NULL; - } + handle = (ma_handle)dlopen(filename, RTLD_NOW); #endif + + /* + I'm not considering failure to load a library an error nor a warning because seamlessly falling through to a lower-priority + backend is a deliberate design choice. Instead I'm logging it as an informational message. + */ + if (handle == NULL) { + ma_log_postf(pLog, MA_LOG_LEVEL_INFO, "Failed to load library: %s\n", filename); + } + + return handle; +#else + /* Runtime linking is disabled. */ + (void)pLog; + (void)filename; + return NULL; +#endif } MA_API void ma_dlclose(ma_log* pLog, ma_handle handle) { - #ifndef MA_NO_RUNTIME_LINKING - { - #ifdef MA_WIN32 +#ifndef MA_NO_RUNTIME_LINKING + #ifdef MA_WIN32 + FreeLibrary((HMODULE)handle); + #else + /* Hack for Android bug (see https://github.com/android/ndk/issues/360). Calling dlclose() pre-API 28 may segfault. */ + #if !defined(MA_ANDROID) || (defined(__ANDROID_API__) && __ANDROID_API__ >= 28) { - FreeLibrary((HMODULE)handle); + dlclose((void*)handle); } #else { - /* Hack for Android bug (see https://github.com/android/ndk/issues/360). Calling dlclose() pre-API 28 may segfault. */ - #if !defined(MA_ANDROID) || (defined(__ANDROID_API__) && __ANDROID_API__ >= 28) - { - dlclose((void*)handle); - } - #else - { - (void)handle; - } - #endif + (void)handle; } #endif - - (void)pLog; - } - #else - { - /* Runtime linking is disabled. */ - (void)pLog; - (void)handle; - } #endif + + (void)pLog; +#else + /* Runtime linking is disabled. */ + (void)pLog; + (void)handle; +#endif } MA_API ma_proc ma_dlsym(ma_log* pLog, ma_handle handle, const char* symbol) { - #ifndef MA_NO_RUNTIME_LINKING - { - ma_proc proc; +#ifndef MA_NO_RUNTIME_LINKING + ma_proc proc; - ma_log_postf(pLog, MA_LOG_LEVEL_DEBUG, "Loading symbol: %s\n", symbol); + ma_log_postf(pLog, MA_LOG_LEVEL_DEBUG, "Loading symbol: %s\n", symbol); - #ifdef _WIN32 - { - proc = (ma_proc)GetProcAddress((HMODULE)handle, symbol); - } - #else - { - #if (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))) || defined(__clang__) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wpedantic" - #endif - proc = (ma_proc)dlsym((void*)handle, symbol); - #if (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))) || defined(__clang__) - #pragma GCC diagnostic pop - #endif - } - #endif +#ifdef _WIN32 + proc = (ma_proc)GetProcAddress((HMODULE)handle, symbol); +#else +#if (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))) || defined(__clang__) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wpedantic" +#endif + proc = (ma_proc)dlsym((void*)handle, symbol); +#if (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))) || defined(__clang__) + #pragma GCC diagnostic pop +#endif +#endif - if (proc == NULL) { - ma_log_postf(pLog, MA_LOG_LEVEL_WARNING, "Failed to load symbol: %s\n", symbol); - } - - (void)pLog; /* It's possible for pContext to be unused. */ - return proc; + if (proc == NULL) { + ma_log_postf(pLog, MA_LOG_LEVEL_WARNING, "Failed to load symbol: %s\n", symbol); } - #else - { - /* Runtime linking is disabled. */ - (void)pLog; - (void)handle; - (void)symbol; - return NULL; - } - #endif + + (void)pLog; /* It's possible for pContext to be unused. */ + return proc; +#else + /* Runtime linking is disabled. */ + (void)pLog; + (void)handle; + (void)symbol; + return NULL; +#endif } @@ -19439,6 +18020,13 @@ DEVICE I/O ************************************************************************************************************************************************************* ************************************************************************************************************************************************************/ +/* Disable run-time linking on certain backends and platforms. */ +#ifndef MA_NO_RUNTIME_LINKING + #if defined(MA_EMSCRIPTEN) || defined(MA_ORBIS) || defined(MA_PROSPERO) + #define MA_NO_RUNTIME_LINKING + #endif +#endif + #ifdef MA_APPLE #include #endif @@ -19451,6 +18039,12 @@ DEVICE I/O #ifdef MA_POSIX #include + #include + + /* No need for dlfcn.h if we're not using runtime linking. */ + #ifndef MA_NO_RUNTIME_LINKING + #include + #endif #endif /* This must be set to at least 26. */ @@ -19705,7 +18299,7 @@ MA_API ma_bool32 ma_is_loopback_supported(ma_backend backend) -#if defined(MA_WIN32) && !defined(MA_XBOX) +#if defined(MA_WIN32) /* WASAPI error codes. */ #define MA_AUDCLNT_E_NOT_INITIALIZED ((HRESULT)0x88890001) #define MA_AUDCLNT_E_ALREADY_INITIALIZED ((HRESULT)0x88890002) @@ -19920,11 +18514,6 @@ typedef LONG (WINAPI * MA_PFN_RegCloseKey)(HKEY hKey); typedef LONG (WINAPI * MA_PFN_RegQueryValueExA)(HKEY hKey, const char* lpValueName, DWORD* lpReserved, DWORD* lpType, BYTE* lpData, DWORD* lpcbData); #endif /* MA_WIN32_DESKTOP */ -static GUID MA_GUID_KSDATAFORMAT_SUBTYPE_PCM = {0x00000001, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; -static GUID MA_GUID_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT = {0x00000003, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; -/*static GUID MA_GUID_KSDATAFORMAT_SUBTYPE_ALAW = {0x00000006, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};*/ -/*static GUID MA_GUID_KSDATAFORMAT_SUBTYPE_MULAW = {0x00000007, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};*/ - MA_API size_t ma_strlen_WCHAR(const WCHAR* str) { size_t len = 0; @@ -19988,7 +18577,7 @@ Timing *******************************************************************************/ #if defined(MA_WIN32) && !defined(MA_POSIX) static LARGE_INTEGER g_ma_TimerFrequency; /* <-- Initialized to zero since it's static. */ - static MA_INLINE void ma_timer_init(ma_timer* pTimer) + static void ma_timer_init(ma_timer* pTimer) { LARGE_INTEGER counter; @@ -20000,7 +18589,7 @@ Timing pTimer->counter = counter.QuadPart; } - static MA_INLINE double ma_timer_get_time_in_seconds(ma_timer* pTimer) + static double ma_timer_get_time_in_seconds(ma_timer* pTimer) { LARGE_INTEGER counter; if (!QueryPerformanceCounter(&counter)) { @@ -20011,7 +18600,7 @@ Timing } #elif defined(MA_APPLE) && (MAC_OS_X_VERSION_MIN_REQUIRED < 101200) static ma_uint64 g_ma_TimerFrequency = 0; - static MA_INLINE void ma_timer_init(ma_timer* pTimer) + static void ma_timer_init(ma_timer* pTimer) { mach_timebase_info_data_t baseTime; mach_timebase_info(&baseTime); @@ -20020,7 +18609,7 @@ Timing pTimer->counter = mach_absolute_time(); } - static MA_INLINE double ma_timer_get_time_in_seconds(ma_timer* pTimer) + static double ma_timer_get_time_in_seconds(ma_timer* pTimer) { ma_uint64 newTimeCounter = mach_absolute_time(); ma_uint64 oldTimeCounter = pTimer->counter; @@ -20045,7 +18634,7 @@ Timing #define MA_CLOCK_ID CLOCK_REALTIME #endif - static MA_INLINE void ma_timer_init(ma_timer* pTimer) + static void ma_timer_init(ma_timer* pTimer) { struct timespec newTime; clock_gettime(MA_CLOCK_ID, &newTime); @@ -20053,7 +18642,7 @@ Timing pTimer->counter = (newTime.tv_sec * 1000000000) + newTime.tv_nsec; } - static MA_INLINE double ma_timer_get_time_in_seconds(ma_timer* pTimer) + static double ma_timer_get_time_in_seconds(ma_timer* pTimer) { ma_uint64 newTimeCounter; ma_uint64 oldTimeCounter; @@ -20067,7 +18656,7 @@ Timing return (newTimeCounter - oldTimeCounter) / 1000000000.0; } #else - static MA_INLINE void ma_timer_init(ma_timer* pTimer) + static void ma_timer_init(ma_timer* pTimer) { struct timeval newTime; gettimeofday(&newTime, NULL); @@ -20075,7 +18664,7 @@ Timing pTimer->counter = (newTime.tv_sec * 1000000) + newTime.tv_usec; } - static MA_INLINE double ma_timer_get_time_in_seconds(ma_timer* pTimer) + static double ma_timer_get_time_in_seconds(ma_timer* pTimer) { ma_uint64 newTimeCounter; ma_uint64 oldTimeCounter; @@ -20659,6 +19248,14 @@ static MA_INLINE void ma_device__set_state(ma_device* pDevice, ma_device_state n } +#if defined(MA_WIN32) + static GUID MA_GUID_KSDATAFORMAT_SUBTYPE_PCM = {0x00000001, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; + static GUID MA_GUID_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT = {0x00000003, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; + /*static GUID MA_GUID_KSDATAFORMAT_SUBTYPE_ALAW = {0x00000006, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};*/ + /*static GUID MA_GUID_KSDATAFORMAT_SUBTYPE_MULAW = {0x00000007, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};*/ +#endif + + MA_API ma_uint32 ma_get_format_priority_index(ma_format format) /* Lower = better. */ { @@ -21370,7 +19967,7 @@ static ma_result ma_context_init__null(ma_context* pContext, const ma_context_co WIN32 COMMON *******************************************************************************/ -#if defined(MA_WIN32) && !defined(MA_XBOX) +#if defined(MA_WIN32) #if defined(MA_WIN32_DESKTOP) || defined(MA_WIN32_GDK) #define ma_CoInitializeEx(pContext, pvReserved, dwCoInit) ((pContext->win32.CoInitializeEx) ? ((MA_PFN_CoInitializeEx)pContext->win32.CoInitializeEx)(pvReserved, dwCoInit) : ((MA_PFN_CoInitialize)pContext->win32.CoInitialize)(pvReserved)) #define ma_CoUninitialize(pContext) ((MA_PFN_CoUninitialize)pContext->win32.CoUninitialize)() @@ -21385,7 +19982,7 @@ WIN32 COMMON #define ma_PropVariantClear(pContext, pvar) PropVariantClear(pvar) #endif -#if !defined(MAXULONG_PTR) && !defined(__WATCOMC__) && !defined(MA_XBOX_NXDK) +#if !defined(MAXULONG_PTR) && !defined(__WATCOMC__) typedef size_t DWORD_PTR; #endif @@ -21812,21 +20409,11 @@ typedef enum MA_AudioCategory_Other = 0 /* <-- miniaudio is only caring about Other. */ } MA_AUDIO_STREAM_CATEGORY; -typedef enum -{ - MA_AUDCLNT_STREAMOPTIONS_NONE, - MA_AUDCLNT_STREAMOPTIONS_RAW, - MA_AUDCLNT_STREAMOPTIONS_MATCH_FORMAT, - MA_AUDCLNT_STREAMOPTIONS_AMBISONICS, - MA_AUDCLNT_STREAMOPTIONS_POST_VOLUME_LOOPBACK -} MA_AUDCLNT_STREAMOPTIONS; - typedef struct { ma_uint32 cbSize; BOOL bIsOffload; MA_AUDIO_STREAM_CATEGORY eCategory; - MA_AUDCLNT_STREAMOPTIONS Options; } ma_AudioClientProperties; /* IUnknown */ @@ -23001,7 +21588,6 @@ static ma_result ma_context_get_MMDevice__wasapi(ma_context* pContext, ma_device { ma_IMMDeviceEnumerator* pDeviceEnumerator; HRESULT hr; - HRESULT CoInitializeResult; MA_ASSERT(pContext != NULL); MA_ASSERT(ppMMDevice != NULL); @@ -23015,17 +21601,12 @@ static ma_result ma_context_get_MMDevice__wasapi(ma_context* pContext, ma_device The community has reported that this seems to fix the crash. There are future plans to move all WASAPI operation over to a single thread to make everything safer, but in the meantime while we wait for that to come online I'm happy enough to use this hack instead. - - CoUninitialize should only be called if we successfully initialized. S_OK and S_FALSE both mean that we need to - call CoUninitialize since the internal ref count was increased. RPC_E_CHANGED_MODE means that CoInitializeEx was - called with a different COINIT value, and we don't call CoUninitialize in that case. Other errors are possible, - so we check for S_OK and S_FALSE specifically. */ - CoInitializeResult = ma_CoInitializeEx(pContext, NULL, MA_COINIT_VALUE); + ma_CoInitializeEx(pContext, NULL, MA_COINIT_VALUE); { hr = ma_CoCreateInstance(pContext, &MA_CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL, &MA_IID_IMMDeviceEnumerator, (void**)&pDeviceEnumerator); - } - if (CoInitializeResult == S_OK || CoInitializeResult == S_FALSE) { ma_CoUninitialize(pContext); } + } + ma_CoUninitialize(pContext); if (FAILED(hr)) { /* <-- This is checking the call above to ma_CoCreateInstance(). */ ma_log_postf(ma_context_get_log(pContext), MA_LOG_LEVEL_ERROR, "[WASAPI] Failed to create IMMDeviceEnumerator.\n"); @@ -23369,7 +21950,7 @@ static ma_result ma_context_get_IAudioClient__wasapi(ma_context* pContext, ma_de pActivationParams = &activationParams; /* When requesting a specific device ID we need to use a special device ID. */ - MA_COPY_MEMORY(virtualDeviceID.wasapi, MA_VIRTUAL_AUDIO_DEVICE_PROCESS_LOOPBACK, (ma_wcslen(MA_VIRTUAL_AUDIO_DEVICE_PROCESS_LOOPBACK) + 1) * sizeof(wchar_t)); /* +1 for the null terminator. */ + MA_COPY_MEMORY(virtualDeviceID.wasapi, MA_VIRTUAL_AUDIO_DEVICE_PROCESS_LOOPBACK, (wcslen(MA_VIRTUAL_AUDIO_DEVICE_PROCESS_LOOPBACK) + 1) * sizeof(wchar_t)); /* +1 for the null terminator. */ pDeviceID = &virtualDeviceID; } else { pActivationParams = NULL; /* No activation parameters required. */ @@ -28098,9 +26679,6 @@ typedef snd_pcm_channel_area_t ma_snd_pcm_channel_area_t; typedef snd_pcm_chmap_t ma_snd_pcm_chmap_t; typedef snd_pcm_state_t ma_snd_pcm_state_t; -/* snd_pcm_state_t */ -#define MA_SND_PCM_STATE_XRUN SND_PCM_STATE_XRUN - /* snd_pcm_stream_t */ #define MA_SND_PCM_STREAM_PLAYBACK SND_PCM_STREAM_PLAYBACK #define MA_SND_PCM_STREAM_CAPTURE SND_PCM_STREAM_CAPTURE @@ -28296,7 +26874,6 @@ typedef int (* ma_snd_pcm_hw_params_set_channels_minmax_proc) ( typedef int (* ma_snd_pcm_hw_params_set_rate_resample_proc) (ma_snd_pcm_t *pcm, ma_snd_pcm_hw_params_t *params, unsigned int val); typedef int (* ma_snd_pcm_hw_params_set_rate_proc) (ma_snd_pcm_t *pcm, ma_snd_pcm_hw_params_t *params, unsigned int val, int dir); typedef int (* ma_snd_pcm_hw_params_set_rate_near_proc) (ma_snd_pcm_t *pcm, ma_snd_pcm_hw_params_t *params, unsigned int *val, int *dir); -typedef int (* ma_snd_pcm_hw_params_set_rate_minmax_proc) (ma_snd_pcm_t *pcm, ma_snd_pcm_hw_params_t *params, unsigned int *min, int *mindir, unsigned int *max, int *maxdir); typedef int (* ma_snd_pcm_hw_params_set_buffer_size_near_proc)(ma_snd_pcm_t *pcm, ma_snd_pcm_hw_params_t *params, ma_snd_pcm_uframes_t *val); typedef int (* ma_snd_pcm_hw_params_set_periods_near_proc) (ma_snd_pcm_t *pcm, ma_snd_pcm_hw_params_t *params, unsigned int *val, int *dir); typedef int (* ma_snd_pcm_hw_params_set_access_proc) (ma_snd_pcm_t *pcm, ma_snd_pcm_hw_params_t *params, ma_snd_pcm_access_t _access); @@ -30063,9 +28640,8 @@ static ma_result ma_context_init__alsa(ma_context* pContext, const ma_context_co ma_snd_pcm_hw_params_get_format_mask_proc _snd_pcm_hw_params_get_format_mask = snd_pcm_hw_params_get_format_mask; ma_snd_pcm_hw_params_set_channels_proc _snd_pcm_hw_params_set_channels = snd_pcm_hw_params_set_channels; ma_snd_pcm_hw_params_set_channels_near_proc _snd_pcm_hw_params_set_channels_near = snd_pcm_hw_params_set_channels_near; - ma_snd_pcm_hw_params_set_channels_minmax_proc _snd_pcm_hw_params_set_channels_minmax = snd_pcm_hw_params_set_channels_minmax; ma_snd_pcm_hw_params_set_rate_resample_proc _snd_pcm_hw_params_set_rate_resample = snd_pcm_hw_params_set_rate_resample; - ma_snd_pcm_hw_params_set_rate_proc _snd_pcm_hw_params_set_rate = snd_pcm_hw_params_set_rate; + ma_snd_pcm_hw_params_set_rate_near _snd_pcm_hw_params_set_rate = snd_pcm_hw_params_set_rate; ma_snd_pcm_hw_params_set_rate_near_proc _snd_pcm_hw_params_set_rate_near = snd_pcm_hw_params_set_rate_near; ma_snd_pcm_hw_params_set_rate_minmax_proc _snd_pcm_hw_params_set_rate_minmax = snd_pcm_hw_params_set_rate_minmax; ma_snd_pcm_hw_params_set_buffer_size_near_proc _snd_pcm_hw_params_set_buffer_size_near = snd_pcm_hw_params_set_buffer_size_near; @@ -30117,9 +28693,9 @@ static ma_result ma_context_init__alsa(ma_context* pContext, const ma_context_co ma_snd_pcm_info_proc _snd_pcm_info = snd_pcm_info; ma_snd_pcm_info_sizeof_proc _snd_pcm_info_sizeof = snd_pcm_info_sizeof; ma_snd_pcm_info_get_name_proc _snd_pcm_info_get_name = snd_pcm_info_get_name; - ma_snd_pcm_poll_descriptors_proc _snd_pcm_poll_descriptors = snd_pcm_poll_descriptors; - ma_snd_pcm_poll_descriptors_count_proc _snd_pcm_poll_descriptors_count = snd_pcm_poll_descriptors_count; - ma_snd_pcm_poll_descriptors_revents_proc _snd_pcm_poll_descriptors_revents = snd_pcm_poll_descriptors_revents; + ma_snd_pcm_poll_descriptors _snd_pcm_poll_descriptors = snd_pcm_poll_descriptors; + ma_snd_pcm_poll_descriptors_count _snd_pcm_poll_descriptors_count = snd_pcm_poll_descriptors_count; + ma_snd_pcm_poll_descriptors_revents _snd_pcm_poll_descriptors_revents = snd_pcm_poll_descriptors_revents; ma_snd_config_update_free_global_proc _snd_config_update_free_global = snd_config_update_free_global; pContext->alsa.snd_pcm_open = (ma_proc)_snd_pcm_open; @@ -30135,7 +28711,6 @@ static ma_result ma_context_init__alsa(ma_context* pContext, const ma_context_co pContext->alsa.snd_pcm_hw_params_set_rate_resample = (ma_proc)_snd_pcm_hw_params_set_rate_resample; pContext->alsa.snd_pcm_hw_params_set_rate = (ma_proc)_snd_pcm_hw_params_set_rate; pContext->alsa.snd_pcm_hw_params_set_rate_near = (ma_proc)_snd_pcm_hw_params_set_rate_near; - pContext->alsa.snd_pcm_hw_params_set_rate_minmax = (ma_proc)_snd_pcm_hw_params_set_rate_minmax; pContext->alsa.snd_pcm_hw_params_set_buffer_size_near = (ma_proc)_snd_pcm_hw_params_set_buffer_size_near; pContext->alsa.snd_pcm_hw_params_set_periods_near = (ma_proc)_snd_pcm_hw_params_set_periods_near; pContext->alsa.snd_pcm_hw_params_set_access = (ma_proc)_snd_pcm_hw_params_set_access; @@ -30861,7 +29436,7 @@ typedef void (* ma_pa_threaded_mainloop_unlock_proc) ( typedef void (* ma_pa_threaded_mainloop_wait_proc) (ma_pa_threaded_mainloop* m); typedef void (* ma_pa_threaded_mainloop_signal_proc) (ma_pa_threaded_mainloop* m, int wait_for_accept); typedef void (* ma_pa_threaded_mainloop_accept_proc) (ma_pa_threaded_mainloop* m); -typedef int (* ma_pa_threaded_mainloop_get_retval_proc) (const ma_pa_threaded_mainloop* m); +typedef int (* ma_pa_threaded_mainloop_get_retval_proc) (ma_pa_threaded_mainloop* m); typedef ma_pa_mainloop_api* (* ma_pa_threaded_mainloop_get_api_proc) (ma_pa_threaded_mainloop* m); typedef int (* ma_pa_threaded_mainloop_in_thread_proc) (ma_pa_threaded_mainloop* m); typedef void (* ma_pa_threaded_mainloop_set_name_proc) (ma_pa_threaded_mainloop* m, const char* name); @@ -30870,13 +29445,13 @@ typedef void (* ma_pa_context_unref_proc) ( typedef int (* ma_pa_context_connect_proc) (ma_pa_context* c, const char* server, ma_pa_context_flags_t flags, const ma_pa_spawn_api* api); typedef void (* ma_pa_context_disconnect_proc) (ma_pa_context* c); typedef void (* ma_pa_context_set_state_callback_proc) (ma_pa_context* c, ma_pa_context_notify_cb_t cb, void* userdata); -typedef ma_pa_context_state_t (* ma_pa_context_get_state_proc) (const ma_pa_context* c); +typedef ma_pa_context_state_t (* ma_pa_context_get_state_proc) (ma_pa_context* c); typedef ma_pa_operation* (* ma_pa_context_get_sink_info_list_proc) (ma_pa_context* c, ma_pa_sink_info_cb_t cb, void* userdata); typedef ma_pa_operation* (* ma_pa_context_get_source_info_list_proc) (ma_pa_context* c, ma_pa_source_info_cb_t cb, void* userdata); typedef ma_pa_operation* (* ma_pa_context_get_sink_info_by_name_proc) (ma_pa_context* c, const char* name, ma_pa_sink_info_cb_t cb, void* userdata); typedef ma_pa_operation* (* ma_pa_context_get_source_info_by_name_proc)(ma_pa_context* c, const char* name, ma_pa_source_info_cb_t cb, void* userdata); typedef void (* ma_pa_operation_unref_proc) (ma_pa_operation* o); -typedef ma_pa_operation_state_t (* ma_pa_operation_get_state_proc) (const ma_pa_operation* o); +typedef ma_pa_operation_state_t (* ma_pa_operation_get_state_proc) (ma_pa_operation* o); typedef ma_pa_channel_map* (* ma_pa_channel_map_init_extend_proc) (ma_pa_channel_map* m, unsigned channels, ma_pa_channel_map_def_t def); typedef int (* ma_pa_channel_map_valid_proc) (const ma_pa_channel_map* m); typedef int (* ma_pa_channel_map_compatible_proc) (const ma_pa_channel_map* m, const ma_pa_sample_spec* ss); @@ -30885,12 +29460,12 @@ typedef void (* ma_pa_stream_unref_proc) ( typedef int (* ma_pa_stream_connect_playback_proc) (ma_pa_stream* s, const char* dev, const ma_pa_buffer_attr* attr, ma_pa_stream_flags_t flags, const ma_pa_cvolume* volume, ma_pa_stream* sync_stream); typedef int (* ma_pa_stream_connect_record_proc) (ma_pa_stream* s, const char* dev, const ma_pa_buffer_attr* attr, ma_pa_stream_flags_t flags); typedef int (* ma_pa_stream_disconnect_proc) (ma_pa_stream* s); -typedef ma_pa_stream_state_t (* ma_pa_stream_get_state_proc) (const ma_pa_stream* s); +typedef ma_pa_stream_state_t (* ma_pa_stream_get_state_proc) (ma_pa_stream* s); typedef const ma_pa_sample_spec* (* ma_pa_stream_get_sample_spec_proc) (ma_pa_stream* s); typedef const ma_pa_channel_map* (* ma_pa_stream_get_channel_map_proc) (ma_pa_stream* s); typedef const ma_pa_buffer_attr* (* ma_pa_stream_get_buffer_attr_proc) (ma_pa_stream* s); typedef ma_pa_operation* (* ma_pa_stream_set_buffer_attr_proc) (ma_pa_stream* s, const ma_pa_buffer_attr* attr, ma_pa_stream_success_cb_t cb, void* userdata); -typedef const char* (* ma_pa_stream_get_device_name_proc) (const ma_pa_stream* s); +typedef const char* (* ma_pa_stream_get_device_name_proc) (ma_pa_stream* s); typedef void (* ma_pa_stream_set_write_callback_proc) (ma_pa_stream* s, ma_pa_stream_request_cb_t cb, void* userdata); typedef void (* ma_pa_stream_set_read_callback_proc) (ma_pa_stream* s, ma_pa_stream_request_cb_t cb, void* userdata); typedef void (* ma_pa_stream_set_suspended_callback_proc) (ma_pa_stream* s, ma_pa_stream_notify_cb_t cb, void* userdata); @@ -30898,15 +29473,15 @@ typedef void (* ma_pa_stream_set_moved_callback_proc) ( typedef int (* ma_pa_stream_is_suspended_proc) (const ma_pa_stream* s); typedef ma_pa_operation* (* ma_pa_stream_flush_proc) (ma_pa_stream* s, ma_pa_stream_success_cb_t cb, void* userdata); typedef ma_pa_operation* (* ma_pa_stream_drain_proc) (ma_pa_stream* s, ma_pa_stream_success_cb_t cb, void* userdata); -typedef int (* ma_pa_stream_is_corked_proc) (const ma_pa_stream* s); +typedef int (* ma_pa_stream_is_corked_proc) (ma_pa_stream* s); typedef ma_pa_operation* (* ma_pa_stream_cork_proc) (ma_pa_stream* s, int b, ma_pa_stream_success_cb_t cb, void* userdata); typedef ma_pa_operation* (* ma_pa_stream_trigger_proc) (ma_pa_stream* s, ma_pa_stream_success_cb_t cb, void* userdata); typedef int (* ma_pa_stream_begin_write_proc) (ma_pa_stream* s, void** data, size_t* nbytes); typedef int (* ma_pa_stream_write_proc) (ma_pa_stream* s, const void* data, size_t nbytes, ma_pa_free_cb_t free_cb, int64_t offset, ma_pa_seek_mode_t seek); typedef int (* ma_pa_stream_peek_proc) (ma_pa_stream* s, const void** data, size_t* nbytes); typedef int (* ma_pa_stream_drop_proc) (ma_pa_stream* s); -typedef size_t (* ma_pa_stream_writable_size_proc) (const ma_pa_stream* s); -typedef size_t (* ma_pa_stream_readable_size_proc) (const ma_pa_stream* s); +typedef size_t (* ma_pa_stream_writable_size_proc) (ma_pa_stream* s); +typedef size_t (* ma_pa_stream_readable_size_proc) (ma_pa_stream* s); typedef struct { @@ -31202,7 +29777,7 @@ static ma_result ma_init_pa_mainloop_and_pa_context__pulse(ma_context* pContext, } /* Now we need to connect to the context. Everything is asynchronous so we need to wait for it to connect before returning. */ - result = ma_result_from_pulse(((ma_pa_context_connect_proc)pContext->pulse.pa_context_connect)((ma_pa_context*)pPulseContext, pServerName, (tryAutoSpawn) ? MA_PA_CONTEXT_NOFLAGS : MA_PA_CONTEXT_NOAUTOSPAWN, NULL)); + result = ma_result_from_pulse(((ma_pa_context_connect_proc)pContext->pulse.pa_context_connect)((ma_pa_context*)pPulseContext, pServerName, (tryAutoSpawn) ? 0 : MA_PA_CONTEXT_NOAUTOSPAWN, NULL)); if (result != MA_SUCCESS) { ma_log_postf(ma_context_get_log(pContext), MA_LOG_LEVEL_ERROR, "[PulseAudio] Failed to connect PulseAudio context."); ((ma_pa_mainloop_free_proc)pContext->pulse.pa_mainloop_free)((ma_pa_mainloop*)(pMainLoop)); @@ -31935,7 +30510,7 @@ static ma_result ma_device_init__pulse(ma_device* pDevice, const ma_device_confi const ma_pa_buffer_attr* pActualAttr = NULL; const ma_pa_channel_map* pActualChannelMap = NULL; ma_uint32 iChannel; - int streamFlags; + ma_pa_stream_flags_t streamFlags; MA_ASSERT(pDevice != NULL); MA_ZERO_OBJECT(&pDevice->pulse); @@ -31993,13 +30568,8 @@ static ma_result ma_device_init__pulse(ma_device* pDevice, const ma_device_confi ss.channels = pDescriptorCapture->channels; } - /* PulseAudio has a maximum channel count of 32. We'll get a crash if this is exceeded. */ - if (ss.channels > 32) { - ss.channels = 32; - } - /* Use a default channel map. */ - ((ma_pa_channel_map_init_extend_proc)pDevice->pContext->pulse.pa_channel_map_init_extend)(&cmap, ss.channels, (ma_pa_channel_map_def_t)pConfig->pulse.channelMap); + ((ma_pa_channel_map_init_extend_proc)pDevice->pContext->pulse.pa_channel_map_init_extend)(&cmap, ss.channels, pConfig->pulse.channelMap); /* Use the requested sample rate if one was specified. */ if (pDescriptorCapture->sampleRate != 0) { @@ -32056,7 +30626,7 @@ static ma_result ma_device_init__pulse(ma_device* pDevice, const ma_device_confi streamFlags |= MA_PA_STREAM_DONT_MOVE; } - error = ((ma_pa_stream_connect_record_proc)pDevice->pContext->pulse.pa_stream_connect_record)((ma_pa_stream*)pDevice->pulse.pStreamCapture, devCapture, &attr, (ma_pa_stream_flags_t)streamFlags); + error = ((ma_pa_stream_connect_record_proc)pDevice->pContext->pulse.pa_stream_connect_record)((ma_pa_stream*)pDevice->pulse.pStreamCapture, devCapture, &attr, streamFlags); if (error != MA_PA_OK) { ma_log_post(ma_device_get_log(pDevice), MA_LOG_LEVEL_ERROR, "[PulseAudio] Failed to connect PulseAudio capture stream."); result = ma_result_from_pulse(error); @@ -32150,13 +30720,8 @@ static ma_result ma_device_init__pulse(ma_device* pDevice, const ma_device_confi ss.channels = pDescriptorPlayback->channels; } - /* PulseAudio has a maximum channel count of 32. We'll get a crash if this is exceeded. */ - if (ss.channels > 32) { - ss.channels = 32; - } - /* Use a default channel map. */ - ((ma_pa_channel_map_init_extend_proc)pDevice->pContext->pulse.pa_channel_map_init_extend)(&cmap, ss.channels, (ma_pa_channel_map_def_t)pConfig->pulse.channelMap); + ((ma_pa_channel_map_init_extend_proc)pDevice->pContext->pulse.pa_channel_map_init_extend)(&cmap, ss.channels, pConfig->pulse.channelMap); /* Use the requested sample rate if one was specified. */ @@ -32218,7 +30783,7 @@ static ma_result ma_device_init__pulse(ma_device* pDevice, const ma_device_confi streamFlags |= MA_PA_STREAM_DONT_MOVE; } - error = ((ma_pa_stream_connect_playback_proc)pDevice->pContext->pulse.pa_stream_connect_playback)((ma_pa_stream*)pDevice->pulse.pStreamPlayback, devPlayback, &attr, (ma_pa_stream_flags_t)streamFlags, NULL, NULL); + error = ((ma_pa_stream_connect_playback_proc)pDevice->pContext->pulse.pa_stream_connect_playback)((ma_pa_stream*)pDevice->pulse.pStreamPlayback, devPlayback, &attr, streamFlags, NULL, NULL); if (error != MA_PA_OK) { ma_log_post(ma_device_get_log(pDevice), MA_LOG_LEVEL_ERROR, "[PulseAudio] Failed to connect PulseAudio playback stream."); result = ma_result_from_pulse(error); @@ -32773,7 +31338,6 @@ typedef JackProcessCallback ma_JackProcessCallback; typedef JackBufferSizeCallback ma_JackBufferSizeCallback; typedef JackShutdownCallback ma_JackShutdownCallback; #define MA_JACK_DEFAULT_AUDIO_TYPE JACK_DEFAULT_AUDIO_TYPE -#define ma_JackNullOption JackNullOption #define ma_JackNoStartServer JackNoStartServer #define ma_JackPortIsInput JackPortIsInput #define ma_JackPortIsOutput JackPortIsOutput @@ -32788,7 +31352,6 @@ typedef int (* ma_JackProcessCallback) (ma_jack_nframes_t nframes, void* arg) typedef int (* ma_JackBufferSizeCallback)(ma_jack_nframes_t nframes, void* arg); typedef void (* ma_JackShutdownCallback) (void* arg); #define MA_JACK_DEFAULT_AUDIO_TYPE "32 bit float mono audio" -#define ma_JackNullOption 0 #define ma_JackNoStartServer 1 #define ma_JackPortIsInput 1 #define ma_JackPortIsOutput 2 @@ -32829,7 +31392,7 @@ static ma_result ma_context_open_client__jack(ma_context* pContext, ma_jack_clie maxClientNameSize = ((ma_jack_client_name_size_proc)pContext->jack.jack_client_name_size)(); /* Includes null terminator. */ ma_strncpy_s(clientName, ma_min(sizeof(clientName), maxClientNameSize), (pContext->jack.pClientName != NULL) ? pContext->jack.pClientName : "miniaudio", (size_t)-1); - pClient = ((ma_jack_client_open_proc)pContext->jack.jack_client_open)(clientName, (pContext->jack.tryStartServer) ? ma_JackNullOption : ma_JackNoStartServer, &status, NULL); + pClient = ((ma_jack_client_open_proc)pContext->jack.jack_client_open)(clientName, (pContext->jack.tryStartServer) ? 0 : ma_JackNoStartServer, &status, NULL); if (pClient == NULL) { return MA_FAILED_TO_OPEN_BACKEND_DEVICE; } @@ -38431,7 +36994,7 @@ OSS Backend #define MA_OSS_DEFAULT_DEVICE_NAME "/dev/dsp" -static int ma_open_temp_device__oss(void) +static int ma_open_temp_device__oss() { /* The OSS sample code uses "/dev/mixer" as the device for getting system properties so I'm going to do the same. */ int fd = open("/dev/mixer", O_RDONLY, 0); @@ -39271,30 +37834,25 @@ static void ma_stream_error_callback__aaudio(ma_AAudioStream* pStream, void* pUs (void)error; ma_log_postf(ma_device_get_log(pDevice), MA_LOG_LEVEL_INFO, "[AAudio] ERROR CALLBACK: error=%d, AAudioStream_getState()=%d\n", error, ((MA_PFN_AAudioStream_getState)pDevice->pContext->aaudio.AAudioStream_getState)(pStream)); - /* When we get an error, we'll assume that the stream is in an erroneous state and needs to be restarted. From the documentation, we cannot do this from the error callback. Therefore we are going to use an event thread for the AAudio backend to do this cleanly and safely. */ - if (ma_atomic_bool32_get(&pDevice->aaudio.isTearingDown)) { - ma_log_postf(ma_device_get_log(pDevice), MA_LOG_LEVEL_INFO, "[AAudio] Device Disconnected. Tearing down device.\n"); + job = ma_job_init(MA_JOB_TYPE_DEVICE_AAUDIO_REROUTE); + job.data.device.aaudio.reroute.pDevice = pDevice; + + if (pStream == pDevice->aaudio.pStreamCapture) { + job.data.device.aaudio.reroute.deviceType = ma_device_type_capture; } else { - job = ma_job_init(MA_JOB_TYPE_DEVICE_AAUDIO_REROUTE); - job.data.device.aaudio.reroute.pDevice = pDevice; - - if (pStream == pDevice->aaudio.pStreamCapture) { - job.data.device.aaudio.reroute.deviceType = ma_device_type_capture; - } else { - job.data.device.aaudio.reroute.deviceType = ma_device_type_playback; - } - - result = ma_device_job_thread_post(&pDevice->pContext->aaudio.jobThread, &job); - if (result != MA_SUCCESS) { - ma_log_postf(ma_device_get_log(pDevice), MA_LOG_LEVEL_INFO, "[AAudio] Device Disconnected. Failed to post job for rerouting.\n"); - return; - } + job.data.device.aaudio.reroute.deviceType = ma_device_type_playback; + } + + result = ma_device_job_thread_post(&pDevice->pContext->aaudio.jobThread, &job); + if (result != MA_SUCCESS) { + ma_log_postf(ma_device_get_log(pDevice), MA_LOG_LEVEL_INFO, "[AAudio] Device Disconnected. Failed to post job for rerouting.\n"); + return; } } @@ -39611,7 +38169,7 @@ static ma_result ma_close_streams__aaudio(ma_device* pDevice) { MA_ASSERT(pDevice != NULL); - /* When rerouting, streams may have been closed and never re-opened. Hence the extra checks below. */ + /* When re-routing, streams may have been closed and never re-opened. Hence the extra checks below. */ if (pDevice->type == ma_device_type_capture || pDevice->type == ma_device_type_duplex) { ma_close_stream__aaudio(pDevice->pContext, (ma_AAudioStream*)pDevice->aaudio.pStreamCapture); pDevice->aaudio.pStreamCapture = NULL; @@ -39628,12 +38186,6 @@ static ma_result ma_device_uninit__aaudio(ma_device* pDevice) { MA_ASSERT(pDevice != NULL); - /* - Note: Closing the streams may cause a timeout error, which would then trigger rerouting in our error callback. - We must not schedule a reroute when device is getting destroyed. - */ - ma_atomic_bool32_set(&pDevice->aaudio.isTearingDown, MA_TRUE); - /* Wait for any rerouting to finish before attempting to close the streams. */ ma_mutex_lock(&pDevice->aaudio.rerouteLock); { @@ -39641,7 +38193,7 @@ static ma_result ma_device_uninit__aaudio(ma_device* pDevice) } ma_mutex_unlock(&pDevice->aaudio.rerouteLock); - /* Destroy rerouting lock. */ + /* Destroy re-routing lock. */ ma_mutex_uninit(&pDevice->aaudio.rerouteLock); return MA_SUCCESS; @@ -39877,22 +38429,17 @@ static ma_result ma_device_stop__aaudio(ma_device* pDevice) static ma_result ma_device_reinit__aaudio(ma_device* pDevice, ma_device_type deviceType) { - const ma_int32 maxAttempts = 4; /* Reasonable retry limit. */ - ma_result result; - ma_int32 iAttempt; + int32_t retries = 0; MA_ASSERT(pDevice != NULL); - /* We got disconnected! Retry a few times, until we find a connected device! */ - iAttempt = 0; - while (iAttempt++ < maxAttempts) { - /* Device tearing down? No need to reroute! */ - if (ma_atomic_bool32_get(&pDevice->aaudio.isTearingDown)) { - result = MA_SUCCESS; /* Caller should continue as normal. */ - break; - } - + /* + TODO: Stop retrying if main thread is about to uninit device. + */ + ma_mutex_lock(&pDevice->aaudio.rerouteLock); + { +error_disconnected: /* The first thing to do is close the streams. */ ma_close_streams__aaudio(pDevice); @@ -39948,16 +38495,14 @@ static ma_result ma_device_reinit__aaudio(ma_device* pDevice, ma_device_type dev result = ma_device_init_streams__aaudio(pDevice, &deviceConfig, &descriptorPlayback, &descriptorCapture); if (result != MA_SUCCESS) { ma_log_post(ma_device_get_log(pDevice), MA_LOG_LEVEL_WARNING, "[AAudio] Failed to create stream after route change."); - /* Reroute failed! */ - break; + goto done; } result = ma_device_post_init(pDevice, deviceType, &descriptorPlayback, &descriptorCapture); if (result != MA_SUCCESS) { ma_log_post(ma_device_get_log(pDevice), MA_LOG_LEVEL_WARNING, "[AAudio] Failed to initialize device after route change."); ma_close_streams__aaudio(pDevice); - /* Reroute failed! */ - break; + goto done; } /* We'll only ever do this in response to a reroute. */ @@ -39968,23 +38513,26 @@ static ma_result ma_device_reinit__aaudio(ma_device* pDevice, ma_device_type dev if (pDevice->aaudio.noAutoStartAfterReroute == MA_FALSE) { result = ma_device_start__aaudio(pDevice); if (result != MA_SUCCESS) { - if (iAttempt < maxAttempts) { - ma_log_postf(ma_device_get_log(pDevice), MA_LOG_LEVEL_INFO, "[AAudio] Failed to start stream after route change, retrying(%d)", iAttempt); - } else { - ma_log_post(ma_device_get_log(pDevice), MA_LOG_LEVEL_INFO, "[AAudio] Failed to start stream after route change, giving up."); + /* We got disconnected! Retry a few times, until we find a connected device! */ + retries += 1; + if (retries <= 3) { + ma_log_postf(ma_device_get_log(pDevice), MA_LOG_LEVEL_INFO, "[AAudio] Failed to start stream after route change, retrying(%d)", retries); + goto error_disconnected; } + ma_log_post(ma_device_get_log(pDevice), MA_LOG_LEVEL_INFO, "[AAudio] Failed to start stream after route change."); + goto done; } } else { - ma_device_stop(pDevice); /* Do a full device stop so we set internal state correctly. */ + ma_device_stop(pDevice); /* Do a full device stop so we set internal state correctly. */ } } - - if (result == MA_SUCCESS) { - /* Reroute successful! */ - break; - } + + result = MA_SUCCESS; } - +done: + /* Re-routing done */ + ma_mutex_unlock(&pDevice->aaudio.rerouteLock); + return result; } @@ -40150,7 +38698,7 @@ static ma_result ma_context_init__aaudio(ma_context* pContext, const ma_context_ static ma_result ma_job_process__device__aaudio_reroute(ma_job* pJob) { - ma_result result = MA_SUCCESS; + ma_result result; ma_device* pDevice; MA_ASSERT(pJob != NULL); @@ -40158,22 +38706,19 @@ static ma_result ma_job_process__device__aaudio_reroute(ma_job* pJob) pDevice = (ma_device*)pJob->data.device.aaudio.reroute.pDevice; MA_ASSERT(pDevice != NULL); - ma_mutex_lock(&pDevice->aaudio.rerouteLock); - { - /* Here is where we need to reroute the device. To do this we need to uninitialize the stream and reinitialize it. */ - result = ma_device_reinit__aaudio(pDevice, (ma_device_type)pJob->data.device.aaudio.reroute.deviceType); - if (result != MA_SUCCESS) { - /* - Getting here means we failed to reroute the device. The best thing I can think of here is to - just stop the device. - */ - ma_log_post(ma_device_get_log(pDevice), MA_LOG_LEVEL_ERROR, "[AAudio] Stopping device due to reroute failure."); - ma_device_stop(pDevice); - } + /* Here is where we need to reroute the device. To do this we need to uninitialize the stream and reinitialize it. */ + result = ma_device_reinit__aaudio(pDevice, (ma_device_type)pJob->data.device.aaudio.reroute.deviceType); + if (result != MA_SUCCESS) { + /* + Getting here means we failed to reroute the device. The best thing I can think of here is to + just stop the device. + */ + ma_log_post(ma_device_get_log(pDevice), MA_LOG_LEVEL_ERROR, "[AAudio] Stopping device due to reroute failure."); + ma_device_stop(pDevice); + return result; } - ma_mutex_unlock(&pDevice->aaudio.rerouteLock); - return result; + return MA_SUCCESS; } #else /* Getting here means there is no AAudio backend so we need a no-op job implementation. */ @@ -42691,13 +41236,13 @@ MA_API ma_result ma_device_post_init(ma_device* pDevice, ma_device_type deviceTy static ma_thread_result MA_THREADCALL ma_worker_thread(void* pData) { ma_device* pDevice = (ma_device*)pData; -#if defined(MA_WIN32) && !defined(MA_XBOX) +#ifdef MA_WIN32 HRESULT CoInitializeResult; #endif MA_ASSERT(pDevice != NULL); -#if defined(MA_WIN32) && !defined(MA_XBOX) +#ifdef MA_WIN32 CoInitializeResult = ma_CoInitializeEx(pDevice->pContext, NULL, MA_COINIT_VALUE); #endif @@ -42788,8 +41333,8 @@ static ma_thread_result MA_THREADCALL ma_worker_thread(void* pData) ma_event_signal(&pDevice->stopEvent); } -#if defined(MA_WIN32) && !defined(MA_XBOX) - if (CoInitializeResult == S_OK || CoInitializeResult == S_FALSE) { +#ifdef MA_WIN32 + if (CoInitializeResult == S_OK) { ma_CoUninitialize(pDevice->pContext); } #endif @@ -42813,92 +41358,67 @@ static ma_bool32 ma_device__is_initialized(ma_device* pDevice) static ma_result ma_context_uninit_backend_apis__win32(ma_context* pContext) { /* For some reason UWP complains when CoUninitialize() is called. I'm just not going to call it on UWP. */ - #if defined(MA_WIN32_DESKTOP) || defined(MA_WIN32_GDK) - { - /* TODO: Remove this once the new single threaded backend system is in place in 0.12. */ - #if !defined(MA_XBOX) - { - if (pContext->win32.CoInitializeResult == S_OK || pContext->win32.CoInitializeResult == S_FALSE) { - ma_CoUninitialize(pContext); /* TODO: Remove this once the new single threaded backend system is in place in 0.12. */ - } - } - #endif - - #if defined(MA_WIN32_DESKTOP) - ma_dlclose(ma_context_get_log(pContext), pContext->win32.hUser32DLL); - ma_dlclose(ma_context_get_log(pContext), pContext->win32.hAdvapi32DLL); - #endif - - ma_dlclose(ma_context_get_log(pContext), pContext->win32.hOle32DLL); - } - #else - { - (void)pContext; +#if defined(MA_WIN32_DESKTOP) || defined(MA_WIN32_GDK) + if (pContext->win32.CoInitializeResult == S_OK) { + ma_CoUninitialize(pContext); } + + #if defined(MA_WIN32_DESKTOP) + ma_dlclose(ma_context_get_log(pContext), pContext->win32.hUser32DLL); + ma_dlclose(ma_context_get_log(pContext), pContext->win32.hAdvapi32DLL); #endif + ma_dlclose(ma_context_get_log(pContext), pContext->win32.hOle32DLL); +#else + (void)pContext; +#endif + return MA_SUCCESS; } static ma_result ma_context_init_backend_apis__win32(ma_context* pContext) { - /* - TODO: Reassess all of this stuff and move everything to the relevant backends. For example, I think - GetForegroundWindow() and GetDesktopWindow() are only used by the DirectSound backend. - */ - #if (defined(MA_WIN32_DESKTOP) || defined(MA_WIN32_GDK)) && !defined(MA_XBOX) - { - #if defined(MA_WIN32_DESKTOP) - { - /* User32.dll */ - pContext->win32.hUser32DLL = ma_dlopen(ma_context_get_log(pContext), "user32.dll"); - if (pContext->win32.hUser32DLL == NULL) { - return MA_FAILED_TO_INIT_BACKEND; - } - - pContext->win32.GetForegroundWindow = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hUser32DLL, "GetForegroundWindow"); - pContext->win32.GetDesktopWindow = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hUser32DLL, "GetDesktopWindow"); - - - /* Advapi32.dll */ - pContext->win32.hAdvapi32DLL = ma_dlopen(ma_context_get_log(pContext), "advapi32.dll"); - if (pContext->win32.hAdvapi32DLL == NULL) { - return MA_FAILED_TO_INIT_BACKEND; - } - - pContext->win32.RegOpenKeyExA = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hAdvapi32DLL, "RegOpenKeyExA"); - pContext->win32.RegCloseKey = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hAdvapi32DLL, "RegCloseKey"); - pContext->win32.RegQueryValueExA = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hAdvapi32DLL, "RegQueryValueExA"); - } - #endif - - /* Ole32.dll */ - pContext->win32.hOle32DLL = ma_dlopen(ma_context_get_log(pContext), "ole32.dll"); - if (pContext->win32.hOle32DLL == NULL) { +#if defined(MA_WIN32_DESKTOP) || defined(MA_WIN32_GDK) + #if defined(MA_WIN32_DESKTOP) + /* User32.dll */ + pContext->win32.hUser32DLL = ma_dlopen(ma_context_get_log(pContext), "user32.dll"); + if (pContext->win32.hUser32DLL == NULL) { return MA_FAILED_TO_INIT_BACKEND; } - pContext->win32.CoInitialize = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "CoInitialize"); - pContext->win32.CoInitializeEx = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "CoInitializeEx"); - pContext->win32.CoUninitialize = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "CoUninitialize"); - pContext->win32.CoCreateInstance = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "CoCreateInstance"); - pContext->win32.CoTaskMemFree = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "CoTaskMemFree"); - pContext->win32.PropVariantClear = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "PropVariantClear"); - pContext->win32.StringFromGUID2 = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "StringFromGUID2"); - } - #else - { - (void)pContext; /* Unused. */ - } + pContext->win32.GetForegroundWindow = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hUser32DLL, "GetForegroundWindow"); + pContext->win32.GetDesktopWindow = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hUser32DLL, "GetDesktopWindow"); + + + /* Advapi32.dll */ + pContext->win32.hAdvapi32DLL = ma_dlopen(ma_context_get_log(pContext), "advapi32.dll"); + if (pContext->win32.hAdvapi32DLL == NULL) { + return MA_FAILED_TO_INIT_BACKEND; + } + + pContext->win32.RegOpenKeyExA = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hAdvapi32DLL, "RegOpenKeyExA"); + pContext->win32.RegCloseKey = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hAdvapi32DLL, "RegCloseKey"); + pContext->win32.RegQueryValueExA = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hAdvapi32DLL, "RegQueryValueExA"); #endif - /* TODO: Remove this once the new single threaded backend system is in place in 0.12. */ - #if !defined(MA_XBOX) - { - pContext->win32.CoInitializeResult = ma_CoInitializeEx(pContext, NULL, MA_COINIT_VALUE); + /* Ole32.dll */ + pContext->win32.hOle32DLL = ma_dlopen(ma_context_get_log(pContext), "ole32.dll"); + if (pContext->win32.hOle32DLL == NULL) { + return MA_FAILED_TO_INIT_BACKEND; } - #endif + pContext->win32.CoInitialize = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "CoInitialize"); + pContext->win32.CoInitializeEx = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "CoInitializeEx"); + pContext->win32.CoUninitialize = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "CoUninitialize"); + pContext->win32.CoCreateInstance = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "CoCreateInstance"); + pContext->win32.CoTaskMemFree = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "CoTaskMemFree"); + pContext->win32.PropVariantClear = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "PropVariantClear"); + pContext->win32.StringFromGUID2 = (ma_proc)ma_dlsym(ma_context_get_log(pContext), pContext->win32.hOle32DLL, "StringFromGUID2"); +#else + (void)pContext; /* Unused. */ +#endif + + pContext->win32.CoInitializeResult = ma_CoInitializeEx(pContext, NULL, MA_COINIT_VALUE); return MA_SUCCESS; } #else @@ -45496,7 +44016,7 @@ static MA_INLINE void ma_pcm_s16_to_s32__reference(void* dst, const void* src, m ma_uint64 i; for (i = 0; i < count; i += 1) { - dst_s32[i] = (ma_int32)src_s16[i] << 16; + dst_s32[i] = src_s16[i] << 16; } (void)ditherMode; @@ -57888,12 +56408,8 @@ MA_API size_t ma_channel_map_to_string(const ma_channel* pChannelMap, ma_uint32 } /* Null terminate. Don't increment the length here. */ - if (pBufferOut != NULL) { - if (bufferCap > len) { - pBufferOut[len] = '\0'; - } else if (bufferCap > 0) { - pBufferOut[bufferCap - 1] = '\0'; - } + if (pBufferOut != NULL && bufferCap > len + 1) { + pBufferOut[len] = '\0'; } return len; @@ -58104,7 +56620,7 @@ MA_API ma_result ma_rb_init_ex(size_t subbufferSizeInBytes, size_t subbufferCoun Here is where we allocate our own buffer. We always want to align this to MA_SIMD_ALIGNMENT for future SIMD optimization opportunity. To do this we need to make sure the stride is a multiple of MA_SIMD_ALIGNMENT. */ - pRB->subbufferStrideInBytes = ma_align(pRB->subbufferSizeInBytes, MA_SIMD_ALIGNMENT); + pRB->subbufferStrideInBytes = (pRB->subbufferSizeInBytes + (MA_SIMD_ALIGNMENT-1)) & ~MA_SIMD_ALIGNMENT; bufferSizeInBytes = (size_t)pRB->subbufferCount*pRB->subbufferStrideInBytes; pRB->pBuffer = ma_aligned_malloc(bufferSizeInBytes, MA_SIMD_ALIGNMENT, &pRB->allocationCallbacks); @@ -60999,7 +59515,7 @@ MA_API ma_result ma_vfs_info(ma_vfs* pVFS, ma_vfs_file file, ma_file_info* pInfo } -#if !defined(MA_USE_WIN32_FILEIO) && (defined(MA_WIN32) && (defined(MA_WIN32_DESKTOP) || defined(MA_WIN32_NXDK)) && !defined(MA_NO_WIN32_FILEIO) && !defined(MA_POSIX)) +#if !defined(MA_USE_WIN32_FILEIO) && (defined(MA_WIN32) && defined(MA_WIN32_DESKTOP) && !defined(MA_NO_WIN32_FILEIO) && !defined(MA_POSIX)) #define MA_USE_WIN32_FILEIO #endif @@ -61076,34 +59592,25 @@ static ma_result ma_default_vfs_open__win32(ma_vfs* pVFS, const char* pFilePath, static ma_result ma_default_vfs_open_w__win32(ma_vfs* pVFS, const wchar_t* pFilePath, ma_uint32 openMode, ma_vfs_file* pFile) { - #if !defined(MA_XBOX_NXDK) - { - HANDLE hFile; - DWORD dwDesiredAccess; - DWORD dwShareMode; - DWORD dwCreationDisposition; + HANDLE hFile; + DWORD dwDesiredAccess; + DWORD dwShareMode; + DWORD dwCreationDisposition; - (void)pVFS; + (void)pVFS; - /* Load some Win32 symbols dynamically so we can dynamically check for the existence of SetFilePointerEx. */ - ma_win32_fileio_init(); + /* Load some Win32 symbols dynamically so we can dynamically check for the existence of SetFilePointerEx. */ + ma_win32_fileio_init(); - ma_default_vfs__get_open_settings_win32(openMode, &dwDesiredAccess, &dwShareMode, &dwCreationDisposition); + ma_default_vfs__get_open_settings_win32(openMode, &dwDesiredAccess, &dwShareMode, &dwCreationDisposition); - hFile = CreateFileW(pFilePath, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, FILE_ATTRIBUTE_NORMAL, NULL); - if (hFile == INVALID_HANDLE_VALUE) { - return ma_result_from_GetLastError(GetLastError()); - } - - *pFile = hFile; - return MA_SUCCESS; + hFile = CreateFileW(pFilePath, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile == INVALID_HANDLE_VALUE) { + return ma_result_from_GetLastError(GetLastError()); } - #else - { - /* No CreateFileW() available. */ - return MA_NOT_IMPLEMENTED; - } - #endif + + *pFile = hFile; + return MA_SUCCESS; } static ma_result ma_default_vfs_close__win32(ma_vfs* pVFS, ma_vfs_file file) @@ -61274,28 +59781,19 @@ static ma_result ma_default_vfs_tell__win32(ma_vfs* pVFS, ma_vfs_file file, ma_i static ma_result ma_default_vfs_info__win32(ma_vfs* pVFS, ma_vfs_file file, ma_file_info* pInfo) { + BY_HANDLE_FILE_INFORMATION fi; + BOOL result; + (void)pVFS; - #if !defined(MA_XBOX_NXDK) - { - BY_HANDLE_FILE_INFORMATION fi; - BOOL result; - - result = GetFileInformationByHandle((HANDLE)file, &fi); - if (result == 0) { - return ma_result_from_GetLastError(GetLastError()); - } - - pInfo->sizeInBytes = ((ma_uint64)fi.nFileSizeHigh << 32) | ((ma_uint64)fi.nFileSizeLow); - - return MA_SUCCESS; + result = GetFileInformationByHandle((HANDLE)file, &fi); + if (result == 0) { + return ma_result_from_GetLastError(GetLastError()); } - #else - { - /* GetFileInformationByHandle() is unavailable. */ - return MA_NOT_IMPLEMENTED; - } - #endif + + pInfo->sizeInBytes = ((ma_uint64)fi.nFileSizeHigh << 32) | ((ma_uint64)fi.nFileSizeLow); + + return MA_SUCCESS; } #else static ma_result ma_default_vfs_open__stdio(ma_vfs* pVFS, const char* pFilePath, ma_uint32 openMode, ma_vfs_file* pFile) @@ -61633,8 +60131,6 @@ static ma_result ma_default_vfs_tell(ma_vfs* pVFS, ma_vfs_file file, ma_int64* p static ma_result ma_default_vfs_info(ma_vfs* pVFS, ma_vfs_file file, ma_file_info* pInfo) { - ma_result result; - if (pInfo == NULL) { return MA_INVALID_ARGS; } @@ -61646,43 +60142,10 @@ static ma_result ma_default_vfs_info(ma_vfs* pVFS, ma_vfs_file file, ma_file_inf } #if defined(MA_USE_WIN32_FILEIO) - result = ma_default_vfs_info__win32(pVFS, file, pInfo); + return ma_default_vfs_info__win32(pVFS, file, pInfo); #else - result = ma_default_vfs_info__stdio(pVFS, file, pInfo); + return ma_default_vfs_info__stdio(pVFS, file, pInfo); #endif - - if (result == MA_NOT_IMPLEMENTED) { - /* Not implemented. Fall back to seek/tell/seek. */ - ma_result result; - ma_int64 cursor; - ma_int64 sizeInBytes; - - result = ma_default_vfs_tell(pVFS, file, &cursor); - if (result != MA_SUCCESS) { - return result; - } - - result = ma_default_vfs_seek(pVFS, file, 0, ma_seek_origin_end); - if (result != MA_SUCCESS) { - return result; - } - - result = ma_default_vfs_tell(pVFS, file, &sizeInBytes); - if (result != MA_SUCCESS) { - return result; - } - - pInfo->sizeInBytes = sizeInBytes; - - result = ma_default_vfs_seek(pVFS, file, cursor, ma_seek_origin_start); - if (result != MA_SUCCESS) { - return result; - } - - MA_ASSERT(result == MA_SUCCESS); - } - - return result; } @@ -61870,8 +60333,8 @@ extern "C" { #define MA_DR_WAV_STRINGIFY(x) #x #define MA_DR_WAV_XSTRINGIFY(x) MA_DR_WAV_STRINGIFY(x) #define MA_DR_WAV_VERSION_MAJOR 0 -#define MA_DR_WAV_VERSION_MINOR 14 -#define MA_DR_WAV_VERSION_REVISION 1 +#define MA_DR_WAV_VERSION_MINOR 13 +#define MA_DR_WAV_VERSION_REVISION 18 #define MA_DR_WAV_VERSION_STRING MA_DR_WAV_XSTRINGIFY(MA_DR_WAV_VERSION_MAJOR) "." MA_DR_WAV_XSTRINGIFY(MA_DR_WAV_VERSION_MINOR) "." MA_DR_WAV_XSTRINGIFY(MA_DR_WAV_VERSION_REVISION) #include #define MA_DR_WAVE_FORMAT_PCM 0x1 @@ -61887,9 +60350,8 @@ MA_API void ma_dr_wav_version(ma_uint32* pMajor, ma_uint32* pMinor, ma_uint32* p MA_API const char* ma_dr_wav_version_string(void); typedef enum { - MA_DR_WAV_SEEK_SET, - MA_DR_WAV_SEEK_CUR, - MA_DR_WAV_SEEK_END + ma_dr_wav_seek_origin_start, + ma_dr_wav_seek_origin_current } ma_dr_wav_seek_origin; typedef enum { @@ -61926,7 +60388,6 @@ MA_API ma_uint16 ma_dr_wav_fmt_get_format(const ma_dr_wav_fmt* pFMT); typedef size_t (* ma_dr_wav_read_proc)(void* pUserData, void* pBufferOut, size_t bytesToRead); typedef size_t (* ma_dr_wav_write_proc)(void* pUserData, const void* pData, size_t bytesToWrite); typedef ma_bool32 (* ma_dr_wav_seek_proc)(void* pUserData, int offset, ma_dr_wav_seek_origin origin); -typedef ma_bool32 (* ma_dr_wav_tell_proc)(void* pUserData, ma_int64* pCursor); typedef ma_uint64 (* ma_dr_wav_chunk_proc)(void* pChunkUserData, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, void* pReadSeekUserData, const ma_dr_wav_chunk_header* pChunkHeader, ma_dr_wav_container container, const ma_dr_wav_fmt* pFMT); typedef struct { @@ -61971,11 +60432,6 @@ typedef enum ma_dr_wav_metadata_type_list_info_genre = 1 << 15, ma_dr_wav_metadata_type_list_info_album = 1 << 16, ma_dr_wav_metadata_type_list_info_tracknumber = 1 << 17, - ma_dr_wav_metadata_type_list_info_location = 1 << 18, - ma_dr_wav_metadata_type_list_info_organization = 1 << 19, - ma_dr_wav_metadata_type_list_info_keywords = 1 << 20, - ma_dr_wav_metadata_type_list_info_medium = 1 << 21, - ma_dr_wav_metadata_type_list_info_description = 1 << 22, ma_dr_wav_metadata_type_list_all_info_strings = ma_dr_wav_metadata_type_list_info_software | ma_dr_wav_metadata_type_list_info_copyright | ma_dr_wav_metadata_type_list_info_title @@ -61984,12 +60440,7 @@ typedef enum | ma_dr_wav_metadata_type_list_info_date | ma_dr_wav_metadata_type_list_info_genre | ma_dr_wav_metadata_type_list_info_album - | ma_dr_wav_metadata_type_list_info_tracknumber - | ma_dr_wav_metadata_type_list_info_location - | ma_dr_wav_metadata_type_list_info_organization - | ma_dr_wav_metadata_type_list_info_keywords - | ma_dr_wav_metadata_type_list_info_medium - | ma_dr_wav_metadata_type_list_info_description, + | ma_dr_wav_metadata_type_list_info_tracknumber, ma_dr_wav_metadata_type_list_all_adtl = ma_dr_wav_metadata_type_list_label | ma_dr_wav_metadata_type_list_note | ma_dr_wav_metadata_type_list_labelled_cue_region, @@ -62006,8 +60457,8 @@ typedef struct { ma_uint32 cuePointId; ma_uint32 type; - ma_uint32 firstSampleOffset; - ma_uint32 lastSampleOffset; + ma_uint32 firstSampleByteOffset; + ma_uint32 lastSampleByteOffset; ma_uint32 sampleFraction; ma_uint32 playCount; } ma_dr_wav_smpl_loop; @@ -62042,7 +60493,7 @@ typedef struct ma_uint8 dataChunkId[4]; ma_uint32 chunkStart; ma_uint32 blockStart; - ma_uint32 sampleOffset; + ma_uint32 sampleByteOffset; } ma_dr_wav_cue_point; typedef struct { @@ -62144,7 +60595,6 @@ typedef struct ma_dr_wav_read_proc onRead; ma_dr_wav_write_proc onWrite; ma_dr_wav_seek_proc onSeek; - ma_dr_wav_tell_proc onTell; void* pUserData; ma_allocation_callbacks allocationCallbacks; ma_dr_wav_container container; @@ -62187,9 +60637,9 @@ typedef struct ma_bool8 isUnsigned; } aiff; } ma_dr_wav; -MA_API ma_bool32 ma_dr_wav_init(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_tell_proc onTell, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); -MA_API ma_bool32 ma_dr_wav_init_ex(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_tell_proc onTell, ma_dr_wav_chunk_proc onChunk, void* pReadSeekTellUserData, void* pChunkUserData, ma_uint32 flags, const ma_allocation_callbacks* pAllocationCallbacks); -MA_API ma_bool32 ma_dr_wav_init_with_metadata(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_tell_proc onTell, void* pUserData, ma_uint32 flags, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_bool32 ma_dr_wav_init(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_bool32 ma_dr_wav_init_ex(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_chunk_proc onChunk, void* pReadSeekUserData, void* pChunkUserData, ma_uint32 flags, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_bool32 ma_dr_wav_init_with_metadata(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, void* pUserData, ma_uint32 flags, const ma_allocation_callbacks* pAllocationCallbacks); MA_API ma_bool32 ma_dr_wav_init_write(ma_dr_wav* pWav, const ma_dr_wav_data_format* pFormat, ma_dr_wav_write_proc onWrite, ma_dr_wav_seek_proc onSeek, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); MA_API ma_bool32 ma_dr_wav_init_write_sequential(ma_dr_wav* pWav, const ma_dr_wav_data_format* pFormat, ma_uint64 totalSampleCount, ma_dr_wav_write_proc onWrite, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); MA_API ma_bool32 ma_dr_wav_init_write_sequential_pcm_frames(ma_dr_wav* pWav, const ma_dr_wav_data_format* pFormat, ma_uint64 totalPCMFrameCount, ma_dr_wav_write_proc onWrite, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); @@ -62261,9 +60711,9 @@ MA_API ma_bool32 ma_dr_wav_init_memory_write(ma_dr_wav* pWav, void** ppData, siz MA_API ma_bool32 ma_dr_wav_init_memory_write_sequential(ma_dr_wav* pWav, void** ppData, size_t* pDataSize, const ma_dr_wav_data_format* pFormat, ma_uint64 totalSampleCount, const ma_allocation_callbacks* pAllocationCallbacks); MA_API ma_bool32 ma_dr_wav_init_memory_write_sequential_pcm_frames(ma_dr_wav* pWav, void** ppData, size_t* pDataSize, const ma_dr_wav_data_format* pFormat, ma_uint64 totalPCMFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); #ifndef MA_DR_WAV_NO_CONVERSION_API -MA_API ma_int16* ma_dr_wav_open_and_read_pcm_frames_s16(ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_tell_proc onTell, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks); -MA_API float* ma_dr_wav_open_and_read_pcm_frames_f32(ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_tell_proc onTell, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks); -MA_API ma_int32* ma_dr_wav_open_and_read_pcm_frames_s32(ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_tell_proc onTell, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_int16* ma_dr_wav_open_and_read_pcm_frames_s16(ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API float* ma_dr_wav_open_and_read_pcm_frames_f32(ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_int32* ma_dr_wav_open_and_read_pcm_frames_s32(ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks); #ifndef MA_DR_WAV_NO_STDIO MA_API ma_int16* ma_dr_wav_open_file_and_read_pcm_frames_s16(const char* filename, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks); MA_API float* ma_dr_wav_open_file_and_read_pcm_frames_f32(const char* filename, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks); @@ -62303,8 +60753,8 @@ extern "C" { #define MA_DR_FLAC_STRINGIFY(x) #x #define MA_DR_FLAC_XSTRINGIFY(x) MA_DR_FLAC_STRINGIFY(x) #define MA_DR_FLAC_VERSION_MAJOR 0 -#define MA_DR_FLAC_VERSION_MINOR 13 -#define MA_DR_FLAC_VERSION_REVISION 1 +#define MA_DR_FLAC_VERSION_MINOR 12 +#define MA_DR_FLAC_VERSION_REVISION 43 #define MA_DR_FLAC_VERSION_STRING MA_DR_FLAC_XSTRINGIFY(MA_DR_FLAC_VERSION_MAJOR) "." MA_DR_FLAC_XSTRINGIFY(MA_DR_FLAC_VERSION_MINOR) "." MA_DR_FLAC_XSTRINGIFY(MA_DR_FLAC_VERSION_REVISION) #include #if defined(_MSC_VER) && _MSC_VER >= 1700 @@ -62367,9 +60817,8 @@ typedef enum } ma_dr_flac_container; typedef enum { - MA_DR_FLAC_SEEK_SET, - MA_DR_FLAC_SEEK_CUR, - MA_DR_FLAC_SEEK_END + ma_dr_flac_seek_origin_start, + ma_dr_flac_seek_origin_current } ma_dr_flac_seek_origin; typedef struct { @@ -62445,7 +60894,6 @@ typedef struct } ma_dr_flac_metadata; typedef size_t (* ma_dr_flac_read_proc)(void* pUserData, void* pBufferOut, size_t bytesToRead); typedef ma_bool32 (* ma_dr_flac_seek_proc)(void* pUserData, int offset, ma_dr_flac_seek_origin origin); -typedef ma_bool32 (* ma_dr_flac_tell_proc)(void* pUserData, ma_int64* pCursor); typedef void (* ma_dr_flac_meta_proc)(void* pUserData, ma_dr_flac_metadata* pMetadata); typedef struct { @@ -62457,7 +60905,6 @@ typedef struct { ma_dr_flac_read_proc onRead; ma_dr_flac_seek_proc onSeek; - ma_dr_flac_tell_proc onTell; void* pUserData; size_t unalignedByteCount; ma_dr_flac_cache_t unalignedCache; @@ -62517,10 +60964,10 @@ typedef struct ma_dr_flac_bs bs; ma_uint8 pExtraData[1]; } ma_dr_flac; -MA_API ma_dr_flac* ma_dr_flac_open(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); -MA_API ma_dr_flac* ma_dr_flac_open_relaxed(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, ma_dr_flac_container container, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); -MA_API ma_dr_flac* ma_dr_flac_open_with_metadata(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, ma_dr_flac_meta_proc onMeta, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); -MA_API ma_dr_flac* ma_dr_flac_open_with_metadata_relaxed(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, ma_dr_flac_meta_proc onMeta, ma_dr_flac_container container, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_dr_flac* ma_dr_flac_open(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_dr_flac* ma_dr_flac_open_relaxed(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_container container, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_dr_flac* ma_dr_flac_open_with_metadata(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_meta_proc onMeta, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_dr_flac* ma_dr_flac_open_with_metadata_relaxed(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_meta_proc onMeta, ma_dr_flac_container container, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); MA_API void ma_dr_flac_close(ma_dr_flac* pFlac); MA_API ma_uint64 ma_dr_flac_read_pcm_frames_s32(ma_dr_flac* pFlac, ma_uint64 framesToRead, ma_int32* pBufferOut); MA_API ma_uint64 ma_dr_flac_read_pcm_frames_s16(ma_dr_flac* pFlac, ma_uint64 framesToRead, ma_int16* pBufferOut); @@ -62534,9 +60981,9 @@ MA_API ma_dr_flac* ma_dr_flac_open_file_with_metadata_w(const wchar_t* pFileName #endif MA_API ma_dr_flac* ma_dr_flac_open_memory(const void* pData, size_t dataSize, const ma_allocation_callbacks* pAllocationCallbacks); MA_API ma_dr_flac* ma_dr_flac_open_memory_with_metadata(const void* pData, size_t dataSize, ma_dr_flac_meta_proc onMeta, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); -MA_API ma_int32* ma_dr_flac_open_and_read_pcm_frames_s32(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, void* pUserData, unsigned int* channels, unsigned int* sampleRate, ma_uint64* totalPCMFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); -MA_API ma_int16* ma_dr_flac_open_and_read_pcm_frames_s16(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, void* pUserData, unsigned int* channels, unsigned int* sampleRate, ma_uint64* totalPCMFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); -MA_API float* ma_dr_flac_open_and_read_pcm_frames_f32(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, void* pUserData, unsigned int* channels, unsigned int* sampleRate, ma_uint64* totalPCMFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_int32* ma_dr_flac_open_and_read_pcm_frames_s32(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, void* pUserData, unsigned int* channels, unsigned int* sampleRate, ma_uint64* totalPCMFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_int16* ma_dr_flac_open_and_read_pcm_frames_s16(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, void* pUserData, unsigned int* channels, unsigned int* sampleRate, ma_uint64* totalPCMFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API float* ma_dr_flac_open_and_read_pcm_frames_f32(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, void* pUserData, unsigned int* channels, unsigned int* sampleRate, ma_uint64* totalPCMFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); #ifndef MA_DR_FLAC_NO_STDIO MA_API ma_int32* ma_dr_flac_open_file_and_read_pcm_frames_s32(const char* filename, unsigned int* channels, unsigned int* sampleRate, ma_uint64* totalPCMFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); MA_API ma_int16* ma_dr_flac_open_file_and_read_pcm_frames_s16(const char* filename, unsigned int* channels, unsigned int* sampleRate, ma_uint64* totalPCMFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); @@ -62584,12 +61031,6 @@ MA_API ma_bool32 ma_dr_flac_next_cuesheet_track(ma_dr_flac_cuesheet_track_iterat #endif /* MA_NO_FLAC */ #if !defined(MA_NO_MP3) && !defined(MA_NO_DECODING) -#ifndef MA_DR_MP3_NO_SIMD - #if (defined(MA_NO_NEON) && defined(MA_ARM)) || (defined(MA_NO_SSE2) && (defined(MA_X86) || defined(MA_X64))) - #define MA_DR_MP3_NO_SIMD - #endif -#endif - /* dr_mp3_h begin */ #ifndef ma_dr_mp3_h #define ma_dr_mp3_h @@ -62599,8 +61040,8 @@ extern "C" { #define MA_DR_MP3_STRINGIFY(x) #x #define MA_DR_MP3_XSTRINGIFY(x) MA_DR_MP3_STRINGIFY(x) #define MA_DR_MP3_VERSION_MAJOR 0 -#define MA_DR_MP3_VERSION_MINOR 7 -#define MA_DR_MP3_VERSION_REVISION 1 +#define MA_DR_MP3_VERSION_MINOR 6 +#define MA_DR_MP3_VERSION_REVISION 40 #define MA_DR_MP3_VERSION_STRING MA_DR_MP3_XSTRINGIFY(MA_DR_MP3_VERSION_MAJOR) "." MA_DR_MP3_XSTRINGIFY(MA_DR_MP3_VERSION_MINOR) "." MA_DR_MP3_XSTRINGIFY(MA_DR_MP3_VERSION_REVISION) #include #define MA_DR_MP3_MAX_PCM_FRAMES_PER_MP3_FRAME 1152 @@ -62609,7 +61050,7 @@ MA_API void ma_dr_mp3_version(ma_uint32* pMajor, ma_uint32* pMinor, ma_uint32* p MA_API const char* ma_dr_mp3_version_string(void); typedef struct { - int frame_bytes, channels, sample_rate, layer, bitrate_kbps; + int frame_bytes, channels, hz, layer, bitrate_kbps; } ma_dr_mp3dec_frame_info; typedef struct { @@ -62622,9 +61063,8 @@ MA_API int ma_dr_mp3dec_decode_frame(ma_dr_mp3dec *dec, const ma_uint8 *mp3, int MA_API void ma_dr_mp3dec_f32_to_s16(const float *in, ma_int16 *out, size_t num_samples); typedef enum { - MA_DR_MP3_SEEK_SET, - MA_DR_MP3_SEEK_CUR, - MA_DR_MP3_SEEK_END + ma_dr_mp3_seek_origin_start, + ma_dr_mp3_seek_origin_current } ma_dr_mp3_seek_origin; typedef struct { @@ -62633,24 +61073,8 @@ typedef struct ma_uint16 mp3FramesToDiscard; ma_uint16 pcmFramesToDiscard; } ma_dr_mp3_seek_point; -typedef enum -{ - MA_DR_MP3_METADATA_TYPE_ID3V1, - MA_DR_MP3_METADATA_TYPE_ID3V2, - MA_DR_MP3_METADATA_TYPE_APE, - MA_DR_MP3_METADATA_TYPE_XING, - MA_DR_MP3_METADATA_TYPE_VBRI -} ma_dr_mp3_metadata_type; -typedef struct -{ - ma_dr_mp3_metadata_type type; - const void* pRawData; - size_t rawDataSize; -} ma_dr_mp3_metadata; typedef size_t (* ma_dr_mp3_read_proc)(void* pUserData, void* pBufferOut, size_t bytesToRead); typedef ma_bool32 (* ma_dr_mp3_seek_proc)(void* pUserData, int offset, ma_dr_mp3_seek_origin origin); -typedef ma_bool32 (* ma_dr_mp3_tell_proc)(void* pUserData, ma_int64* pCursor); -typedef void (* ma_dr_mp3_meta_proc)(void* pUserData, const ma_dr_mp3_metadata* pMetadata); typedef struct { ma_uint32 channels; @@ -62663,9 +61087,7 @@ typedef struct ma_uint32 sampleRate; ma_dr_mp3_read_proc onRead; ma_dr_mp3_seek_proc onSeek; - ma_dr_mp3_meta_proc onMeta; void* pUserData; - void* pUserDataMeta; ma_allocation_callbacks allocationCallbacks; ma_uint32 mp3FrameChannels; ma_uint32 mp3FrameSampleRate; @@ -62674,20 +61096,13 @@ typedef struct ma_uint8 pcmFrames[sizeof(float)*MA_DR_MP3_MAX_SAMPLES_PER_FRAME]; ma_uint64 currentPCMFrame; ma_uint64 streamCursor; - ma_uint64 streamLength; - ma_uint64 streamStartOffset; ma_dr_mp3_seek_point* pSeekPoints; ma_uint32 seekPointCount; - ma_uint32 delayInPCMFrames; - ma_uint32 paddingInPCMFrames; - ma_uint64 totalPCMFrameCount; - ma_bool32 isVBR; - ma_bool32 isCBR; size_t dataSize; size_t dataCapacity; size_t dataConsumed; ma_uint8* pData; - ma_bool32 atEnd; + ma_bool32 atEnd : 1; struct { const ma_uint8* pData; @@ -62695,12 +61110,9 @@ typedef struct size_t currentReadPos; } memory; } ma_dr_mp3; -MA_API ma_bool32 ma_dr_mp3_init(ma_dr_mp3* pMP3, ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, ma_dr_mp3_tell_proc onTell, ma_dr_mp3_meta_proc onMeta, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); -MA_API ma_bool32 ma_dr_mp3_init_memory_with_metadata(ma_dr_mp3* pMP3, const void* pData, size_t dataSize, ma_dr_mp3_meta_proc onMeta, void* pUserDataMeta, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_bool32 ma_dr_mp3_init(ma_dr_mp3* pMP3, ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks); MA_API ma_bool32 ma_dr_mp3_init_memory(ma_dr_mp3* pMP3, const void* pData, size_t dataSize, const ma_allocation_callbacks* pAllocationCallbacks); #ifndef MA_DR_MP3_NO_STDIO -MA_API ma_bool32 ma_dr_mp3_init_file_with_metadata(ma_dr_mp3* pMP3, const char* pFilePath, ma_dr_mp3_meta_proc onMeta, void* pUserDataMeta, const ma_allocation_callbacks* pAllocationCallbacks); -MA_API ma_bool32 ma_dr_mp3_init_file_with_metadata_w(ma_dr_mp3* pMP3, const wchar_t* pFilePath, ma_dr_mp3_meta_proc onMeta, void* pUserDataMeta, const ma_allocation_callbacks* pAllocationCallbacks); MA_API ma_bool32 ma_dr_mp3_init_file(ma_dr_mp3* pMP3, const char* pFilePath, const ma_allocation_callbacks* pAllocationCallbacks); MA_API ma_bool32 ma_dr_mp3_init_file_w(ma_dr_mp3* pMP3, const wchar_t* pFilePath, const ma_allocation_callbacks* pAllocationCallbacks); #endif @@ -62713,8 +61125,8 @@ MA_API ma_uint64 ma_dr_mp3_get_mp3_frame_count(ma_dr_mp3* pMP3); MA_API ma_bool32 ma_dr_mp3_get_mp3_and_pcm_frame_count(ma_dr_mp3* pMP3, ma_uint64* pMP3FrameCount, ma_uint64* pPCMFrameCount); MA_API ma_bool32 ma_dr_mp3_calculate_seek_points(ma_dr_mp3* pMP3, ma_uint32* pSeekPointCount, ma_dr_mp3_seek_point* pSeekPoints); MA_API ma_bool32 ma_dr_mp3_bind_seek_table(ma_dr_mp3* pMP3, ma_uint32 seekPointCount, ma_dr_mp3_seek_point* pSeekPoints); -MA_API float* ma_dr_mp3_open_and_read_pcm_frames_f32(ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, ma_dr_mp3_tell_proc onTell, void* pUserData, ma_dr_mp3_config* pConfig, ma_uint64* pTotalFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); -MA_API ma_int16* ma_dr_mp3_open_and_read_pcm_frames_s16(ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, ma_dr_mp3_tell_proc onTell, void* pUserData, ma_dr_mp3_config* pConfig, ma_uint64* pTotalFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API float* ma_dr_mp3_open_and_read_pcm_frames_f32(ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, void* pUserData, ma_dr_mp3_config* pConfig, ma_uint64* pTotalFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); +MA_API ma_int16* ma_dr_mp3_open_and_read_pcm_frames_s16(ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, void* pUserData, ma_dr_mp3_config* pConfig, ma_uint64* pTotalFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); MA_API float* ma_dr_mp3_open_memory_and_read_pcm_frames_f32(const void* pData, size_t dataSize, ma_dr_mp3_config* pConfig, ma_uint64* pTotalFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); MA_API ma_int16* ma_dr_mp3_open_memory_and_read_pcm_frames_s16(const void* pData, size_t dataSize, ma_dr_mp3_config* pConfig, ma_uint64* pTotalFrameCount, const ma_allocation_callbacks* pAllocationCallbacks); #ifndef MA_DR_MP3_NO_STDIO @@ -63267,10 +61679,8 @@ static ma_bool32 ma_wav_dr_callback__seek(void* pUserData, int offset, ma_dr_wav MA_ASSERT(pWav != NULL); maSeekOrigin = ma_seek_origin_start; - if (origin == MA_DR_WAV_SEEK_CUR) { - maSeekOrigin = ma_seek_origin_current; - } else if (origin == MA_DR_WAV_SEEK_END) { - maSeekOrigin = ma_seek_origin_end; + if (origin == ma_dr_wav_seek_origin_current) { + maSeekOrigin = ma_seek_origin_current; } result = pWav->onSeek(pWav->pReadSeekTellUserData, offset, maSeekOrigin); @@ -63280,26 +61690,6 @@ static ma_bool32 ma_wav_dr_callback__seek(void* pUserData, int offset, ma_dr_wav return MA_TRUE; } - -static ma_bool32 ma_wav_dr_callback__tell(void* pUserData, ma_int64* pCursor) -{ - ma_wav* pWav = (ma_wav*)pUserData; - ma_result result; - - MA_ASSERT(pWav != NULL); - MA_ASSERT(pCursor != NULL); - - if (pWav->onTell == NULL) { - return MA_FALSE; /* Not implemented. */ - } - - result = pWav->onTell(pWav->pReadSeekTellUserData, pCursor); - if (result != MA_SUCCESS) { - return MA_FALSE; /* Failed to tell. */ - } - - return MA_TRUE; -} #endif static ma_result ma_wav_init_internal(const ma_decoding_backend_config* pConfig, ma_wav* pWav) @@ -63394,7 +61784,7 @@ MA_API ma_result ma_wav_init(ma_read_proc onRead, ma_seek_proc onSeek, ma_tell_p { ma_bool32 wavResult; - wavResult = ma_dr_wav_init(&pWav->dr, ma_wav_dr_callback__read, ma_wav_dr_callback__seek, ma_wav_dr_callback__tell, pWav, pAllocationCallbacks); + wavResult = ma_dr_wav_init(&pWav->dr, ma_wav_dr_callback__read, ma_wav_dr_callback__seek, pWav, pAllocationCallbacks); if (wavResult != MA_TRUE) { return MA_INVALID_FILE; } @@ -63973,10 +62363,8 @@ static ma_bool32 ma_flac_dr_callback__seek(void* pUserData, int offset, ma_dr_fl MA_ASSERT(pFlac != NULL); maSeekOrigin = ma_seek_origin_start; - if (origin == MA_DR_FLAC_SEEK_CUR) { - maSeekOrigin = ma_seek_origin_current; - } else if (origin == MA_DR_FLAC_SEEK_END) { - maSeekOrigin = ma_seek_origin_end; + if (origin == ma_dr_flac_seek_origin_current) { + maSeekOrigin = ma_seek_origin_current; } result = pFlac->onSeek(pFlac->pReadSeekTellUserData, offset, maSeekOrigin); @@ -63986,26 +62374,6 @@ static ma_bool32 ma_flac_dr_callback__seek(void* pUserData, int offset, ma_dr_fl return MA_TRUE; } - -static ma_bool32 ma_flac_dr_callback__tell(void* pUserData, ma_int64* pCursor) -{ - ma_flac* pFlac = (ma_flac*)pUserData; - ma_result result; - - MA_ASSERT(pFlac != NULL); - MA_ASSERT(pCursor != NULL); - - if (pFlac->onTell == NULL) { - return MA_FALSE; /* Not implemented. */ - } - - result = pFlac->onTell(pFlac->pReadSeekTellUserData, pCursor); - if (result != MA_SUCCESS) { - return MA_FALSE; /* Failed to tell. */ - } - - return MA_TRUE; -} #endif static ma_result ma_flac_init_internal(const ma_decoding_backend_config* pConfig, ma_flac* pFlac) @@ -64057,7 +62425,7 @@ MA_API ma_result ma_flac_init(ma_read_proc onRead, ma_seek_proc onSeek, ma_tell_ #if !defined(MA_NO_FLAC) { - pFlac->dr = ma_dr_flac_open(ma_flac_dr_callback__read, ma_flac_dr_callback__seek, ma_flac_dr_callback__tell, pFlac, pAllocationCallbacks); + pFlac->dr = ma_dr_flac_open(ma_flac_dr_callback__read, ma_flac_dr_callback__seek, pFlac, pAllocationCallbacks); if (pFlac->dr == NULL) { return MA_INVALID_FILE; } @@ -64618,12 +62986,9 @@ static ma_bool32 ma_mp3_dr_callback__seek(void* pUserData, int offset, ma_dr_mp3 MA_ASSERT(pMP3 != NULL); - if (origin == MA_DR_MP3_SEEK_SET) { - maSeekOrigin = ma_seek_origin_start; - } else if (origin == MA_DR_MP3_SEEK_END) { - maSeekOrigin = ma_seek_origin_end; - } else { - maSeekOrigin = ma_seek_origin_current; + maSeekOrigin = ma_seek_origin_start; + if (origin == ma_dr_mp3_seek_origin_current) { + maSeekOrigin = ma_seek_origin_current; } result = pMP3->onSeek(pMP3->pReadSeekTellUserData, offset, maSeekOrigin); @@ -64633,21 +62998,6 @@ static ma_bool32 ma_mp3_dr_callback__seek(void* pUserData, int offset, ma_dr_mp3 return MA_TRUE; } - -static ma_bool32 ma_mp3_dr_callback__tell(void* pUserData, ma_int64* pCursor) -{ - ma_mp3* pMP3 = (ma_mp3*)pUserData; - ma_result result; - - MA_ASSERT(pMP3 != NULL); - - result = pMP3->onTell(pMP3->pReadSeekTellUserData, pCursor); - if (result != MA_SUCCESS) { - return MA_FALSE; - } - - return MA_TRUE; -} #endif static ma_result ma_mp3_init_internal(const ma_decoding_backend_config* pConfig, ma_mp3* pMP3) @@ -64748,7 +63098,7 @@ MA_API ma_result ma_mp3_init(ma_read_proc onRead, ma_seek_proc onSeek, ma_tell_p { ma_bool32 mp3Result; - mp3Result = ma_dr_mp3_init(&pMP3->dr, ma_mp3_dr_callback__read, ma_mp3_dr_callback__seek, ma_mp3_dr_callback__tell, NULL, pMP3, pAllocationCallbacks); + mp3Result = ma_dr_mp3_init(&pMP3->dr, ma_mp3_dr_callback__read, ma_mp3_dr_callback__seek, pMP3, pAllocationCallbacks); if (mp3Result != MA_TRUE) { return MA_INVALID_FILE; } @@ -66647,16 +64997,14 @@ static ma_bool32 ma_path_extension_equal_w(const wchar_t* path, const wchar_t* e ext1 = extension; ext2 = ma_path_extension_w(path); - #if (defined(_MSC_VER) || defined(__WATCOMC__) || defined(__DMC__)) && !defined(MA_XBOX_NXDK) +#if defined(_MSC_VER) || defined(__WATCOMC__) || defined(__DMC__) + return _wcsicmp(ext1, ext2) == 0; +#else + /* + I'm not aware of a wide character version of strcasecmp(). I'm therefore converting the extensions to multibyte strings and comparing those. This + isn't the most efficient way to do it, but it should work OK. + */ { - return _wcsicmp(ext1, ext2) == 0; - } - #elif !defined(MA_XBOX_NXDK) && !defined(MA_DOS) - { - /* - I'm not aware of a wide character version of strcasecmp(). I'm therefore converting the extensions to multibyte strings and comparing those. This - isn't the most efficient way to do it, but it should work OK. - */ char ext1MB[4096]; char ext2MB[4096]; const wchar_t* pext1 = ext1; @@ -66676,13 +65024,7 @@ static ma_bool32 ma_path_extension_equal_w(const wchar_t* path, const wchar_t* e return strcasecmp(ext1MB, ext2MB) == 0; } - #else - { - /* Getting here means we don't have a way to do a case-sensitive comparison for wide strings. Fall back to a simple case-sensitive comparison. */ - /* TODO: Implement our own wchar_t-to-char conversion routine and then use the char* version for comparing. */ - return ma_wcscmp(ext1, ext2) == 0; - } - #endif +#endif } #endif /* MA_HAS_PATH_API */ @@ -67777,18 +66119,10 @@ static ma_bool32 ma_encoder__internal_on_seek_wav(void* pUserData, int offset, m { ma_encoder* pEncoder = (ma_encoder*)pUserData; ma_result result; - ma_seek_origin maSeekOrigin; MA_ASSERT(pEncoder != NULL); - maSeekOrigin = ma_seek_origin_start; - if (origin == MA_DR_WAV_SEEK_CUR) { - maSeekOrigin = ma_seek_origin_current; - } else if (origin == MA_DR_WAV_SEEK_END) { - maSeekOrigin = ma_seek_origin_end; - } - - result = pEncoder->onSeek(pEncoder, offset, maSeekOrigin); + result = pEncoder->onSeek(pEncoder, offset, (origin == ma_dr_wav_seek_origin_start) ? ma_seek_origin_start : ma_seek_origin_current); if (result != MA_SUCCESS) { return MA_FALSE; } else { @@ -69310,7 +67644,7 @@ static MA_INLINE ma_uint32 ma_hash_getblock(const ma_uint32* blocks, int i) ma_uint32 block; /* Try silencing a sanitization warning about unaligned access by doing a memcpy() instead of assignment. */ - MA_COPY_MEMORY(&block, ma_offset_ptr(blocks, i * (int) sizeof(block)), sizeof(block)); + MA_COPY_MEMORY(&block, ma_offset_ptr(blocks, i * sizeof(block)), sizeof(block)); if (ma_is_little_endian()) { return block; @@ -69386,7 +67720,7 @@ static ma_uint32 ma_hash_string_32(const char* str) static ma_uint32 ma_hash_string_w_32(const wchar_t* str) { - return ma_hash_32(str, (int)ma_wcslen(str) * sizeof(*str), MA_DEFAULT_HASH_SEED); + return ma_hash_32(str, (int)wcslen(str) * sizeof(*str), MA_DEFAULT_HASH_SEED); } @@ -69546,7 +67880,6 @@ static MA_INLINE ma_resource_manager_data_buffer_node* ma_resource_manager_data_ return ma_resource_manager_data_buffer_node_find_min(pDataBufferNode->pChildHi); } -#if 0 /* Currently unused, but might make use of this later. */ static MA_INLINE ma_resource_manager_data_buffer_node* ma_resource_manager_data_buffer_node_find_inorder_predecessor(ma_resource_manager_data_buffer_node* pDataBufferNode) { MA_ASSERT(pDataBufferNode != NULL); @@ -69554,7 +67887,6 @@ static MA_INLINE ma_resource_manager_data_buffer_node* ma_resource_manager_data_ return ma_resource_manager_data_buffer_node_find_max(pDataBufferNode->pChildLo); } -#endif static ma_result ma_resource_manager_data_buffer_node_remove(ma_resource_manager* pResourceManager, ma_resource_manager_data_buffer_node* pDataBufferNode) { @@ -70677,19 +69009,16 @@ static ma_result ma_resource_manager_data_buffer_node_acquire_critical_section(m /* Failed to post job. Probably ran out of memory. */ ma_log_postf(ma_resource_manager_get_log(pResourceManager), MA_LOG_LEVEL_ERROR, "Failed to post MA_JOB_TYPE_RESOURCE_MANAGER_LOAD_DATA_BUFFER_NODE job. %s.\n", ma_result_description(result)); + /* + Fences were acquired before posting the job, but since the job was not able to + be posted, we need to make sure we release them so nothing gets stuck waiting. + */ + if (pInitFence != NULL) { ma_fence_release(pInitFence); } + if (pDoneFence != NULL) { ma_fence_release(pDoneFence); } + if ((flags & MA_RESOURCE_MANAGER_DATA_SOURCE_FLAG_WAIT_INIT) != 0) { ma_resource_manager_inline_notification_uninit(pInitNotification); } else { - /* - Fences were acquired before posting the job, but since the job was not able to - be posted, we need to make sure we release them so nothing gets stuck waiting. - - In the WAIT_INIT case, these will have already been released in ma_job_process() - so we should only release fences in this branch. - */ - if (pInitFence != NULL) { ma_fence_release(pInitFence); } - if (pDoneFence != NULL) { ma_fence_release(pDoneFence); } - /* These will have been freed by the job thread, but with WAIT_INIT they will already have happened since the job has already been handled. */ ma_free(pFilePathCopy, &pResourceManager->config.allocationCallbacks); ma_free(pFilePathWCopy, &pResourceManager->config.allocationCallbacks); @@ -78345,7 +76674,7 @@ static ma_result ma_sound_init_from_data_source_internal(ma_engine* pEngine, con } if (pConfig->loopPointBegInPCMFrames != 0 || pConfig->loopPointEndInPCMFrames != ~((ma_uint64)0)) { - ma_data_source_set_loop_point_in_pcm_frames(ma_sound_get_data_source(pSound), pConfig->loopPointBegInPCMFrames, pConfig->loopPointEndInPCMFrames); + ma_data_source_set_range_in_pcm_frames(ma_sound_get_data_source(pSound), pConfig->loopPointBegInPCMFrames, pConfig->loopPointEndInPCMFrames); } ma_sound_set_looping(pSound, pConfig->isLooping || ((pConfig->flags & MA_SOUND_FLAG_LOOPING) != 0)); @@ -78407,7 +76736,6 @@ MA_API ma_result ma_sound_init_from_file_internal(ma_engine* pEngine, const ma_s result = ma_resource_manager_data_source_init_ex(pEngine->pResourceManager, &resourceManagerDataSourceConfig, pSound->pResourceManagerDataSource); if (result != MA_SUCCESS) { - ma_free(pSound->pResourceManagerDataSource, &pEngine->allocationCallbacks); goto done; } @@ -79213,12 +77541,7 @@ MA_API ma_uint64 ma_sound_get_time_in_pcm_frames(const ma_sound* pSound) MA_API ma_uint64 ma_sound_get_time_in_milliseconds(const ma_sound* pSound) { - ma_uint32 sampleRate = ma_engine_get_sample_rate(ma_sound_get_engine(pSound)); - if (sampleRate == 0) { - return 0; /* Prevent a division by zero. */ - } - - return ma_sound_get_time_in_pcm_frames(pSound) * 1000 / sampleRate; + return ma_sound_get_time_in_pcm_frames(pSound) * 1000 / ma_engine_get_sample_rate(ma_sound_get_engine(pSound)); } MA_API void ma_sound_set_looping(ma_sound* pSound, ma_bool32 isLooping) @@ -79302,7 +77625,7 @@ MA_API ma_result ma_sound_seek_to_second(ma_sound* pSound, float seekPointInSeco return ma_sound_seek_to_pcm_frame(pSound, frameIndex); } -MA_API ma_result ma_sound_get_data_format(const ma_sound* pSound, ma_format* pFormat, ma_uint32* pChannels, ma_uint32* pSampleRate, ma_channel* pChannelMap, size_t channelMapCap) +MA_API ma_result ma_sound_get_data_format(ma_sound* pSound, ma_format* pFormat, ma_uint32* pChannels, ma_uint32* pSampleRate, ma_channel* pChannelMap, size_t channelMapCap) { if (pSound == NULL) { return MA_INVALID_ARGS; @@ -79335,7 +77658,7 @@ MA_API ma_result ma_sound_get_data_format(const ma_sound* pSound, ma_format* pFo } } -MA_API ma_result ma_sound_get_cursor_in_pcm_frames(const ma_sound* pSound, ma_uint64* pCursor) +MA_API ma_result ma_sound_get_cursor_in_pcm_frames(ma_sound* pSound, ma_uint64* pCursor) { ma_uint64 seekTarget; @@ -79357,7 +77680,7 @@ MA_API ma_result ma_sound_get_cursor_in_pcm_frames(const ma_sound* pSound, ma_ui } } -MA_API ma_result ma_sound_get_length_in_pcm_frames(const ma_sound* pSound, ma_uint64* pLength) +MA_API ma_result ma_sound_get_length_in_pcm_frames(ma_sound* pSound, ma_uint64* pLength) { if (pSound == NULL) { return MA_INVALID_ARGS; @@ -79371,7 +77694,7 @@ MA_API ma_result ma_sound_get_length_in_pcm_frames(const ma_sound* pSound, ma_ui return ma_data_source_get_length_in_pcm_frames(pSound->pDataSource, pLength); } -MA_API ma_result ma_sound_get_cursor_in_seconds(const ma_sound* pSound, float* pCursor) +MA_API ma_result ma_sound_get_cursor_in_seconds(ma_sound* pSound, float* pCursor) { ma_result result; ma_uint64 cursorInPCMFrames; @@ -79397,7 +77720,7 @@ MA_API ma_result ma_sound_get_cursor_in_seconds(const ma_sound* pSound, float* p return MA_SUCCESS; } -MA_API ma_result ma_sound_get_length_in_seconds(const ma_sound* pSound, float* pLength) +MA_API ma_result ma_sound_get_length_in_seconds(ma_sound* pSound, float* pLength) { if (pSound == NULL) { return MA_INVALID_ARGS; @@ -80216,12 +78539,12 @@ MA_PRIVATE ma_bool32 ma_dr_wav__seek_forward(ma_dr_wav_seek_proc onSeek, ma_uint ma_uint64 bytesRemainingToSeek = offset; while (bytesRemainingToSeek > 0) { if (bytesRemainingToSeek > 0x7FFFFFFF) { - if (!onSeek(pUserData, 0x7FFFFFFF, MA_DR_WAV_SEEK_CUR)) { + if (!onSeek(pUserData, 0x7FFFFFFF, ma_dr_wav_seek_origin_current)) { return MA_FALSE; } bytesRemainingToSeek -= 0x7FFFFFFF; } else { - if (!onSeek(pUserData, (int)bytesRemainingToSeek, MA_DR_WAV_SEEK_CUR)) { + if (!onSeek(pUserData, (int)bytesRemainingToSeek, ma_dr_wav_seek_origin_current)) { return MA_FALSE; } bytesRemainingToSeek = 0; @@ -80232,17 +78555,17 @@ MA_PRIVATE ma_bool32 ma_dr_wav__seek_forward(ma_dr_wav_seek_proc onSeek, ma_uint MA_PRIVATE ma_bool32 ma_dr_wav__seek_from_start(ma_dr_wav_seek_proc onSeek, ma_uint64 offset, void* pUserData) { if (offset <= 0x7FFFFFFF) { - return onSeek(pUserData, (int)offset, MA_DR_WAV_SEEK_SET); + return onSeek(pUserData, (int)offset, ma_dr_wav_seek_origin_start); } - if (!onSeek(pUserData, 0x7FFFFFFF, MA_DR_WAV_SEEK_SET)) { + if (!onSeek(pUserData, 0x7FFFFFFF, ma_dr_wav_seek_origin_start)) { return MA_FALSE; } offset -= 0x7FFFFFFF; for (;;) { if (offset <= 0x7FFFFFFF) { - return onSeek(pUserData, (int)offset, MA_DR_WAV_SEEK_CUR); + return onSeek(pUserData, (int)offset, ma_dr_wav_seek_origin_current); } - if (!onSeek(pUserData, 0x7FFFFFFF, MA_DR_WAV_SEEK_CUR)) { + if (!onSeek(pUserData, 0x7FFFFFFF, ma_dr_wav_seek_origin_current)) { return MA_FALSE; } offset -= 0x7FFFFFFF; @@ -80265,7 +78588,7 @@ MA_PRIVATE ma_bool32 ma_dr_wav__on_seek(ma_dr_wav_seek_proc onSeek, void* pUserD if (!onSeek(pUserData, offset, origin)) { return MA_FALSE; } - if (origin == MA_DR_WAV_SEEK_SET) { + if (origin == ma_dr_wav_seek_origin_start) { *pCursor = offset; } else { *pCursor += offset; @@ -80384,12 +78707,12 @@ MA_PRIVATE ma_uint64 ma_dr_wav__read_smpl_to_metadata_obj(ma_dr_wav__metadata_pa ma_uint8 smplLoopData[MA_DR_WAV_SMPL_LOOP_BYTES]; bytesJustRead = ma_dr_wav__metadata_parser_read(pParser, smplLoopData, sizeof(smplLoopData), &totalBytesRead); if (bytesJustRead == sizeof(smplLoopData)) { - pMetadata->data.smpl.pLoops[iSampleLoop].cuePointId = ma_dr_wav_bytes_to_u32(smplLoopData + 0); - pMetadata->data.smpl.pLoops[iSampleLoop].type = ma_dr_wav_bytes_to_u32(smplLoopData + 4); - pMetadata->data.smpl.pLoops[iSampleLoop].firstSampleOffset = ma_dr_wav_bytes_to_u32(smplLoopData + 8); - pMetadata->data.smpl.pLoops[iSampleLoop].lastSampleOffset = ma_dr_wav_bytes_to_u32(smplLoopData + 12); - pMetadata->data.smpl.pLoops[iSampleLoop].sampleFraction = ma_dr_wav_bytes_to_u32(smplLoopData + 16); - pMetadata->data.smpl.pLoops[iSampleLoop].playCount = ma_dr_wav_bytes_to_u32(smplLoopData + 20); + pMetadata->data.smpl.pLoops[iSampleLoop].cuePointId = ma_dr_wav_bytes_to_u32(smplLoopData + 0); + pMetadata->data.smpl.pLoops[iSampleLoop].type = ma_dr_wav_bytes_to_u32(smplLoopData + 4); + pMetadata->data.smpl.pLoops[iSampleLoop].firstSampleByteOffset = ma_dr_wav_bytes_to_u32(smplLoopData + 8); + pMetadata->data.smpl.pLoops[iSampleLoop].lastSampleByteOffset = ma_dr_wav_bytes_to_u32(smplLoopData + 12); + pMetadata->data.smpl.pLoops[iSampleLoop].sampleFraction = ma_dr_wav_bytes_to_u32(smplLoopData + 16); + pMetadata->data.smpl.pLoops[iSampleLoop].playCount = ma_dr_wav_bytes_to_u32(smplLoopData + 20); } else { break; } @@ -80433,7 +78756,7 @@ MA_PRIVATE ma_uint64 ma_dr_wav__read_cue_to_metadata_obj(ma_dr_wav__metadata_par pMetadata->data.cue.pCuePoints[iCuePoint].dataChunkId[3] = cuePointData[11]; pMetadata->data.cue.pCuePoints[iCuePoint].chunkStart = ma_dr_wav_bytes_to_u32(cuePointData + 12); pMetadata->data.cue.pCuePoints[iCuePoint].blockStart = ma_dr_wav_bytes_to_u32(cuePointData + 16); - pMetadata->data.cue.pCuePoints[iCuePoint].sampleOffset = ma_dr_wav_bytes_to_u32(cuePointData + 20); + pMetadata->data.cue.pCuePoints[iCuePoint].sampleByteOffset = ma_dr_wav_bytes_to_u32(cuePointData + 20); } else { break; } @@ -80773,7 +79096,7 @@ MA_PRIVATE ma_uint64 ma_dr_wav__metadata_process_chunk(ma_dr_wav__metadata_parse if (pParser->stage == ma_dr_wav__metadata_parser_stage_count) { ma_uint8 buffer[4]; size_t bytesJustRead; - if (!pParser->onSeek(pParser->pReadSeekUserData, 28, MA_DR_WAV_SEEK_CUR)) { + if (!pParser->onSeek(pParser->pReadSeekUserData, 28, ma_dr_wav_seek_origin_current)) { return bytesRead; } bytesRead += 28; @@ -80868,7 +79191,7 @@ MA_PRIVATE ma_uint64 ma_dr_wav__metadata_process_chunk(ma_dr_wav__metadata_parse return bytesRead; } allocSizeNeeded += ma_dr_wav__strlen(buffer) + 1; - allocSizeNeeded += (size_t)pChunkHeader->sizeInBytes - MA_DR_WAV_BEXT_BYTES + 1; + allocSizeNeeded += (size_t)pChunkHeader->sizeInBytes - MA_DR_WAV_BEXT_BYTES; ma_dr_wav__metadata_request_extra_memory_for_stage_2(pParser, allocSizeNeeded, 1); pParser->metadataCount += 1; } else { @@ -80951,16 +79274,6 @@ MA_PRIVATE ma_uint64 ma_dr_wav__metadata_process_chunk(ma_dr_wav__metadata_parse subchunkBytesRead = ma_dr_wav__metadata_process_info_text_chunk(pParser, subchunkDataSize, ma_dr_wav_metadata_type_list_info_album); } else if (ma_dr_wav__chunk_matches(allowedMetadataTypes, subchunkId, ma_dr_wav_metadata_type_list_info_tracknumber, "ITRK")) { subchunkBytesRead = ma_dr_wav__metadata_process_info_text_chunk(pParser, subchunkDataSize, ma_dr_wav_metadata_type_list_info_tracknumber); - } else if (ma_dr_wav__chunk_matches(allowedMetadataTypes, subchunkId, ma_dr_wav_metadata_type_list_info_location, "IARL")) { - subchunkBytesRead = ma_dr_wav__metadata_process_info_text_chunk(pParser, subchunkDataSize, ma_dr_wav_metadata_type_list_info_location); - } else if (ma_dr_wav__chunk_matches(allowedMetadataTypes, subchunkId, ma_dr_wav_metadata_type_list_info_organization, "ICMS")) { - subchunkBytesRead = ma_dr_wav__metadata_process_info_text_chunk(pParser, subchunkDataSize, ma_dr_wav_metadata_type_list_info_organization); - } else if (ma_dr_wav__chunk_matches(allowedMetadataTypes, subchunkId, ma_dr_wav_metadata_type_list_info_keywords, "IKEY")) { - subchunkBytesRead = ma_dr_wav__metadata_process_info_text_chunk(pParser, subchunkDataSize, ma_dr_wav_metadata_type_list_info_keywords); - } else if (ma_dr_wav__chunk_matches(allowedMetadataTypes, subchunkId, ma_dr_wav_metadata_type_list_info_medium, "IMED")) { - subchunkBytesRead = ma_dr_wav__metadata_process_info_text_chunk(pParser, subchunkDataSize, ma_dr_wav_metadata_type_list_info_medium); - } else if (ma_dr_wav__chunk_matches(allowedMetadataTypes, subchunkId, ma_dr_wav_metadata_type_list_info_description, "ISBJ")) { - subchunkBytesRead = ma_dr_wav__metadata_process_info_text_chunk(pParser, subchunkDataSize, ma_dr_wav_metadata_type_list_info_description); } else if ((allowedMetadataTypes & ma_dr_wav_metadata_type_unknown) != 0) { subchunkBytesRead = ma_dr_wav__metadata_process_unknown_chunk(pParser, subchunkId, subchunkDataSize, listType); } @@ -80968,13 +79281,13 @@ MA_PRIVATE ma_uint64 ma_dr_wav__metadata_process_chunk(ma_dr_wav__metadata_parse MA_DR_WAV_ASSERT(subchunkBytesRead <= subchunkDataSize); if (subchunkBytesRead < subchunkDataSize) { ma_uint64 bytesToSeek = subchunkDataSize - subchunkBytesRead; - if (!pParser->onSeek(pParser->pReadSeekUserData, (int)bytesToSeek, MA_DR_WAV_SEEK_CUR)) { + if (!pParser->onSeek(pParser->pReadSeekUserData, (int)bytesToSeek, ma_dr_wav_seek_origin_current)) { break; } bytesRead += bytesToSeek; } if ((subchunkDataSize % 2) == 1) { - if (!pParser->onSeek(pParser->pReadSeekUserData, 1, MA_DR_WAV_SEEK_CUR)) { + if (!pParser->onSeek(pParser->pReadSeekUserData, 1, ma_dr_wav_seek_origin_current)) { break; } bytesRead += 1; @@ -81011,7 +79324,7 @@ MA_API ma_uint16 ma_dr_wav_fmt_get_format(const ma_dr_wav_fmt* pFMT) return ma_dr_wav_bytes_to_u16(pFMT->subFormat); } } -MA_PRIVATE ma_bool32 ma_dr_wav_preinit(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_tell_proc onTell, void* pReadSeekTellUserData, const ma_allocation_callbacks* pAllocationCallbacks) +MA_PRIVATE ma_bool32 ma_dr_wav_preinit(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, void* pReadSeekUserData, const ma_allocation_callbacks* pAllocationCallbacks) { if (pWav == NULL || onRead == NULL || onSeek == NULL) { return MA_FALSE; @@ -81019,8 +79332,7 @@ MA_PRIVATE ma_bool32 ma_dr_wav_preinit(ma_dr_wav* pWav, ma_dr_wav_read_proc onRe MA_DR_WAV_ZERO_MEMORY(pWav, sizeof(*pWav)); pWav->onRead = onRead; pWav->onSeek = onSeek; - pWav->onTell = onTell; - pWav->pUserData = pReadSeekTellUserData; + pWav->pUserData = pReadSeekUserData; pWav->allocationCallbacks = ma_dr_wav_copy_allocation_callbacks_or_defaults(pAllocationCallbacks); if (pWav->allocationCallbacks.onFree == NULL || (pWav->allocationCallbacks.onMalloc == NULL && pWav->allocationCallbacks.onRealloc == NULL)) { return MA_FALSE; @@ -81234,14 +79546,14 @@ MA_PRIVATE ma_bool32 ma_dr_wav_init__internal(ma_dr_wav* pWav, ma_dr_wav_chunk_p fmt.channelMask = ma_dr_wav_bytes_to_u32_ex(fmtext + 2, pWav->container); ma_dr_wav_bytes_to_guid(fmtext + 6, fmt.subFormat); } else { - if (pWav->onSeek(pWav->pUserData, fmt.extendedSize, MA_DR_WAV_SEEK_CUR) == MA_FALSE) { + if (pWav->onSeek(pWav->pUserData, fmt.extendedSize, ma_dr_wav_seek_origin_current) == MA_FALSE) { return MA_FALSE; } } cursor += fmt.extendedSize; bytesReadSoFar += fmt.extendedSize; } - if (pWav->onSeek(pWav->pUserData, (int)(header.sizeInBytes - bytesReadSoFar), MA_DR_WAV_SEEK_CUR) == MA_FALSE) { + if (pWav->onSeek(pWav->pUserData, (int)(header.sizeInBytes - bytesReadSoFar), ma_dr_wav_seek_origin_current) == MA_FALSE) { return MA_FALSE; } cursor += (header.sizeInBytes - bytesReadSoFar); @@ -81392,26 +79704,15 @@ MA_PRIVATE ma_bool32 ma_dr_wav_init__internal(ma_dr_wav* pWav, ma_dr_wav_chunk_p return MA_FALSE; } offset = ma_dr_wav_bytes_to_u32_ex(offsetAndBlockSizeData + 0, pWav->container); - pWav->dataChunkDataPos = cursor + offset; - dataChunkSize = chunkSize; - if (dataChunkSize > offset) { - dataChunkSize -= offset; - } else { - dataChunkSize = 0; + if (ma_dr_wav__seek_forward(pWav->onSeek, offset, pWav->pUserData) == MA_FALSE) { + return MA_FALSE; } - if (sequential) { - if (foundChunk_fmt) { - if (ma_dr_wav__seek_forward(pWav->onSeek, offset, pWav->pUserData) == MA_FALSE) { - return MA_FALSE; - } - cursor += offset; - break; - } else { - return MA_FALSE; - } + cursor += offset; + pWav->dataChunkDataPos = cursor; + dataChunkSize = chunkSize; + if (sequential || !isProcessingMetadata) { + break; } else { - chunkSize += header.paddingSize; - chunkSize -= sizeof(offsetAndBlockSizeData); if (ma_dr_wav__seek_forward(pWav->onSeek, chunkSize, pWav->pUserData) == MA_FALSE) { break; } @@ -81475,17 +79776,6 @@ MA_PRIVATE ma_bool32 ma_dr_wav_init__internal(ma_dr_wav* pWav, ma_dr_wav_chunk_p pWav->pMetadata = metadataParser.pMetadata; pWav->metadataCount = metadataParser.metadataCount; } - if (pWav->onTell != NULL && pWav->onSeek != NULL) { - if (pWav->onSeek(pWav->pUserData, 0, MA_DR_WAV_SEEK_END) == MA_TRUE) { - ma_int64 fileSize; - if (pWav->onTell(pWav->pUserData, &fileSize)) { - if (dataChunkSize + pWav->dataChunkDataPos > (ma_uint64)fileSize) { - dataChunkSize = (ma_uint64)fileSize - pWav->dataChunkDataPos; - } - } - } else { - } - } if (dataChunkSize == 0xFFFFFFFF && (pWav->container == ma_dr_wav_container_riff || pWav->container == ma_dr_wav_container_rifx) && pWav->isSequentialWrite == MA_FALSE) { dataChunkSize = 0; for (;;) { @@ -81505,14 +79795,8 @@ MA_PRIVATE ma_bool32 ma_dr_wav_init__internal(ma_dr_wav* pWav, ma_dr_wav_chunk_p pWav->sampleRate = fmt.sampleRate; pWav->channels = fmt.channels; pWav->bitsPerSample = fmt.bitsPerSample; - pWav->translatedFormatTag = translatedFormatTag; - if (!ma_dr_wav__is_compressed_format_tag(translatedFormatTag)) { - ma_uint32 bytesPerFrame = ma_dr_wav_get_bytes_per_pcm_frame(pWav); - if (bytesPerFrame > 0) { - dataChunkSize -= (dataChunkSize % bytesPerFrame); - } - } pWav->bytesRemaining = dataChunkSize; + pWav->translatedFormatTag = translatedFormatTag; pWav->dataChunkDataSize = dataChunkSize; if (sampleCountFromFactChunk != 0) { pWav->totalPCMFrameCount = sampleCountFromFactChunk; @@ -81567,20 +79851,20 @@ MA_PRIVATE ma_bool32 ma_dr_wav_init__internal(ma_dr_wav* pWav, ma_dr_wav_chunk_p #endif return MA_TRUE; } -MA_API ma_bool32 ma_dr_wav_init(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_tell_proc onTell, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_bool32 ma_dr_wav_init(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks) { - return ma_dr_wav_init_ex(pWav, onRead, onSeek, onTell, NULL, pUserData, NULL, 0, pAllocationCallbacks); + return ma_dr_wav_init_ex(pWav, onRead, onSeek, NULL, pUserData, NULL, 0, pAllocationCallbacks); } -MA_API ma_bool32 ma_dr_wav_init_ex(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_tell_proc onTell, ma_dr_wav_chunk_proc onChunk, void* pReadSeekTellUserData, void* pChunkUserData, ma_uint32 flags, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_bool32 ma_dr_wav_init_ex(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_chunk_proc onChunk, void* pReadSeekUserData, void* pChunkUserData, ma_uint32 flags, const ma_allocation_callbacks* pAllocationCallbacks) { - if (!ma_dr_wav_preinit(pWav, onRead, onSeek, onTell, pReadSeekTellUserData, pAllocationCallbacks)) { + if (!ma_dr_wav_preinit(pWav, onRead, onSeek, pReadSeekUserData, pAllocationCallbacks)) { return MA_FALSE; } return ma_dr_wav_init__internal(pWav, onChunk, pChunkUserData, flags); } -MA_API ma_bool32 ma_dr_wav_init_with_metadata(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_tell_proc onTell, void* pUserData, ma_uint32 flags, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_bool32 ma_dr_wav_init_with_metadata(ma_dr_wav* pWav, ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, void* pUserData, ma_uint32 flags, const ma_allocation_callbacks* pAllocationCallbacks) { - if (!ma_dr_wav_preinit(pWav, onRead, onSeek, onTell, pUserData, pAllocationCallbacks)) { + if (!ma_dr_wav_preinit(pWav, onRead, onSeek, pUserData, pAllocationCallbacks)) { return MA_FALSE; } return ma_dr_wav_init__internal(pWav, NULL, NULL, flags | MA_DR_WAV_WITH_METADATA); @@ -81742,8 +80026,8 @@ MA_PRIVATE size_t ma_dr_wav__write_or_count_metadata(ma_dr_wav* pWav, ma_dr_wav_ for (iLoop = 0; iLoop < pMetadata->data.smpl.sampleLoopCount; ++iLoop) { bytesWritten += ma_dr_wav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.pLoops[iLoop].cuePointId); bytesWritten += ma_dr_wav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.pLoops[iLoop].type); - bytesWritten += ma_dr_wav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.pLoops[iLoop].firstSampleOffset); - bytesWritten += ma_dr_wav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.pLoops[iLoop].lastSampleOffset); + bytesWritten += ma_dr_wav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.pLoops[iLoop].firstSampleByteOffset); + bytesWritten += ma_dr_wav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.pLoops[iLoop].lastSampleByteOffset); bytesWritten += ma_dr_wav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.pLoops[iLoop].sampleFraction); bytesWritten += ma_dr_wav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.pLoops[iLoop].playCount); } @@ -81777,7 +80061,7 @@ MA_PRIVATE size_t ma_dr_wav__write_or_count_metadata(ma_dr_wav* pWav, ma_dr_wav_ bytesWritten += ma_dr_wav__write_or_count(pWav, pMetadata->data.cue.pCuePoints[iCuePoint].dataChunkId, 4); bytesWritten += ma_dr_wav__write_or_count_u32ne_to_le(pWav, pMetadata->data.cue.pCuePoints[iCuePoint].chunkStart); bytesWritten += ma_dr_wav__write_or_count_u32ne_to_le(pWav, pMetadata->data.cue.pCuePoints[iCuePoint].blockStart); - bytesWritten += ma_dr_wav__write_or_count_u32ne_to_le(pWav, pMetadata->data.cue.pCuePoints[iCuePoint].sampleOffset); + bytesWritten += ma_dr_wav__write_or_count_u32ne_to_le(pWav, pMetadata->data.cue.pCuePoints[iCuePoint].sampleByteOffset); } } break; case ma_dr_wav_metadata_type_acid: @@ -81863,20 +80147,15 @@ MA_PRIVATE size_t ma_dr_wav__write_or_count_metadata(ma_dr_wav* pWav, ma_dr_wav_ if (pMetadata->type & ma_dr_wav_metadata_type_list_all_info_strings) { const char* pID = NULL; switch (pMetadata->type) { - case ma_dr_wav_metadata_type_list_info_software: pID = "ISFT"; break; - case ma_dr_wav_metadata_type_list_info_copyright: pID = "ICOP"; break; - case ma_dr_wav_metadata_type_list_info_title: pID = "INAM"; break; - case ma_dr_wav_metadata_type_list_info_artist: pID = "IART"; break; - case ma_dr_wav_metadata_type_list_info_comment: pID = "ICMT"; break; - case ma_dr_wav_metadata_type_list_info_date: pID = "ICRD"; break; - case ma_dr_wav_metadata_type_list_info_genre: pID = "IGNR"; break; - case ma_dr_wav_metadata_type_list_info_album: pID = "IPRD"; break; - case ma_dr_wav_metadata_type_list_info_tracknumber: pID = "ITRK"; break; - case ma_dr_wav_metadata_type_list_info_location: pID = "IARL"; break; - case ma_dr_wav_metadata_type_list_info_organization: pID = "ICMS"; break; - case ma_dr_wav_metadata_type_list_info_keywords: pID = "IKEY"; break; - case ma_dr_wav_metadata_type_list_info_medium: pID = "IMED"; break; - case ma_dr_wav_metadata_type_list_info_description: pID = "ISBJ"; break; + case ma_dr_wav_metadata_type_list_info_software: pID = "ISFT"; break; + case ma_dr_wav_metadata_type_list_info_copyright: pID = "ICOP"; break; + case ma_dr_wav_metadata_type_list_info_title: pID = "INAM"; break; + case ma_dr_wav_metadata_type_list_info_artist: pID = "IART"; break; + case ma_dr_wav_metadata_type_list_info_comment: pID = "ICMT"; break; + case ma_dr_wav_metadata_type_list_info_date: pID = "ICRD"; break; + case ma_dr_wav_metadata_type_list_info_genre: pID = "IGNR"; break; + case ma_dr_wav_metadata_type_list_info_album: pID = "IPRD"; break; + case ma_dr_wav_metadata_type_list_info_tracknumber: pID = "ITRK"; break; default: break; } MA_DR_WAV_ASSERT(pID != NULL); @@ -82091,7 +80370,7 @@ MA_PRIVATE ma_bool32 ma_dr_wav_init_write__internal(ma_dr_wav* pWav, const ma_dr } pWav->dataChunkDataSizeTargetWrite = initialDataChunkSize; if (pFormat->container == ma_dr_wav_container_riff) { - ma_uint32 chunkSizeRIFF = 36 + (ma_uint32)initialDataChunkSize; + ma_uint32 chunkSizeRIFF = 28 + (ma_uint32)initialDataChunkSize; runningPos += ma_dr_wav__write(pWav, "RIFF", 4); runningPos += ma_dr_wav__write_u32ne_to_le(pWav, chunkSizeRIFF); runningPos += ma_dr_wav__write(pWav, "WAVE", 4); @@ -82214,31 +80493,7 @@ MA_PRIVATE size_t ma_dr_wav__on_write_stdio(void* pUserData, const void* pData, } MA_PRIVATE ma_bool32 ma_dr_wav__on_seek_stdio(void* pUserData, int offset, ma_dr_wav_seek_origin origin) { - int whence = SEEK_SET; - if (origin == MA_DR_WAV_SEEK_CUR) { - whence = SEEK_CUR; - } else if (origin == MA_DR_WAV_SEEK_END) { - whence = SEEK_END; - } - return fseek((FILE*)pUserData, offset, whence) == 0; -} -MA_PRIVATE ma_bool32 ma_dr_wav__on_tell_stdio(void* pUserData, ma_int64* pCursor) -{ - FILE* pFileStdio = (FILE*)pUserData; - ma_int64 result; - MA_DR_WAV_ASSERT(pFileStdio != NULL); - MA_DR_WAV_ASSERT(pCursor != NULL); -#if defined(_WIN32) && !defined(NXDK) - #if defined(_MSC_VER) && _MSC_VER > 1200 - result = _ftelli64(pFileStdio); - #else - result = ftell(pFileStdio); - #endif -#else - result = ftell(pFileStdio); -#endif - *pCursor = result; - return MA_TRUE; + return fseek((FILE*)pUserData, offset, (origin == ma_dr_wav_seek_origin_current) ? SEEK_CUR : SEEK_SET) == 0; } MA_API ma_bool32 ma_dr_wav_init_file(ma_dr_wav* pWav, const char* filename, const ma_allocation_callbacks* pAllocationCallbacks) { @@ -82247,7 +80502,7 @@ MA_API ma_bool32 ma_dr_wav_init_file(ma_dr_wav* pWav, const char* filename, cons MA_PRIVATE ma_bool32 ma_dr_wav_init_file__internal_FILE(ma_dr_wav* pWav, FILE* pFile, ma_dr_wav_chunk_proc onChunk, void* pChunkUserData, ma_uint32 flags, const ma_allocation_callbacks* pAllocationCallbacks) { ma_bool32 result; - result = ma_dr_wav_preinit(pWav, ma_dr_wav__on_read_stdio, ma_dr_wav__on_seek_stdio, ma_dr_wav__on_tell_stdio, (void*)pFile, pAllocationCallbacks); + result = ma_dr_wav_preinit(pWav, ma_dr_wav__on_read_stdio, ma_dr_wav__on_seek_stdio, (void*)pFile, pAllocationCallbacks); if (result != MA_TRUE) { fclose(pFile); return result; @@ -82384,27 +80639,25 @@ MA_PRIVATE size_t ma_dr_wav__on_read_memory(void* pUserData, void* pBufferOut, s MA_PRIVATE ma_bool32 ma_dr_wav__on_seek_memory(void* pUserData, int offset, ma_dr_wav_seek_origin origin) { ma_dr_wav* pWav = (ma_dr_wav*)pUserData; - ma_int64 newCursor; MA_DR_WAV_ASSERT(pWav != NULL); - newCursor = pWav->memoryStream.currentReadPos; - if (origin == MA_DR_WAV_SEEK_SET) { - newCursor = 0; - } else if (origin == MA_DR_WAV_SEEK_CUR) { - newCursor = (ma_int64)pWav->memoryStream.currentReadPos; - } else if (origin == MA_DR_WAV_SEEK_END) { - newCursor = (ma_int64)pWav->memoryStream.dataSize; + if (origin == ma_dr_wav_seek_origin_current) { + if (offset > 0) { + if (pWav->memoryStream.currentReadPos + offset > pWav->memoryStream.dataSize) { + return MA_FALSE; + } + } else { + if (pWav->memoryStream.currentReadPos < (size_t)-offset) { + return MA_FALSE; + } + } + pWav->memoryStream.currentReadPos += offset; } else { - MA_DR_WAV_ASSERT(!"Invalid seek origin"); - return MA_FALSE; + if ((ma_uint32)offset <= pWav->memoryStream.dataSize) { + pWav->memoryStream.currentReadPos = offset; + } else { + return MA_FALSE; + } } - newCursor += offset; - if (newCursor < 0) { - return MA_FALSE; - } - if ((size_t)newCursor > pWav->memoryStream.dataSize) { - return MA_FALSE; - } - pWav->memoryStream.currentReadPos = (size_t)newCursor; return MA_TRUE; } MA_PRIVATE size_t ma_dr_wav__on_write_memory(void* pUserData, const void* pDataIn, size_t bytesToWrite) @@ -82438,35 +80691,25 @@ MA_PRIVATE size_t ma_dr_wav__on_write_memory(void* pUserData, const void* pDataI MA_PRIVATE ma_bool32 ma_dr_wav__on_seek_memory_write(void* pUserData, int offset, ma_dr_wav_seek_origin origin) { ma_dr_wav* pWav = (ma_dr_wav*)pUserData; - ma_int64 newCursor; MA_DR_WAV_ASSERT(pWav != NULL); - newCursor = pWav->memoryStreamWrite.currentWritePos; - if (origin == MA_DR_WAV_SEEK_SET) { - newCursor = 0; - } else if (origin == MA_DR_WAV_SEEK_CUR) { - newCursor = (ma_int64)pWav->memoryStreamWrite.currentWritePos; - } else if (origin == MA_DR_WAV_SEEK_END) { - newCursor = (ma_int64)pWav->memoryStreamWrite.dataSize; + if (origin == ma_dr_wav_seek_origin_current) { + if (offset > 0) { + if (pWav->memoryStreamWrite.currentWritePos + offset > pWav->memoryStreamWrite.dataSize) { + offset = (int)(pWav->memoryStreamWrite.dataSize - pWav->memoryStreamWrite.currentWritePos); + } + } else { + if (pWav->memoryStreamWrite.currentWritePos < (size_t)-offset) { + offset = -(int)pWav->memoryStreamWrite.currentWritePos; + } + } + pWav->memoryStreamWrite.currentWritePos += offset; } else { - MA_DR_WAV_ASSERT(!"Invalid seek origin"); - return MA_INVALID_ARGS; + if ((ma_uint32)offset <= pWav->memoryStreamWrite.dataSize) { + pWav->memoryStreamWrite.currentWritePos = offset; + } else { + pWav->memoryStreamWrite.currentWritePos = pWav->memoryStreamWrite.dataSize; + } } - newCursor += offset; - if (newCursor < 0) { - return MA_FALSE; - } - if ((size_t)newCursor > pWav->memoryStreamWrite.dataSize) { - return MA_FALSE; - } - pWav->memoryStreamWrite.currentWritePos = (size_t)newCursor; - return MA_TRUE; -} -MA_PRIVATE ma_bool32 ma_dr_wav__on_tell_memory(void* pUserData, ma_int64* pCursor) -{ - ma_dr_wav* pWav = (ma_dr_wav*)pUserData; - MA_DR_WAV_ASSERT(pWav != NULL); - MA_DR_WAV_ASSERT(pCursor != NULL); - *pCursor = (ma_int64)pWav->memoryStream.currentReadPos; return MA_TRUE; } MA_API ma_bool32 ma_dr_wav_init_memory(ma_dr_wav* pWav, const void* data, size_t dataSize, const ma_allocation_callbacks* pAllocationCallbacks) @@ -82478,7 +80721,7 @@ MA_API ma_bool32 ma_dr_wav_init_memory_ex(ma_dr_wav* pWav, const void* data, siz if (data == NULL || dataSize == 0) { return MA_FALSE; } - if (!ma_dr_wav_preinit(pWav, ma_dr_wav__on_read_memory, ma_dr_wav__on_seek_memory, ma_dr_wav__on_tell_memory, pWav, pAllocationCallbacks)) { + if (!ma_dr_wav_preinit(pWav, ma_dr_wav__on_read_memory, ma_dr_wav__on_seek_memory, pWav, pAllocationCallbacks)) { return MA_FALSE; } pWav->memoryStream.data = (const ma_uint8*)data; @@ -82491,7 +80734,7 @@ MA_API ma_bool32 ma_dr_wav_init_memory_with_metadata(ma_dr_wav* pWav, const void if (data == NULL || dataSize == 0) { return MA_FALSE; } - if (!ma_dr_wav_preinit(pWav, ma_dr_wav__on_read_memory, ma_dr_wav__on_seek_memory, ma_dr_wav__on_tell_memory, pWav, pAllocationCallbacks)) { + if (!ma_dr_wav_preinit(pWav, ma_dr_wav__on_read_memory, ma_dr_wav__on_seek_memory, pWav, pAllocationCallbacks)) { return MA_FALSE; } pWav->memoryStream.data = (const ma_uint8*)data; @@ -82550,30 +80793,30 @@ MA_API ma_result ma_dr_wav_uninit(ma_dr_wav* pWav) } if (pWav->onSeek && !pWav->isSequentialWrite) { if (pWav->container == ma_dr_wav_container_riff) { - if (pWav->onSeek(pWav->pUserData, 4, MA_DR_WAV_SEEK_SET)) { + if (pWav->onSeek(pWav->pUserData, 4, ma_dr_wav_seek_origin_start)) { ma_uint32 riffChunkSize = ma_dr_wav__riff_chunk_size_riff(pWav->dataChunkDataSize, pWav->pMetadata, pWav->metadataCount); ma_dr_wav__write_u32ne_to_le(pWav, riffChunkSize); } - if (pWav->onSeek(pWav->pUserData, (int)pWav->dataChunkDataPos - 4, MA_DR_WAV_SEEK_SET)) { + if (pWav->onSeek(pWav->pUserData, (int)pWav->dataChunkDataPos - 4, ma_dr_wav_seek_origin_start)) { ma_uint32 dataChunkSize = ma_dr_wav__data_chunk_size_riff(pWav->dataChunkDataSize); ma_dr_wav__write_u32ne_to_le(pWav, dataChunkSize); } } else if (pWav->container == ma_dr_wav_container_w64) { - if (pWav->onSeek(pWav->pUserData, 16, MA_DR_WAV_SEEK_SET)) { + if (pWav->onSeek(pWav->pUserData, 16, ma_dr_wav_seek_origin_start)) { ma_uint64 riffChunkSize = ma_dr_wav__riff_chunk_size_w64(pWav->dataChunkDataSize); ma_dr_wav__write_u64ne_to_le(pWav, riffChunkSize); } - if (pWav->onSeek(pWav->pUserData, (int)pWav->dataChunkDataPos - 8, MA_DR_WAV_SEEK_SET)) { + if (pWav->onSeek(pWav->pUserData, (int)pWav->dataChunkDataPos - 8, ma_dr_wav_seek_origin_start)) { ma_uint64 dataChunkSize = ma_dr_wav__data_chunk_size_w64(pWav->dataChunkDataSize); ma_dr_wav__write_u64ne_to_le(pWav, dataChunkSize); } } else if (pWav->container == ma_dr_wav_container_rf64) { int ds64BodyPos = 12 + 8; - if (pWav->onSeek(pWav->pUserData, ds64BodyPos + 0, MA_DR_WAV_SEEK_SET)) { + if (pWav->onSeek(pWav->pUserData, ds64BodyPos + 0, ma_dr_wav_seek_origin_start)) { ma_uint64 riffChunkSize = ma_dr_wav__riff_chunk_size_rf64(pWav->dataChunkDataSize, pWav->pMetadata, pWav->metadataCount); ma_dr_wav__write_u64ne_to_le(pWav, riffChunkSize); } - if (pWav->onSeek(pWav->pUserData, ds64BodyPos + 8, MA_DR_WAV_SEEK_SET)) { + if (pWav->onSeek(pWav->pUserData, ds64BodyPos + 8, ma_dr_wav_seek_origin_start)) { ma_uint64 dataChunkSize = ma_dr_wav__data_chunk_size_rf64(pWav->dataChunkDataSize); ma_dr_wav__write_u64ne_to_le(pWav, dataChunkSize); } @@ -82620,7 +80863,7 @@ MA_API size_t ma_dr_wav_read_raw(ma_dr_wav* pWav, size_t bytesToRead, void* pBuf if (bytesToSeek > 0x7FFFFFFF) { bytesToSeek = 0x7FFFFFFF; } - if (pWav->onSeek(pWav->pUserData, (int)bytesToSeek, MA_DR_WAV_SEEK_CUR) == MA_FALSE) { + if (pWav->onSeek(pWav->pUserData, (int)bytesToSeek, ma_dr_wav_seek_origin_current) == MA_FALSE) { break; } bytesRead += bytesToSeek; @@ -82719,7 +80962,7 @@ MA_PRIVATE ma_bool32 ma_dr_wav_seek_to_first_pcm_frame(ma_dr_wav* pWav) if (pWav->onWrite != NULL) { return MA_FALSE; } - if (!pWav->onSeek(pWav->pUserData, (int)pWav->dataChunkDataPos, MA_DR_WAV_SEEK_SET)) { + if (!pWav->onSeek(pWav->pUserData, (int)pWav->dataChunkDataPos, ma_dr_wav_seek_origin_start)) { return MA_FALSE; } if (ma_dr_wav__is_compressed_format_tag(pWav->translatedFormatTag)) { @@ -82800,7 +81043,7 @@ MA_API ma_bool32 ma_dr_wav_seek_to_pcm_frame(ma_dr_wav* pWav, ma_uint64 targetFr } while (offset > 0) { int offset32 = ((offset > INT_MAX) ? INT_MAX : (int)offset); - if (!pWav->onSeek(pWav->pUserData, offset32, MA_DR_WAV_SEEK_CUR)) { + if (!pWav->onSeek(pWav->pUserData, offset32, ma_dr_wav_seek_origin_current)) { return MA_FALSE; } pWav->readCursorInPCMFrames += offset32 / bytesPerFrame; @@ -82926,12 +81169,12 @@ MA_API ma_uint64 ma_dr_wav_write_pcm_frames(ma_dr_wav* pWav, ma_uint64 framesToW MA_PRIVATE ma_uint64 ma_dr_wav_read_pcm_frames_s16__msadpcm(ma_dr_wav* pWav, ma_uint64 framesToRead, ma_int16* pBufferOut) { ma_uint64 totalFramesRead = 0; - static const ma_int32 adaptationTable[] = { + static ma_int32 adaptationTable[] = { 230, 230, 230, 230, 307, 409, 512, 614, 768, 614, 512, 409, 307, 230, 230, 230 }; - static const ma_int32 coeff1Table[] = { 256, 512, 0, 192, 240, 460, 392 }; - static const ma_int32 coeff2Table[] = { 0, -256, 0, 64, 0, -208, -232 }; + static ma_int32 coeff1Table[] = { 256, 512, 0, 192, 240, 460, 392 }; + static ma_int32 coeff2Table[] = { 0, -256, 0, 64, 0, -208, -232 }; MA_DR_WAV_ASSERT(pWav != NULL); MA_DR_WAV_ASSERT(framesToRead > 0); while (pWav->readCursorInPCMFrames < pWav->totalPCMFrameCount) { @@ -83064,11 +81307,11 @@ MA_PRIVATE ma_uint64 ma_dr_wav_read_pcm_frames_s16__ima(ma_dr_wav* pWav, ma_uint { ma_uint64 totalFramesRead = 0; ma_uint32 iChannel; - static const ma_int32 indexTable[16] = { + static ma_int32 indexTable[16] = { -1, -1, -1, -1, 2, 4, 6, 8, -1, -1, -1, -1, 2, 4, 6, 8 }; - static const ma_int32 stepTable[89] = { + static ma_int32 stepTable[89] = { 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, 19, 21, 23, 25, 28, 31, 34, 37, 41, 45, 50, 55, 60, 66, 73, 80, 88, 97, 107, 118, @@ -83091,7 +81334,7 @@ MA_PRIVATE ma_uint64 ma_dr_wav_read_pcm_frames_s16__ima(ma_dr_wav* pWav, ma_uint } pWav->ima.bytesRemainingInBlock = pWav->fmt.blockAlign - sizeof(header); if (header[2] >= ma_dr_wav_countof(stepTable)) { - pWav->onSeek(pWav->pUserData, pWav->ima.bytesRemainingInBlock, MA_DR_WAV_SEEK_CUR); + pWav->onSeek(pWav->pUserData, pWav->ima.bytesRemainingInBlock, ma_dr_wav_seek_origin_current); pWav->ima.bytesRemainingInBlock = 0; return totalFramesRead; } @@ -83106,7 +81349,7 @@ MA_PRIVATE ma_uint64 ma_dr_wav_read_pcm_frames_s16__ima(ma_dr_wav* pWav, ma_uint } pWav->ima.bytesRemainingInBlock = pWav->fmt.blockAlign - sizeof(header); if (header[2] >= ma_dr_wav_countof(stepTable) || header[6] >= ma_dr_wav_countof(stepTable)) { - pWav->onSeek(pWav->pUserData, pWav->ima.bytesRemainingInBlock, MA_DR_WAV_SEEK_CUR); + pWav->onSeek(pWav->pUserData, pWav->ima.bytesRemainingInBlock, ma_dr_wav_seek_origin_current); pWav->ima.bytesRemainingInBlock = 0; return totalFramesRead; } @@ -83181,7 +81424,7 @@ MA_PRIVATE ma_uint64 ma_dr_wav_read_pcm_frames_s16__ima(ma_dr_wav* pWav, ma_uint return totalFramesRead; } #ifndef MA_DR_WAV_NO_CONVERSION_API -static const unsigned short ma_dr_wav_gAlawTable[256] = { +static unsigned short g_ma_dr_wavAlawTable[256] = { 0xEA80, 0xEB80, 0xE880, 0xE980, 0xEE80, 0xEF80, 0xEC80, 0xED80, 0xE280, 0xE380, 0xE080, 0xE180, 0xE680, 0xE780, 0xE480, 0xE580, 0xF540, 0xF5C0, 0xF440, 0xF4C0, 0xF740, 0xF7C0, 0xF640, 0xF6C0, 0xF140, 0xF1C0, 0xF040, 0xF0C0, 0xF340, 0xF3C0, 0xF240, 0xF2C0, 0xAA00, 0xAE00, 0xA200, 0xA600, 0xBA00, 0xBE00, 0xB200, 0xB600, 0x8A00, 0x8E00, 0x8200, 0x8600, 0x9A00, 0x9E00, 0x9200, 0x9600, @@ -83199,7 +81442,7 @@ static const unsigned short ma_dr_wav_gAlawTable[256] = { 0x0560, 0x0520, 0x05E0, 0x05A0, 0x0460, 0x0420, 0x04E0, 0x04A0, 0x0760, 0x0720, 0x07E0, 0x07A0, 0x0660, 0x0620, 0x06E0, 0x06A0, 0x02B0, 0x0290, 0x02F0, 0x02D0, 0x0230, 0x0210, 0x0270, 0x0250, 0x03B0, 0x0390, 0x03F0, 0x03D0, 0x0330, 0x0310, 0x0370, 0x0350 }; -static const unsigned short ma_dr_wav_gMulawTable[256] = { +static unsigned short g_ma_dr_wavMulawTable[256] = { 0x8284, 0x8684, 0x8A84, 0x8E84, 0x9284, 0x9684, 0x9A84, 0x9E84, 0xA284, 0xA684, 0xAA84, 0xAE84, 0xB284, 0xB684, 0xBA84, 0xBE84, 0xC184, 0xC384, 0xC584, 0xC784, 0xC984, 0xCB84, 0xCD84, 0xCF84, 0xD184, 0xD384, 0xD584, 0xD784, 0xD984, 0xDB84, 0xDD84, 0xDF84, 0xE104, 0xE204, 0xE304, 0xE404, 0xE504, 0xE604, 0xE704, 0xE804, 0xE904, 0xEA04, 0xEB04, 0xEC04, 0xED04, 0xEE04, 0xEF04, 0xF004, @@ -83219,11 +81462,11 @@ static const unsigned short ma_dr_wav_gMulawTable[256] = { }; static MA_INLINE ma_int16 ma_dr_wav__alaw_to_s16(ma_uint8 sampleIn) { - return (short)ma_dr_wav_gAlawTable[sampleIn]; + return (short)g_ma_dr_wavAlawTable[sampleIn]; } static MA_INLINE ma_int16 ma_dr_wav__mulaw_to_s16(ma_uint8 sampleIn) { - return (short)ma_dr_wav_gMulawTable[sampleIn]; + return (short)g_ma_dr_wavMulawTable[sampleIn]; } MA_PRIVATE void ma_dr_wav__pcm_to_s16(ma_int16* pOut, const ma_uint8* pIn, size_t totalSampleCount, unsigned int bytesPerSample) { @@ -84382,7 +82625,7 @@ MA_PRIVATE ma_int32* ma_dr_wav__read_pcm_frames_and_close_s32(ma_dr_wav* pWav, u } return pSampleData; } -MA_API ma_int16* ma_dr_wav_open_and_read_pcm_frames_s16(ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_tell_proc onTell, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_int16* ma_dr_wav_open_and_read_pcm_frames_s16(ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks) { ma_dr_wav wav; if (channelsOut) { @@ -84394,12 +82637,12 @@ MA_API ma_int16* ma_dr_wav_open_and_read_pcm_frames_s16(ma_dr_wav_read_proc onRe if (totalFrameCountOut) { *totalFrameCountOut = 0; } - if (!ma_dr_wav_init(&wav, onRead, onSeek, onTell, pUserData, pAllocationCallbacks)) { + if (!ma_dr_wav_init(&wav, onRead, onSeek, pUserData, pAllocationCallbacks)) { return NULL; } return ma_dr_wav__read_pcm_frames_and_close_s16(&wav, channelsOut, sampleRateOut, totalFrameCountOut); } -MA_API float* ma_dr_wav_open_and_read_pcm_frames_f32(ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_tell_proc onTell, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API float* ma_dr_wav_open_and_read_pcm_frames_f32(ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks) { ma_dr_wav wav; if (channelsOut) { @@ -84411,12 +82654,12 @@ MA_API float* ma_dr_wav_open_and_read_pcm_frames_f32(ma_dr_wav_read_proc onRead, if (totalFrameCountOut) { *totalFrameCountOut = 0; } - if (!ma_dr_wav_init(&wav, onRead, onSeek, onTell, pUserData, pAllocationCallbacks)) { + if (!ma_dr_wav_init(&wav, onRead, onSeek, pUserData, pAllocationCallbacks)) { return NULL; } return ma_dr_wav__read_pcm_frames_and_close_f32(&wav, channelsOut, sampleRateOut, totalFrameCountOut); } -MA_API ma_int32* ma_dr_wav_open_and_read_pcm_frames_s32(ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, ma_dr_wav_tell_proc onTell, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_int32* ma_dr_wav_open_and_read_pcm_frames_s32(ma_dr_wav_read_proc onRead, ma_dr_wav_seek_proc onSeek, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks) { ma_dr_wav wav; if (channelsOut) { @@ -84428,7 +82671,7 @@ MA_API ma_int32* ma_dr_wav_open_and_read_pcm_frames_s32(ma_dr_wav_read_proc onRe if (totalFrameCountOut) { *totalFrameCountOut = 0; } - if (!ma_dr_wav_init(&wav, onRead, onSeek, onTell, pUserData, pAllocationCallbacks)) { + if (!ma_dr_wav_init(&wav, onRead, onSeek, pUserData, pAllocationCallbacks)) { return NULL; } return ma_dr_wav__read_pcm_frames_and_close_s32(&wav, channelsOut, sampleRateOut, totalFrameCountOut); @@ -85863,23 +84106,23 @@ static ma_bool32 ma_dr_flac__seek_to_byte(ma_dr_flac_bs* bs, ma_uint64 offsetFro MA_DR_FLAC_ASSERT(offsetFromStart > 0); if (offsetFromStart > 0x7FFFFFFF) { ma_uint64 bytesRemaining = offsetFromStart; - if (!bs->onSeek(bs->pUserData, 0x7FFFFFFF, MA_DR_FLAC_SEEK_SET)) { + if (!bs->onSeek(bs->pUserData, 0x7FFFFFFF, ma_dr_flac_seek_origin_start)) { return MA_FALSE; } bytesRemaining -= 0x7FFFFFFF; while (bytesRemaining > 0x7FFFFFFF) { - if (!bs->onSeek(bs->pUserData, 0x7FFFFFFF, MA_DR_FLAC_SEEK_CUR)) { + if (!bs->onSeek(bs->pUserData, 0x7FFFFFFF, ma_dr_flac_seek_origin_current)) { return MA_FALSE; } bytesRemaining -= 0x7FFFFFFF; } if (bytesRemaining > 0) { - if (!bs->onSeek(bs->pUserData, (int)bytesRemaining, MA_DR_FLAC_SEEK_CUR)) { + if (!bs->onSeek(bs->pUserData, (int)bytesRemaining, ma_dr_flac_seek_origin_current)) { return MA_FALSE; } } } else { - if (!bs->onSeek(bs->pUserData, (int)offsetFromStart, MA_DR_FLAC_SEEK_SET)) { + if (!bs->onSeek(bs->pUserData, (int)offsetFromStart, ma_dr_flac_seek_origin_start)) { return MA_FALSE; } } @@ -88357,7 +86600,6 @@ typedef struct { ma_dr_flac_read_proc onRead; ma_dr_flac_seek_proc onSeek; - ma_dr_flac_tell_proc onTell; ma_dr_flac_meta_proc onMeta; ma_dr_flac_container container; void* pUserData; @@ -88486,12 +86728,11 @@ static void ma_dr_flac__free_from_callbacks(void* p, const ma_allocation_callbac pAllocationCallbacks->onFree(p, pAllocationCallbacks->pUserData); } } -static ma_bool32 ma_dr_flac__read_and_decode_metadata(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, ma_dr_flac_meta_proc onMeta, void* pUserData, void* pUserDataMD, ma_uint64* pFirstFramePos, ma_uint64* pSeektablePos, ma_uint32* pSeekpointCount, ma_allocation_callbacks* pAllocationCallbacks) +static ma_bool32 ma_dr_flac__read_and_decode_metadata(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_meta_proc onMeta, void* pUserData, void* pUserDataMD, ma_uint64* pFirstFramePos, ma_uint64* pSeektablePos, ma_uint32* pSeekpointCount, ma_allocation_callbacks* pAllocationCallbacks) { ma_uint64 runningFilePos = 42; ma_uint64 seektablePos = 0; ma_uint32 seektableSize = 0; - (void)onTell; for (;;) { ma_dr_flac_metadata metadata; ma_uint8 isLastBlock = 0; @@ -88749,7 +86990,7 @@ static ma_bool32 ma_dr_flac__read_and_decode_metadata(ma_dr_flac_read_proc onRea { if (onMeta) { metadata.data.padding.unused = 0; - if (!onSeek(pUserData, blockSize, MA_DR_FLAC_SEEK_CUR)) { + if (!onSeek(pUserData, blockSize, ma_dr_flac_seek_origin_current)) { isLastBlock = MA_TRUE; } else { onMeta(pUserDataMD, &metadata); @@ -88759,7 +87000,7 @@ static ma_bool32 ma_dr_flac__read_and_decode_metadata(ma_dr_flac_read_proc onRea case MA_DR_FLAC_METADATA_BLOCK_TYPE_INVALID: { if (onMeta) { - if (!onSeek(pUserData, blockSize, MA_DR_FLAC_SEEK_CUR)) { + if (!onSeek(pUserData, blockSize, ma_dr_flac_seek_origin_current)) { isLastBlock = MA_TRUE; } } @@ -88783,7 +87024,7 @@ static ma_bool32 ma_dr_flac__read_and_decode_metadata(ma_dr_flac_read_proc onRea } break; } if (onMeta == NULL && blockSize > 0) { - if (!onSeek(pUserData, blockSize, MA_DR_FLAC_SEEK_CUR)) { + if (!onSeek(pUserData, blockSize, ma_dr_flac_seek_origin_current)) { isLastBlock = MA_TRUE; } } @@ -89047,7 +87288,6 @@ typedef struct { ma_dr_flac_read_proc onRead; ma_dr_flac_seek_proc onSeek; - ma_dr_flac_tell_proc onTell; void* pUserData; ma_uint64 currentBytePos; ma_uint64 firstBytePos; @@ -89066,29 +87306,29 @@ static size_t ma_dr_flac_oggbs__read_physical(ma_dr_flac_oggbs* oggbs, void* buf } static ma_bool32 ma_dr_flac_oggbs__seek_physical(ma_dr_flac_oggbs* oggbs, ma_uint64 offset, ma_dr_flac_seek_origin origin) { - if (origin == MA_DR_FLAC_SEEK_SET) { + if (origin == ma_dr_flac_seek_origin_start) { if (offset <= 0x7FFFFFFF) { - if (!oggbs->onSeek(oggbs->pUserData, (int)offset, MA_DR_FLAC_SEEK_SET)) { + if (!oggbs->onSeek(oggbs->pUserData, (int)offset, ma_dr_flac_seek_origin_start)) { return MA_FALSE; } oggbs->currentBytePos = offset; return MA_TRUE; } else { - if (!oggbs->onSeek(oggbs->pUserData, 0x7FFFFFFF, MA_DR_FLAC_SEEK_SET)) { + if (!oggbs->onSeek(oggbs->pUserData, 0x7FFFFFFF, ma_dr_flac_seek_origin_start)) { return MA_FALSE; } oggbs->currentBytePos = offset; - return ma_dr_flac_oggbs__seek_physical(oggbs, offset - 0x7FFFFFFF, MA_DR_FLAC_SEEK_CUR); + return ma_dr_flac_oggbs__seek_physical(oggbs, offset - 0x7FFFFFFF, ma_dr_flac_seek_origin_current); } } else { while (offset > 0x7FFFFFFF) { - if (!oggbs->onSeek(oggbs->pUserData, 0x7FFFFFFF, MA_DR_FLAC_SEEK_CUR)) { + if (!oggbs->onSeek(oggbs->pUserData, 0x7FFFFFFF, ma_dr_flac_seek_origin_current)) { return MA_FALSE; } oggbs->currentBytePos += 0x7FFFFFFF; offset -= 0x7FFFFFFF; } - if (!oggbs->onSeek(oggbs->pUserData, (int)offset, MA_DR_FLAC_SEEK_CUR)) { + if (!oggbs->onSeek(oggbs->pUserData, (int)offset, ma_dr_flac_seek_origin_current)) { return MA_FALSE; } oggbs->currentBytePos += offset; @@ -89114,7 +87354,7 @@ static ma_bool32 ma_dr_flac_oggbs__goto_next_page(ma_dr_flac_oggbs* oggbs, ma_dr continue; } if (header.serialNumber != oggbs->serialNumber) { - if (pageBodySize > 0 && !ma_dr_flac_oggbs__seek_physical(oggbs, pageBodySize, MA_DR_FLAC_SEEK_CUR)) { + if (pageBodySize > 0 && !ma_dr_flac_oggbs__seek_physical(oggbs, pageBodySize, ma_dr_flac_seek_origin_current)) { return MA_FALSE; } continue; @@ -89176,7 +87416,7 @@ static ma_bool32 ma_dr_flac_oggbs__seek_to_next_packet(ma_dr_flac_oggbs* oggbs) } bytesToEndOfPacketOrPage += segmentSize; } - ma_dr_flac_oggbs__seek_physical(oggbs, bytesToEndOfPacketOrPage, MA_DR_FLAC_SEEK_CUR); + ma_dr_flac_oggbs__seek_physical(oggbs, bytesToEndOfPacketOrPage, ma_dr_flac_seek_origin_current); oggbs->bytesRemainingInPage -= bytesToEndOfPacketOrPage; if (atEndOfPage) { if (!ma_dr_flac_oggbs__goto_next_page(oggbs)) { @@ -89229,44 +87469,36 @@ static ma_bool32 ma_dr_flac__on_seek_ogg(void* pUserData, int offset, ma_dr_flac int bytesSeeked = 0; MA_DR_FLAC_ASSERT(oggbs != NULL); MA_DR_FLAC_ASSERT(offset >= 0); - if (origin == MA_DR_FLAC_SEEK_SET) { - if (!ma_dr_flac_oggbs__seek_physical(oggbs, (int)oggbs->firstBytePos, MA_DR_FLAC_SEEK_SET)) { + if (origin == ma_dr_flac_seek_origin_start) { + if (!ma_dr_flac_oggbs__seek_physical(oggbs, (int)oggbs->firstBytePos, ma_dr_flac_seek_origin_start)) { return MA_FALSE; } if (!ma_dr_flac_oggbs__goto_next_page(oggbs, ma_dr_flac_ogg_fail_on_crc_mismatch)) { return MA_FALSE; } - return ma_dr_flac__on_seek_ogg(pUserData, offset, MA_DR_FLAC_SEEK_CUR); - } else if (origin == MA_DR_FLAC_SEEK_CUR) { - while (bytesSeeked < offset) { - int bytesRemainingToSeek = offset - bytesSeeked; - MA_DR_FLAC_ASSERT(bytesRemainingToSeek >= 0); - if (oggbs->bytesRemainingInPage >= (size_t)bytesRemainingToSeek) { - bytesSeeked += bytesRemainingToSeek; - (void)bytesSeeked; - oggbs->bytesRemainingInPage -= bytesRemainingToSeek; - break; - } - if (oggbs->bytesRemainingInPage > 0) { - bytesSeeked += (int)oggbs->bytesRemainingInPage; - oggbs->bytesRemainingInPage = 0; - } - MA_DR_FLAC_ASSERT(bytesRemainingToSeek > 0); - if (!ma_dr_flac_oggbs__goto_next_page(oggbs, ma_dr_flac_ogg_fail_on_crc_mismatch)) { - return MA_FALSE; - } + return ma_dr_flac__on_seek_ogg(pUserData, offset, ma_dr_flac_seek_origin_current); + } + MA_DR_FLAC_ASSERT(origin == ma_dr_flac_seek_origin_current); + while (bytesSeeked < offset) { + int bytesRemainingToSeek = offset - bytesSeeked; + MA_DR_FLAC_ASSERT(bytesRemainingToSeek >= 0); + if (oggbs->bytesRemainingInPage >= (size_t)bytesRemainingToSeek) { + bytesSeeked += bytesRemainingToSeek; + (void)bytesSeeked; + oggbs->bytesRemainingInPage -= bytesRemainingToSeek; + break; + } + if (oggbs->bytesRemainingInPage > 0) { + bytesSeeked += (int)oggbs->bytesRemainingInPage; + oggbs->bytesRemainingInPage = 0; + } + MA_DR_FLAC_ASSERT(bytesRemainingToSeek > 0); + if (!ma_dr_flac_oggbs__goto_next_page(oggbs, ma_dr_flac_ogg_fail_on_crc_mismatch)) { + return MA_FALSE; } - } else if (origin == MA_DR_FLAC_SEEK_END) { - return MA_FALSE; } return MA_TRUE; } -static ma_bool32 ma_dr_flac__on_tell_ogg(void* pUserData, ma_int64* pCursor) -{ - (void)pUserData; - (void)pCursor; - return MA_FALSE; -} static ma_bool32 ma_dr_flac_ogg__seek_to_pcm_frame(ma_dr_flac* pFlac, ma_uint64 pcmFrameIndex) { ma_dr_flac_oggbs* oggbs = (ma_dr_flac_oggbs*)pFlac->_oggbs; @@ -89283,7 +87515,7 @@ static ma_bool32 ma_dr_flac_ogg__seek_to_pcm_frame(ma_dr_flac* pFlac, ma_uint64 runningGranulePosition = 0; for (;;) { if (!ma_dr_flac_oggbs__goto_next_page(oggbs, ma_dr_flac_ogg_recover_on_crc_mismatch)) { - ma_dr_flac_oggbs__seek_physical(oggbs, originalBytePos, MA_DR_FLAC_SEEK_SET); + ma_dr_flac_oggbs__seek_physical(oggbs, originalBytePos, ma_dr_flac_seek_origin_start); return MA_FALSE; } runningFrameBytePos = oggbs->currentBytePos - ma_dr_flac_ogg__get_page_header_size(&oggbs->currentPageHeader) - oggbs->pageDataSize; @@ -89302,7 +87534,7 @@ static ma_bool32 ma_dr_flac_ogg__seek_to_pcm_frame(ma_dr_flac* pFlac, ma_uint64 } } } - if (!ma_dr_flac_oggbs__seek_physical(oggbs, runningFrameBytePos, MA_DR_FLAC_SEEK_SET)) { + if (!ma_dr_flac_oggbs__seek_physical(oggbs, runningFrameBytePos, ma_dr_flac_seek_origin_start)) { return MA_FALSE; } if (!ma_dr_flac_oggbs__goto_next_page(oggbs, ma_dr_flac_ogg_recover_on_crc_mismatch)) { @@ -89397,7 +87629,7 @@ static ma_bool32 ma_dr_flac__init_private__ogg(ma_dr_flac_init_info* pInit, ma_d if (mappingVersion[0] != 1) { return MA_FALSE; } - if (!onSeek(pUserData, 2, MA_DR_FLAC_SEEK_CUR)) { + if (!onSeek(pUserData, 2, ma_dr_flac_seek_origin_current)) { return MA_FALSE; } if (onRead(pUserData, sig, 4) != 4) { @@ -89442,17 +87674,17 @@ static ma_bool32 ma_dr_flac__init_private__ogg(ma_dr_flac_init_info* pInit, ma_d return MA_FALSE; } } else { - if (!onSeek(pUserData, bytesRemainingInPage, MA_DR_FLAC_SEEK_CUR)) { + if (!onSeek(pUserData, bytesRemainingInPage, ma_dr_flac_seek_origin_current)) { return MA_FALSE; } } } else { - if (!onSeek(pUserData, bytesRemainingInPage, MA_DR_FLAC_SEEK_CUR)) { + if (!onSeek(pUserData, bytesRemainingInPage, ma_dr_flac_seek_origin_current)) { return MA_FALSE; } } } else { - if (!onSeek(pUserData, pageBodySize, MA_DR_FLAC_SEEK_CUR)) { + if (!onSeek(pUserData, pageBodySize, ma_dr_flac_seek_origin_current)) { return MA_FALSE; } } @@ -89466,7 +87698,7 @@ static ma_bool32 ma_dr_flac__init_private__ogg(ma_dr_flac_init_info* pInit, ma_d return MA_TRUE; } #endif -static ma_bool32 ma_dr_flac__init_private(ma_dr_flac_init_info* pInit, ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, ma_dr_flac_meta_proc onMeta, ma_dr_flac_container container, void* pUserData, void* pUserDataMD) +static ma_bool32 ma_dr_flac__init_private(ma_dr_flac_init_info* pInit, ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_meta_proc onMeta, ma_dr_flac_container container, void* pUserData, void* pUserDataMD) { ma_bool32 relaxed; ma_uint8 id[4]; @@ -89476,14 +87708,12 @@ static ma_bool32 ma_dr_flac__init_private(ma_dr_flac_init_info* pInit, ma_dr_fla MA_DR_FLAC_ZERO_MEMORY(pInit, sizeof(*pInit)); pInit->onRead = onRead; pInit->onSeek = onSeek; - pInit->onTell = onTell; pInit->onMeta = onMeta; pInit->container = container; pInit->pUserData = pUserData; pInit->pUserDataMD = pUserDataMD; pInit->bs.onRead = onRead; pInit->bs.onSeek = onSeek; - pInit->bs.onTell = onTell; pInit->bs.pUserData = pUserData; ma_dr_flac__reset_cache(&pInit->bs); relaxed = container != ma_dr_flac_container_unknown; @@ -89506,7 +87736,7 @@ static ma_bool32 ma_dr_flac__init_private(ma_dr_flac_init_info* pInit, ma_dr_fla if (flags & 0x10) { headerSize += 10; } - if (!onSeek(pUserData, headerSize, MA_DR_FLAC_SEEK_CUR)) { + if (!onSeek(pUserData, headerSize, ma_dr_flac_seek_origin_current)) { return MA_FALSE; } pInit->runningFilePos += headerSize; @@ -89549,7 +87779,7 @@ static void ma_dr_flac__init_from_info(ma_dr_flac* pFlac, const ma_dr_flac_init_ pFlac->totalPCMFrameCount = pInit->totalPCMFrameCount; pFlac->container = pInit->container; } -static ma_dr_flac* ma_dr_flac_open_with_metadata_private(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, ma_dr_flac_meta_proc onMeta, ma_dr_flac_container container, void* pUserData, void* pUserDataMD, const ma_allocation_callbacks* pAllocationCallbacks) +static ma_dr_flac* ma_dr_flac_open_with_metadata_private(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_meta_proc onMeta, ma_dr_flac_container container, void* pUserData, void* pUserDataMD, const ma_allocation_callbacks* pAllocationCallbacks) { ma_dr_flac_init_info init; ma_uint32 allocationSize; @@ -89564,7 +87794,7 @@ static ma_dr_flac* ma_dr_flac_open_with_metadata_private(ma_dr_flac_read_proc on ma_allocation_callbacks allocationCallbacks; ma_dr_flac* pFlac; ma_dr_flac__init_cpu_caps(); - if (!ma_dr_flac__init_private(&init, onRead, onSeek, onTell, onMeta, container, pUserData, pUserDataMD)) { + if (!ma_dr_flac__init_private(&init, onRead, onSeek, onMeta, container, pUserData, pUserDataMD)) { return NULL; } if (pAllocationCallbacks != NULL) { @@ -89597,7 +87827,6 @@ static ma_dr_flac* ma_dr_flac_open_with_metadata_private(ma_dr_flac_read_proc on MA_DR_FLAC_ZERO_MEMORY(pOggbs, sizeof(*pOggbs)); pOggbs->onRead = onRead; pOggbs->onSeek = onSeek; - pOggbs->onTell = onTell; pOggbs->pUserData = pUserData; pOggbs->currentBytePos = init.oggFirstBytePos; pOggbs->firstBytePos = init.oggFirstBytePos; @@ -89612,17 +87841,15 @@ static ma_dr_flac* ma_dr_flac_open_with_metadata_private(ma_dr_flac_read_proc on if (init.hasMetadataBlocks) { ma_dr_flac_read_proc onReadOverride = onRead; ma_dr_flac_seek_proc onSeekOverride = onSeek; - ma_dr_flac_tell_proc onTellOverride = onTell; void* pUserDataOverride = pUserData; #ifndef MA_DR_FLAC_NO_OGG if (init.container == ma_dr_flac_container_ogg) { onReadOverride = ma_dr_flac__on_read_ogg; onSeekOverride = ma_dr_flac__on_seek_ogg; - onTellOverride = ma_dr_flac__on_tell_ogg; pUserDataOverride = (void*)pOggbs; } #endif - if (!ma_dr_flac__read_and_decode_metadata(onReadOverride, onSeekOverride, onTellOverride, onMeta, pUserDataOverride, pUserDataMD, &firstFramePos, &seektablePos, &seekpointCount, &allocationCallbacks)) { + if (!ma_dr_flac__read_and_decode_metadata(onReadOverride, onSeekOverride, onMeta, pUserDataOverride, pUserDataMD, &firstFramePos, &seektablePos, &seekpointCount, &allocationCallbacks)) { #ifndef MA_DR_FLAC_NO_OGG ma_dr_flac__free_from_callbacks(pOggbs, &allocationCallbacks); #endif @@ -89648,7 +87875,6 @@ static ma_dr_flac* ma_dr_flac_open_with_metadata_private(ma_dr_flac_read_proc on pOggbs = NULL; pFlac->bs.onRead = ma_dr_flac__on_read_ogg; pFlac->bs.onSeek = ma_dr_flac__on_seek_ogg; - pFlac->bs.onTell = ma_dr_flac__on_tell_ogg; pFlac->bs.pUserData = (void*)pInternalOggbs; pFlac->_oggbs = (void*)pInternalOggbs; } @@ -89668,7 +87894,7 @@ static ma_dr_flac* ma_dr_flac_open_with_metadata_private(ma_dr_flac_read_proc on pFlac->pSeekpoints = (ma_dr_flac_seekpoint*)((ma_uint8*)pFlac->pDecodedSamples + decodedSamplesAllocationSize); MA_DR_FLAC_ASSERT(pFlac->bs.onSeek != NULL); MA_DR_FLAC_ASSERT(pFlac->bs.onRead != NULL); - if (pFlac->bs.onSeek(pFlac->bs.pUserData, (int)seektablePos, MA_DR_FLAC_SEEK_SET)) { + if (pFlac->bs.onSeek(pFlac->bs.pUserData, (int)seektablePos, ma_dr_flac_seek_origin_start)) { ma_uint32 iSeekpoint; for (iSeekpoint = 0; iSeekpoint < seekpointCount; iSeekpoint += 1) { if (pFlac->bs.onRead(pFlac->bs.pUserData, pFlac->pSeekpoints + iSeekpoint, MA_DR_FLAC_SEEKPOINT_SIZE_IN_BYTES) == MA_DR_FLAC_SEEKPOINT_SIZE_IN_BYTES) { @@ -89681,7 +87907,7 @@ static ma_dr_flac* ma_dr_flac_open_with_metadata_private(ma_dr_flac_read_proc on break; } } - if (!pFlac->bs.onSeek(pFlac->bs.pUserData, (int)pFlac->firstFLACFramePosInBytes, MA_DR_FLAC_SEEK_SET)) { + if (!pFlac->bs.onSeek(pFlac->bs.pUserData, (int)pFlac->firstFLACFramePosInBytes, ma_dr_flac_seek_origin_start)) { ma_dr_flac__free_from_callbacks(pFlac, &allocationCallbacks); return NULL; } @@ -89724,31 +87950,8 @@ static size_t ma_dr_flac__on_read_stdio(void* pUserData, void* bufferOut, size_t } static ma_bool32 ma_dr_flac__on_seek_stdio(void* pUserData, int offset, ma_dr_flac_seek_origin origin) { - int whence = SEEK_SET; - if (origin == MA_DR_FLAC_SEEK_CUR) { - whence = SEEK_CUR; - } else if (origin == MA_DR_FLAC_SEEK_END) { - whence = SEEK_END; - } - return fseek((FILE*)pUserData, offset, whence) == 0; -} -static ma_bool32 ma_dr_flac__on_tell_stdio(void* pUserData, ma_int64* pCursor) -{ - FILE* pFileStdio = (FILE*)pUserData; - ma_int64 result; - MA_DR_FLAC_ASSERT(pFileStdio != NULL); - MA_DR_FLAC_ASSERT(pCursor != NULL); -#if defined(_WIN32) && !defined(NXDK) - #if defined(_MSC_VER) && _MSC_VER > 1200 - result = _ftelli64(pFileStdio); - #else - result = ftell(pFileStdio); - #endif -#else - result = ftell(pFileStdio); -#endif - *pCursor = result; - return MA_TRUE; + MA_DR_FLAC_ASSERT(offset >= 0); + return fseek((FILE*)pUserData, offset, (origin == ma_dr_flac_seek_origin_current) ? SEEK_CUR : SEEK_SET) == 0; } MA_API ma_dr_flac* ma_dr_flac_open_file(const char* pFileName, const ma_allocation_callbacks* pAllocationCallbacks) { @@ -89757,7 +87960,7 @@ MA_API ma_dr_flac* ma_dr_flac_open_file(const char* pFileName, const ma_allocati if (ma_fopen(&pFile, pFileName, "rb") != MA_SUCCESS) { return NULL; } - pFlac = ma_dr_flac_open(ma_dr_flac__on_read_stdio, ma_dr_flac__on_seek_stdio, ma_dr_flac__on_tell_stdio, (void*)pFile, pAllocationCallbacks); + pFlac = ma_dr_flac_open(ma_dr_flac__on_read_stdio, ma_dr_flac__on_seek_stdio, (void*)pFile, pAllocationCallbacks); if (pFlac == NULL) { fclose(pFile); return NULL; @@ -89772,7 +87975,7 @@ MA_API ma_dr_flac* ma_dr_flac_open_file_w(const wchar_t* pFileName, const ma_all if (ma_wfopen(&pFile, pFileName, L"rb", pAllocationCallbacks) != MA_SUCCESS) { return NULL; } - pFlac = ma_dr_flac_open(ma_dr_flac__on_read_stdio, ma_dr_flac__on_seek_stdio, ma_dr_flac__on_tell_stdio, (void*)pFile, pAllocationCallbacks); + pFlac = ma_dr_flac_open(ma_dr_flac__on_read_stdio, ma_dr_flac__on_seek_stdio, (void*)pFile, pAllocationCallbacks); if (pFlac == NULL) { fclose(pFile); return NULL; @@ -89787,7 +87990,7 @@ MA_API ma_dr_flac* ma_dr_flac_open_file_with_metadata(const char* pFileName, ma_ if (ma_fopen(&pFile, pFileName, "rb") != MA_SUCCESS) { return NULL; } - pFlac = ma_dr_flac_open_with_metadata_private(ma_dr_flac__on_read_stdio, ma_dr_flac__on_seek_stdio, ma_dr_flac__on_tell_stdio, onMeta, ma_dr_flac_container_unknown, (void*)pFile, pUserData, pAllocationCallbacks); + pFlac = ma_dr_flac_open_with_metadata_private(ma_dr_flac__on_read_stdio, ma_dr_flac__on_seek_stdio, onMeta, ma_dr_flac_container_unknown, (void*)pFile, pUserData, pAllocationCallbacks); if (pFlac == NULL) { fclose(pFile); return pFlac; @@ -89802,7 +88005,7 @@ MA_API ma_dr_flac* ma_dr_flac_open_file_with_metadata_w(const wchar_t* pFileName if (ma_wfopen(&pFile, pFileName, L"rb", pAllocationCallbacks) != MA_SUCCESS) { return NULL; } - pFlac = ma_dr_flac_open_with_metadata_private(ma_dr_flac__on_read_stdio, ma_dr_flac__on_seek_stdio, ma_dr_flac__on_tell_stdio, onMeta, ma_dr_flac_container_unknown, (void*)pFile, pUserData, pAllocationCallbacks); + pFlac = ma_dr_flac_open_with_metadata_private(ma_dr_flac__on_read_stdio, ma_dr_flac__on_seek_stdio, onMeta, ma_dr_flac_container_unknown, (void*)pFile, pUserData, pAllocationCallbacks); if (pFlac == NULL) { fclose(pFile); return pFlac; @@ -89830,35 +88033,24 @@ static size_t ma_dr_flac__on_read_memory(void* pUserData, void* bufferOut, size_ static ma_bool32 ma_dr_flac__on_seek_memory(void* pUserData, int offset, ma_dr_flac_seek_origin origin) { ma_dr_flac__memory_stream* memoryStream = (ma_dr_flac__memory_stream*)pUserData; - ma_int64 newCursor; MA_DR_FLAC_ASSERT(memoryStream != NULL); - newCursor = memoryStream->currentReadPos; - if (origin == MA_DR_FLAC_SEEK_SET) { - newCursor = 0; - } else if (origin == MA_DR_FLAC_SEEK_CUR) { - newCursor = (ma_int64)memoryStream->currentReadPos; - } else if (origin == MA_DR_FLAC_SEEK_END) { - newCursor = (ma_int64)memoryStream->dataSize; + MA_DR_FLAC_ASSERT(offset >= 0); + if (offset > (ma_int64)memoryStream->dataSize) { + return MA_FALSE; + } + if (origin == ma_dr_flac_seek_origin_current) { + if (memoryStream->currentReadPos + offset <= memoryStream->dataSize) { + memoryStream->currentReadPos += offset; + } else { + return MA_FALSE; + } } else { - MA_DR_FLAC_ASSERT(!"Invalid seek origin"); - return MA_FALSE; + if ((ma_uint32)offset <= memoryStream->dataSize) { + memoryStream->currentReadPos = offset; + } else { + return MA_FALSE; + } } - newCursor += offset; - if (newCursor < 0) { - return MA_FALSE; - } - if ((size_t)newCursor > memoryStream->dataSize) { - return MA_FALSE; - } - memoryStream->currentReadPos = (size_t)newCursor; - return MA_TRUE; -} -static ma_bool32 ma_dr_flac__on_tell_memory(void* pUserData, ma_int64* pCursor) -{ - ma_dr_flac__memory_stream* memoryStream = (ma_dr_flac__memory_stream*)pUserData; - MA_DR_FLAC_ASSERT(memoryStream != NULL); - MA_DR_FLAC_ASSERT(pCursor != NULL); - *pCursor = (ma_int64)memoryStream->currentReadPos; return MA_TRUE; } MA_API ma_dr_flac* ma_dr_flac_open_memory(const void* pData, size_t dataSize, const ma_allocation_callbacks* pAllocationCallbacks) @@ -89868,7 +88060,7 @@ MA_API ma_dr_flac* ma_dr_flac_open_memory(const void* pData, size_t dataSize, co memoryStream.data = (const ma_uint8*)pData; memoryStream.dataSize = dataSize; memoryStream.currentReadPos = 0; - pFlac = ma_dr_flac_open(ma_dr_flac__on_read_memory, ma_dr_flac__on_seek_memory, ma_dr_flac__on_tell_memory, &memoryStream, pAllocationCallbacks); + pFlac = ma_dr_flac_open(ma_dr_flac__on_read_memory, ma_dr_flac__on_seek_memory, &memoryStream, pAllocationCallbacks); if (pFlac == NULL) { return NULL; } @@ -89893,7 +88085,7 @@ MA_API ma_dr_flac* ma_dr_flac_open_memory_with_metadata(const void* pData, size_ memoryStream.data = (const ma_uint8*)pData; memoryStream.dataSize = dataSize; memoryStream.currentReadPos = 0; - pFlac = ma_dr_flac_open_with_metadata_private(ma_dr_flac__on_read_memory, ma_dr_flac__on_seek_memory, ma_dr_flac__on_tell_memory, onMeta, ma_dr_flac_container_unknown, &memoryStream, pUserData, pAllocationCallbacks); + pFlac = ma_dr_flac_open_with_metadata_private(ma_dr_flac__on_read_memory, ma_dr_flac__on_seek_memory, onMeta, ma_dr_flac_container_unknown, &memoryStream, pUserData, pAllocationCallbacks); if (pFlac == NULL) { return NULL; } @@ -89911,21 +88103,21 @@ MA_API ma_dr_flac* ma_dr_flac_open_memory_with_metadata(const void* pData, size_ } return pFlac; } -MA_API ma_dr_flac* ma_dr_flac_open(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_dr_flac* ma_dr_flac_open(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks) { - return ma_dr_flac_open_with_metadata_private(onRead, onSeek, onTell, NULL, ma_dr_flac_container_unknown, pUserData, pUserData, pAllocationCallbacks); + return ma_dr_flac_open_with_metadata_private(onRead, onSeek, NULL, ma_dr_flac_container_unknown, pUserData, pUserData, pAllocationCallbacks); } -MA_API ma_dr_flac* ma_dr_flac_open_relaxed(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, ma_dr_flac_container container, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_dr_flac* ma_dr_flac_open_relaxed(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_container container, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks) { - return ma_dr_flac_open_with_metadata_private(onRead, onSeek, onTell, NULL, container, pUserData, pUserData, pAllocationCallbacks); + return ma_dr_flac_open_with_metadata_private(onRead, onSeek, NULL, container, pUserData, pUserData, pAllocationCallbacks); } -MA_API ma_dr_flac* ma_dr_flac_open_with_metadata(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, ma_dr_flac_meta_proc onMeta, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_dr_flac* ma_dr_flac_open_with_metadata(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_meta_proc onMeta, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks) { - return ma_dr_flac_open_with_metadata_private(onRead, onSeek, onTell, onMeta, ma_dr_flac_container_unknown, pUserData, pUserData, pAllocationCallbacks); + return ma_dr_flac_open_with_metadata_private(onRead, onSeek, onMeta, ma_dr_flac_container_unknown, pUserData, pUserData, pAllocationCallbacks); } -MA_API ma_dr_flac* ma_dr_flac_open_with_metadata_relaxed(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, ma_dr_flac_meta_proc onMeta, ma_dr_flac_container container, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_dr_flac* ma_dr_flac_open_with_metadata_relaxed(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_meta_proc onMeta, ma_dr_flac_container container, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks) { - return ma_dr_flac_open_with_metadata_private(onRead, onSeek, onTell, onMeta, container, pUserData, pUserData, pAllocationCallbacks); + return ma_dr_flac_open_with_metadata_private(onRead, onSeek, onMeta, container, pUserData, pUserData, pAllocationCallbacks); } MA_API void ma_dr_flac_close(ma_dr_flac* pFlac) { @@ -92218,7 +90410,7 @@ on_error: MA_DR_FLAC_DEFINE_FULL_READ_AND_CLOSE(s32, ma_int32) MA_DR_FLAC_DEFINE_FULL_READ_AND_CLOSE(s16, ma_int16) MA_DR_FLAC_DEFINE_FULL_READ_AND_CLOSE(f32, float) -MA_API ma_int32* ma_dr_flac_open_and_read_pcm_frames_s32(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalPCMFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_int32* ma_dr_flac_open_and_read_pcm_frames_s32(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalPCMFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks) { ma_dr_flac* pFlac; if (channelsOut) { @@ -92230,13 +90422,13 @@ MA_API ma_int32* ma_dr_flac_open_and_read_pcm_frames_s32(ma_dr_flac_read_proc on if (totalPCMFrameCountOut) { *totalPCMFrameCountOut = 0; } - pFlac = ma_dr_flac_open(onRead, onSeek, onTell, pUserData, pAllocationCallbacks); + pFlac = ma_dr_flac_open(onRead, onSeek, pUserData, pAllocationCallbacks); if (pFlac == NULL) { return NULL; } return ma_dr_flac__full_read_and_close_s32(pFlac, channelsOut, sampleRateOut, totalPCMFrameCountOut); } -MA_API ma_int16* ma_dr_flac_open_and_read_pcm_frames_s16(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalPCMFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_int16* ma_dr_flac_open_and_read_pcm_frames_s16(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalPCMFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks) { ma_dr_flac* pFlac; if (channelsOut) { @@ -92248,13 +90440,13 @@ MA_API ma_int16* ma_dr_flac_open_and_read_pcm_frames_s16(ma_dr_flac_read_proc on if (totalPCMFrameCountOut) { *totalPCMFrameCountOut = 0; } - pFlac = ma_dr_flac_open(onRead, onSeek, onTell, pUserData, pAllocationCallbacks); + pFlac = ma_dr_flac_open(onRead, onSeek, pUserData, pAllocationCallbacks); if (pFlac == NULL) { return NULL; } return ma_dr_flac__full_read_and_close_s16(pFlac, channelsOut, sampleRateOut, totalPCMFrameCountOut); } -MA_API float* ma_dr_flac_open_and_read_pcm_frames_f32(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, ma_dr_flac_tell_proc onTell, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalPCMFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API float* ma_dr_flac_open_and_read_pcm_frames_f32(ma_dr_flac_read_proc onRead, ma_dr_flac_seek_proc onSeek, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, ma_uint64* totalPCMFrameCountOut, const ma_allocation_callbacks* pAllocationCallbacks) { ma_dr_flac* pFlac; if (channelsOut) { @@ -92266,7 +90458,7 @@ MA_API float* ma_dr_flac_open_and_read_pcm_frames_f32(ma_dr_flac_read_proc onRea if (totalPCMFrameCountOut) { *totalPCMFrameCountOut = 0; } - pFlac = ma_dr_flac_open(onRead, onSeek, onTell, pUserData, pAllocationCallbacks); + pFlac = ma_dr_flac_open(onRead, onSeek, pUserData, pAllocationCallbacks); if (pFlac == NULL) { return NULL; } @@ -93070,10 +91262,6 @@ static float ma_dr_mp3_L3_ldexp_q2(float y, int exp_q2) } while ((exp_q2 -= e) > 0); return y; } -#if (defined(__GNUC__) && (__GNUC__ >= 14)) && !defined(__clang__) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wstringop-overflow" -#endif static void ma_dr_mp3_L3_decode_scalefactors(const ma_uint8 *hdr, ma_uint8 *ist_pos, ma_dr_mp3_bs *bs, const ma_dr_mp3_L3_gr_info *gr, float *scf, int ch) { static const ma_uint8 g_scf_partitions[3][28] = { @@ -93132,10 +91320,7 @@ static void ma_dr_mp3_L3_decode_scalefactors(const ma_uint8 *hdr, ma_uint8 *ist_ scf[i] = ma_dr_mp3_L3_ldexp_q2(gain, iscf[i] << scf_shift); } } -#if (defined(__GNUC__) && (__GNUC__ >= 14)) && !defined(__clang__) - #pragma GCC diagnostic pop -#endif -static const float ma_dr_mp3_g_pow43[129 + 16] = { +static const float g_ma_dr_mp3_pow43[129 + 16] = { 0,-1,-2.519842f,-4.326749f,-6.349604f,-8.549880f,-10.902724f,-13.390518f,-16.000000f,-18.720754f,-21.544347f,-24.463781f,-27.473142f,-30.567351f,-33.741992f,-36.993181f, 0,1,2.519842f,4.326749f,6.349604f,8.549880f,10.902724f,13.390518f,16.000000f,18.720754f,21.544347f,24.463781f,27.473142f,30.567351f,33.741992f,36.993181f,40.317474f,43.711787f,47.173345f,50.699631f,54.288352f,57.937408f,61.644865f,65.408941f,69.227979f,73.100443f,77.024898f,81.000000f,85.024491f,89.097188f,93.216975f,97.382800f,101.593667f,105.848633f,110.146801f,114.487321f,118.869381f,123.292209f,127.755065f,132.257246f,136.798076f,141.376907f,145.993119f,150.646117f,155.335327f,160.060199f,164.820202f,169.614826f,174.443577f,179.305980f,184.201575f,189.129918f,194.090580f,199.083145f,204.107210f,209.162385f,214.248292f,219.364564f,224.510845f,229.686789f,234.892058f,240.126328f,245.389280f,250.680604f,256.000000f,261.347174f,266.721841f,272.123723f,277.552547f,283.008049f,288.489971f,293.998060f,299.532071f,305.091761f,310.676898f,316.287249f,321.922592f,327.582707f,333.267377f,338.976394f,344.709550f,350.466646f,356.247482f,362.051866f,367.879608f,373.730522f,379.604427f,385.501143f,391.420496f,397.362314f,403.326427f,409.312672f,415.320884f,421.350905f,427.402579f,433.475750f,439.570269f,445.685987f,451.822757f,457.980436f,464.158883f,470.357960f,476.577530f,482.817459f,489.077615f,495.357868f,501.658090f,507.978156f,514.317941f,520.677324f,527.056184f,533.454404f,539.871867f,546.308458f,552.764065f,559.238575f,565.731879f,572.243870f,578.774440f,585.323483f,591.890898f,598.476581f,605.080431f,611.702349f,618.342238f,625.000000f,631.675540f,638.368763f,645.079578f }; @@ -93145,7 +91330,7 @@ static float ma_dr_mp3_L3_pow_43(int x) int sign, mult = 256; if (x < 129) { - return ma_dr_mp3_g_pow43[16 + x]; + return g_ma_dr_mp3_pow43[16 + x]; } if (x < 1024) { @@ -93154,7 +91339,7 @@ static float ma_dr_mp3_L3_pow_43(int x) } sign = 2*x & 64; frac = (float)((x & 63) - sign) / ((x & ~63) + sign); - return ma_dr_mp3_g_pow43[16 + ((x + sign) >> 6)]*(1.f + frac*((4.f/3) + frac*(2.f/9)))*mult; + return g_ma_dr_mp3_pow43[16 + ((x + sign) >> 6)]*(1.f + frac*((4.f/3) + frac*(2.f/9)))*mult; } static void ma_dr_mp3_L3_huffman(float *dst, ma_dr_mp3_bs *bs, const ma_dr_mp3_L3_gr_info *gr_info, const float *scf, int layer3gr_limit) { @@ -93224,7 +91409,7 @@ static void ma_dr_mp3_L3_huffman(float *dst, ma_dr_mp3_bs *bs, const ma_dr_mp3_L *dst = one*ma_dr_mp3_L3_pow_43(lsb)*((ma_int32)bs_cache < 0 ? -1: 1); } else { - *dst = ma_dr_mp3_g_pow43[16 + lsb - 16*(bs_cache >> 31)]*one; + *dst = g_ma_dr_mp3_pow43[16 + lsb - 16*(bs_cache >> 31)]*one; } MA_DR_MP3_FLUSH_BITS(lsb ? 1 : 0); } @@ -93252,7 +91437,7 @@ static void ma_dr_mp3_L3_huffman(float *dst, ma_dr_mp3_bs *bs, const ma_dr_mp3_L for (j = 0; j < 2; j++, dst++, leaf >>= 4) { int lsb = leaf & 0x0F; - *dst = ma_dr_mp3_g_pow43[16 + lsb - 16*(bs_cache >> 31)]*one; + *dst = g_ma_dr_mp3_pow43[16 + lsb - 16*(bs_cache >> 31)]*one; MA_DR_MP3_FLUSH_BITS(lsb ? 1 : 0); } MA_DR_MP3_CHECK_BITS; @@ -94083,7 +92268,7 @@ MA_API int ma_dr_mp3dec_decode_frame(ma_dr_mp3dec *dec, const ma_uint8 *mp3, int MA_DR_MP3_COPY_MEMORY(dec->header, hdr, MA_DR_MP3_HDR_SIZE); info->frame_bytes = i + frame_size; info->channels = MA_DR_MP3_HDR_IS_MONO(hdr) ? 1 : 2; - info->sample_rate = ma_dr_mp3_hdr_sample_rate_hz(hdr); + info->hz = ma_dr_mp3_hdr_sample_rate_hz(hdr); info->layer = 4 - MA_DR_MP3_HDR_GET_LAYER(hdr); info->bitrate_kbps = ma_dr_mp3_hdr_bitrate_kbps(hdr); ma_dr_mp3_bs_init(bs_frame, hdr + MA_DR_MP3_HDR_SIZE, frame_size - MA_DR_MP3_HDR_SIZE); @@ -94306,41 +92491,19 @@ static ma_allocation_callbacks ma_dr_mp3_copy_allocation_callbacks_or_defaults(c } static size_t ma_dr_mp3__on_read(ma_dr_mp3* pMP3, void* pBufferOut, size_t bytesToRead) { - size_t bytesRead; - MA_DR_MP3_ASSERT(pMP3 != NULL); - MA_DR_MP3_ASSERT(pMP3->onRead != NULL); - if (bytesToRead == 0) { - return 0; - } - bytesRead = pMP3->onRead(pMP3->pUserData, pBufferOut, bytesToRead); + size_t bytesRead = pMP3->onRead(pMP3->pUserData, pBufferOut, bytesToRead); pMP3->streamCursor += bytesRead; return bytesRead; } -static size_t ma_dr_mp3__on_read_clamped(ma_dr_mp3* pMP3, void* pBufferOut, size_t bytesToRead) -{ - MA_DR_MP3_ASSERT(pMP3 != NULL); - MA_DR_MP3_ASSERT(pMP3->onRead != NULL); - if (pMP3->streamLength == MA_UINT64_MAX) { - return ma_dr_mp3__on_read(pMP3, pBufferOut, bytesToRead); - } else { - ma_uint64 bytesRemaining; - bytesRemaining = (pMP3->streamLength - pMP3->streamCursor); - if (bytesToRead > bytesRemaining) { - bytesToRead = (size_t)bytesRemaining; - } - return ma_dr_mp3__on_read(pMP3, pBufferOut, bytesToRead); - } -} static ma_bool32 ma_dr_mp3__on_seek(ma_dr_mp3* pMP3, int offset, ma_dr_mp3_seek_origin origin) { MA_DR_MP3_ASSERT(offset >= 0); - MA_DR_MP3_ASSERT(origin == MA_DR_MP3_SEEK_SET || origin == MA_DR_MP3_SEEK_CUR); if (!pMP3->onSeek(pMP3->pUserData, offset, origin)) { return MA_FALSE; } - if (origin == MA_DR_MP3_SEEK_SET) { + if (origin == ma_dr_mp3_seek_origin_start) { pMP3->streamCursor = (ma_uint64)offset; - } else{ + } else { pMP3->streamCursor += offset; } return MA_TRUE; @@ -94350,18 +92513,18 @@ static ma_bool32 ma_dr_mp3__on_seek_64(ma_dr_mp3* pMP3, ma_uint64 offset, ma_dr_ if (offset <= 0x7FFFFFFF) { return ma_dr_mp3__on_seek(pMP3, (int)offset, origin); } - if (!ma_dr_mp3__on_seek(pMP3, 0x7FFFFFFF, MA_DR_MP3_SEEK_SET)) { + if (!ma_dr_mp3__on_seek(pMP3, 0x7FFFFFFF, ma_dr_mp3_seek_origin_start)) { return MA_FALSE; } offset -= 0x7FFFFFFF; while (offset > 0) { if (offset <= 0x7FFFFFFF) { - if (!ma_dr_mp3__on_seek(pMP3, (int)offset, MA_DR_MP3_SEEK_CUR)) { + if (!ma_dr_mp3__on_seek(pMP3, (int)offset, ma_dr_mp3_seek_origin_current)) { return MA_FALSE; } offset = 0; } else { - if (!ma_dr_mp3__on_seek(pMP3, 0x7FFFFFFF, MA_DR_MP3_SEEK_CUR)) { + if (!ma_dr_mp3__on_seek(pMP3, 0x7FFFFFFF, ma_dr_mp3_seek_origin_current)) { return MA_FALSE; } offset -= 0x7FFFFFFF; @@ -94369,18 +92532,7 @@ static ma_bool32 ma_dr_mp3__on_seek_64(ma_dr_mp3* pMP3, ma_uint64 offset, ma_dr_ } return MA_TRUE; } -static void ma_dr_mp3__on_meta(ma_dr_mp3* pMP3, ma_dr_mp3_metadata_type type, const void* pRawData, size_t rawDataSize) -{ - if (pMP3->onMeta) { - ma_dr_mp3_metadata metadata; - MA_DR_MP3_ZERO_OBJECT(&metadata); - metadata.type = type; - metadata.pRawData = pRawData; - metadata.rawDataSize = rawDataSize; - pMP3->onMeta(pMP3->pUserDataMeta, &metadata); - } -} -static ma_uint32 ma_dr_mp3_decode_next_frame_ex__callbacks(ma_dr_mp3* pMP3, ma_dr_mp3d_sample_t* pPCMFrames, ma_dr_mp3dec_frame_info* pMP3FrameInfo, const ma_uint8** ppMP3FrameData) +static ma_uint32 ma_dr_mp3_decode_next_frame_ex__callbacks(ma_dr_mp3* pMP3, ma_dr_mp3d_sample_t* pPCMFrames) { ma_uint32 pcmFramesRead = 0; MA_DR_MP3_ASSERT(pMP3 != NULL); @@ -94407,7 +92559,7 @@ static ma_uint32 ma_dr_mp3_decode_next_frame_ex__callbacks(ma_dr_mp3* pMP3, ma_d pMP3->pData = pNewData; pMP3->dataCapacity = newDataCap; } - bytesRead = ma_dr_mp3__on_read_clamped(pMP3, pMP3->pData + pMP3->dataSize, (pMP3->dataCapacity - pMP3->dataSize)); + bytesRead = ma_dr_mp3__on_read(pMP3, pMP3->pData + pMP3->dataSize, (pMP3->dataCapacity - pMP3->dataSize)); if (bytesRead == 0) { if (pMP3->dataSize == 0) { pMP3->atEnd = MA_TRUE; @@ -94426,20 +92578,16 @@ static ma_uint32 ma_dr_mp3_decode_next_frame_ex__callbacks(ma_dr_mp3* pMP3, ma_d return 0; } pcmFramesRead = ma_dr_mp3dec_decode_frame(&pMP3->decoder, pMP3->pData + pMP3->dataConsumed, (int)pMP3->dataSize, pPCMFrames, &info); - pMP3->dataConsumed += (size_t)info.frame_bytes; - pMP3->dataSize -= (size_t)info.frame_bytes; + if (info.frame_bytes > 0) { + pMP3->dataConsumed += (size_t)info.frame_bytes; + pMP3->dataSize -= (size_t)info.frame_bytes; + } if (pcmFramesRead > 0) { pcmFramesRead = ma_dr_mp3_hdr_frame_samples(pMP3->decoder.header); pMP3->pcmFramesConsumedInMP3Frame = 0; pMP3->pcmFramesRemainingInMP3Frame = pcmFramesRead; pMP3->mp3FrameChannels = info.channels; - pMP3->mp3FrameSampleRate = info.sample_rate; - if (pMP3FrameInfo != NULL) { - *pMP3FrameInfo = info; - } - if (ppMP3FrameData != NULL) { - *ppMP3FrameData = pMP3->pData + pMP3->dataConsumed - (size_t)info.frame_bytes; - } + pMP3->mp3FrameSampleRate = info.hz; break; } else if (info.frame_bytes == 0) { size_t bytesRead; @@ -94456,7 +92604,7 @@ static ma_uint32 ma_dr_mp3_decode_next_frame_ex__callbacks(ma_dr_mp3* pMP3, ma_d pMP3->pData = pNewData; pMP3->dataCapacity = newDataCap; } - bytesRead = ma_dr_mp3__on_read_clamped(pMP3, pMP3->pData + pMP3->dataSize, (pMP3->dataCapacity - pMP3->dataSize)); + bytesRead = ma_dr_mp3__on_read(pMP3, pMP3->pData + pMP3->dataSize, (pMP3->dataCapacity - pMP3->dataSize)); if (bytesRead == 0) { pMP3->atEnd = MA_TRUE; return 0; @@ -94466,7 +92614,7 @@ static ma_uint32 ma_dr_mp3_decode_next_frame_ex__callbacks(ma_dr_mp3* pMP3, ma_d }; return pcmFramesRead; } -static ma_uint32 ma_dr_mp3_decode_next_frame_ex__memory(ma_dr_mp3* pMP3, ma_dr_mp3d_sample_t* pPCMFrames, ma_dr_mp3dec_frame_info* pMP3FrameInfo, const ma_uint8** ppMP3FrameData) +static ma_uint32 ma_dr_mp3_decode_next_frame_ex__memory(ma_dr_mp3* pMP3, ma_dr_mp3d_sample_t* pPCMFrames) { ma_uint32 pcmFramesRead = 0; ma_dr_mp3dec_frame_info info; @@ -94482,44 +92630,36 @@ static ma_uint32 ma_dr_mp3_decode_next_frame_ex__memory(ma_dr_mp3* pMP3, ma_dr_m pMP3->pcmFramesConsumedInMP3Frame = 0; pMP3->pcmFramesRemainingInMP3Frame = pcmFramesRead; pMP3->mp3FrameChannels = info.channels; - pMP3->mp3FrameSampleRate = info.sample_rate; - if (pMP3FrameInfo != NULL) { - *pMP3FrameInfo = info; - } - if (ppMP3FrameData != NULL) { - *ppMP3FrameData = pMP3->memory.pData + pMP3->memory.currentReadPos; - } + pMP3->mp3FrameSampleRate = info.hz; break; } else if (info.frame_bytes > 0) { pMP3->memory.currentReadPos += (size_t)info.frame_bytes; - pMP3->streamCursor += (size_t)info.frame_bytes; } else { break; } } pMP3->memory.currentReadPos += (size_t)info.frame_bytes; - pMP3->streamCursor += (size_t)info.frame_bytes; return pcmFramesRead; } -static ma_uint32 ma_dr_mp3_decode_next_frame_ex(ma_dr_mp3* pMP3, ma_dr_mp3d_sample_t* pPCMFrames, ma_dr_mp3dec_frame_info* pMP3FrameInfo, const ma_uint8** ppMP3FrameData) +static ma_uint32 ma_dr_mp3_decode_next_frame_ex(ma_dr_mp3* pMP3, ma_dr_mp3d_sample_t* pPCMFrames) { if (pMP3->memory.pData != NULL && pMP3->memory.dataSize > 0) { - return ma_dr_mp3_decode_next_frame_ex__memory(pMP3, pPCMFrames, pMP3FrameInfo, ppMP3FrameData); + return ma_dr_mp3_decode_next_frame_ex__memory(pMP3, pPCMFrames); } else { - return ma_dr_mp3_decode_next_frame_ex__callbacks(pMP3, pPCMFrames, pMP3FrameInfo, ppMP3FrameData); + return ma_dr_mp3_decode_next_frame_ex__callbacks(pMP3, pPCMFrames); } } static ma_uint32 ma_dr_mp3_decode_next_frame(ma_dr_mp3* pMP3) { MA_DR_MP3_ASSERT(pMP3 != NULL); - return ma_dr_mp3_decode_next_frame_ex(pMP3, (ma_dr_mp3d_sample_t*)pMP3->pcmFrames, NULL, NULL); + return ma_dr_mp3_decode_next_frame_ex(pMP3, (ma_dr_mp3d_sample_t*)pMP3->pcmFrames); } #if 0 static ma_uint32 ma_dr_mp3_seek_next_frame(ma_dr_mp3* pMP3) { ma_uint32 pcmFrameCount; MA_DR_MP3_ASSERT(pMP3 != NULL); - pcmFrameCount = ma_dr_mp3_decode_next_frame_ex(pMP3, NULL, NULL, NULL); + pcmFrameCount = ma_dr_mp3_decode_next_frame_ex(pMP3, NULL); if (pcmFrameCount == 0) { return 0; } @@ -94529,249 +92669,33 @@ static ma_uint32 ma_dr_mp3_seek_next_frame(ma_dr_mp3* pMP3) return pcmFrameCount; } #endif -static ma_bool32 ma_dr_mp3_init_internal(ma_dr_mp3* pMP3, ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, ma_dr_mp3_tell_proc onTell, ma_dr_mp3_meta_proc onMeta, void* pUserData, void* pUserDataMeta, const ma_allocation_callbacks* pAllocationCallbacks) +static ma_bool32 ma_dr_mp3_init_internal(ma_dr_mp3* pMP3, ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks) { - ma_dr_mp3dec_frame_info firstFrameInfo; - const ma_uint8* pFirstFrameData; - ma_uint32 firstFramePCMFrameCount; - ma_uint32 detectedMP3FrameCount = 0xFFFFFFFF; MA_DR_MP3_ASSERT(pMP3 != NULL); MA_DR_MP3_ASSERT(onRead != NULL); ma_dr_mp3dec_init(&pMP3->decoder); pMP3->onRead = onRead; pMP3->onSeek = onSeek; - pMP3->onMeta = onMeta; pMP3->pUserData = pUserData; - pMP3->pUserDataMeta = pUserDataMeta; pMP3->allocationCallbacks = ma_dr_mp3_copy_allocation_callbacks_or_defaults(pAllocationCallbacks); if (pMP3->allocationCallbacks.onFree == NULL || (pMP3->allocationCallbacks.onMalloc == NULL && pMP3->allocationCallbacks.onRealloc == NULL)) { return MA_FALSE; } - pMP3->streamCursor = 0; - pMP3->streamLength = MA_UINT64_MAX; - pMP3->streamStartOffset = 0; - pMP3->delayInPCMFrames = 0; - pMP3->paddingInPCMFrames = 0; - pMP3->totalPCMFrameCount = MA_UINT64_MAX; - #if 1 - if (onSeek != NULL && onTell != NULL) { - if (onSeek(pUserData, 0, MA_DR_MP3_SEEK_END)) { - ma_int64 streamLen; - int streamEndOffset = 0; - if (onTell(pUserData, &streamLen)) { - if (streamLen > 128) { - char id3[3]; - if (onSeek(pUserData, streamEndOffset - 128, MA_DR_MP3_SEEK_END)) { - if (onRead(pUserData, id3, 3) == 3 && id3[0] == 'T' && id3[1] == 'A' && id3[2] == 'G') { - streamEndOffset -= 128; - streamLen -= 128; - if (onMeta != NULL) { - ma_uint8 tag[128]; - tag[0] = 'T'; tag[1] = 'A'; tag[2] = 'G'; - if (onRead(pUserData, tag + 3, 125) == 125) { - ma_dr_mp3__on_meta(pMP3, MA_DR_MP3_METADATA_TYPE_ID3V1, tag, 128); - } - } - } else { - } - } else { - } - } else { - } - if (streamLen > 32) { - char ape[32]; - if (onSeek(pUserData, streamEndOffset - 32, MA_DR_MP3_SEEK_END)) { - if (onRead(pUserData, ape, 32) == 32 && ape[0] == 'A' && ape[1] == 'P' && ape[2] == 'E' && ape[3] == 'T' && ape[4] == 'A' && ape[5] == 'G' && ape[6] == 'E' && ape[7] == 'X') { - ma_uint32 tagSize = - ((ma_uint32)ape[24] << 0) | - ((ma_uint32)ape[25] << 8) | - ((ma_uint32)ape[26] << 16) | - ((ma_uint32)ape[27] << 24); - streamEndOffset -= 32 + tagSize; - streamLen -= 32 + tagSize; - if (onMeta != NULL) { - if (onSeek(pUserData, streamEndOffset, MA_DR_MP3_SEEK_END)) { - size_t apeTagSize = (size_t)tagSize + 32; - ma_uint8* pTagData = (ma_uint8*)ma_dr_mp3_malloc(apeTagSize, pAllocationCallbacks); - if (pTagData != NULL) { - if (onRead(pUserData, pTagData, apeTagSize) == apeTagSize) { - ma_dr_mp3__on_meta(pMP3, MA_DR_MP3_METADATA_TYPE_APE, pTagData, apeTagSize); - } - ma_dr_mp3_free(pTagData, pAllocationCallbacks); - } - } - } - } - } - } else { - } - if (!onSeek(pUserData, 0, MA_DR_MP3_SEEK_SET)) { - return MA_FALSE; - } - pMP3->streamLength = (ma_uint64)streamLen; - if (pMP3->memory.pData != NULL) { - pMP3->memory.dataSize = (size_t)pMP3->streamLength; - } - } else { - if (!onSeek(pUserData, 0, MA_DR_MP3_SEEK_SET)) { - return MA_FALSE; - } - } - } else { - } - } else { - } - #endif - #if 1 - { - char header[10]; - if (onRead(pUserData, header, 10) == 10) { - if (header[0] == 'I' && header[1] == 'D' && header[2] == '3') { - ma_uint32 tagSize = - (((ma_uint32)header[6] & 0x7F) << 21) | - (((ma_uint32)header[7] & 0x7F) << 14) | - (((ma_uint32)header[8] & 0x7F) << 7) | - (((ma_uint32)header[9] & 0x7F) << 0); - if (header[5] & 0x10) { - tagSize += 10; - } - if (onMeta != NULL) { - size_t tagSizeWithHeader = 10 + tagSize; - ma_uint8* pTagData = (ma_uint8*)ma_dr_mp3_malloc(tagSizeWithHeader, pAllocationCallbacks); - if (pTagData != NULL) { - MA_DR_MP3_COPY_MEMORY(pTagData, header, 10); - if (onRead(pUserData, pTagData + 10, tagSize) == tagSize) { - ma_dr_mp3__on_meta(pMP3, MA_DR_MP3_METADATA_TYPE_ID3V2, pTagData, tagSizeWithHeader); - } - ma_dr_mp3_free(pTagData, pAllocationCallbacks); - } - } else { - if (onSeek != NULL) { - if (!onSeek(pUserData, tagSize, MA_DR_MP3_SEEK_CUR)) { - return MA_FALSE; - } - } else { - char discard[1024]; - while (tagSize > 0) { - size_t bytesToRead = tagSize; - if (bytesToRead > sizeof(discard)) { - bytesToRead = sizeof(discard); - } - if (onRead(pUserData, discard, bytesToRead) != bytesToRead) { - return MA_FALSE; - } - tagSize -= (ma_uint32)bytesToRead; - } - } - } - pMP3->streamStartOffset += 10 + tagSize; - pMP3->streamCursor = pMP3->streamStartOffset; - } else { - if (onSeek != NULL) { - if (!onSeek(pUserData, 0, MA_DR_MP3_SEEK_SET)) { - return MA_FALSE; - } - } else { - } - } - } else { - return MA_FALSE; - } - } - #endif - firstFramePCMFrameCount = ma_dr_mp3_decode_next_frame_ex(pMP3, (ma_dr_mp3d_sample_t*)pMP3->pcmFrames, &firstFrameInfo, &pFirstFrameData); - if (firstFramePCMFrameCount > 0) { - MA_DR_MP3_ASSERT(pFirstFrameData != NULL); - #if 1 - MA_DR_MP3_ASSERT(firstFrameInfo.frame_bytes > 0); - { - ma_dr_mp3_bs bs; - ma_dr_mp3_L3_gr_info grInfo[4]; - const ma_uint8* pTagData = pFirstFrameData; - ma_dr_mp3_bs_init(&bs, pFirstFrameData + MA_DR_MP3_HDR_SIZE, firstFrameInfo.frame_bytes - MA_DR_MP3_HDR_SIZE); - if (MA_DR_MP3_HDR_IS_CRC(pFirstFrameData)) { - ma_dr_mp3_bs_get_bits(&bs, 16); - } - if (ma_dr_mp3_L3_read_side_info(&bs, grInfo, pFirstFrameData) >= 0) { - ma_bool32 isXing = MA_FALSE; - ma_bool32 isInfo = MA_FALSE; - const ma_uint8* pTagDataBeg; - pTagDataBeg = pFirstFrameData + MA_DR_MP3_HDR_SIZE + (bs.pos/8); - pTagData = pTagDataBeg; - isXing = (pTagData[0] == 'X' && pTagData[1] == 'i' && pTagData[2] == 'n' && pTagData[3] == 'g'); - isInfo = (pTagData[0] == 'I' && pTagData[1] == 'n' && pTagData[2] == 'f' && pTagData[3] == 'o'); - if (isXing || isInfo) { - ma_uint32 bytes = 0; - ma_uint32 flags = pTagData[7]; - pTagData += 8; - if (flags & 0x01) { - detectedMP3FrameCount = (ma_uint32)pTagData[0] << 24 | (ma_uint32)pTagData[1] << 16 | (ma_uint32)pTagData[2] << 8 | (ma_uint32)pTagData[3]; - pTagData += 4; - } - if (flags & 0x02) { - bytes = (ma_uint32)pTagData[0] << 24 | (ma_uint32)pTagData[1] << 16 | (ma_uint32)pTagData[2] << 8 | (ma_uint32)pTagData[3]; - (void)bytes; - pTagData += 4; - } - if (flags & 0x04) { - pTagData += 100; - } - if (flags & 0x08) { - pTagData += 4; - } - if (pTagData[0]) { - pTagData += 21; - if (pTagData - pFirstFrameData + 14 < firstFrameInfo.frame_bytes) { - int delayInPCMFrames; - int paddingInPCMFrames; - delayInPCMFrames = (( (ma_uint32)pTagData[0] << 4) | ((ma_uint32)pTagData[1] >> 4)) + (528 + 1); - paddingInPCMFrames = ((((ma_uint32)pTagData[1] & 0xF) << 8) | ((ma_uint32)pTagData[2] )) - (528 + 1); - if (paddingInPCMFrames < 0) { - paddingInPCMFrames = 0; - } - pMP3->delayInPCMFrames = (ma_uint32)delayInPCMFrames; - pMP3->paddingInPCMFrames = (ma_uint32)paddingInPCMFrames; - } - } - if (isXing) { - pMP3->isVBR = MA_TRUE; - } else if (isInfo) { - pMP3->isCBR = MA_TRUE; - } - if (onMeta != NULL) { - ma_dr_mp3_metadata_type metadataType = isXing ? MA_DR_MP3_METADATA_TYPE_XING : MA_DR_MP3_METADATA_TYPE_VBRI; - size_t tagDataSize; - tagDataSize = (size_t)firstFrameInfo.frame_bytes; - tagDataSize -= (size_t)(pTagDataBeg - pFirstFrameData); - ma_dr_mp3__on_meta(pMP3, metadataType, pTagDataBeg, tagDataSize); - } - pMP3->pcmFramesRemainingInMP3Frame = 0; - pMP3->streamStartOffset += (ma_uint32)(firstFrameInfo.frame_bytes); - pMP3->streamCursor = pMP3->streamStartOffset; - ma_dr_mp3dec_init(&pMP3->decoder); - } - } else { - } - } - #endif - } else { + if (ma_dr_mp3_decode_next_frame(pMP3) == 0) { ma_dr_mp3__free_from_callbacks(pMP3->pData, &pMP3->allocationCallbacks); return MA_FALSE; } - if (detectedMP3FrameCount != 0xFFFFFFFF) { - pMP3->totalPCMFrameCount = detectedMP3FrameCount * firstFramePCMFrameCount; - } pMP3->channels = pMP3->mp3FrameChannels; pMP3->sampleRate = pMP3->mp3FrameSampleRate; return MA_TRUE; } -MA_API ma_bool32 ma_dr_mp3_init(ma_dr_mp3* pMP3, ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, ma_dr_mp3_tell_proc onTell, ma_dr_mp3_meta_proc onMeta, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_bool32 ma_dr_mp3_init(ma_dr_mp3* pMP3, ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, void* pUserData, const ma_allocation_callbacks* pAllocationCallbacks) { if (pMP3 == NULL || onRead == NULL) { return MA_FALSE; } MA_DR_MP3_ZERO_OBJECT(pMP3); - return ma_dr_mp3_init_internal(pMP3, onRead, onSeek, onTell, onMeta, pUserData, pUserData, pAllocationCallbacks); + return ma_dr_mp3_init_internal(pMP3, onRead, onSeek, pUserData, pAllocationCallbacks); } static size_t ma_dr_mp3__on_read_memory(void* pUserData, void* pBufferOut, size_t bytesToRead) { @@ -94792,40 +92716,29 @@ static size_t ma_dr_mp3__on_read_memory(void* pUserData, void* pBufferOut, size_ static ma_bool32 ma_dr_mp3__on_seek_memory(void* pUserData, int byteOffset, ma_dr_mp3_seek_origin origin) { ma_dr_mp3* pMP3 = (ma_dr_mp3*)pUserData; - ma_int64 newCursor; MA_DR_MP3_ASSERT(pMP3 != NULL); - newCursor = pMP3->memory.currentReadPos; - if (origin == MA_DR_MP3_SEEK_SET) { - newCursor = 0; - } else if (origin == MA_DR_MP3_SEEK_CUR) { - newCursor = (ma_int64)pMP3->memory.currentReadPos; - } else if (origin == MA_DR_MP3_SEEK_END) { - newCursor = (ma_int64)pMP3->memory.dataSize; + if (origin == ma_dr_mp3_seek_origin_current) { + if (byteOffset > 0) { + if (pMP3->memory.currentReadPos + byteOffset > pMP3->memory.dataSize) { + byteOffset = (int)(pMP3->memory.dataSize - pMP3->memory.currentReadPos); + } + } else { + if (pMP3->memory.currentReadPos < (size_t)-byteOffset) { + byteOffset = -(int)pMP3->memory.currentReadPos; + } + } + pMP3->memory.currentReadPos += byteOffset; } else { - MA_DR_MP3_ASSERT(!"Invalid seek origin"); - return MA_FALSE; + if ((ma_uint32)byteOffset <= pMP3->memory.dataSize) { + pMP3->memory.currentReadPos = byteOffset; + } else { + pMP3->memory.currentReadPos = pMP3->memory.dataSize; + } } - newCursor += byteOffset; - if (newCursor < 0) { - return MA_FALSE; - } - if ((size_t)newCursor > pMP3->memory.dataSize) { - return MA_FALSE; - } - pMP3->memory.currentReadPos = (size_t)newCursor; return MA_TRUE; } -static ma_bool32 ma_dr_mp3__on_tell_memory(void* pUserData, ma_int64* pCursor) +MA_API ma_bool32 ma_dr_mp3_init_memory(ma_dr_mp3* pMP3, const void* pData, size_t dataSize, const ma_allocation_callbacks* pAllocationCallbacks) { - ma_dr_mp3* pMP3 = (ma_dr_mp3*)pUserData; - MA_DR_MP3_ASSERT(pMP3 != NULL); - MA_DR_MP3_ASSERT(pCursor != NULL); - *pCursor = (ma_int64)pMP3->memory.currentReadPos; - return MA_TRUE; -} -MA_API ma_bool32 ma_dr_mp3_init_memory_with_metadata(ma_dr_mp3* pMP3, const void* pData, size_t dataSize, ma_dr_mp3_meta_proc onMeta, void* pUserDataMeta, const ma_allocation_callbacks* pAllocationCallbacks) -{ - ma_bool32 result; if (pMP3 == NULL) { return MA_FALSE; } @@ -94836,21 +92749,7 @@ MA_API ma_bool32 ma_dr_mp3_init_memory_with_metadata(ma_dr_mp3* pMP3, const void pMP3->memory.pData = (const ma_uint8*)pData; pMP3->memory.dataSize = dataSize; pMP3->memory.currentReadPos = 0; - result = ma_dr_mp3_init_internal(pMP3, ma_dr_mp3__on_read_memory, ma_dr_mp3__on_seek_memory, ma_dr_mp3__on_tell_memory, onMeta, pMP3, pUserDataMeta, pAllocationCallbacks); - if (result == MA_FALSE) { - return MA_FALSE; - } - if (pMP3->streamLength <= (ma_uint64)MA_SIZE_MAX) { - pMP3->memory.dataSize = (size_t)pMP3->streamLength; - } - if (pMP3->streamStartOffset > (ma_uint64)MA_SIZE_MAX) { - return MA_FALSE; - } - return MA_TRUE; -} -MA_API ma_bool32 ma_dr_mp3_init_memory(ma_dr_mp3* pMP3, const void* pData, size_t dataSize, const ma_allocation_callbacks* pAllocationCallbacks) -{ - return ma_dr_mp3_init_memory_with_metadata(pMP3, pData, dataSize, NULL, NULL, pAllocationCallbacks); + return ma_dr_mp3_init_internal(pMP3, ma_dr_mp3__on_read_memory, ma_dr_mp3__on_seek_memory, pMP3, pAllocationCallbacks); } #ifndef MA_DR_MP3_NO_STDIO #include @@ -94861,75 +92760,35 @@ static size_t ma_dr_mp3__on_read_stdio(void* pUserData, void* pBufferOut, size_t } static ma_bool32 ma_dr_mp3__on_seek_stdio(void* pUserData, int offset, ma_dr_mp3_seek_origin origin) { - int whence = SEEK_SET; - if (origin == MA_DR_MP3_SEEK_CUR) { - whence = SEEK_CUR; - } else if (origin == MA_DR_MP3_SEEK_END) { - whence = SEEK_END; - } - return fseek((FILE*)pUserData, offset, whence) == 0; -} -static ma_bool32 ma_dr_mp3__on_tell_stdio(void* pUserData, ma_int64* pCursor) -{ - FILE* pFileStdio = (FILE*)pUserData; - ma_int64 result; - MA_DR_MP3_ASSERT(pFileStdio != NULL); - MA_DR_MP3_ASSERT(pCursor != NULL); -#if defined(_WIN32) && !defined(NXDK) - #if defined(_MSC_VER) && _MSC_VER > 1200 - result = _ftelli64(pFileStdio); - #else - result = ftell(pFileStdio); - #endif -#else - result = ftell(pFileStdio); -#endif - *pCursor = result; - return MA_TRUE; -} -MA_API ma_bool32 ma_dr_mp3_init_file_with_metadata(ma_dr_mp3* pMP3, const char* pFilePath, ma_dr_mp3_meta_proc onMeta, void* pUserDataMeta, const ma_allocation_callbacks* pAllocationCallbacks) -{ - ma_bool32 result; - FILE* pFile; - if (pMP3 == NULL) { - return MA_FALSE; - } - MA_DR_MP3_ZERO_OBJECT(pMP3); - if (ma_fopen(&pFile, pFilePath, "rb") != MA_SUCCESS) { - return MA_FALSE; - } - result = ma_dr_mp3_init_internal(pMP3, ma_dr_mp3__on_read_stdio, ma_dr_mp3__on_seek_stdio, ma_dr_mp3__on_tell_stdio, onMeta, (void*)pFile, pUserDataMeta, pAllocationCallbacks); - if (result != MA_TRUE) { - fclose(pFile); - return result; - } - return MA_TRUE; -} -MA_API ma_bool32 ma_dr_mp3_init_file_with_metadata_w(ma_dr_mp3* pMP3, const wchar_t* pFilePath, ma_dr_mp3_meta_proc onMeta, void* pUserDataMeta, const ma_allocation_callbacks* pAllocationCallbacks) -{ - ma_bool32 result; - FILE* pFile; - if (pMP3 == NULL) { - return MA_FALSE; - } - MA_DR_MP3_ZERO_OBJECT(pMP3); - if (ma_wfopen(&pFile, pFilePath, L"rb", pAllocationCallbacks) != MA_SUCCESS) { - return MA_FALSE; - } - result = ma_dr_mp3_init_internal(pMP3, ma_dr_mp3__on_read_stdio, ma_dr_mp3__on_seek_stdio, ma_dr_mp3__on_tell_stdio, onMeta, (void*)pFile, pUserDataMeta, pAllocationCallbacks); - if (result != MA_TRUE) { - fclose(pFile); - return result; - } - return MA_TRUE; + return fseek((FILE*)pUserData, offset, (origin == ma_dr_mp3_seek_origin_current) ? SEEK_CUR : SEEK_SET) == 0; } MA_API ma_bool32 ma_dr_mp3_init_file(ma_dr_mp3* pMP3, const char* pFilePath, const ma_allocation_callbacks* pAllocationCallbacks) { - return ma_dr_mp3_init_file_with_metadata(pMP3, pFilePath, NULL, NULL, pAllocationCallbacks); + ma_bool32 result; + FILE* pFile; + if (ma_fopen(&pFile, pFilePath, "rb") != MA_SUCCESS) { + return MA_FALSE; + } + result = ma_dr_mp3_init(pMP3, ma_dr_mp3__on_read_stdio, ma_dr_mp3__on_seek_stdio, (void*)pFile, pAllocationCallbacks); + if (result != MA_TRUE) { + fclose(pFile); + return result; + } + return MA_TRUE; } MA_API ma_bool32 ma_dr_mp3_init_file_w(ma_dr_mp3* pMP3, const wchar_t* pFilePath, const ma_allocation_callbacks* pAllocationCallbacks) { - return ma_dr_mp3_init_file_with_metadata_w(pMP3, pFilePath, NULL, NULL, pAllocationCallbacks); + ma_bool32 result; + FILE* pFile; + if (ma_wfopen(&pFile, pFilePath, L"rb", pAllocationCallbacks) != MA_SUCCESS) { + return MA_FALSE; + } + result = ma_dr_mp3_init(pMP3, ma_dr_mp3__on_read_stdio, ma_dr_mp3__on_seek_stdio, (void*)pFile, pAllocationCallbacks); + if (result != MA_TRUE) { + fclose(pFile); + return result; + } + return MA_TRUE; } #endif MA_API void ma_dr_mp3_uninit(ma_dr_mp3* pMP3) @@ -95000,38 +92859,17 @@ static ma_uint64 ma_dr_mp3_read_pcm_frames_raw(ma_dr_mp3* pMP3, ma_uint64 frames MA_DR_MP3_ASSERT(pMP3 != NULL); MA_DR_MP3_ASSERT(pMP3->onRead != NULL); while (framesToRead > 0) { - ma_uint32 framesToConsume; - if (pMP3->currentPCMFrame < pMP3->delayInPCMFrames) { - ma_uint32 framesToSkip = (ma_uint32)MA_DR_MP3_MIN(pMP3->pcmFramesRemainingInMP3Frame, pMP3->delayInPCMFrames - pMP3->currentPCMFrame); - pMP3->currentPCMFrame += framesToSkip; - pMP3->pcmFramesConsumedInMP3Frame += framesToSkip; - pMP3->pcmFramesRemainingInMP3Frame -= framesToSkip; - } - framesToConsume = (ma_uint32)MA_DR_MP3_MIN(pMP3->pcmFramesRemainingInMP3Frame, framesToRead); - if (pMP3->totalPCMFrameCount != MA_UINT64_MAX && pMP3->totalPCMFrameCount > pMP3->paddingInPCMFrames) { - if (pMP3->currentPCMFrame < (pMP3->totalPCMFrameCount - pMP3->paddingInPCMFrames)) { - ma_uint64 framesRemainigToPadding = (pMP3->totalPCMFrameCount - pMP3->paddingInPCMFrames) - pMP3->currentPCMFrame; - if (framesToConsume > framesRemainigToPadding) { - framesToConsume = (ma_uint32)framesRemainigToPadding; - } - } else { - break; - } - } + ma_uint32 framesToConsume = (ma_uint32)MA_DR_MP3_MIN(pMP3->pcmFramesRemainingInMP3Frame, framesToRead); if (pBufferOut != NULL) { - #if defined(MA_DR_MP3_FLOAT_OUTPUT) - { - float* pFramesOutF32 = (float*)MA_DR_MP3_OFFSET_PTR(pBufferOut, sizeof(float) * totalFramesRead * pMP3->channels); - float* pFramesInF32 = (float*)MA_DR_MP3_OFFSET_PTR(&pMP3->pcmFrames[0], sizeof(float) * pMP3->pcmFramesConsumedInMP3Frame * pMP3->mp3FrameChannels); - MA_DR_MP3_COPY_MEMORY(pFramesOutF32, pFramesInF32, sizeof(float) * framesToConsume * pMP3->channels); - } - #else - { - ma_int16* pFramesOutS16 = (ma_int16*)MA_DR_MP3_OFFSET_PTR(pBufferOut, sizeof(ma_int16) * totalFramesRead * pMP3->channels); - ma_int16* pFramesInS16 = (ma_int16*)MA_DR_MP3_OFFSET_PTR(&pMP3->pcmFrames[0], sizeof(ma_int16) * pMP3->pcmFramesConsumedInMP3Frame * pMP3->mp3FrameChannels); - MA_DR_MP3_COPY_MEMORY(pFramesOutS16, pFramesInS16, sizeof(ma_int16) * framesToConsume * pMP3->channels); - } - #endif + #if defined(MA_DR_MP3_FLOAT_OUTPUT) + float* pFramesOutF32 = (float*)MA_DR_MP3_OFFSET_PTR(pBufferOut, sizeof(float) * totalFramesRead * pMP3->channels); + float* pFramesInF32 = (float*)MA_DR_MP3_OFFSET_PTR(&pMP3->pcmFrames[0], sizeof(float) * pMP3->pcmFramesConsumedInMP3Frame * pMP3->mp3FrameChannels); + MA_DR_MP3_COPY_MEMORY(pFramesOutF32, pFramesInF32, sizeof(float) * framesToConsume * pMP3->channels); + #else + ma_int16* pFramesOutS16 = (ma_int16*)MA_DR_MP3_OFFSET_PTR(pBufferOut, sizeof(ma_int16) * totalFramesRead * pMP3->channels); + ma_int16* pFramesInS16 = (ma_int16*)MA_DR_MP3_OFFSET_PTR(&pMP3->pcmFrames[0], sizeof(ma_int16) * pMP3->pcmFramesConsumedInMP3Frame * pMP3->mp3FrameChannels); + MA_DR_MP3_COPY_MEMORY(pFramesOutS16, pFramesInS16, sizeof(ma_int16) * framesToConsume * pMP3->channels); + #endif } pMP3->currentPCMFrame += framesToConsume; pMP3->pcmFramesConsumedInMP3Frame += framesToConsume; @@ -95041,9 +92879,6 @@ static ma_uint64 ma_dr_mp3_read_pcm_frames_raw(ma_dr_mp3* pMP3, ma_uint64 frames if (framesToRead == 0) { break; } - if (pMP3->totalPCMFrameCount != MA_UINT64_MAX && pMP3->totalPCMFrameCount > pMP3->paddingInPCMFrames && pMP3->currentPCMFrame >= (pMP3->totalPCMFrameCount - pMP3->paddingInPCMFrames)) { - break; - } MA_DR_MP3_ASSERT(pMP3->pcmFramesRemainingInMP3Frame == 0); if (ma_dr_mp3_decode_next_frame(pMP3) == 0) { break; @@ -95123,7 +92958,7 @@ static ma_bool32 ma_dr_mp3_seek_to_start_of_stream(ma_dr_mp3* pMP3) { MA_DR_MP3_ASSERT(pMP3 != NULL); MA_DR_MP3_ASSERT(pMP3->onSeek != NULL); - if (!ma_dr_mp3__on_seek_64(pMP3, pMP3->streamStartOffset, MA_DR_MP3_SEEK_SET)) { + if (!ma_dr_mp3__on_seek(pMP3, 0, ma_dr_mp3_seek_origin_start)) { return MA_FALSE; } ma_dr_mp3_reset(pMP3); @@ -95189,7 +93024,7 @@ static ma_bool32 ma_dr_mp3_seek_to_pcm_frame__seek_table(ma_dr_mp3* pMP3, ma_uin seekPoint.mp3FramesToDiscard = 0; seekPoint.pcmFramesToDiscard = 0; } - if (!ma_dr_mp3__on_seek_64(pMP3, seekPoint.seekPosInBytes, MA_DR_MP3_SEEK_SET)) { + if (!ma_dr_mp3__on_seek_64(pMP3, seekPoint.seekPosInBytes, ma_dr_mp3_seek_origin_start)) { return MA_FALSE; } ma_dr_mp3_reset(pMP3); @@ -95200,7 +93035,7 @@ static ma_bool32 ma_dr_mp3_seek_to_pcm_frame__seek_table(ma_dr_mp3* pMP3, ma_uin if (iMP3Frame == seekPoint.mp3FramesToDiscard-1) { pPCMFrames = (ma_dr_mp3d_sample_t*)pMP3->pcmFrames; } - pcmFramesRead = ma_dr_mp3_decode_next_frame_ex(pMP3, pPCMFrames, NULL, NULL); + pcmFramesRead = ma_dr_mp3_decode_next_frame_ex(pMP3, pPCMFrames); if (pcmFramesRead == 0) { return MA_FALSE; } @@ -95242,7 +93077,7 @@ MA_API ma_bool32 ma_dr_mp3_get_mp3_and_pcm_frame_count(ma_dr_mp3* pMP3, ma_uint6 totalMP3FrameCount = 0; for (;;) { ma_uint32 pcmFramesInCurrentMP3Frame; - pcmFramesInCurrentMP3Frame = ma_dr_mp3_decode_next_frame_ex(pMP3, NULL, NULL, NULL); + pcmFramesInCurrentMP3Frame = ma_dr_mp3_decode_next_frame_ex(pMP3, NULL); if (pcmFramesInCurrentMP3Frame == 0) { break; } @@ -95266,26 +93101,10 @@ MA_API ma_bool32 ma_dr_mp3_get_mp3_and_pcm_frame_count(ma_dr_mp3* pMP3, ma_uint6 MA_API ma_uint64 ma_dr_mp3_get_pcm_frame_count(ma_dr_mp3* pMP3) { ma_uint64 totalPCMFrameCount; - if (pMP3 == NULL) { + if (!ma_dr_mp3_get_mp3_and_pcm_frame_count(pMP3, NULL, &totalPCMFrameCount)) { return 0; } - if (pMP3->totalPCMFrameCount != MA_UINT64_MAX) { - totalPCMFrameCount = pMP3->totalPCMFrameCount; - if (totalPCMFrameCount >= pMP3->delayInPCMFrames) { - totalPCMFrameCount -= pMP3->delayInPCMFrames; - } else { - } - if (totalPCMFrameCount >= pMP3->paddingInPCMFrames) { - totalPCMFrameCount -= pMP3->paddingInPCMFrames; - } else { - } - return totalPCMFrameCount; - } else { - if (!ma_dr_mp3_get_mp3_and_pcm_frame_count(pMP3, NULL, &totalPCMFrameCount)) { - return 0; - } - return totalPCMFrameCount; - } + return totalPCMFrameCount; } MA_API ma_uint64 ma_dr_mp3_get_mp3_frame_count(ma_dr_mp3* pMP3) { @@ -95355,7 +93174,7 @@ MA_API ma_bool32 ma_dr_mp3_calculate_seek_points(ma_dr_mp3* pMP3, ma_uint32* pSe MA_DR_MP3_ASSERT(pMP3->streamCursor >= pMP3->dataSize); mp3FrameInfo[iMP3Frame].bytePos = pMP3->streamCursor - pMP3->dataSize; mp3FrameInfo[iMP3Frame].pcmFrameIndex = runningPCMFrameCount; - pcmFramesInCurrentMP3FrameIn = ma_dr_mp3_decode_next_frame_ex(pMP3, NULL, NULL, NULL); + pcmFramesInCurrentMP3FrameIn = ma_dr_mp3_decode_next_frame_ex(pMP3, NULL); if (pcmFramesInCurrentMP3FrameIn == 0) { return MA_FALSE; } @@ -95379,7 +93198,7 @@ MA_API ma_bool32 ma_dr_mp3_calculate_seek_points(ma_dr_mp3* pMP3, ma_uint32* pSe } mp3FrameInfo[MA_DR_MP3_COUNTOF(mp3FrameInfo)-1].bytePos = pMP3->streamCursor - pMP3->dataSize; mp3FrameInfo[MA_DR_MP3_COUNTOF(mp3FrameInfo)-1].pcmFrameIndex = runningPCMFrameCount; - pcmFramesInCurrentMP3FrameIn = ma_dr_mp3_decode_next_frame_ex(pMP3, NULL, NULL, NULL); + pcmFramesInCurrentMP3FrameIn = ma_dr_mp3_decode_next_frame_ex(pMP3, NULL); if (pcmFramesInCurrentMP3FrameIn == 0) { pSeekPoints[iSeekPoint].seekPosInBytes = mp3FrameInfo[0].bytePos; pSeekPoints[iSeekPoint].pcmFrameIndex = nextTargetPCMFrame; @@ -95517,18 +93336,18 @@ static ma_int16* ma_dr_mp3__full_read_and_close_s16(ma_dr_mp3* pMP3, ma_dr_mp3_c } return pFrames; } -MA_API float* ma_dr_mp3_open_and_read_pcm_frames_f32(ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, ma_dr_mp3_tell_proc onTell, void* pUserData, ma_dr_mp3_config* pConfig, ma_uint64* pTotalFrameCount, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API float* ma_dr_mp3_open_and_read_pcm_frames_f32(ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, void* pUserData, ma_dr_mp3_config* pConfig, ma_uint64* pTotalFrameCount, const ma_allocation_callbacks* pAllocationCallbacks) { ma_dr_mp3 mp3; - if (!ma_dr_mp3_init(&mp3, onRead, onSeek, onTell, NULL, pUserData, pAllocationCallbacks)) { + if (!ma_dr_mp3_init(&mp3, onRead, onSeek, pUserData, pAllocationCallbacks)) { return NULL; } return ma_dr_mp3__full_read_and_close_f32(&mp3, pConfig, pTotalFrameCount); } -MA_API ma_int16* ma_dr_mp3_open_and_read_pcm_frames_s16(ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, ma_dr_mp3_tell_proc onTell, void* pUserData, ma_dr_mp3_config* pConfig, ma_uint64* pTotalFrameCount, const ma_allocation_callbacks* pAllocationCallbacks) +MA_API ma_int16* ma_dr_mp3_open_and_read_pcm_frames_s16(ma_dr_mp3_read_proc onRead, ma_dr_mp3_seek_proc onSeek, void* pUserData, ma_dr_mp3_config* pConfig, ma_uint64* pTotalFrameCount, const ma_allocation_callbacks* pAllocationCallbacks) { ma_dr_mp3 mp3; - if (!ma_dr_mp3_init(&mp3, onRead, onSeek, onTell, NULL, pUserData, pAllocationCallbacks)) { + if (!ma_dr_mp3_init(&mp3, onRead, onSeek, pUserData, pAllocationCallbacks)) { return NULL; } return ma_dr_mp3__full_read_and_close_s16(&mp3, pConfig, pTotalFrameCount); From 0e57a572b447e45ac5afcc8bc83795dd4158c5c4 Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 29 Sep 2025 18:05:07 +0200 Subject: [PATCH 22/23] REVIEWED: `rlsw` module and related files --- src/external/rlsw.h | 3512 +++++++++++++---------------- src/platforms/rcore_desktop_sdl.c | 2 +- src/platforms/rcore_drm.c | 46 +- src/rlgl.h | 24 +- 4 files changed, 1640 insertions(+), 1944 deletions(-) diff --git a/src/external/rlsw.h b/src/external/rlsw.h index 2177467ec..49050f848 100644 --- a/src/external/rlsw.h +++ b/src/external/rlsw.h @@ -1,26 +1,81 @@ -/** - * MIT License - * - * Copyright (c) 2025 Le Juez Victor - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +/********************************************************************************************** +* +* rlsw v1.0 - An OpenGL 1.1-style software renderer implementation +* +* DESCRIPTION: +* rlsw is a custom OpenGL 1.1-style implementation on software, intended to provide all +* functionality available on rlgl.h library used by raylib, becoming a direct software +* rendering replacement for OpenGL 1.1 backend and allowing to run raylib on GPU-less +* devices when required. +* +* FEATURES: +* - Rendering to custom internal framebuffer with multiple color modes supported: +* - Color buffer: RGB - 8-bit (3:3:2) | RGB - 16-bit (5:6:5) | RGB - 24-bit (8:8:8) +* - Depth buffer: D - 8-bit (unorm) | D - 16-bit (unorm) | D - 24-bit (unorm) +* - Rendering modes supported: POINT, LINES, TRIANGLE, QUADS +* - Additional features: Polygon modes, Point width, Line width +* - Clipping support for all rendering modes +* - Texture features supported: +* - All uncompressed texture formats supported by raylib +* - Texture Minification/Magnification checks +* - Point and Bilinear filtering +* - Texture Wrap Modes with separate checks for S/T coordinates +* - Vertex Arrays support with direct primitive drawing mode +* - Matrix Stack support (Matrix Push/Pop) +* - Other GL misc features: +* - GL-style getter functions +* - Framebuffer resizing +* - Perspective correction +* - Scissor clipping +* - Depth testing +* - Blend modes +* - Face culling +* +* ADDITIONAL NOTES: +* Check PR for more info: https://github.com/raysan5/raylib/pull/4832 +* +* CONFIGURATION: +* #define RLSW_IMPLEMENTATION +* Generates the implementation of the library into the included file +* If not defined, the library is in header only mode and can be included in other headers +* or source files without problems. But only ONE file should hold the implementation +* +* rlsw capabilities could be customized just defining some internal +* values before library inclusion (default values listed): +* +* #define SW_GL_FRAMEBUFFER_COPY_BGRA true +* #define SW_GL_BINDING_COPY_TEXTURE true +* #define SW_COLOR_BUFFER_BITS 24 +* #define SW_DEPTH_BUFFER_BITS 16 +* #define SW_MAX_PROJECTION_STACK_SIZE 2 +* #define SW_MAX_MODELVIEW_STACK_SIZE 8 +* #define SW_MAX_TEXTURE_STACK_SIZE 2 +* #define SW_MAX_TEXTURES 128 +* +* +* LICENSE: MIT +* +* Copyright (c) 2025-2026 Le Juez Victor (@Bigfoot71), reviewed by Ramon Santamaria (@raysan5) +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in all +* copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +* SOFTWARE. +* +**********************************************************************************************/ #ifndef RLSW_H #define RLSW_H @@ -28,94 +83,102 @@ #include #include -/* === RLSW Definition And Macros === */ +//---------------------------------------------------------------------------------- +// Defines and Macros +//---------------------------------------------------------------------------------- +// Function specifiers definition +#ifndef SWAPI + #define SWAPI // Functions defined as 'extern' by default (implicit specifiers) +#endif #ifndef SW_MALLOC -# define SW_MALLOC(sz) malloc(sz) + #define SW_MALLOC(sz) malloc(sz) #endif #ifndef SW_REALLOC -# define SW_REALLOC(ptr, newSz) realloc(ptr, newSz) + #define SW_REALLOC(ptr, newSz) realloc(ptr, newSz) #endif #ifndef SW_FREE -# define SW_FREE(ptr) free(ptr) + #define SW_FREE(ptr) free(ptr) #endif #ifndef SW_RESTRICT -# ifdef _MSC_VER -# define SW_RESTRICT __restrict -# else -# define SW_RESTRICT restrict -# endif + #ifdef _MSC_VER + #define SW_RESTRICT __restrict + #else + #define SW_RESTRICT restrict + #endif #endif #ifndef SW_GL_FRAMEBUFFER_COPY_BGRA -# define SW_GL_FRAMEBUFFER_COPY_BGRA true + #define SW_GL_FRAMEBUFFER_COPY_BGRA true #endif #ifndef SW_GL_BINDING_COPY_TEXTURE -# define SW_GL_BINDING_COPY_TEXTURE true + #define SW_GL_BINDING_COPY_TEXTURE true #endif #ifndef SW_COLOR_BUFFER_BITS -# define SW_COLOR_BUFFER_BITS 24 + #define SW_COLOR_BUFFER_BITS 24 #endif #ifndef SW_DEPTH_BUFFER_BITS -# define SW_DEPTH_BUFFER_BITS 16 + #define SW_DEPTH_BUFFER_BITS 16 #endif #ifndef SW_MAX_PROJECTION_STACK_SIZE -# define SW_MAX_PROJECTION_STACK_SIZE 2 + #define SW_MAX_PROJECTION_STACK_SIZE 2 #endif #ifndef SW_MAX_MODELVIEW_STACK_SIZE -# define SW_MAX_MODELVIEW_STACK_SIZE 8 + #define SW_MAX_MODELVIEW_STACK_SIZE 8 #endif #ifndef SW_MAX_TEXTURE_STACK_SIZE -# define SW_MAX_TEXTURE_STACK_SIZE 2 + #define SW_MAX_TEXTURE_STACK_SIZE 2 #endif #ifndef SW_MAX_TEXTURES -# define SW_MAX_TEXTURES 128 + #define SW_MAX_TEXTURES 128 #endif -#ifndef SW_MAX_CLIPPED_POLYGON_VERTICES // Under normal circumstances, clipping a polygon can add at most one vertex per clipping plane. // Considering the largest polygon involved is a quadrilateral (4 vertices), -// and that clipping occurs against both the frustum (6 planes) -// and the scissors (4 planes), +// and that clipping occurs against both the frustum (6 planes) and the scissors (4 planes), // the maximum number of vertices after clipping is: // 4 (original vertices) + 6 (frustum planes) + 4 (scissors planes) = 14 -# define SW_MAX_CLIPPED_POLYGON_VERTICES 14 +#ifndef SW_MAX_CLIPPED_POLYGON_VERTICES + #define SW_MAX_CLIPPED_POLYGON_VERTICES 14 #endif #ifndef SW_CLIP_EPSILON -# define SW_CLIP_EPSILON 1e-4f + #define SW_CLIP_EPSILON 1e-4f #endif -/* === OpenGL Compatibility Types === */ - -typedef unsigned int GLenum; -typedef unsigned char GLboolean; -typedef unsigned int GLbitfield; -typedef void GLvoid; -typedef signed char GLbyte; -typedef short GLshort; -typedef int GLint; -typedef unsigned char GLubyte; -typedef unsigned short GLushort; -typedef unsigned int GLuint; -typedef int GLsizei; -typedef float GLfloat; -typedef float GLclampf; -typedef double GLdouble; -typedef double GLclampd; - -/* === OpenGL Definitions === */ +//---------------------------------------------------------------------------------- +// OpenGL Compatibility Types +//---------------------------------------------------------------------------------- +typedef unsigned int GLenum; +typedef unsigned char GLboolean; +typedef unsigned int GLbitfield; +typedef void GLvoid; +typedef signed char GLbyte; +typedef short GLshort; +typedef int GLint; +typedef unsigned char GLubyte; +typedef unsigned short GLushort; +typedef unsigned int GLuint; +typedef int GLsizei; +typedef float GLfloat; +typedef float GLclampf; +typedef double GLdouble; +typedef double GLclampd; +//---------------------------------------------------------------------------------- +// OpenGL Definitions +// NOTE: Not used/supported definitions are commented +//---------------------------------------------------------------------------------- #define GL_FALSE 0 #define GL_TRUE 1 @@ -168,7 +231,7 @@ typedef double GLclampd; #define GL_TEXTURE 0x1702 #define GL_VERTEX_ARRAY 0x8074 -#define GL_NORMAL_ARRAY 0x8075 //< WARNING: Not implemented (defined for RLGL) +#define GL_NORMAL_ARRAY 0x8075 // WARNING: Not implemented (defined for RLGL) #define GL_COLOR_ARRAY 0x8076 //#define GL_INDEX_ARRAY 0x8077 #define GL_TEXTURE_COORD_ARRAY 0x8078 @@ -237,8 +300,7 @@ typedef double GLclampd; #define GL_UNSIGNED_INT 0x1405 #define GL_FLOAT 0x1406 -/* === Not Used Definitions === */ - +// OpenGL Definitions NOT USED #define GL_PERSPECTIVE_CORRECTION_HINT 0x0C50 #define GL_PACK_ALIGNMENT 0x0D05 #define GL_UNPACK_ALIGNMENT 0x0CF5 @@ -256,8 +318,9 @@ typedef double GLclampd; #define GL_GEQUAL 0x0206 #define GL_ALWAYS 0x0207 -/* === OpenGL Binding === */ - +//---------------------------------------------------------------------------------- +// OpenGL Bindings to rlsw +//---------------------------------------------------------------------------------- #define glReadPixels(x, y, w, h, f, t, p) swCopyFramebuffer((x), (y), (w), (h), (f), (t), (p)) #define glEnable(state) swEnable((state)) #define glDisable(state) swDisable((state)) @@ -317,8 +380,7 @@ typedef double GLclampd; #define glTexParameteri(tr, pname, param) swTexParameteri((pname), (param)) #define glBindTexture(tr, id) swBindTexture((id)) -/* === Not Implemented === */ - +// OpenGL functions NOT IMPLEMENTED by rlsw #define glClearDepth(X) ((void)(X)) #define glDepthMask(X) ((void)(X)) #define glColorMask(X,Y,Z,W) ((void)(X),(void)(Y),(void)(Z),(void)(W)) @@ -334,8 +396,9 @@ typedef double GLclampd; #define glNormal3fv(X) ((void)(X)) #define glNormalPointer(X,Y,Z) ((void)(X),(void)(Y),(void)(Z)) -/* === RLSW Enums === */ - +//---------------------------------------------------------------------------------- +// Types and Structures Definition +//---------------------------------------------------------------------------------- typedef enum { SW_SCISSOR_TEST = GL_SCISSOR_TEST, SW_TEXTURE_2D = GL_TEXTURE_2D, @@ -455,102 +518,108 @@ typedef enum { SW_INVALID_OPERATION = GL_INVALID_OPERATION, } SWerrcode; -/* === Public API === */ +//------------------------------------------------------------------------------------ +// Functions Declaration - Public API +//------------------------------------------------------------------------------------ +SWAPI bool swInit(int w, int h); +SWAPI void swClose(void); -bool swInit(int w, int h); -void swClose(void); +SWAPI bool swResizeFramebuffer(int w, int h); +SWAPI void swCopyFramebuffer(int x, int y, int w, int h, SWformat format, SWtype type, void *pixels); +SWAPI void swBlitFramebuffer(int xDst, int yDst, int wDst, int hDst, int xSrc, int ySrc, int wSrc, int hSrc, SWformat format, SWtype type, void *pixels); +SWAPI void *swGetColorBuffer(int *w, int *h); -bool swResizeFramebuffer(int w, int h); -void swCopyFramebuffer(int x, int y, int w, int h, SWformat format, SWtype type, void* pixels); -void swBlitFramebuffer(int xDst, int yDst, int wDst, int hDst, int xSrc, int ySrc, int wSrc, int hSrc, SWformat format, SWtype type, void* pixels); -void* swGetColorBuffer(int* w, int* h); +SWAPI void swEnable(SWstate state); +SWAPI void swDisable(SWstate state); -void swEnable(SWstate state); -void swDisable(SWstate state); +SWAPI void swGetFloatv(SWget name, float *v); +SWAPI const char *swGetString(SWget name); +SWAPI SWerrcode swGetError(void); -void swGetFloatv(SWget name, float* v); -const char* swGetString(SWget name); -SWerrcode swGetError(void); +SWAPI void swViewport(int x, int y, int width, int height); +SWAPI void swScissor(int x, int y, int width, int height); -void swViewport(int x, int y, int width, int height); -void swScissor(int x, int y, int width, int height); +SWAPI void swClearColor(float r, float g, float b, float a); +SWAPI void swClear(uint32_t bitmask); -void swClearColor(float r, float g, float b, float a); -void swClear(uint32_t bitmask); +SWAPI void swBlendFunc(SWfactor sfactor, SWfactor dfactor); +SWAPI void swPolygonMode(SWpoly mode); +SWAPI void swCullFace(SWface face); -void swBlendFunc(SWfactor sfactor, SWfactor dfactor); -void swPolygonMode(SWpoly mode); -void swCullFace(SWface face); +SWAPI void swPointSize(float size); +SWAPI void swLineWidth(float width); -void swPointSize(float size); -void swLineWidth(float width); +SWAPI void swMatrixMode(SWmatrix mode); +SWAPI void swPushMatrix(void); +SWAPI void swPopMatrix(void); +SWAPI void swLoadIdentity(void); +SWAPI void swTranslatef(float x, float y, float z); +SWAPI void swRotatef(float angle, float x, float y, float z); +SWAPI void swScalef(float x, float y, float z); +SWAPI void swMultMatrixf(const float *mat); +SWAPI void swFrustum(double left, double right, double bottom, double top, double znear, double zfar); +SWAPI void swOrtho(double left, double right, double bottom, double top, double znear, double zfar); -void swMatrixMode(SWmatrix mode); -void swPushMatrix(void); -void swPopMatrix(void); -void swLoadIdentity(void); -void swTranslatef(float x, float y, float z); -void swRotatef(float angle, float x, float y, float z); -void swScalef(float x, float y, float z); -void swMultMatrixf(const float* mat); -void swFrustum(double left, double right, double bottom, double top, double znear, double zfar); -void swOrtho(double left, double right, double bottom, double top, double znear, double zfar); +SWAPI void swBegin(SWdraw mode); +SWAPI void swEnd(void); -void swBegin(SWdraw mode); -void swEnd(void); +SWAPI void swVertex2i(int x, int y); +SWAPI void swVertex2f(float x, float y); +SWAPI void swVertex2fv(const float *v); +SWAPI void swVertex3i(int x, int y, int z); +SWAPI void swVertex3f(float x, float y, float z); +SWAPI void swVertex3fv(const float *v); +SWAPI void swVertex4i(int x, int y, int z, int w); +SWAPI void swVertex4f(float x, float y, float z, float w); +SWAPI void swVertex4fv(const float *v); -void swVertex2i(int x, int y); -void swVertex2f(float x, float y); -void swVertex2fv(const float* v); -void swVertex3i(int x, int y, int z); -void swVertex3f(float x, float y, float z); -void swVertex3fv(const float* v); -void swVertex4i(int x, int y, int z, int w); -void swVertex4f(float x, float y, float z, float w); -void swVertex4fv(const float* v); +SWAPI void swColor3ub(uint8_t r, uint8_t g, uint8_t b); +SWAPI void swColor3ubv(const uint8_t *v); +SWAPI void swColor3f(float r, float g, float b); +SWAPI void swColor3fv(const float *v); +SWAPI void swColor4ub(uint8_t r, uint8_t g, uint8_t b, uint8_t a); +SWAPI void swColor4ubv(const uint8_t *v); +SWAPI void swColor4f(float r, float g, float b, float a); +SWAPI void swColor4fv(const float *v); -void swColor3ub(uint8_t r, uint8_t g, uint8_t b); -void swColor3ubv(const uint8_t* v); -void swColor3f(float r, float g, float b); -void swColor3fv(const float* v); -void swColor4ub(uint8_t r, uint8_t g, uint8_t b, uint8_t a); -void swColor4ubv(const uint8_t* v); -void swColor4f(float r, float g, float b, float a); -void swColor4fv(const float* v); +SWAPI void swTexCoord2f(float u, float v); +SWAPI void swTexCoord2fv(const float *v); -void swTexCoord2f(float u, float v); -void swTexCoord2fv(const float* v); +SWAPI void swBindArray(SWarray type, void *buffer); +SWAPI void swDrawArrays(SWdraw mode, int offset, int count); -void swBindArray(SWarray type, void *buffer); -void swDrawArrays(SWdraw mode, int offset, int count); +SWAPI void swGenTextures(int count, uint32_t *textures); +SWAPI void swDeleteTextures(int count, uint32_t *textures); -void swGenTextures(int count, uint32_t* textures); -void swDeleteTextures(int count, uint32_t* textures); - -void swTexImage2D(int width, int height, SWformat format, SWtype type, bool copy, const void* data); -void swTexParameteri(int param, int value); -void swBindTexture(uint32_t id); +SWAPI void swTexImage2D(int width, int height, SWformat format, SWtype type, bool copy, const void *data); +SWAPI void swTexParameteri(int param, int value); +SWAPI void swBindTexture(uint32_t id); #endif // RLSW_H -/* === RLSW Implementation === */ - -#ifdef RLSW_IMPL +/*********************************************************************************** +* +* RLSW IMPLEMENTATION +* +************************************************************************************/ +#define RLSW_IMPLEMENTATION +#if defined(RLSW_IMPLEMENTATION) #include #include -#include +#include // Required for: floorf(), fabsf() -/* === Defines and Macros === */ +//---------------------------------------------------------------------------------- +// Defines and Macros +//---------------------------------------------------------------------------------- +#define SW_PI 3.14159265358979323846f +#define SW_DEG2RAD (SW_PI/180.0f) +#define SW_RAD2DEG (180.0f/SW_PI) -#define SW_PI 3.14159265358979323846f -#define SW_DEG2RAD (SW_PI/180.0f) -#define SW_RAD2DEG (180.0f/SW_PI) +#define SW_COLOR_PIXEL_SIZE (SW_COLOR_BUFFER_BITS/8) +#define SW_DEPTH_PIXEL_SIZE (SW_DEPTH_BUFFER_BITS/8) -#define SW_COLOR_PIXEL_SIZE (SW_COLOR_BUFFER_BITS / 8) -#define SW_DEPTH_PIXEL_SIZE (SW_DEPTH_BUFFER_BITS / 8) - -#define SW_STATE_CHECK(flags) ((RLSW.stateFlags & (flags)) == (flags)) +#define SW_STATE_CHECK(flags) ((RLSW.stateFlags & (flags)) == (flags)) #define SW_STATE_SCISSOR_TEST (1 << 0) #define SW_STATE_TEXTURE_2D (1 << 1) @@ -558,8 +627,11 @@ void swBindTexture(uint32_t id); #define SW_STATE_CULL_FACE (1 << 3) #define SW_STATE_BLEND (1 << 4) -/* === Internal Structs === */ - +//---------------------------------------------------------------------------------- +// Module Types and Structures Definition +//---------------------------------------------------------------------------------- +// Pixel data format type +// NOTE: Enum aligned with raylib PixelFormat typedef enum { SW_PIXELFORMAT_UNKNOWN = 0, SW_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE, // 8 bit per pixel (no alpha) @@ -578,49 +650,45 @@ typedef enum { } sw_pixelformat_t; typedef void (*sw_factor_f)( - float* SW_RESTRICT factor, - const float* SW_RESTRICT src, - const float* SW_RESTRICT dst + float *SW_RESTRICT factor, + const float *SW_RESTRICT src, + const float *SW_RESTRICT dst ); typedef float sw_matrix_t[4*4]; typedef uint16_t sw_half_t; typedef struct { + float position[4]; // Position coordinates + float texcoord[2]; // Texture coordinates + float color[4]; // Color value (RGBA) - float position[4]; // Position coordinates - float texcoord[2]; // Texture coordinates - float color[4]; // Color - - float homogeneous[4]; // Homogeneous coordinates - float screen[2]; // Screen coordinates - + float homogeneous[4]; // Homogeneous coordinates + float screen[2]; // Screen coordinates } sw_vertex_t; typedef struct { - // Dirty hack for copied data - // TODO: Rework copied image handling - + // TODO: Rework copied image handling union { - const void* cptr; //< NOTE: Is used for all data reads - void* ptr; //< WARNING: Should only be used to allocate and free data + const void *cptr; // NOTE: Is used for all data reads + void *ptr; // WARNING: Should only be used to allocate and free data } pixels; - int width, height; //< Dimensions of the texture - int wMinus1, hMinus1; //< Dimensions minus one - sw_pixelformat_t format; //< Pixel format (internal representation) + int width, height; // Dimensions of the texture + int wMinus1, hMinus1; // Dimensions minus one + sw_pixelformat_t format; // Pixel format (internal representation) - SWfilter minFilter; //< Minification filter - SWfilter magFilter; //< Magnification filter + SWfilter minFilter; // Minification filter + SWfilter magFilter; // Magnification filter - SWwrap sWrap; //< texcoord.x wrap mode - SWwrap tWrap; //< texcoord.y wrap mode + SWwrap sWrap; // texcoord.x wrap mode + SWwrap tWrap; // texcoord.y wrap mode - float tx; //< Texel width - float ty; //< Texel height + float tx; // Texel width + float ty; // Texel height - bool copy; //< Flag indicating whether memory has been allocated + bool copy; // Flag indicating whether memory has been allocated } sw_texture_t; @@ -633,28 +701,27 @@ typedef struct { } sw_framebuffer_t; typedef struct { - - sw_framebuffer_t framebuffer; + sw_framebuffer_t framebuffer; // Main framebuffer float clearColor[4]; // Color used to clear the screen float clearDepth; // Depth value used to clear the screen - int vpCenter[2]; // Represents the center of the viewport - int vpHalfSize[2]; // Represents the half dimensions of the viewport - int vpSize[2]; // Represents the dimensions of the viewport (minus one) - int vpMin[2]; // Represents the minimum renderable point of the viewport (top-left) - int vpMax[2]; // Represents the maximum renderable point of the viewport (bottom-right) + int vpCenter[2]; // Viewport center + int vpHalfSize[2]; // Viewport half dimensions + int vpSize[2]; // Viewport dimensions (minus one) + int vpMin[2]; // Viewport minimum renderable point (top-left) + int vpMax[2]; // Viewport maximum renderable point (bottom-right) - int scMin[2]; // Represents the minimum renderable point of the scissor rect (top-left) - int scMax[2]; // Represents the maximum renderable point of the scissor rect (bottom-right) - float scClipMin[2]; // Represents the minimum renderable point of the scissor rect in clip space - float scClipMax[2]; // Represents the maximum renderable point of the scissor rect in clip space + int scMin[2]; // Scissor rectangle minimum renderable point (top-left) + int scMax[2]; // Scissor rectangle maximum renderable point (bottom-right) + float scClipMin[2]; // Scissor rectangle minimum renderable point in clip space + float scClipMax[2]; // Scissor rectangle maximum renderable point in clip space - uint32_t currentTexture; + uint32_t currentTexture; // Current active texture id struct { - float* positions; - float* texcoords; - uint8_t* colors; + float *positions; + float *texcoords; + uint8_t *colors; } array; struct { @@ -678,7 +745,7 @@ typedef struct { uint32_t stackModelviewCounter; // Counter for matrix stack operations uint32_t stackTextureCounter; // Counter for matrix stack operations SWmatrix currentMatrixMode; // Current matrix mode (e.g., sw_MODELVIEW, sw_PROJECTION) - sw_matrix_t* currentMatrix; // Pointer to the currently used matrix according to the mode + sw_matrix_t *currentMatrix; // Pointer to the currently used matrix according to the mode sw_matrix_t matMVP; // Model view projection matrix, calculated and used internally bool isDirtyMVP; // Indicates if the MVP matrix should be rebuilt @@ -691,22 +758,24 @@ typedef struct { SWface cullFace; // Faces to cull SWerrcode errCode; // Last error code - sw_texture_t* loadedTextures; + sw_texture_t *loadedTextures; int loadedTextureCount; - uint32_t* freeTextureIds; + uint32_t *freeTextureIds; int freeTextureIdCount; uint32_t stateFlags; } sw_context_t; -/* === Global Data === */ - +//---------------------------------------------------------------------------------- +// Global Variables Definition +//---------------------------------------------------------------------------------- static sw_context_t RLSW = { 0 }; -/* === Helper Functions === */ - +//---------------------------------------------------------------------------------- +// Module Functions Declaration +//---------------------------------------------------------------------------------- static inline void sw_matrix_id(sw_matrix_t dst) { dst[0] = 1, dst[1] = 0, dst[2] = 0, dst[3] = 0; @@ -715,32 +784,32 @@ static inline void sw_matrix_id(sw_matrix_t dst) dst[12] = 0, dst[13] = 0, dst[14] = 0, dst[15] = 1; } -static inline void sw_matrix_mul_rst(float* SW_RESTRICT dst, const float* SW_RESTRICT left, const float* SW_RESTRICT right) +static inline void sw_matrix_mul_rst(float *SW_RESTRICT dst, const float *SW_RESTRICT left, const float *SW_RESTRICT right) { - float l00 = left[0], l01 = left[1], l02 = left[2], l03 = left[3]; + float l00 = left[0], l01 = left[1], l02 = left[2], l03 = left[3]; float l10 = left[4], l11 = left[5], l12 = left[6], l13 = left[7]; float l20 = left[8], l21 = left[9], l22 = left[10], l23 = left[11]; float l30 = left[12], l31 = left[13], l32 = left[14], l33 = left[15]; - dst[0] = l00 * right[0] + l01 * right[4] + l02 * right[8] + l03 * right[12]; - dst[4] = l10 * right[0] + l11 * right[4] + l12 * right[8] + l13 * right[12]; - dst[8] = l20 * right[0] + l21 * right[4] + l22 * right[8] + l23 * right[12]; - dst[12] = l30 * right[0] + l31 * right[4] + l32 * right[8] + l33 * right[12]; + dst[0] = l00*right[0] + l01*right[4] + l02*right[8] + l03*right[12]; + dst[4] = l10*right[0] + l11*right[4] + l12*right[8] + l13*right[12]; + dst[8] = l20*right[0] + l21*right[4] + l22*right[8] + l23*right[12]; + dst[12] = l30*right[0] + l31*right[4] + l32*right[8] + l33*right[12]; - dst[1] = l00 * right[1] + l01 * right[5] + l02 * right[9] + l03 * right[13]; - dst[5] = l10 * right[1] + l11 * right[5] + l12 * right[9] + l13 * right[13]; - dst[9] = l20 * right[1] + l21 * right[5] + l22 * right[9] + l23 * right[13]; - dst[13] = l30 * right[1] + l31 * right[5] + l32 * right[9] + l33 * right[13]; + dst[1] = l00*right[1] + l01*right[5] + l02*right[9] + l03*right[13]; + dst[5] = l10*right[1] + l11*right[5] + l12*right[9] + l13*right[13]; + dst[9] = l20*right[1] + l21*right[5] + l22*right[9] + l23*right[13]; + dst[13] = l30*right[1] + l31*right[5] + l32*right[9] + l33*right[13]; - dst[2] = l00 * right[2] + l01 * right[6] + l02 * right[10] + l03 * right[14]; - dst[6] = l10 * right[2] + l11 * right[6] + l12 * right[10] + l13 * right[14]; - dst[10] = l20 * right[2] + l21 * right[6] + l22 * right[10] + l23 * right[14]; - dst[14] = l30 * right[2] + l31 * right[6] + l32 * right[10] + l33 * right[14]; + dst[2] = l00*right[2] + l01*right[6] + l02*right[10] + l03*right[14]; + dst[6] = l10*right[2] + l11*right[6] + l12*right[10] + l13*right[14]; + dst[10] = l20*right[2] + l21*right[6] + l22*right[10] + l23*right[14]; + dst[14] = l30*right[2] + l31*right[6] + l32*right[10] + l33*right[14]; - dst[3] = l00 * right[3] + l01 * right[7] + l02 * right[11] + l03 * right[15]; - dst[7] = l10 * right[3] + l11 * right[7] + l12 * right[11] + l13 * right[15]; - dst[11] = l20 * right[3] + l21 * right[7] + l22 * right[11] + l23 * right[15]; - dst[15] = l30 * right[3] + l31 * right[7] + l32 * right[11] + l33 * right[15]; + dst[3] = l00*right[3] + l01*right[7] + l02*right[11] + l03*right[15]; + dst[7] = l10*right[3] + l11*right[7] + l12*right[11] + l13*right[15]; + dst[11] = l20*right[3] + l21*right[7] + l22*right[11] + l23*right[15]; + dst[15] = l30*right[3] + l31*right[7] + l32*right[11] + l33*right[15]; } static inline void sw_matrix_mul(sw_matrix_t dst, const sw_matrix_t left, const sw_matrix_t right) @@ -749,9 +818,7 @@ static inline void sw_matrix_mul(sw_matrix_t dst, const sw_matrix_t left, const sw_matrix_mul_rst(result, left, right); - for (int i = 0; i < 16; i++) { - dst[i] = result[i]; - } + for (int i = 0; i < 16; i++) dst[i] = result[i]; } static inline float sw_saturate(float x) @@ -761,15 +828,11 @@ static inline float sw_saturate(float x) // Check if x < 0.0f // If sign bit is set (MSB), x is negative - if ((fb.u & 0x80000000) != 0) { - return 0.0f; - } + if ((fb.u & 0x80000000) != 0) return 0.0f; // Check if x > 1.0f // Works for positive floats: IEEE 754 ordering matches integer ordering - if (fb.u > 0x3F800000) { - return 1.0f; - } + if (fb.u > 0x3F800000) return 1.0f; // x is in [0.0f, 1.0f] return x; @@ -777,7 +840,7 @@ static inline float sw_saturate(float x) static inline float sw_fract(float x) { - return x - floorf(x); + return (x - floorf(x)); } static inline int sw_clampi(int v, int min, int max) @@ -788,68 +851,68 @@ static inline int sw_clampi(int v, int min, int max) } static inline void sw_lerp_vertex_PTCH( - sw_vertex_t* SW_RESTRICT out, - const sw_vertex_t* SW_RESTRICT a, - const sw_vertex_t* SW_RESTRICT b, + sw_vertex_t *SW_RESTRICT out, + const sw_vertex_t *SW_RESTRICT a, + const sw_vertex_t *SW_RESTRICT b, float t) { const float tInv = 1.0f - t; // Position interpolation (4 components) - out->position[0] = a->position[0] * tInv + b->position[0] * t; - out->position[1] = a->position[1] * tInv + b->position[1] * t; - out->position[2] = a->position[2] * tInv + b->position[2] * t; - out->position[3] = a->position[3] * tInv + b->position[3] * t; + out->position[0] = a->position[0]*tInv + b->position[0]*t; + out->position[1] = a->position[1]*tInv + b->position[1]*t; + out->position[2] = a->position[2]*tInv + b->position[2]*t; + out->position[3] = a->position[3]*tInv + b->position[3]*t; // Texture coordinate interpolation (2 components) - out->texcoord[0] = a->texcoord[0] * tInv + b->texcoord[0] * t; - out->texcoord[1] = a->texcoord[1] * tInv + b->texcoord[1] * t; + out->texcoord[0] = a->texcoord[0]*tInv + b->texcoord[0]*t; + out->texcoord[1] = a->texcoord[1]*tInv + b->texcoord[1]*t; // Color interpolation (4 components) - out->color[0] = a->color[0] * tInv + b->color[0] * t; - out->color[1] = a->color[1] * tInv + b->color[1] * t; - out->color[2] = a->color[2] * tInv + b->color[2] * t; - out->color[3] = a->color[3] * tInv + b->color[3] * t; + out->color[0] = a->color[0]*tInv + b->color[0]*t; + out->color[1] = a->color[1]*tInv + b->color[1]*t; + out->color[2] = a->color[2]*tInv + b->color[2]*t; + out->color[3] = a->color[3]*tInv + b->color[3]*t; // Homogeneous coordinate interpolation (4 components) - out->homogeneous[0] = a->homogeneous[0] * tInv + b->homogeneous[0] * t; - out->homogeneous[1] = a->homogeneous[1] * tInv + b->homogeneous[1] * t; - out->homogeneous[2] = a->homogeneous[2] * tInv + b->homogeneous[2] * t; - out->homogeneous[3] = a->homogeneous[3] * tInv + b->homogeneous[3] * t; + out->homogeneous[0] = a->homogeneous[0]*tInv + b->homogeneous[0]*t; + out->homogeneous[1] = a->homogeneous[1]*tInv + b->homogeneous[1]*t; + out->homogeneous[2] = a->homogeneous[2]*tInv + b->homogeneous[2]*t; + out->homogeneous[3] = a->homogeneous[3]*tInv + b->homogeneous[3]*t; } static inline void sw_get_vertex_grad_PTCH( - sw_vertex_t* SW_RESTRICT out, - const sw_vertex_t* SW_RESTRICT a, - const sw_vertex_t* SW_RESTRICT b, + sw_vertex_t *SW_RESTRICT out, + const sw_vertex_t *SW_RESTRICT a, + const sw_vertex_t *SW_RESTRICT b, float scale) { // Calculate gradients for Position - out->position[0] = (b->position[0] - a->position[0]) * scale; - out->position[1] = (b->position[1] - a->position[1]) * scale; - out->position[2] = (b->position[2] - a->position[2]) * scale; - out->position[3] = (b->position[3] - a->position[3]) * scale; + out->position[0] = (b->position[0] - a->position[0])*scale; + out->position[1] = (b->position[1] - a->position[1])*scale; + out->position[2] = (b->position[2] - a->position[2])*scale; + out->position[3] = (b->position[3] - a->position[3])*scale; // Calculate gradients for Texture coordinates - out->texcoord[0] = (b->texcoord[0] - a->texcoord[0]) * scale; - out->texcoord[1] = (b->texcoord[1] - a->texcoord[1]) * scale; + out->texcoord[0] = (b->texcoord[0] - a->texcoord[0])*scale; + out->texcoord[1] = (b->texcoord[1] - a->texcoord[1])*scale; // Calculate gradients for Color - out->color[0] = (b->color[0] - a->color[0]) * scale; - out->color[1] = (b->color[1] - a->color[1]) * scale; - out->color[2] = (b->color[2] - a->color[2]) * scale; - out->color[3] = (b->color[3] - a->color[3]) * scale; + out->color[0] = (b->color[0] - a->color[0])*scale; + out->color[1] = (b->color[1] - a->color[1])*scale; + out->color[2] = (b->color[2] - a->color[2])*scale; + out->color[3] = (b->color[3] - a->color[3])*scale; // Calculate gradients for Homogeneous coordinates - out->homogeneous[0] = (b->homogeneous[0] - a->homogeneous[0]) * scale; - out->homogeneous[1] = (b->homogeneous[1] - a->homogeneous[1]) * scale; - out->homogeneous[2] = (b->homogeneous[2] - a->homogeneous[2]) * scale; - out->homogeneous[3] = (b->homogeneous[3] - a->homogeneous[3]) * scale; + out->homogeneous[0] = (b->homogeneous[0] - a->homogeneous[0])*scale; + out->homogeneous[1] = (b->homogeneous[1] - a->homogeneous[1])*scale; + out->homogeneous[2] = (b->homogeneous[2] - a->homogeneous[2])*scale; + out->homogeneous[3] = (b->homogeneous[3] - a->homogeneous[3])*scale; } static inline void sw_add_vertex_grad_PTCH( - sw_vertex_t* SW_RESTRICT out, - const sw_vertex_t* SW_RESTRICT gradients) + sw_vertex_t *SW_RESTRICT out, + const sw_vertex_t *SW_RESTRICT gradients) { // Add gradients to Position out->position[0] += gradients->position[0]; @@ -874,8 +937,7 @@ static inline void sw_add_vertex_grad_PTCH( out->homogeneous[3] += gradients->homogeneous[3]; } -/* === Half Floating Point === */ - +// Half floating point management functions static inline uint32_t sw_f16_to_f32_ui(uint16_t h) { uint32_t s = (uint32_t)(h & 0x8000) << 16; @@ -885,20 +947,19 @@ static inline uint32_t sw_f16_to_f32_ui(uint16_t h) int32_t r = (em + (112 << 10)) << 13; // denormal: flush to zero - r = (em < (1 << 10)) ? 0 : r; + r = (em < (1 << 10))? 0 : r; // infinity/NaN; note that we preserve NaN payload as a byproduct of unifying inf/nan cases // 112 is an exponent bias fixup; since we already applied it once, applying it twice converts 31 to 255 - r += (em >= (31 << 10)) ? (112 << 23) : 0; + r += (em >= (31 << 10))? (112 << 23) : 0; return s | r; } static inline float sw_f16_to_f32(sw_half_t y) { - union { float f; uint32_t i; } v = { - .i = sw_f16_to_f32_ui(y) - }; + union { float f; uint32_t i; } v = { .i = sw_f16_to_f32_ui(y) }; + return v.f; } @@ -907,17 +968,17 @@ static inline uint16_t sw_f16_from_f32_ui(uint32_t ui) int32_t s = (ui >> 16) & 0x8000; int32_t em = ui & 0x7fffffff; - // bias exponent and round to nearest; 112 is relative exponent bias (127-15) + // Bias exponent and round to nearest; 112 is relative exponent bias (127-15) int32_t h = (em - (112 << 23) + (1 << 12)) >> 13; - // underflow: flush to zero; 113 encodes exponent -14 - h = (em < (113 << 23)) ? 0 : h; + // Underflow: flush to zero; 113 encodes exponent -14 + h = (em < (113 << 23))? 0 : h; - // overflow: infinity; 143 encodes exponent 16 - h = (em >= (143 << 23)) ? 0x7c00 : h; + // Overflow: infinity; 143 encodes exponent 16 + h = (em >= (143 << 23))? 0x7c00 : h; // NaN; note that we convert all types of NaN to qNaN - h = (em > (255 << 23)) ? 0x7e00 : h; + h = (em > (255 << 23))? 0x7e00 : h; return (uint16_t)(s | h); } @@ -929,39 +990,39 @@ static inline sw_half_t sw_f16_from_f32(float i) return sw_f16_from_f32_ui(v.i); } -/* === Framebuffer Part === */ - +// Framebuffer management functions static inline bool sw_framebuffer_load(int w, int h) { - int size = w * h; + int size = w*h; - RLSW.framebuffer.color = SW_MALLOC(SW_COLOR_PIXEL_SIZE * size); + RLSW.framebuffer.color = SW_MALLOC(SW_COLOR_PIXEL_SIZE*size); if (RLSW.framebuffer.color == NULL) return false; - RLSW.framebuffer.depth = SW_MALLOC(SW_DEPTH_PIXEL_SIZE * size); + RLSW.framebuffer.depth = SW_MALLOC(SW_DEPTH_PIXEL_SIZE*size); if (RLSW.framebuffer.depth == NULL) return false; RLSW.framebuffer.width = w; RLSW.framebuffer.height = h; - RLSW.framebuffer.allocSz = w * h; + RLSW.framebuffer.allocSz = size; return true; } static inline bool sw_framebuffer_resize(int w, int h) { - int newSize = w * h; + int newSize = w*h; - if (newSize <= RLSW.framebuffer.allocSz) { + if (newSize <= RLSW.framebuffer.allocSz) + { RLSW.framebuffer.width = w; RLSW.framebuffer.height = h; return true; } - void* newColor = SW_REALLOC(RLSW.framebuffer.color, newSize); + void *newColor = SW_REALLOC(RLSW.framebuffer.color, newSize); if (newColor == NULL) return false; - void* newDepth = SW_REALLOC(RLSW.framebuffer.depth, newSize); + void *newDepth = SW_REALLOC(RLSW.framebuffer.depth, newSize); if (newDepth == NULL) return false; RLSW.framebuffer.color = newColor; @@ -974,199 +1035,201 @@ static inline bool sw_framebuffer_resize(int w, int h) return true; } -static inline void* sw_framebuffer_get_color_addr(const void* ptr, uint32_t offset) +static inline void *sw_framebuffer_get_color_addr(const void *ptr, uint32_t offset) { - return (uint8_t*)ptr + offset * SW_COLOR_PIXEL_SIZE; + return (uint8_t *)ptr + offset*SW_COLOR_PIXEL_SIZE; } -static inline void sw_framebuffer_inc_color_addr(void** ptr) +static inline void sw_framebuffer_inc_color_addr(void **ptr) { - *ptr = (void*)(((uint8_t*)*ptr) + SW_COLOR_PIXEL_SIZE); + *ptr = (void *)(((uint8_t *)*ptr) + SW_COLOR_PIXEL_SIZE); } -static inline void sw_framebuffer_inc_const_color_addr(const void** ptr) +static inline void sw_framebuffer_inc_const_color_addr(const void **ptr) { - *ptr = (const void*)(((const uint8_t*)*ptr) + SW_COLOR_PIXEL_SIZE); + *ptr = (const void *)(((const uint8_t *)*ptr) + SW_COLOR_PIXEL_SIZE); } -static inline void* sw_framebuffer_get_depth_addr(const void* ptr, uint32_t offset) +static inline void *sw_framebuffer_get_depth_addr(const void *ptr, uint32_t offset) { - return (uint8_t*)ptr + offset * SW_DEPTH_PIXEL_SIZE; + return (uint8_t *)ptr + offset*SW_DEPTH_PIXEL_SIZE; } -static inline void sw_framebuffer_inc_depth_addr(void** ptr) +static inline void sw_framebuffer_inc_depth_addr(void* *ptr) { - *ptr = (void*)(((uint8_t*)*ptr) + SW_DEPTH_PIXEL_SIZE); + *ptr = (void*)(((uint8_t *)*ptr) + SW_DEPTH_PIXEL_SIZE); } -#if (SW_COLOR_BUFFER_BITS == 8) // RGB - 332 - -static inline void sw_framebuffer_read_color(float dst[4], const void* src) +#if (SW_COLOR_BUFFER_BITS == 8) // RGB - (3:3:2) +static inline void sw_framebuffer_read_color(float dst[4], const void *src) { - uint8_t pixel = ((uint8_t*)src)[0]; + uint8_t pixel = ((uint8_t *)src)[0]; - dst[0] = ((pixel >> 5) & 0x07) * (1.0f / 7.0f); - dst[1] = ((pixel >> 2) & 0x07) * (1.0f / 7.0f); - dst[2] = (pixel & 0x03) * (1.0f / 3.0f); + dst[0] = ((pixel >> 5) & 0x07)*(1.0f/7.0f); + dst[1] = ((pixel >> 2) & 0x07)*(1.0f/7.0f); + dst[2] = (pixel & 0x03)*(1.0f/3.0f); dst[3] = 1.0f; } -static inline void sw_framebuffer_read_color8(uint8_t dst[4], const void* src) +static inline void sw_framebuffer_read_color8(uint8_t dst[4], const void *src) { - uint8_t pixel = ((const uint8_t*)src)[0]; + uint8_t pixel = ((const uint8_t *)src)[0]; uint8_t r = (pixel >> 5) & 0x07; uint8_t g = (pixel >> 2) & 0x07; uint8_t b = pixel & 0x03; - dst[0] = (r * 255 + 3) / 7; - dst[1] = (g * 255 + 3) / 7; - dst[2] = (b * 255 + 1) / 3; + dst[0] = (r*255 + 3)/7; + dst[1] = (g*255 + 3)/7; + dst[2] = (b*255 + 1)/3; dst[3] = 255; } -static inline void sw_framebuffer_write_color(void* dst, const float color[3]) +static inline void sw_framebuffer_write_color(void *dst, const float color[3]) { - uint8_t r = ((uint8_t)(color[0] * UINT8_MAX) >> 5) & 0x07; - uint8_t g = ((uint8_t)(color[1] * UINT8_MAX) >> 5) & 0x07; - uint8_t b = ((uint8_t)(color[2] * UINT8_MAX) >> 6) & 0x03; + uint8_t r = ((uint8_t)(color[0]*UINT8_MAX) >> 5) & 0x07; + uint8_t g = ((uint8_t)(color[1]*UINT8_MAX) >> 5) & 0x07; + uint8_t b = ((uint8_t)(color[2]*UINT8_MAX) >> 6) & 0x03; - ((uint8_t*)dst)[0] = (r << 5) | (g << 2) | b; + ((uint8_t *)dst)[0] = (r << 5) | (g << 2) | b; } -static inline void sw_framebuffer_fill_color(void* ptr, int size, const float color[3]) +static inline void sw_framebuffer_fill_color(void *ptr, int size, const float color[3]) { - uint8_t r8 = (uint8_t)(color[0] * 7.0f + 0.5f); - uint8_t g8 = (uint8_t)(color[1] * 7.0f + 0.5f); - uint8_t b8 = (uint8_t)(color[2] * 3.0f + 0.5f); + uint8_t r8 = (uint8_t)(color[0]*7.0f + 0.5f); + uint8_t g8 = (uint8_t)(color[1]*7.0f + 0.5f); + uint8_t b8 = (uint8_t)(color[2]*3.0f + 0.5f); uint8_t packedColor = ((r8 & 0x07) << 5) | ((g8 & 0x07) << 2) | (b8 & 0x03); - uint8_t* p = (uint8_t*)ptr; + uint8_t *p = (uint8_t *)ptr; - if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) { + if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) + { int wScissor = RLSW.scMax[0] - RLSW.scMin[0] + 1; - for (int y = RLSW.scMin[1]; y <= RLSW.scMax[1]; y++) { - uint8_t* curPtr = p + y * RLSW.framebuffer.width + RLSW.scMin[0]; - for (int xCount = 0; xCount < wScissor; xCount++) { - *curPtr++ = packedColor; - } + for (int y = RLSW.scMin[1]; y <= RLSW.scMax[1]; y++) + { + uint8_t *curPtr = p + y*RLSW.framebuffer.width + RLSW.scMin[0]; + for (int xCount = 0; xCount < wScissor; xCount++) *curPtr++ = packedColor; } } - else { - for (int i = 0; i < size; i++) { - *p++ = packedColor; - } + else + { + for (int i = 0; i < size; i++) *p++ = packedColor; } } -#elif (SW_COLOR_BUFFER_BITS == 16) // RGB - 565 +#elif (SW_COLOR_BUFFER_BITS == 16) // RGB - (5:6:5) -static inline void sw_framebuffer_read_color(float dst[4], const void* src) +static inline void sw_framebuffer_read_color(float dst[4], const void *src) { - uint16_t pixel = ((uint16_t*)src)[0]; + uint16_t pixel = ((uint16_t *)src)[0]; - dst[0] = ((pixel >> 11) & 0x1F) * (1.0f / 31.0f); - dst[1] = ((pixel >> 5) & 0x3F) * (1.0f / 63.0f); - dst[2] = (pixel & 0x1F) * (1.0f / 31.0f); + dst[0] = ((pixel >> 11) & 0x1F)*(1.0f/31.0f); + dst[1] = ((pixel >> 5) & 0x3F)*(1.0f/63.0f); + dst[2] = (pixel & 0x1F)*(1.0f/31.0f); dst[3] = 1.0f; } -static inline void sw_framebuffer_read_color8(uint8_t dst[4], const void* src) +static inline void sw_framebuffer_read_color8(uint8_t dst[4], const void *src) { - uint16_t pixel = ((const uint16_t*)src)[0]; + uint16_t pixel = ((const uint16_t *)src)[0]; uint8_t r = (pixel >> 11) & 0x1F; uint8_t g = (pixel >> 5) & 0x3F; uint8_t b = pixel & 0x1F; - dst[0] = (r * 255 + 15) / 31; - dst[1] = (g * 255 + 31) / 63; - dst[2] = (b * 255 + 15) / 31; + dst[0] = (r*255 + 15)/31; + dst[1] = (g*255 + 31)/63; + dst[2] = (b*255 + 15)/31; dst[3] = 255; } -static inline void sw_framebuffer_write_color(void* dst, const float color[3]) +static inline void sw_framebuffer_write_color(void *dst, const float color[3]) { - uint8_t r = (uint8_t)(color[0] * 31.0f + 0.5f) & 0x1F; - uint8_t g = (uint8_t)(color[1] * 63.0f + 0.5f) & 0x3F; - uint8_t b = (uint8_t)(color[2] * 31.0f + 0.5f) & 0x1F; + uint8_t r = (uint8_t)(color[0]*31.0f + 0.5f) & 0x1F; + uint8_t g = (uint8_t)(color[1]*63.0f + 0.5f) & 0x3F; + uint8_t b = (uint8_t)(color[2]*31.0f + 0.5f) & 0x1F; - ((uint16_t*)dst)[0] = (r << 11) | (g << 5) | b; + ((uint16_t *)dst)[0] = (r << 11) | (g << 5) | b; } -static inline void sw_framebuffer_fill_color(void* ptr, int size, const float color[3]) +static inline void sw_framebuffer_fill_color(void *ptr, int size, const float color[3]) { - uint16_t r16 = (uint16_t)(color[0] * 31.0f + 0.5f); - uint16_t g_16 = (uint16_t)(color[1] * 63.0f + 0.5f); - uint16_t b_16 = (uint16_t)(color[2] * 31.0f + 0.5f); + uint16_t r16 = (uint16_t)(color[0]*31.0f + 0.5f); + uint16_t g_16 = (uint16_t)(color[1]*63.0f + 0.5f); + uint16_t b_16 = (uint16_t)(color[2]*31.0f + 0.5f); uint16_t packedColor = ((r16 & 0x1F) << 11) | ((g_16 & 0x3F) << 5) | (b_16 & 0x1F); - uint16_t* p = (uint16_t*)ptr; + uint16_t *p = (uint16_t *)ptr; - if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) { + if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) + { int wScissor = RLSW.scMax[0] - RLSW.scMin[0] + 1; - for (int y = RLSW.scMin[1]; y <= RLSW.scMax[1]; y++) { - uint16_t* curPtr = p + y * RLSW.framebuffer.width + RLSW.scMin[0]; - for (int xCount = 0; xCount < wScissor; xCount++) { - *curPtr++ = packedColor; - } + for (int y = RLSW.scMin[1]; y <= RLSW.scMax[1]; y++) + { + uint16_t *curPtr = p + y*RLSW.framebuffer.width + RLSW.scMin[0]; + for (int xCount = 0; xCount < wScissor; xCount++) *curPtr++ = packedColor; } } - else { - for (int i = 0; i < size; i++) { - *p++ = packedColor; - } + else + { + for (int i = 0; i < size; i++) *p++ = packedColor; } } -#elif (SW_COLOR_BUFFER_BITS == 24) // RGB - 888 +#elif (SW_COLOR_BUFFER_BITS == 24) // RGB - (8:8:8) -static inline void sw_framebuffer_read_color(float dst[4], const void* src) +static inline void sw_framebuffer_read_color(float dst[4], const void *src) { - dst[0] = ((uint8_t*)src)[0] * (1.0f / 255.0f); - dst[1] = ((uint8_t*)src)[1] * (1.0f / 255.0f); - dst[2] = ((uint8_t*)src)[2] * (1.0f / 255.0f); + dst[0] = ((uint8_t *)src)[0]*(1.0f/255.0f); + dst[1] = ((uint8_t *)src)[1]*(1.0f/255.0f); + dst[2] = ((uint8_t *)src)[2]*(1.0f/255.0f); dst[3] = 1.0f; } -static inline void sw_framebuffer_read_color8(uint8_t dst[4], const void* src) +static inline void sw_framebuffer_read_color8(uint8_t dst[4], const void *src) { - dst[0] = ((uint8_t*)src)[0]; - dst[1] = ((uint8_t*)src)[1]; - dst[2] = ((uint8_t*)src)[2]; + dst[0] = ((uint8_t *)src)[0]; + dst[1] = ((uint8_t *)src)[1]; + dst[2] = ((uint8_t *)src)[2]; dst[3] = 255; } -static inline void sw_framebuffer_write_color(void* dst, const float color[3]) +static inline void sw_framebuffer_write_color(void *dst, const float color[3]) { - ((uint8_t*)dst)[0] = (uint8_t)(color[0] * UINT8_MAX); - ((uint8_t*)dst)[1] = (uint8_t)(color[1] * UINT8_MAX); - ((uint8_t*)dst)[2] = (uint8_t)(color[2] * UINT8_MAX); + ((uint8_t *)dst)[0] = (uint8_t)(color[0]*UINT8_MAX); + ((uint8_t *)dst)[1] = (uint8_t)(color[1]*UINT8_MAX); + ((uint8_t *)dst)[2] = (uint8_t)(color[2]*UINT8_MAX); } -static inline void sw_framebuffer_fill_color(void* ptr, int size, const float color[3]) +static inline void sw_framebuffer_fill_color(void *ptr, int size, const float color[3]) { - uint8_t r = (uint8_t)(color[0] * 255.0f); - uint8_t g = (uint8_t)(color[1] * 255.0f); - uint8_t b = (uint8_t)(color[2] * 255.0f); + uint8_t r = (uint8_t)(color[0]*255.0f); + uint8_t g = (uint8_t)(color[1]*255.0f); + uint8_t b = (uint8_t)(color[2]*255.0f); - uint8_t* p = (uint8_t*)ptr; + uint8_t *p = (uint8_t *)ptr; - if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) { + if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) + { int wScissor = RLSW.scMax[0] - RLSW.scMin[0] + 1; - for (int y = RLSW.scMin[1]; y <= RLSW.scMax[1]; y++) { - uint8_t* curPtr = p + 3 * (y * RLSW.framebuffer.width + RLSW.scMin[0]); - for (int xCount = 0; xCount < wScissor; xCount++) { + for (int y = RLSW.scMin[1]; y <= RLSW.scMax[1]; y++) + { + uint8_t *curPtr = p + 3*(y*RLSW.framebuffer.width + RLSW.scMin[0]); + for (int xCount = 0; xCount < wScissor; xCount++) + { *curPtr++ = r; *curPtr++ = g; *curPtr++ = b; } } } - else { - for (int i = 0; i < size; i++) { + else + { + for (int i = 0; i < size; i++) + { *p++ = r; *p++ = g; *p++ = b; @@ -1178,112 +1241,115 @@ static inline void sw_framebuffer_fill_color(void* ptr, int size, const float co #if (SW_DEPTH_BUFFER_BITS == 8) -static inline float sw_framebuffer_read_depth(const void* src) +static inline float sw_framebuffer_read_depth(const void *src) { - return (float)((uint8_t*)src)[0] * (1.0f / UINT8_MAX); + return (float)((uint8_t *)src)[0]*(1.0f/UINT8_MAX); } -static inline void sw_framebuffer_write_depth(void* dst, float depth) +static inline void sw_framebuffer_write_depth(void *dst, float depth) { - ((uint8_t*)dst)[0] = (uint8_t)(depth * UINT8_MAX); + ((uint8_t *)dst)[0] = (uint8_t)(depth*UINT8_MAX); } -static inline void sw_framebuffer_fill_depth(void* ptr, int size, float value) +static inline void sw_framebuffer_fill_depth(void *ptr, int size, float value) { - uint8_t d8 = (uint8_t)(value * UINT8_MAX); - uint8_t* p = (uint8_t*)ptr; + uint8_t d8 = (uint8_t)(value*UINT8_MAX); + uint8_t *p = (uint8_t *)ptr; - if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) { + if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) + { int wScissor = RLSW.scMax[0] - RLSW.scMin[0] + 1; - for (int y = RLSW.scMin[1]; y <= RLSW.scMax[1]; y++) { - uint8_t* curPtr = p + y * RLSW.framebuffer.width + RLSW.scMin[0]; - for (int xCount = 0; xCount < wScissor; xCount++) { - *curPtr++ = d8; - } + for (int y = RLSW.scMin[1]; y <= RLSW.scMax[1]; y++) + { + uint8_t *curPtr = p + y*RLSW.framebuffer.width + RLSW.scMin[0]; + for (int xCount = 0; xCount < wScissor; xCount++) *curPtr++ = d8; } } - else { - for (int i = 0; i < size; i++) { - *p++ = d8; - } + else + { + for (int i = 0; i < size; i++) *p++ = d8; } } #elif (SW_DEPTH_BUFFER_BITS == 16) -static inline float sw_framebuffer_read_depth(const void* src) +static inline float sw_framebuffer_read_depth(const void *src) { - return (float)((uint16_t*)src)[0] * (1.0f / UINT16_MAX); + return (float)((uint16_t *)src)[0]*(1.0f/UINT16_MAX); } -static inline void sw_framebuffer_write_depth(void* dst, float depth) +static inline void sw_framebuffer_write_depth(void *dst, float depth) { - ((uint16_t*)dst)[0] = (uint16_t)(depth * UINT16_MAX); + ((uint16_t *)dst)[0] = (uint16_t)(depth*UINT16_MAX); } -static inline void sw_framebuffer_fill_depth(void* ptr, int size, float value) +static inline void sw_framebuffer_fill_depth(void *ptr, int size, float value) { - uint16_t d16 = (uint16_t)(value * UINT16_MAX); - uint16_t* p = (uint16_t*)ptr; + uint16_t d16 = (uint16_t)(value*UINT16_MAX); + uint16_t *p = (uint16_t *)ptr; - if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) { + if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) + { int wScissor = RLSW.scMax[0] - RLSW.scMin[0] + 1; - for (int y = RLSW.scMin[1]; y <= RLSW.scMax[1]; y++) { - uint16_t* curPtr = p + y * RLSW.framebuffer.width + RLSW.scMin[0]; - for (int xCount = 0; xCount < wScissor; xCount++) { - *curPtr++ = d16; - } + for (int y = RLSW.scMin[1]; y <= RLSW.scMax[1]; y++) + { + uint16_t *curPtr = p + y*RLSW.framebuffer.width + RLSW.scMin[0]; + for (int xCount = 0; xCount < wScissor; xCount++) *curPtr++ = d16; } } - else { - for (int i = 0; i < size; i++) { - *p++ = d16; - } + else + { + for (int i = 0; i < size; i++) *p++ = d16; } } #elif (SW_DEPTH_BUFFER_BITS == 24) -static inline float sw_framebuffer_read_depth(const void* src) +static inline float sw_framebuffer_read_depth(const void *src) { - uint32_t depth24 = (((uint8_t*)src)[0] << 16) | - (((uint8_t*)src)[1] << 8) | - ((uint8_t*)src)[2]; + uint32_t depth24 = (((uint8_t *)src)[0] << 16) | + (((uint8_t *)src)[1] << 8) | + ((uint8_t *)src)[2]; - return depth24 / (float)0xFFFFFF; + return depth24/(float)0xFFFFFF; } -static inline void sw_framebuffer_write_depth(void* dst, float depth) +static inline void sw_framebuffer_write_depth(void *dst, float depth) { - uint32_t depth24 = (uint32_t)(depth * 0xFFFFFF); + uint32_t depth24 = (uint32_t)(depth*0xFFFFFF); - ((uint8_t*)dst)[0] = (depth24 >> 16) & 0xFF; - ((uint8_t*)dst)[1] = (depth24 >> 8) & 0xFF; - ((uint8_t*)dst)[2] = depth24 & 0xFF; + ((uint8_t *)dst)[0] = (depth24 >> 16) & 0xFF; + ((uint8_t *)dst)[1] = (depth24 >> 8) & 0xFF; + ((uint8_t *)dst)[2] = depth24 & 0xFF; } -static inline void sw_framebuffer_fill_depth(void* ptr, int size, float value) +static inline void sw_framebuffer_fill_depth(void *ptr, int size, float value) { - uint32_t d32 = (uint32_t)(value * UINT32_MAX); + uint32_t d32 = (uint32_t)(value*UINT32_MAX); uint8_t d_byte0 = (uint8_t)((d32 >> 16) & 0xFF); uint8_t d_byte1 = (uint8_t)((d32 >> 8) & 0xFF); uint8_t d_byte2 = (uint8_t)(d32 & 0xFF); - uint8_t* p = (uint8_t*)ptr; + uint8_t *p = (uint8_t *)ptr; - if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) { + if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) + { int wScissor = RLSW.scMax[0] - RLSW.scMin[0] + 1; - for (int y = RLSW.scMin[1]; y <= RLSW.scMax[1]; y++) { - uint8_t* curPtr = p + 3 * (y * RLSW.framebuffer.width + RLSW.scMin[0]); - for (int xCount = 0; xCount < wScissor; xCount++) { + for (int y = RLSW.scMin[1]; y <= RLSW.scMax[1]; y++) + { + uint8_t *curPtr = p + 3*(y*RLSW.framebuffer.width + RLSW.scMin[0]); + for (int xCount = 0; xCount < wScissor; xCount++) + { *curPtr++ = d_byte0; *curPtr++ = d_byte1; *curPtr++ = d_byte2; } } } - else { - for (int i = 0; i < size; i++) { + else + { + for (int i = 0; i < size; i++) + { *p++ = d_byte0; *p++ = d_byte1; *p++ = d_byte2; @@ -1293,97 +1359,99 @@ static inline void sw_framebuffer_fill_depth(void* ptr, int size, float value) #endif // SW_DEPTH_BUFFER_BITS -static inline void sw_framebuffer_fill(void* colorPtr, void* depthPtr, int size, float color[4], float depth_value) +static inline void sw_framebuffer_fill(void *colorPtr, void *depthPtr, int size, float color[4], float depth_value) { #if (SW_COLOR_BUFFER_BITS == 8) // Calculate and pack 3:3:2 color // Scale color components to the max value for each bit depth and round - uint8_t r8 = (uint8_t)(color[0] * 7.0f + 0.5f); - uint8_t g8 = (uint8_t)(color[1] * 7.0f + 0.5f); - uint8_t b8 = (uint8_t)(color[2] * 3.0f + 0.5f); + uint8_t r8 = (uint8_t)(color[0]*7.0f + 0.5f); + uint8_t g8 = (uint8_t)(color[1]*7.0f + 0.5f); + uint8_t b8 = (uint8_t)(color[2]*3.0f + 0.5f); // Pack the components into a single byte uint8_t packedColor = ((r8 & 0x07) << 5) | ((g8 & 0x07) << 2) | (b8 & 0x03); - uint8_t* cptr = (uint8_t*)colorPtr; + uint8_t *cptr = (uint8_t *)colorPtr; #elif (SW_COLOR_BUFFER_BITS == 16) // Calculate and pack 5:6:5 color // Scale color components to the max value for each bit depth and round - uint16_t r16 = (uint16_t)(color[0] * 31.0f + 0.5f); - uint16_t g16 = (uint16_t)(color[1] * 63.0f + 0.5f); - uint16_t b16 = (uint16_t)(color[2] * 31.0f + 0.5f); + uint16_t r16 = (uint16_t)(color[0]*31.0f + 0.5f); + uint16_t g16 = (uint16_t)(color[1]*63.0f + 0.5f); + uint16_t b16 = (uint16_t)(color[2]*31.0f + 0.5f); // Pack the components into a 16-bit value uint16_t packedColor = ((r16 & 0x1F) << 11) | ((g16 & 0x3F) << 5) | (b16 & 0x1F); - uint16_t* cptr = (uint16_t*)colorPtr; + uint16_t *cptr = (uint16_t *)colorPtr; #elif (SW_COLOR_BUFFER_BITS == 24) // Calculate 8:8:8 color components - uint8_t r24 = (uint8_t)(color[0] * 255.0f); - uint8_t g24 = (uint8_t)(color[1] * 255.0f); - uint8_t b24 = (uint8_t)(color[2] * 255.0f); - uint8_t* cptr = (uint8_t*)colorPtr; + uint8_t r24 = (uint8_t)(color[0]*255.0f); + uint8_t g24 = (uint8_t)(color[1]*255.0f); + uint8_t b24 = (uint8_t)(color[2]*255.0f); + uint8_t *cptr = (uint8_t *)colorPtr; #endif #if (SW_DEPTH_BUFFER_BITS == 8) // Calculate 8-bit depth - uint8_t d8 = (uint8_t)(depth_value * UINT8_MAX); - uint8_t* dptr = (uint8_t*)depthPtr; + uint8_t d8 = (uint8_t)(depth_value*UINT8_MAX); + uint8_t *dptr = (uint8_t *)depthPtr; #elif (SW_DEPTH_BUFFER_BITS == 16) // Calculate 16-bit depth - uint16_t d16 = (uint16_t)(depth_value * UINT16_MAX); - uint16_t* dptr = (uint16_t*)depthPtr; + uint16_t d16 = (uint16_t)(depth_value*UINT16_MAX); + uint16_t *dptr = (uint16_t *)depthPtr; #elif (SW_DEPTH_BUFFER_BITS == 24) // Calculate 24-bit depth and pre-calculate bytes - uint32_t d32 = (uint32_t)(depth_value * UINT32_MAX); + uint32_t d32 = (uint32_t)(depth_value*UINT32_MAX); uint8_t dByte0 = (uint8_t)((d32 >> 16) & 0xFF); uint8_t dByte1 = (uint8_t)((d32 >> 8) & 0xFF); uint8_t dByte2 = (uint8_t)(d32 & 0xFF); - uint8_t* dptr = (uint8_t*)depthPtr; + uint8_t *dptr = (uint8_t *)depthPtr; #endif - if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) { + if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) + { int wScissor = RLSW.scMax[0] - RLSW.scMin[0] + 1; - for (int y = RLSW.scMin[1]; y <= RLSW.scMax[1]; y++) { - int rowStartIdx = y * RLSW.framebuffer.width + RLSW.scMin[0]; + for (int y = RLSW.scMin[1]; y <= RLSW.scMax[1]; y++) + { + int rowStartIdx = y*RLSW.framebuffer.width + RLSW.scMin[0]; // Calculate starting pointers for the current row within the scissor rectangle -# if (SW_COLOR_BUFFER_BITS == 8) - uint8_t* curCPtr = cptr + rowStartIdx; -# elif (SW_COLOR_BUFFER_BITS == 16) - uint16_t* curCPtr = cptr + rowStartIdx; -# elif (SW_COLOR_BUFFER_BITS == 24) - uint8_t* curCPtr = cptr + 3 * rowStartIdx; -# endif + #if (SW_COLOR_BUFFER_BITS == 8) + uint8_t *curCPtr = cptr + rowStartIdx; + #elif (SW_COLOR_BUFFER_BITS == 16) + uint16_t *curCPtr = cptr + rowStartIdx; + #elif (SW_COLOR_BUFFER_BITS == 24) + uint8_t *curCPtr = cptr + 3*rowStartIdx; + #endif -# if (SW_DEPTH_BUFFER_BITS == 8) - uint8_t* curDPtr = dptr + rowStartIdx; -# elif (SW_DEPTH_BUFFER_BITS == 16) - uint16_t* curDPtr = dptr + rowStartIdx; -# elif (SW_DEPTH_BUFFER_BITS == 24) - uint8_t* curDPtr = dptr + 3 * rowStartIdx; -# endif + #if (SW_DEPTH_BUFFER_BITS == 8) + uint8_t *curDPtr = dptr + rowStartIdx; + #elif (SW_DEPTH_BUFFER_BITS == 16) + uint16_t *curDPtr = dptr + rowStartIdx; + #elif (SW_DEPTH_BUFFER_BITS == 24) + uint8_t *curDPtr = dptr + 3*rowStartIdx; + #endif // Fill the current row within the scissor rectangle for (int xCount = 0; xCount < wScissor; xCount++) { // Write color -# if (SW_COLOR_BUFFER_BITS == 8) + #if (SW_COLOR_BUFFER_BITS == 8) *curCPtr++ = packedColor; -# elif (SW_COLOR_BUFFER_BITS == 16) + #elif (SW_COLOR_BUFFER_BITS == 16) *curCPtr++ = packedColor; -# elif (SW_COLOR_BUFFER_BITS == 24) + #elif (SW_COLOR_BUFFER_BITS == 24) *curCPtr++ = r24; *curCPtr++ = g24; *curCPtr++ = b24; -# endif + #endif // Write depth -# if (SW_DEPTH_BUFFER_BITS == 8) + #if (SW_DEPTH_BUFFER_BITS == 8) *curDPtr++ = d8; -# elif (SW_DEPTH_BUFFER_BITS == 16) + #elif (SW_DEPTH_BUFFER_BITS == 16) *curDPtr++ = d16; -# elif (SW_DEPTH_BUFFER_BITS == 24) + #elif (SW_DEPTH_BUFFER_BITS == 24) *curDPtr++ = dByte0; *curDPtr++ = dByte1; *curDPtr++ = dByte2; -# endif + #endif } } return; @@ -1392,33 +1460,33 @@ static inline void sw_framebuffer_fill(void* colorPtr, void* depthPtr, int size, for (int i = 0; i < size; i++) { // Write color -# if (SW_COLOR_BUFFER_BITS == 8) + #if (SW_COLOR_BUFFER_BITS == 8) *cptr++ = packedColor; -# elif (SW_COLOR_BUFFER_BITS == 16) + #elif (SW_COLOR_BUFFER_BITS == 16) *cptr++ = packedColor; -# elif (SW_COLOR_BUFFER_BITS == 24) + #elif (SW_COLOR_BUFFER_BITS == 24) *cptr++ = r24; *cptr++ = g24; *cptr++ = b24; -# endif + #endif // Write depth -# if (SW_DEPTH_BUFFER_BITS == 8) + #if (SW_DEPTH_BUFFER_BITS == 8) *dptr++ = d8; -# elif (SW_DEPTH_BUFFER_BITS == 16) + #elif (SW_DEPTH_BUFFER_BITS == 16) *dptr++ = d16; -# elif (SW_DEPTH_BUFFER_BITS == 24) + #elif (SW_DEPTH_BUFFER_BITS == 24) *dptr++ = dByte0; *dptr++ = dByte1; *dptr++ = dByte2; -# endif + #endif } } #define DEFINE_FRAMEBUFFER_COPY_U32_BEGIN(name, DST_PTR_T) \ -static inline void sw_framebuffer_copy_to_##name(int x, int y, int w, int h, DST_PTR_T* dst) \ +static inline void sw_framebuffer_copy_to_##name(int x, int y, int w, int h, DST_PTR_T *dst) \ { \ - const void* src = RLSW.framebuffer.color; \ + const void *src = RLSW.framebuffer.color; \ \ for (int iy = y; iy < h; iy++) { \ for (int ix = x; ix < w; ix++) { \ @@ -1426,9 +1494,9 @@ static inline void sw_framebuffer_copy_to_##name(int x, int y, int w, int h, DST sw_framebuffer_read_color8(color, src); \ #define DEFINE_FRAMEBUFFER_COPY_F32_BEGIN(name, DST_PTR_T) \ -static inline void sw_framebuffer_copy_to_##name(int x, int y, int w, int h, DST_PTR_T* dst) \ +static inline void sw_framebuffer_copy_to_##name(int x, int y, int w, int h, DST_PTR_T *dst) \ { \ - const void* src = RLSW.framebuffer.color; \ + const void *src = RLSW.framebuffer.color; \ \ for (int iy = y; iy < h; iy++) { \ for (int ix = x; ix < w; ix++) { \ @@ -1444,7 +1512,7 @@ static inline void sw_framebuffer_copy_to_##name(int x, int y, int w, int h, DST DEFINE_FRAMEBUFFER_COPY_U32_BEGIN(GRAYSCALE, uint8_t) { // NTSC grayscale conversion: Y = 0.299R + 0.587G + 0.114B - uint8_t gray = (uint8_t)((color[0] * 299 + color[1] * 587 + color[2] * 114 + 500) / 1000); + uint8_t gray = (uint8_t)((color[0]*299 + color[1]*587 + color[2]*114 + 500)/1000); *dst++ = gray; } DEFINE_FRAMEBUFFER_COPY_END() @@ -1452,7 +1520,7 @@ DEFINE_FRAMEBUFFER_COPY_END() DEFINE_FRAMEBUFFER_COPY_U32_BEGIN(GRAYALPHA, uint8_t) { // Convert RGB to grayscale using NTSC formula - uint8_t gray = (uint8_t)((color[0] * 299 + color[1] * 587 + color[2] * 114 + 500) / 1000); + uint8_t gray = (uint8_t)((color[0]*299 + color[1]*587 + color[2]*114 + 500)/1000); dst[0] = gray; dst[1] = color[3]; // alpha @@ -1464,9 +1532,9 @@ DEFINE_FRAMEBUFFER_COPY_END() DEFINE_FRAMEBUFFER_COPY_U32_BEGIN(R5G6B5, uint16_t) { // Convert 8-bit RGB to 5:6:5 format - uint8_t r5 = (color[0] * 31 + 127) / 255; - uint8_t g6 = (color[1] * 63 + 127) / 255; - uint8_t b5 = (color[2] * 31 + 127) / 255; + uint8_t r5 = (color[0]*31 + 127)/255; + uint8_t g6 = (color[1]*63 + 127)/255; + uint8_t b5 = (color[2]*31 + 127)/255; #if SW_GL_FRAMEBUFFER_COPY_BGRA uint16_t rgb565 = (b5 << 11) | (g6 << 5) | r5; @@ -1496,9 +1564,9 @@ DEFINE_FRAMEBUFFER_COPY_END() DEFINE_FRAMEBUFFER_COPY_U32_BEGIN(R5G5B5A1, uint16_t) { - uint8_t r5 = (color[0] * 31 + 127) / 255; - uint8_t g5 = (color[1] * 31 + 127) / 255; - uint8_t b5 = (color[2] * 31 + 127) / 255; + uint8_t r5 = (color[0]*31 + 127)/255; + uint8_t g5 = (color[1]*31 + 127)/255; + uint8_t b5 = (color[2]*31 + 127)/255; uint8_t a1 = color[3] >= 128 ? 1 : 0; #if SW_GL_FRAMEBUFFER_COPY_BGRA @@ -1513,10 +1581,10 @@ DEFINE_FRAMEBUFFER_COPY_END() DEFINE_FRAMEBUFFER_COPY_U32_BEGIN(R4G4B4A4, uint16_t) { - uint8_t r4 = (color[0] * 15 + 127) / 255; - uint8_t g4 = (color[1] * 15 + 127) / 255; - uint8_t b4 = (color[2] * 15 + 127) / 255; - uint8_t a4 = (color[3] * 15 + 127) / 255; + uint8_t r4 = (color[0]*15 + 127)/255; + uint8_t g4 = (color[1]*15 + 127)/255; + uint8_t b4 = (color[2]*15 + 127)/255; + uint8_t a4 = (color[3]*15 + 127)/255; #if SW_GL_FRAMEBUFFER_COPY_BGRA uint16_t pixel = (b4 << 12) | (g4 << 8) | (r4 << 4) | a4; @@ -1629,22 +1697,22 @@ DEFINE_FRAMEBUFFER_COPY_END() static inline void sw_framebuffer_blit_to_##name( \ int xDst, int yDst, int wDst, int hDst, \ int xSrc, int ySrc, int wSrc, int hSrc, \ - DST_PTR_T* dst) \ + DST_PTR_T *dst) \ { \ - const uint8_t* srcBase = RLSW.framebuffer.color; \ + const uint8_t *srcBase = RLSW.framebuffer.color; \ int fbWidth = RLSW.framebuffer.width; \ \ - uint32_t xScale = ((uint32_t)wSrc << 16) / (uint32_t)wDst; \ - uint32_t yScale = ((uint32_t)hSrc << 16) / (uint32_t)hDst; \ + uint32_t xScale = ((uint32_t)wSrc << 16)/(uint32_t)wDst; \ + uint32_t yScale = ((uint32_t)hSrc << 16)/(uint32_t)hDst; \ \ for (int dy = 0; dy < hDst; dy++) { \ - uint32_t yFix = ((uint32_t)ySrc << 16) + dy * yScale; \ + uint32_t yFix = ((uint32_t)ySrc << 16) + dy*yScale; \ int sy = yFix >> 16; \ \ for (int dx = 0; dx < wDst; dx++) { \ - uint32_t xFix = dx * xScale; \ + uint32_t xFix = dx*xScale; \ int sx = xFix >> 16; \ - const void* srcPtr = sw_framebuffer_get_color_addr(srcBase, sy * fbWidth + sx); \ + const void *srcPtr = sw_framebuffer_get_color_addr(srcBase, sy*fbWidth + sx); \ uint8_t color[4]; \ sw_framebuffer_read_color8(color, srcPtr); \ @@ -1652,22 +1720,22 @@ static inline void sw_framebuffer_blit_to_##name( static inline void sw_framebuffer_blit_to_##name( \ int xDst, int yDst, int wDst, int hDst, \ int xSrc, int ySrc, int wSrc, int hSrc, \ - DST_PTR_T* dst) \ + DST_PTR_T *dst) \ { \ - const uint8_t* srcBase = RLSW.framebuffer.color; \ + const uint8_t *srcBase = RLSW.framebuffer.color; \ int fbWidth = RLSW.framebuffer.width; \ \ - uint32_t xScale = ((uint32_t)wSrc << 16) / (uint32_t)wDst; \ - uint32_t yScale = ((uint32_t)hSrc << 16) / (uint32_t)hDst; \ + uint32_t xScale = ((uint32_t)wSrc << 16)/(uint32_t)wDst; \ + uint32_t yScale = ((uint32_t)hSrc << 16)/(uint32_t)hDst; \ \ for (int dy = 0; dy < hDst; dy++) { \ - uint32_t yFix = ((uint32_t)ySrc << 16) + dy * yScale; \ + uint32_t yFix = ((uint32_t)ySrc << 16) + dy*yScale; \ int sy = yFix >> 16; \ \ for (int dx = 0; dx < wDst; dx++) { \ - uint32_t xFix = dx * xScale; \ + uint32_t xFix = dx*xScale; \ int sx = xFix >> 16; \ - const void* srcPtr = sw_framebuffer_get_color_addr(srcBase, sy * fbWidth + sx); \ + const void *srcPtr = sw_framebuffer_get_color_addr(srcBase, sy*fbWidth + sx); \ float color[4]; \ sw_framebuffer_read_color(color, srcPtr); \ @@ -1678,14 +1746,14 @@ static inline void sw_framebuffer_blit_to_##name( DEFINE_FRAMEBUFFER_BLIT_U32_BEGIN(GRAYSCALE, uint8_t) { - uint8_t gray = (uint8_t)((color[0] * 299 + color[1] * 587 + color[2] * 114 + 500) / 1000); + uint8_t gray = (uint8_t)((color[0]*299 + color[1]*587 + color[2]*114 + 500)/1000); *dst++ = gray; } DEFINE_FRAMEBUFFER_BLIT_END() DEFINE_FRAMEBUFFER_BLIT_U32_BEGIN(GRAYALPHA, uint8_t) { - uint8_t gray = (uint8_t)((color[0] * 299 + color[1] * 587 + color[2] * 114 + 500) / 1000); + uint8_t gray = (uint8_t)((color[0]*299 + color[1]*587 + color[2]*114 + 500)/1000); dst[0] = gray; dst[1] = color[3]; // alpha @@ -1696,9 +1764,9 @@ DEFINE_FRAMEBUFFER_BLIT_END() DEFINE_FRAMEBUFFER_BLIT_U32_BEGIN(R5G6B5, uint16_t) { - uint8_t r5 = (color[0] * 31 + 127) / 255; - uint8_t g6 = (color[1] * 63 + 127) / 255; - uint8_t b5 = (color[2] * 31 + 127) / 255; + uint8_t r5 = (color[0]*31 + 127)/255; + uint8_t g6 = (color[1]*63 + 127)/255; + uint8_t b5 = (color[2]*31 + 127)/255; #if SW_GL_FRAMEBUFFER_COPY_BGRA uint16_t rgb565 = (b5 << 11) | (g6 << 5) | r5; @@ -1728,9 +1796,9 @@ DEFINE_FRAMEBUFFER_BLIT_END() DEFINE_FRAMEBUFFER_BLIT_U32_BEGIN(R5G5B5A1, uint16_t) { - uint8_t r5 = (color[0] * 31 + 127) / 255; - uint8_t g5 = (color[1] * 31 + 127) / 255; - uint8_t b5 = (color[2] * 31 + 127) / 255; + uint8_t r5 = (color[0]*31 + 127)/255; + uint8_t g5 = (color[1]*31 + 127)/255; + uint8_t b5 = (color[2]*31 + 127)/255; uint8_t a1 = color[3] >= 128 ? 1 : 0; #if SW_GL_FRAMEBUFFER_COPY_BGRA @@ -1745,10 +1813,10 @@ DEFINE_FRAMEBUFFER_BLIT_END() DEFINE_FRAMEBUFFER_BLIT_U32_BEGIN(R4G4B4A4, uint16_t) { - uint8_t r4 = (color[0] * 15 + 127) / 255; - uint8_t g4 = (color[1] * 15 + 127) / 255; - uint8_t b4 = (color[2] * 15 + 127) / 255; - uint8_t a4 = (color[3] * 15 + 127) / 255; + uint8_t r4 = (color[0]*15 + 127)/255; + uint8_t g4 = (color[1]*15 + 127)/255; + uint8_t b4 = (color[2]*15 + 127)/255; + uint8_t a4 = (color[3]*15 + 127)/255; #if SW_GL_FRAMEBUFFER_COPY_BGRA uint16_t pixel = (b4 << 12) | (g4 << 8) | (r4 << 4) | a4; @@ -1857,49 +1925,52 @@ DEFINE_FRAMEBUFFER_BLIT_F32_BEGIN(R16G16B16A16, sw_half_t) } DEFINE_FRAMEBUFFER_BLIT_END() -/* === Pixel Format Part === */ +// Pixel format management functions static inline int sw_get_pixel_format(SWformat format, SWtype type) { int channels = 0; int bitsPerChannel = 8; // Default: 8 bits per channel - + // Determine the number of channels (format) - switch (format) { - case SW_LUMINANCE: channels = 1; break; - case SW_LUMINANCE_ALPHA: channels = 2; break; - case SW_RGB: channels = 3; break; - case SW_RGBA: channels = 4; break; - default: - return SW_PIXELFORMAT_UNKNOWN; + switch (format) + { + case SW_LUMINANCE: channels = 1; break; + case SW_LUMINANCE_ALPHA: channels = 2; break; + case SW_RGB: channels = 3; break; + case SW_RGBA: channels = 4; break; + default: return SW_PIXELFORMAT_UNKNOWN; } // Determine the depth of each channel (type) - switch (type) { - case SW_UNSIGNED_BYTE: bitsPerChannel = 8; break; - case SW_BYTE: bitsPerChannel = 8; break; - case SW_UNSIGNED_SHORT: bitsPerChannel = 16; break; - case SW_SHORT: bitsPerChannel = 16; break; - case SW_UNSIGNED_INT: bitsPerChannel = 32; break; - case SW_INT: bitsPerChannel = 32; break; - case SW_FLOAT: bitsPerChannel = 32; break; - default: - return SW_PIXELFORMAT_UNKNOWN; + switch (type) + { + case SW_UNSIGNED_BYTE: bitsPerChannel = 8; break; + case SW_BYTE: bitsPerChannel = 8; break; + case SW_UNSIGNED_SHORT: bitsPerChannel = 16; break; + case SW_SHORT: bitsPerChannel = 16; break; + case SW_UNSIGNED_INT: bitsPerChannel = 32; break; + case SW_INT: bitsPerChannel = 32; break; + case SW_FLOAT: bitsPerChannel = 32; break; + default: return SW_PIXELFORMAT_UNKNOWN; } // Map the format and type to the correct internal format - if (bitsPerChannel == 8) { + if (bitsPerChannel == 8) + { if (channels == 1) return SW_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE; if (channels == 2) return SW_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA; if (channels == 3) return SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8; if (channels == 4) return SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8; } - else if (bitsPerChannel == 16) { + else if (bitsPerChannel == 16) + { if (channels == 1) return SW_PIXELFORMAT_UNCOMPRESSED_R16; if (channels == 3) return SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16; if (channels == 4) return SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16; } - else if (bitsPerChannel == 32) { + else if (bitsPerChannel == 32) + { if (channels == 1) return SW_PIXELFORMAT_UNCOMPRESSED_R32; if (channels == 3) return SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32; if (channels == 4) return SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32; @@ -1912,29 +1983,30 @@ int sw_get_pixel_bytes(sw_pixelformat_t format) { int bpp = 0; - switch (format) { - case SW_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: bpp = 1; break; - case SW_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: - case SW_PIXELFORMAT_UNCOMPRESSED_R5G6B5: - case SW_PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: - case SW_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: bpp = 2; break; - case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: bpp = 4; break; - case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8: bpp = 3; break; - case SW_PIXELFORMAT_UNCOMPRESSED_R32: bpp = 4; break; - case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32: bpp = 4*3; break; - case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: bpp = 4*4; break; - case SW_PIXELFORMAT_UNCOMPRESSED_R16: bpp = 2; break; - case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16: bpp = 2*3; break; - case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: bpp = 2*4; break; - default: break; + switch (format) + { + case SW_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: bpp = 1; break; + case SW_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: + case SW_PIXELFORMAT_UNCOMPRESSED_R5G6B5: + case SW_PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: + case SW_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: bpp = 2; break; + case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: bpp = 4; break; + case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8: bpp = 3; break; + case SW_PIXELFORMAT_UNCOMPRESSED_R32: bpp = 4; break; + case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32: bpp = 4*3; break; + case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: bpp = 4*4; break; + case SW_PIXELFORMAT_UNCOMPRESSED_R16: bpp = 2; break; + case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16: bpp = 2*3; break; + case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: bpp = 2*4; break; + default: break; } return bpp; } -static inline void sw_get_pixel_grayscale(float* color, const void* pixels, uint32_t offset) +static inline void sw_get_pixel_grayscale(float *color, const void *pixels, uint32_t offset) { - float gray = (float)((uint8_t*)pixels)[offset] * (1.0f / 255); + float gray = (float)((uint8_t *)pixels)[offset]*(1.0f/255); color[0] = gray; color[1] = gray; @@ -1942,9 +2014,9 @@ static inline void sw_get_pixel_grayscale(float* color, const void* pixels, uint color[3] = 1.0f; } -static inline void sw_get_pixel_red_16(float* color, const void* pixels, uint32_t offset) +static inline void sw_get_pixel_red_16(float *color, const void *pixels, uint32_t offset) { - float value = sw_f16_to_f32(((sw_half_t*)pixels)[offset]); + float value = sw_f16_to_f32(((sw_half_t *)pixels)[offset]); color[0] = value; color[1] = value; @@ -1952,9 +2024,9 @@ static inline void sw_get_pixel_red_16(float* color, const void* pixels, uint32_ color[3] = 1.0f; } -static inline void sw_get_pixel_red_32(float* color, const void* pixels, uint32_t offset) +static inline void sw_get_pixel_red_32(float *color, const void *pixels, uint32_t offset) { - float value = ((float*)pixels)[offset]; + float value = ((float *)pixels)[offset]; color[0] = value; color[1] = value; @@ -1962,37 +2034,37 @@ static inline void sw_get_pixel_red_32(float* color, const void* pixels, uint32_ color[3] = 1.0f; } -static inline void sw_get_pixel_grayscale_alpha(float* color, const void* pixels, uint32_t offset) +static inline void sw_get_pixel_grayscale_alpha(float *color, const void *pixels, uint32_t offset) { - const uint8_t* pixelData = (const uint8_t*)pixels + 2 * offset; + const uint8_t *pixelData = (const uint8_t *)pixels + 2*offset; - color[0] = color[1] = color[2] = (float)pixelData[0] * (1.0f / 255); - color[3] = (float)pixelData[1] * (1.0f / 255); + color[0] = color[1] = color[2] = (float)pixelData[0]*(1.0f/255); + color[3] = (float)pixelData[1]*(1.0f/255); } -static inline void sw_get_pixel_rgb_565(float* color, const void* pixels, uint32_t offset) +static inline void sw_get_pixel_rgb_565(float *color, const void *pixels, uint32_t offset) { - uint16_t pixel = ((uint16_t*)pixels)[offset]; + uint16_t pixel = ((uint16_t *)pixels)[offset]; - color[0] = (float)((pixel & 0xF800) >> 11) / 31; - color[1] = (float)((pixel & 0x7E0) >> 5) / 63; - color[2] = (float)(pixel & 0x1F) / 31; + color[0] = (float)((pixel & 0xF800) >> 11)/31; + color[1] = (float)((pixel & 0x7E0) >> 5)/63; + color[2] = (float)(pixel & 0x1F)/31; color[3] = 1.0f; } -static inline void sw_get_pixel_rgb_888(float* color, const void* pixels, uint32_t offset) +static inline void sw_get_pixel_rgb_888(float *color, const void *pixels, uint32_t offset) { - const uint8_t* pixel = (const uint8_t*)pixels + 3 * offset; + const uint8_t *pixel = (const uint8_t *)pixels + 3*offset; - color[0] = (float)pixel[0] * (1.0f / 255); - color[1] = (float)pixel[1] * (1.0f / 255); - color[2] = (float)pixel[2] * (1.0f / 255); + color[0] = (float)pixel[0]*(1.0f/255); + color[1] = (float)pixel[1]*(1.0f/255); + color[2] = (float)pixel[2]*(1.0f/255); color[3] = 1.0f; } -static inline void sw_get_pixel_rgb_161616(float* color, const void* pixels, uint32_t offset) +static inline void sw_get_pixel_rgb_161616(float *color, const void *pixels, uint32_t offset) { - const sw_half_t *pixel = (sw_half_t*)pixels + 3 * offset; + const sw_half_t *pixel = (sw_half_t *)pixels + 3*offset; color[0] = sw_f16_to_f32(pixel[0]); color[1] = sw_f16_to_f32(pixel[1]); @@ -2000,9 +2072,9 @@ static inline void sw_get_pixel_rgb_161616(float* color, const void* pixels, uin color[3] = 1.0f; } -static inline void sw_get_pixel_rgb_323232(float* color, const void* pixels, uint32_t offset) +static inline void sw_get_pixel_rgb_323232(float *color, const void *pixels, uint32_t offset) { - const float *pixel = (float*)pixels + 3 * offset; + const float *pixel = (float *)pixels + 3*offset; color[0] = pixel[0]; color[1] = pixel[1]; @@ -2010,39 +2082,39 @@ static inline void sw_get_pixel_rgb_323232(float* color, const void* pixels, uin color[3] = 1.0f; } -static inline void sw_get_pixel_rgba_5551(float* color, const void* pixels, uint32_t offset) +static inline void sw_get_pixel_rgba_5551(float *color, const void *pixels, uint32_t offset) { - uint16_t pixel = ((uint16_t*)pixels)[offset]; + uint16_t pixel = ((uint16_t *)pixels)[offset]; - color[0] = (float)((pixel & 0xF800) >> 11) / 31; - color[1] = (float)((pixel & 0x7C0) >> 6) / 31; - color[2] = (float)((pixel & 0x3E) >> 1) / 31; + color[0] = (float)((pixel & 0xF800) >> 11)/31; + color[1] = (float)((pixel & 0x7C0) >> 6)/31; + color[2] = (float)((pixel & 0x3E) >> 1)/31; color[3] = (float)(pixel & 0x1); } -static inline void sw_get_pixel_rgba_4444(float* color, const void* pixels, uint32_t offset) +static inline void sw_get_pixel_rgba_4444(float *color, const void *pixels, uint32_t offset) { - uint16_t pixel = ((uint16_t*)pixels)[offset]; + uint16_t pixel = ((uint16_t *)pixels)[offset]; - color[0] = (float)((pixel & 0xF000) >> 12) / 15; - color[1] = (float)((pixel & 0xF00) >> 8) / 15; - color[2] = (float)((pixel & 0xF0) >> 4) / 15; - color[3] = (float)(pixel & 0xF) / 15; + color[0] = (float)((pixel & 0xF000) >> 12)/15; + color[1] = (float)((pixel & 0xF00) >> 8)/15; + color[2] = (float)((pixel & 0xF0) >> 4)/15; + color[3] = (float)(pixel & 0xF)/15; } -static inline void sw_get_pixel_rgba_8888(float* color, const void* pixels, uint32_t offset) +static inline void sw_get_pixel_rgba_8888(float *color, const void *pixels, uint32_t offset) { - const uint8_t *pixel = (uint8_t*)pixels + 4 * offset; + const uint8_t *pixel = (uint8_t *)pixels + 4*offset; - color[0] = (float)pixel[0] * (1.0f / 255); - color[1] = (float)pixel[1] * (1.0f / 255); - color[2] = (float)pixel[2] * (1.0f / 255); - color[3] = (float)pixel[3] * (1.0f / 255); + color[0] = (float)pixel[0]*(1.0f/255); + color[1] = (float)pixel[1]*(1.0f/255); + color[2] = (float)pixel[2]*(1.0f/255); + color[3] = (float)pixel[3]*(1.0f/255); } -static inline void sw_get_pixel_rgba_16161616(float* color, const void* pixels, uint32_t offset) +static inline void sw_get_pixel_rgba_16161616(float *color, const void *pixels, uint32_t offset) { - const sw_half_t *pixel = (sw_half_t*)pixels + 4 * offset; + const sw_half_t *pixel = (sw_half_t *)pixels + 4*offset; color[0] = sw_f16_to_f32(pixel[0]); color[1] = sw_f16_to_f32(pixel[1]); @@ -2050,9 +2122,9 @@ static inline void sw_get_pixel_rgba_16161616(float* color, const void* pixels, color[3] = sw_f16_to_f32(pixel[3]); } -static inline void sw_get_pixel_rgba_32323232(float* color, const void* pixels, uint32_t offset) +static inline void sw_get_pixel_rgba_32323232(float *color, const void *pixels, uint32_t offset) { - const float *pixel = (float*)pixels + 4 * offset; + const float *pixel = (float *)pixels + 4*offset; color[0] = pixel[0]; color[1] = pixel[1]; @@ -2060,72 +2132,47 @@ static inline void sw_get_pixel_rgba_32323232(float* color, const void* pixels, color[3] = pixel[3]; } -static inline void sw_get_pixel(float* color, const void* pixels, uint32_t offset, sw_pixelformat_t format) +static inline void sw_get_pixel(float *color, const void *pixels, uint32_t offset, sw_pixelformat_t format) { - switch (format) { - case SW_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: - sw_get_pixel_grayscale(color, pixels, offset); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: - sw_get_pixel_grayscale_alpha(color, pixels, offset); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R5G6B5: - sw_get_pixel_rgb_565(color, pixels, offset); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8: - sw_get_pixel_rgb_888(color, pixels, offset); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: - sw_get_pixel_rgba_5551(color, pixels, offset); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: - sw_get_pixel_rgba_4444(color, pixels, offset); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: - sw_get_pixel_rgba_8888(color, pixels, offset); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R32: - sw_get_pixel_red_32(color, pixels, offset); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32: - sw_get_pixel_rgb_323232(color, pixels, offset); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: - sw_get_pixel_rgba_32323232(color, pixels, offset); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R16: - sw_get_pixel_red_16(color, pixels, offset); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16: - sw_get_pixel_rgb_161616(color, pixels, offset); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: - sw_get_pixel_rgba_16161616(color, pixels, offset); - break; - case SW_PIXELFORMAT_UNKNOWN: - break; + switch (format) + { + case SW_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: sw_get_pixel_grayscale(color, pixels, offset); break; + case SW_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: sw_get_pixel_grayscale_alpha(color, pixels, offset); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R5G6B5: sw_get_pixel_rgb_565(color, pixels, offset); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8: sw_get_pixel_rgb_888(color, pixels, offset); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: sw_get_pixel_rgba_5551(color, pixels, offset); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: sw_get_pixel_rgba_4444(color, pixels, offset); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: sw_get_pixel_rgba_8888(color, pixels, offset); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R32: sw_get_pixel_red_32(color, pixels, offset); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32: sw_get_pixel_rgb_323232(color, pixels, offset); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: sw_get_pixel_rgba_32323232(color, pixels, offset); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R16: sw_get_pixel_red_16(color, pixels, offset); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16: sw_get_pixel_rgb_161616(color, pixels, offset); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: sw_get_pixel_rgba_16161616(color, pixels, offset); break; + case SW_PIXELFORMAT_UNKNOWN: break; + default: break; } } -/* === Texture Sampling Part === */ +// Texture sampling functionality -static inline void sw_texture_sample_nearest(float* color, const sw_texture_t* tex, float u, float v) +static inline void sw_texture_sample_nearest(float *color, const sw_texture_t *tex, float u, float v) { - u = (tex->sWrap == SW_REPEAT) ? sw_fract(u) : sw_saturate(u); - v = (tex->tWrap == SW_REPEAT) ? sw_fract(v) : sw_saturate(v); + u = (tex->sWrap == SW_REPEAT)? sw_fract(u) : sw_saturate(u); + v = (tex->tWrap == SW_REPEAT)? sw_fract(v) : sw_saturate(v); - int x = u * tex->width, y = v * tex->height; + int x = u*tex->width, y = v*tex->height; - sw_get_pixel(color, tex->pixels.cptr, y * tex->width + x, tex->format); + sw_get_pixel(color, tex->pixels.cptr, y*tex->width + x, tex->format); } -static inline void sw_texture_sample_linear(float* color, const sw_texture_t* tex, float u, float v) +static inline void sw_texture_sample_linear(float *color, const sw_texture_t *tex, float u, float v) { - // REVIEW: With a bit more cleverness we could clearly reduce the - // number of operations here, but for now it works fine. + // TODO: REVIEW: With a bit more cleverness we could clearly reduce the + // number of operations here, but for now it works fine. - float xf = u * tex->width - 0.5f; - float yf = v * tex->height - 0.5f; + float xf = u*tex->width - 0.5f; + float yf = v*tex->height - 0.5f; int x0 = (int)floorf(xf); int y0 = (int)floorf(yf); @@ -2136,148 +2183,149 @@ static inline void sw_texture_sample_linear(float* color, const sw_texture_t* te int x1 = x0 + 1; int y1 = y0 + 1; - if (tex->sWrap == SW_CLAMP) { - x0 = x0 > tex->wMinus1 ? tex->wMinus1 : x0; - x1 = x1 > tex->wMinus1 ? tex->wMinus1 : x1; + if (tex->sWrap == SW_CLAMP) + { + x0 = (x0 > tex->wMinus1)? tex->wMinus1 : x0; + x1 = (x1 > tex->wMinus1)? tex->wMinus1 : x1; } - else { - x0 = (x0 % tex->width + tex->width) % tex->width; - x1 = (x1 % tex->width + tex->width) % tex->width; + else + { + x0 = (x0%tex->width + tex->width)%tex->width; + x1 = (x1%tex->width + tex->width)%tex->width; } - if (tex->tWrap == SW_CLAMP) { - y0 = y0 > tex->hMinus1 ? tex->hMinus1 : y0; - y1 = y1 > tex->hMinus1 ? tex->hMinus1 : y1; + if (tex->tWrap == SW_CLAMP) + { + y0 = (y0 > tex->hMinus1)? tex->hMinus1 : y0; + y1 = (y1 > tex->hMinus1)? tex->hMinus1 : y1; } - else { - y0 = (y0 % tex->height + tex->height) % tex->height; - y1 = (y1 % tex->height + tex->height) % tex->height; + else + { + y0 = (y0%tex->height + tex->height)%tex->height; + y1 = (y1%tex->height + tex->height)%tex->height; } float c00[4], c10[4], c01[4], c11[4]; - sw_get_pixel(c00, tex->pixels.cptr, y0 * tex->width + x0, tex->format); - sw_get_pixel(c10, tex->pixels.cptr, y0 * tex->width + x1, tex->format); - sw_get_pixel(c01, tex->pixels.cptr, y1 * tex->width + x0, tex->format); - sw_get_pixel(c11, tex->pixels.cptr, y1 * tex->width + x1, tex->format); + sw_get_pixel(c00, tex->pixels.cptr, y0*tex->width + x0, tex->format); + sw_get_pixel(c10, tex->pixels.cptr, y0*tex->width + x1, tex->format); + sw_get_pixel(c01, tex->pixels.cptr, y1*tex->width + x0, tex->format); + sw_get_pixel(c11, tex->pixels.cptr, y1*tex->width + x1, tex->format); - for (int i = 0; i < 4; i++) { - float t = c00[i] + fx * (c10[i] - c00[i]); - float b = c01[i] + fx * (c11[i] - c01[i]); - color[i] = t + fy * (b - t); + for (int i = 0; i < 4; i++) + { + float t = c00[i] + fx*(c10[i] - c00[i]); + float b = c01[i] + fx*(c11[i] - c01[i]); + color[i] = t + fy*(b - t); } } -static inline void sw_texture_sample(float* color, const sw_texture_t* tex, float u, float v, - float duDx, float duDy, float dvDx, float dvDy) +static inline void sw_texture_sample(float *color, const sw_texture_t *tex, float u, float v, float duDx, float duDy, float dvDx, float dvDy) { // Previous method: There is no need to compute the square root - // because using the squared value, the comparison remains `L2 > 1.0f * 1.0f` - //float du = sqrtf(duDx * duDx + duDy * duDy); - //float dv = sqrtf(dvDx * dvDx + dvDy * dvDy); - //float L = (du > dv) ? du : dv; + // because using the squared value, the comparison remains `L2 > 1.0f*1.0f` + //float du = sqrtf(duDx*duDx + duDy*duDy); + //float dv = sqrtf(dvDx*dvDx + dvDy*dvDy); + //float L = (du > dv)? du : dv; // Calculate the derivatives for each axis - float du2 = duDx * duDx + duDy * duDy; - float dv2 = dvDx * dvDx + dvDy * dvDy; - float L2 = (du2 > dv2) ? du2 : dv2; + float du2 = duDx*duDx + duDy*duDy; + float dv2 = dvDx*dvDx + dvDy*dvDy; + float L2 = (du2 > dv2)? du2 : dv2; - SWfilter filter = (L2 > 1.0f) - ? tex->minFilter : tex->magFilter; + SWfilter filter = (L2 > 1.0f)? tex->minFilter : tex->magFilter; - switch (filter) { - case SW_NEAREST: - sw_texture_sample_nearest(color, tex, u, v); - break; - case SW_LINEAR: - sw_texture_sample_linear(color, tex, u, v); - break; + switch (filter) + { + case SW_NEAREST: sw_texture_sample_nearest(color, tex, u, v); break; + case SW_LINEAR: sw_texture_sample_linear(color, tex, u, v); break; + default: break; } } -/* === Color Blending Functions === */ +// Color Blending functionality -static inline void sw_factor_zero(float* SW_RESTRICT factor, const float* SW_RESTRICT src, const float* SW_RESTRICT dst) +static inline void sw_factor_zero(float *SW_RESTRICT factor, const float *SW_RESTRICT src, const float *SW_RESTRICT dst) { factor[0] = factor[1] = factor[2] = factor[3] = 0.0f; } -static inline void sw_factor_one(float* SW_RESTRICT factor, const float* SW_RESTRICT src, const float* SW_RESTRICT dst) +static inline void sw_factor_one(float *SW_RESTRICT factor, const float *SW_RESTRICT src, const float *SW_RESTRICT dst) { factor[0] = factor[1] = factor[2] = factor[3] = 1.0f; } -static inline void sw_factor_src_color(float* SW_RESTRICT factor, const float* SW_RESTRICT src, const float* SW_RESTRICT dst) +static inline void sw_factor_src_color(float *SW_RESTRICT factor, const float *SW_RESTRICT src, const float *SW_RESTRICT dst) { factor[0] = src[0]; factor[1] = src[1]; factor[2] = src[2]; factor[3] = src[3]; } -static inline void sw_factor_one_minus_src_color(float* SW_RESTRICT factor, const float* SW_RESTRICT src, const float* SW_RESTRICT dst) +static inline void sw_factor_one_minus_src_color(float *SW_RESTRICT factor, const float *SW_RESTRICT src, const float *SW_RESTRICT dst) { - factor[0] = 1.0f - src[0]; factor[1] = 1.0f - src[1]; + factor[0] = 1.0f - src[0]; factor[1] = 1.0f - src[1]; factor[2] = 1.0f - src[2]; factor[3] = 1.0f - src[3]; } -static inline void sw_factor_src_alpha(float* SW_RESTRICT factor, const float* SW_RESTRICT src, const float* SW_RESTRICT dst) +static inline void sw_factor_src_alpha(float *SW_RESTRICT factor, const float *SW_RESTRICT src, const float *SW_RESTRICT dst) { factor[0] = factor[1] = factor[2] = factor[3] = src[3]; } -static inline void sw_factor_one_minus_src_alpha(float* SW_RESTRICT factor, const float* SW_RESTRICT src, const float* SW_RESTRICT dst) +static inline void sw_factor_one_minus_src_alpha(float *SW_RESTRICT factor, const float *SW_RESTRICT src, const float *SW_RESTRICT dst) { - float inv_alpha = 1.0f - src[3]; - factor[0] = factor[1] = factor[2] = factor[3] = inv_alpha; + float invAlpha = 1.0f - src[3]; + factor[0] = factor[1] = factor[2] = factor[3] = invAlpha; } -static inline void sw_factor_dst_alpha(float* SW_RESTRICT factor, const float* SW_RESTRICT src, const float* SW_RESTRICT dst) +static inline void sw_factor_dst_alpha(float *SW_RESTRICT factor, const float *SW_RESTRICT src, const float *SW_RESTRICT dst) { factor[0] = factor[1] = factor[2] = factor[3] = dst[3]; } -static inline void sw_factor_one_minus_dst_alpha(float* SW_RESTRICT factor, const float* SW_RESTRICT src, const float* SW_RESTRICT dst) +static inline void sw_factor_one_minus_dst_alpha(float *SW_RESTRICT factor, const float *SW_RESTRICT src, const float *SW_RESTRICT dst) { - float inv_alpha = 1.0f - dst[3]; - factor[0] = factor[1] = factor[2] = factor[3] = inv_alpha; + float invAlpha = 1.0f - dst[3]; + factor[0] = factor[1] = factor[2] = factor[3] = invAlpha; } -static inline void sw_factor_dst_color(float* SW_RESTRICT factor, const float* SW_RESTRICT src, const float* SW_RESTRICT dst) +static inline void sw_factor_dst_color(float *SW_RESTRICT factor, const float *SW_RESTRICT src, const float *SW_RESTRICT dst) { factor[0] = dst[0]; factor[1] = dst[1]; factor[2] = dst[2]; factor[3] = dst[3]; } -static inline void sw_factor_one_minus_dst_color(float* SW_RESTRICT factor, const float* SW_RESTRICT src, const float* SW_RESTRICT dst) +static inline void sw_factor_one_minus_dst_color(float *SW_RESTRICT factor, const float *SW_RESTRICT src, const float *SW_RESTRICT dst) { - factor[0] = 1.0f - dst[0]; factor[1] = 1.0f - dst[1]; + factor[0] = 1.0f - dst[0]; factor[1] = 1.0f - dst[1]; factor[2] = 1.0f - dst[2]; factor[3] = 1.0f - dst[3]; } -static inline void sw_factor_src_alpha_saturate(float* SW_RESTRICT factor, const float* SW_RESTRICT src, const float* SW_RESTRICT dst) +static inline void sw_factor_src_alpha_saturate(float *SW_RESTRICT factor, const float *SW_RESTRICT src, const float *SW_RESTRICT dst) { factor[0] = factor[1] = factor[2] = 1.0f; - factor[3] = (src[3] < 1.0f) ? src[3] : 1.0f; + factor[3] = (src[3] < 1.0f)? src[3] : 1.0f; } -static inline void sw_blend_colors(float* SW_RESTRICT dst/*[4]*/, const float* SW_RESTRICT src/*[4]*/) +static inline void sw_blend_colors(float *SW_RESTRICT dst/*[4]*/, const float *SW_RESTRICT src/*[4]*/) { float srcFactor[4], dstFactor[4]; RLSW.srcFactorFunc(srcFactor, src, dst); RLSW.dstFactorFunc(dstFactor, src, dst); - dst[0] = srcFactor[0] * src[0] + dstFactor[0] * dst[0]; - dst[1] = srcFactor[1] * src[1] + dstFactor[1] * dst[1]; - dst[2] = srcFactor[2] * src[2] + dstFactor[2] * dst[2]; - dst[3] = srcFactor[3] * src[3] + dstFactor[3] * dst[3]; + dst[0] = srcFactor[0]*src[0] + dstFactor[0]*dst[0]; + dst[1] = srcFactor[1]*src[1] + dstFactor[1]*dst[1]; + dst[2] = srcFactor[2]*src[2] + dstFactor[2]*dst[2]; + dst[3] = srcFactor[3]*src[3] + dstFactor[3]*dst[3]; } -/* === Projection Helper Functions === */ +// Projection helper functions static inline void sw_project_ndc_to_screen(float screen[2], const float ndc[4]) { - screen[0] = RLSW.vpCenter[0] + ndc[0] * RLSW.vpHalfSize[0]; - screen[1] = RLSW.vpCenter[1] - ndc[1] * RLSW.vpHalfSize[1]; + screen[0] = RLSW.vpCenter[0] + ndc[0]*RLSW.vpHalfSize[0]; + screen[1] = RLSW.vpCenter[1] - ndc[1]*RLSW.vpHalfSize[1]; } -/* === Polygon Clipping Part === */ +// Polygon Clipping management #define DEFINE_CLIP_FUNC(name, FUNC_IS_INSIDE, FUNC_COMPUTE_T) \ static inline int sw_clip_##name( \ @@ -2311,7 +2359,7 @@ static inline int sw_clip_##name( return outputCount; \ } -// Frustum clip functions +// Frustum cliping functions #define IS_INSIDE_PLANE_W(h) ((h)[3] >= SW_CLIP_EPSILON) #define IS_INSIDE_PLANE_X_POS(h) ((h)[0] <= (h)[3]) @@ -2321,13 +2369,13 @@ static inline int sw_clip_##name( #define IS_INSIDE_PLANE_Z_POS(h) ((h)[2] <= (h)[3]) #define IS_INSIDE_PLANE_Z_NEG(h) (-(h)[2] <= (h)[3]) -#define COMPUTE_T_PLANE_W(hPrev, hCurr) ((SW_CLIP_EPSILON - (hPrev)[3]) / ((hCurr)[3] - (hPrev)[3])) -#define COMPUTE_T_PLANE_X_POS(hPrev, hCurr) (((hPrev)[3] - (hPrev)[0]) / (((hPrev)[3] - (hPrev)[0]) - ((hCurr)[3] - (hCurr)[0]))) -#define COMPUTE_T_PLANE_X_NEG(hPrev, hCurr) (((hPrev)[3] + (hPrev)[0]) / (((hPrev)[3] + (hPrev)[0]) - ((hCurr)[3] + (hCurr)[0]))) -#define COMPUTE_T_PLANE_Y_POS(hPrev, hCurr) (((hPrev)[3] - (hPrev)[1]) / (((hPrev)[3] - (hPrev)[1]) - ((hCurr)[3] - (hCurr)[1]))) -#define COMPUTE_T_PLANE_Y_NEG(hPrev, hCurr) (((hPrev)[3] + (hPrev)[1]) / (((hPrev)[3] + (hPrev)[1]) - ((hCurr)[3] + (hCurr)[1]))) -#define COMPUTE_T_PLANE_Z_POS(hPrev, hCurr) (((hPrev)[3] - (hPrev)[2]) / (((hPrev)[3] - (hPrev)[2]) - ((hCurr)[3] - (hCurr)[2]))) -#define COMPUTE_T_PLANE_Z_NEG(hPrev, hCurr) (((hPrev)[3] + (hPrev)[2]) / (((hPrev)[3] + (hPrev)[2]) - ((hCurr)[3] + (hCurr)[2]))) +#define COMPUTE_T_PLANE_W(hPrev, hCurr) ((SW_CLIP_EPSILON - (hPrev)[3])/((hCurr)[3] - (hPrev)[3])) +#define COMPUTE_T_PLANE_X_POS(hPrev, hCurr) (((hPrev)[3] - (hPrev)[0])/(((hPrev)[3] - (hPrev)[0]) - ((hCurr)[3] - (hCurr)[0]))) +#define COMPUTE_T_PLANE_X_NEG(hPrev, hCurr) (((hPrev)[3] + (hPrev)[0])/(((hPrev)[3] + (hPrev)[0]) - ((hCurr)[3] + (hCurr)[0]))) +#define COMPUTE_T_PLANE_Y_POS(hPrev, hCurr) (((hPrev)[3] - (hPrev)[1])/(((hPrev)[3] - (hPrev)[1]) - ((hCurr)[3] - (hCurr)[1]))) +#define COMPUTE_T_PLANE_Y_NEG(hPrev, hCurr) (((hPrev)[3] + (hPrev)[1])/(((hPrev)[3] + (hPrev)[1]) - ((hCurr)[3] + (hCurr)[1]))) +#define COMPUTE_T_PLANE_Z_POS(hPrev, hCurr) (((hPrev)[3] - (hPrev)[2])/(((hPrev)[3] - (hPrev)[2]) - ((hCurr)[3] - (hCurr)[2]))) +#define COMPUTE_T_PLANE_Z_NEG(hPrev, hCurr) (((hPrev)[3] + (hPrev)[2])/(((hPrev)[3] + (hPrev)[2]) - ((hCurr)[3] + (hCurr)[2]))) DEFINE_CLIP_FUNC(w, IS_INSIDE_PLANE_W, COMPUTE_T_PLANE_W) DEFINE_CLIP_FUNC(x_pos, IS_INSIDE_PLANE_X_POS, COMPUTE_T_PLANE_X_POS) @@ -2339,15 +2387,15 @@ DEFINE_CLIP_FUNC(z_neg, IS_INSIDE_PLANE_Z_NEG, COMPUTE_T_PLANE_Z_NEG) // Scissor clip functions -#define COMPUTE_T_SCISSOR_X_MIN(hPrev, hCurr) (((RLSW.scClipMin[0]) * (hPrev)[3] - (hPrev)[0]) / (((hCurr)[0] - (RLSW.scClipMin[0]) * (hCurr)[3]) - ((hPrev)[0] - (RLSW.scClipMin[0]) * (hPrev)[3]))) -#define COMPUTE_T_SCISSOR_X_MAX(hPrev, hCurr) (((RLSW.scClipMax[0]) * (hPrev)[3] - (hPrev)[0]) / (((hCurr)[0] - (RLSW.scClipMax[0]) * (hCurr)[3]) - ((hPrev)[0] - (RLSW.scClipMax[0]) * (hPrev)[3]))) -#define COMPUTE_T_SCISSOR_Y_MIN(hPrev, hCurr) (((RLSW.scClipMin[1]) * (hPrev)[3] - (hPrev)[1]) / (((hCurr)[1] - (RLSW.scClipMin[1]) * (hCurr)[3]) - ((hPrev)[1] - (RLSW.scClipMin[1]) * (hPrev)[3]))) -#define COMPUTE_T_SCISSOR_Y_MAX(hPrev, hCurr) (((RLSW.scClipMax[1]) * (hPrev)[3] - (hPrev)[1]) / (((hCurr)[1] - (RLSW.scClipMax[1]) * (hCurr)[3]) - ((hPrev)[1] - (RLSW.scClipMax[1]) * (hPrev)[3]))) +#define COMPUTE_T_SCISSOR_X_MIN(hPrev, hCurr) (((RLSW.scClipMin[0])*(hPrev)[3] - (hPrev)[0])/(((hCurr)[0] - (RLSW.scClipMin[0])*(hCurr)[3]) - ((hPrev)[0] - (RLSW.scClipMin[0])*(hPrev)[3]))) +#define COMPUTE_T_SCISSOR_X_MAX(hPrev, hCurr) (((RLSW.scClipMax[0])*(hPrev)[3] - (hPrev)[0])/(((hCurr)[0] - (RLSW.scClipMax[0])*(hCurr)[3]) - ((hPrev)[0] - (RLSW.scClipMax[0])*(hPrev)[3]))) +#define COMPUTE_T_SCISSOR_Y_MIN(hPrev, hCurr) (((RLSW.scClipMin[1])*(hPrev)[3] - (hPrev)[1])/(((hCurr)[1] - (RLSW.scClipMin[1])*(hCurr)[3]) - ((hPrev)[1] - (RLSW.scClipMin[1])*(hPrev)[3]))) +#define COMPUTE_T_SCISSOR_Y_MAX(hPrev, hCurr) (((RLSW.scClipMax[1])*(hPrev)[3] - (hPrev)[1])/(((hCurr)[1] - (RLSW.scClipMax[1])*(hCurr)[3]) - ((hPrev)[1] - (RLSW.scClipMax[1])*(hPrev)[3]))) -#define IS_INSIDE_SCISSOR_X_MIN(h) ((h)[0] >= (RLSW.scClipMin[0]) * (h)[3]) -#define IS_INSIDE_SCISSOR_X_MAX(h) ((h)[0] <= (RLSW.scClipMax[0]) * (h)[3]) -#define IS_INSIDE_SCISSOR_Y_MIN(h) ((h)[1] >= (RLSW.scClipMin[1]) * (h)[3]) -#define IS_INSIDE_SCISSOR_Y_MAX(h) ((h)[1] <= (RLSW.scClipMax[1]) * (h)[3]) +#define IS_INSIDE_SCISSOR_X_MIN(h) ((h)[0] >= (RLSW.scClipMin[0])*(h)[3]) +#define IS_INSIDE_SCISSOR_X_MAX(h) ((h)[0] <= (RLSW.scClipMax[0])*(h)[3]) +#define IS_INSIDE_SCISSOR_Y_MIN(h) ((h)[1] >= (RLSW.scClipMin[1])*(h)[3]) +#define IS_INSIDE_SCISSOR_Y_MAX(h) ((h)[1] <= (RLSW.scClipMax[1])*(h)[3]) DEFINE_CLIP_FUNC(scissor_x_min, IS_INSIDE_SCISSOR_X_MIN, COMPUTE_T_SCISSOR_X_MIN) DEFINE_CLIP_FUNC(scissor_x_max, IS_INSIDE_SCISSOR_X_MAX, COMPUTE_T_SCISSOR_X_MAX) @@ -2356,7 +2404,7 @@ DEFINE_CLIP_FUNC(scissor_y_max, IS_INSIDE_SCISSOR_Y_MAX, COMPUTE_T_SCISSOR_Y_MAX // Main clip function -static inline bool sw_polygon_clip(sw_vertex_t polygon[SW_MAX_CLIPPED_POLYGON_VERTICES], int* vertexCounter) +static inline bool sw_polygon_clip(sw_vertex_t polygon[SW_MAX_CLIPPED_POLYGON_VERTICES], int *vertexCounter) { static sw_vertex_t tmp[SW_MAX_CLIPPED_POLYGON_VERTICES]; @@ -2365,13 +2413,12 @@ static inline bool sw_polygon_clip(sw_vertex_t polygon[SW_MAX_CLIPPED_POLYGON_VE #define CLIP_AGAINST_PLANE(FUNC_CLIP) \ { \ n = FUNC_CLIP(tmp, polygon, n); \ - if (n < 3) { \ + if (n < 3) \ + { \ *vertexCounter = 0; \ return false; \ } \ - for (int i = 0; i < n; i++) { \ - polygon[i] = tmp[i]; \ - } \ + for (int i = 0; i < n; i++) polygon[i] = tmp[i]; \ } CLIP_AGAINST_PLANE(sw_clip_w); @@ -2382,7 +2429,8 @@ static inline bool sw_polygon_clip(sw_vertex_t polygon[SW_MAX_CLIPPED_POLYGON_VE CLIP_AGAINST_PLANE(sw_clip_z_pos); CLIP_AGAINST_PLANE(sw_clip_z_neg); - if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) { + if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) + { CLIP_AGAINST_PLANE(sw_clip_scissor_x_min); CLIP_AGAINST_PLANE(sw_clip_scissor_x_max); CLIP_AGAINST_PLANE(sw_clip_scissor_y_min); @@ -2394,7 +2442,7 @@ static inline bool sw_polygon_clip(sw_vertex_t polygon[SW_MAX_CLIPPED_POLYGON_VE return (n >= 3); } -/* === Triangle Rendering Part === */ +// Triangle rendering logic static inline bool sw_triangle_face_culling(void) { @@ -2407,9 +2455,9 @@ static inline bool sw_triangle_face_culling(void) // even with negative w values. // Preload homogeneous coordinates into local variables - const float* h0 = RLSW.vertexBuffer[0].homogeneous; - const float* h1 = RLSW.vertexBuffer[1].homogeneous; - const float* h2 = RLSW.vertexBuffer[2].homogeneous; + const float *h0 = RLSW.vertexBuffer[0].homogeneous; + const float *h1 = RLSW.vertexBuffer[1].homogeneous; + const float *h2 = RLSW.vertexBuffer[2].homogeneous; // Compute a value proportional to the signed area in the projected 2D plane, // calculated directly using homogeneous coordinates BEFORE division by w. @@ -2418,14 +2466,14 @@ static inline bool sw_triangle_face_culling(void) // space and its relationship to the projected 2D winding order, even with // negative w values. // The determinant formula used here is: - // h0.x * (h1.y * h2.w - h2.y * h1.w) + - // h1.x * (h2.y * h0.w - h0.y * h2.w) + - // h2.x * (h0.y * h1.w - h1.y * h0.w) + // h0.x*(h1.y*h2.w - h2.y*h1.w) + + // h1.x*(h2.y*h0.w - h0.y*h2.w) + + // h2.x*(h0.y*h1.w - h1.y*h0.w) const float hSgnArea = - h0[0] * (h1[1] * h2[3] - h2[1] * h1[3]) + - h1[0] * (h2[1] * h0[3] - h0[1] * h2[3]) + - h2[0] * (h0[1] * h1[3] - h1[1] * h0[3]); + h0[0]*(h1[1]*h2[3] - h2[1]*h1[3]) + + h1[0]*(h2[1]*h0[3] - h0[1]*h2[3]) + + h2[0]*(h0[1]*h1[3] - h1[1]*h0[3]); // Discard the triangle if its winding order (determined by the sign // of the homogeneous area/determinant) matches the culled direction. @@ -2446,18 +2494,19 @@ static inline bool sw_triangle_face_culling(void) static inline void sw_triangle_clip_and_project(void) { - sw_vertex_t* polygon = RLSW.vertexBuffer; - int* vertexCounter = &RLSW.vertexCounter; - - if (sw_polygon_clip(polygon, vertexCounter)) { + sw_vertex_t *polygon = RLSW.vertexBuffer; + int *vertexCounter = &RLSW.vertexCounter; + if (sw_polygon_clip(polygon, vertexCounter)) + { // Transformation to screen space and normalization - for (int i = 0; i < *vertexCounter; i++) { + for (int i = 0; i < *vertexCounter; i++) + { sw_vertex_t *v = &polygon[i]; // Calculation of the reciprocal of W for normalization // as well as perspective-correct attributes - const float invW = 1.0f / v->homogeneous[3]; + const float invW = 1.0f/v->homogeneous[3]; v->homogeneous[3] = invW; // Division of XYZ coordinates by weight @@ -2474,7 +2523,7 @@ static inline void sw_triangle_clip_and_project(void) v->color[1] *= invW; v->color[2] *= invW; v->color[3] *= invW; - + // Transformation to screen space sw_project_ndc_to_screen(v->screen, v->homogeneous); } @@ -2482,69 +2531,59 @@ static inline void sw_triangle_clip_and_project(void) } #define DEFINE_TRIANGLE_RASTER_SCANLINE(FUNC_NAME, ENABLE_TEXTURE, ENABLE_DEPTH_TEST, ENABLE_COLOR_BLEND) \ -static inline void FUNC_NAME(const sw_texture_t* tex, const sw_vertex_t* start, \ - const sw_vertex_t* end, float duDy, float dvDy) \ +static inline void FUNC_NAME(const sw_texture_t *tex, const sw_vertex_t *start, \ + const sw_vertex_t *end, float duDy, float dvDy) \ { \ /* Convert and center the screen coordinates */ \ - \ int xStart = (int)(start->screen[0] + 0.5f); \ int xEnd = (int)(end->screen[0] + 0.5f); \ int y = (int)start->screen[1]; \ \ /* Compute the inverse horizontal distance along the X axis */ \ - \ float dx = end->screen[0] - start->screen[0]; \ if (fabsf(dx) < 1e-6f) return; \ - float dxRcp = 1.0f / dx; \ + float dxRcp = 1.0f/dx; \ \ /* Compute the interpolation steps along the X axis */ \ + float dzDx = (end->homogeneous[2] - start->homogeneous[2])*dxRcp; \ + float dwDx = (end->homogeneous[3] - start->homogeneous[3])*dxRcp; \ \ - float dzDx = (end->homogeneous[2] - start->homogeneous[2]) * dxRcp; \ - float dwDx = (end->homogeneous[3] - start->homogeneous[3]) * dxRcp; \ + float dcDx[4] = { 0 }; \ + dcDx[0] = (end->color[0] - start->color[0])*dxRcp; \ + dcDx[1] = (end->color[1] - start->color[1])*dxRcp; \ + dcDx[2] = (end->color[2] - start->color[2])*dxRcp; \ + dcDx[3] = (end->color[3] - start->color[3])*dxRcp; \ \ - float dcDx[4]; \ - dcDx[0] = (end->color[0] - start->color[0]) * dxRcp; \ - dcDx[1] = (end->color[1] - start->color[1]) * dxRcp; \ - dcDx[2] = (end->color[2] - start->color[2]) * dxRcp; \ - dcDx[3] = (end->color[3] - start->color[3]) * dxRcp; \ - \ - float duDx, dvDx; \ + float duDx = 0.0f, dvDx = 0.0f; \ if (ENABLE_TEXTURE) { \ - duDx = (end->texcoord[0] - start->texcoord[0]) * dxRcp; \ - dvDx = (end->texcoord[1] - start->texcoord[1]) * dxRcp; \ + duDx = (end->texcoord[0] - start->texcoord[0])*dxRcp; \ + dvDx = (end->texcoord[1] - start->texcoord[1])*dxRcp; \ } \ \ - /* Initializing the interpolation starting values */ \ - \ + /* Initializing the interpolation starting values */ \ float z = start->homogeneous[2]; \ float w = start->homogeneous[3]; \ \ - float color[4]; \ + float color[4] = { 0 }; \ color[0] = start->color[0]; \ color[1] = start->color[1]; \ color[2] = start->color[2]; \ color[3] = start->color[3]; \ \ - float u, v; \ + float u = 0.0f, v = 0.0f; \ if (ENABLE_TEXTURE) { \ u = start->texcoord[0]; \ v = start->texcoord[1]; \ } \ \ /* Pre-calculate the starting pointers for the framebuffer row */ \ - \ - void* cptr = sw_framebuffer_get_color_addr( \ - RLSW.framebuffer.color, y * RLSW.framebuffer.width + xStart); \ - \ - void* dptr = sw_framebuffer_get_depth_addr( \ - RLSW.framebuffer.depth, y * RLSW.framebuffer.width + xStart); \ + void *cptr = sw_framebuffer_get_color_addr(RLSW.framebuffer.color, y*RLSW.framebuffer.width + xStart); \ + void *dptr = sw_framebuffer_get_depth_addr(RLSW.framebuffer.depth, y*RLSW.framebuffer.width + xStart); \ \ /* Scanline rasterization */ \ - \ for (int x = xStart; x < xEnd; x++) \ { \ /* Test and write depth */ \ - \ if (ENABLE_DEPTH_TEST) \ { \ /* TODO: Implement different depth funcs? */ \ @@ -2555,21 +2594,19 @@ static inline void FUNC_NAME(const sw_texture_t* tex, const sw_vertex_t* start, sw_framebuffer_write_depth(dptr, z); \ \ /* Pixel color computation */ \ - \ - float wRcp = 1.0f / w; \ - \ + float wRcp = 1.0f/w; \ float srcColor[4] = { \ - color[0] * wRcp, \ - color[1] * wRcp, \ - color[2] * wRcp, \ - color[3] * wRcp \ + color[0]*wRcp, \ + color[1]*wRcp, \ + color[2]*wRcp, \ + color[3]*wRcp \ }; \ \ if (ENABLE_TEXTURE) \ { \ float texColor[4]; \ - float s = u * wRcp; \ - float t = v * wRcp; \ + float s = u*wRcp; \ + float t = v*wRcp; \ sw_texture_sample(texColor, tex, s, t, duDx, duDy, dvDx, dvDy); \ srcColor[0] *= texColor[0]; \ srcColor[1] *= texColor[1]; \ @@ -2595,16 +2632,15 @@ static inline void FUNC_NAME(const sw_texture_t* tex, const sw_vertex_t* start, } \ \ /* Increment the interpolation parameter, UVs, and pointers */ \ - \ discard: \ - \ z += dzDx; \ w += dwDx; \ color[0] += dcDx[0]; \ color[1] += dcDx[1]; \ color[2] += dcDx[2]; \ color[3] += dcDx[3]; \ - if (ENABLE_TEXTURE) { \ + if (ENABLE_TEXTURE) \ + { \ u += duDx; \ v += dvDx; \ } \ @@ -2615,102 +2651,79 @@ static inline void FUNC_NAME(const sw_texture_t* tex, const sw_vertex_t* start, } #define DEFINE_TRIANGLE_RASTER(FUNC_NAME, FUNC_SCANLINE, ENABLE_TEXTURE) \ -static inline void FUNC_NAME(const sw_vertex_t* v0, const sw_vertex_t* v1, const sw_vertex_t* v2, \ - const sw_texture_t* tex) \ +static inline void FUNC_NAME(const sw_vertex_t *v0, const sw_vertex_t *v1, \ + const sw_vertex_t *v2, const sw_texture_t *tex) \ { \ /* Swap vertices by increasing y */ \ - \ - if (v0->screen[1] > v1->screen[1]) { const sw_vertex_t* tmp = v0; v0 = v1; v1 = tmp; } \ - if (v1->screen[1] > v2->screen[1]) { const sw_vertex_t* tmp = v1; v1 = v2; v2 = tmp; } \ - if (v0->screen[1] > v1->screen[1]) { const sw_vertex_t* tmp = v0; v0 = v1; v1 = tmp; } \ + if (v0->screen[1] > v1->screen[1]) { const sw_vertex_t *tmp = v0; v0 = v1; v1 = tmp; } \ + if (v1->screen[1] > v2->screen[1]) { const sw_vertex_t *tmp = v1; v1 = v2; v2 = tmp; } \ + if (v0->screen[1] > v1->screen[1]) { const sw_vertex_t *tmp = v0; v0 = v1; v1 = tmp; } \ \ /* Extracting coordinates from the sorted vertices */ \ - \ float x0 = v0->screen[0], y0 = v0->screen[1]; \ float x1 = v1->screen[0], y1 = v1->screen[1]; \ float x2 = v2->screen[0], y2 = v2->screen[1]; \ \ /* Compute height differences */ \ - \ float h02 = y2 - y0; \ float h01 = y1 - y0; \ float h12 = y2 - y1; \ \ - if (h02 < 1e-6f) { \ - return; \ - } \ + if (h02 < 1e-6f) return; \ \ /* Precompute the inverse values without additional checks */ \ - \ - float invH02 = 1.0f / h02; \ - float invH01 = (h01 > 1e-6f) ? 1.0f / h01 : 0.0f; \ - float invH12 = (h12 > 1e-6f) ? 1.0f / h12 : 0.0f; \ + float invH02 = 1.0f/h02; \ + float invH01 = (h01 > 1e-6f)? 1.0f/h01 : 0.0f; \ + float invH12 = (h12 > 1e-6f)? 1.0f/h12 : 0.0f; \ \ /* Pre-calculation of slopes */ \ - \ - float dx02 = (x2 - x0) * invH02; \ - float dx01 = (x1 - x0) * invH01; \ - float dx12 = (x2 - x1) * invH12; \ + float dx02 = (x2 - x0)*invH02; \ + float dx01 = (x1 - x0)*invH01; \ + float dx12 = (x2 - x1)*invH12; \ \ /* Y bounds (vertical clipping) */ \ - \ int yTop = (int)(y0 + 0.5f); \ int yMiddle = (int)(y1 + 0.5f); \ int yBottom = (int)(y2 + 0.5f); \ \ /* Compute gradients for each side of the triangle */ \ - \ sw_vertex_t vDy02, vDy01, vDy12; \ sw_get_vertex_grad_PTCH(&vDy02, v0, v2, invH02); \ sw_get_vertex_grad_PTCH(&vDy01, v0, v1, invH01); \ sw_get_vertex_grad_PTCH(&vDy12, v1, v2, invH12); \ \ /* Initializing scanline variables */ \ - \ sw_vertex_t vLeft = *v0; \ vLeft.screen[0] = x0; \ - \ sw_vertex_t vRight = *v0; \ vRight.screen[0] = x0; \ \ /* Scanline for the upper part of the triangle */ \ - \ for (int y = yTop; y < yMiddle; y++) \ { \ vLeft.screen[1] = vRight.screen[1] = y; \ \ - if (vLeft.screen[0] < vRight.screen[0]) { \ - FUNC_SCANLINE(tex, &vLeft, &vRight, vDy02.texcoord[0], vDy02.texcoord[1]); \ - } \ - else { \ - FUNC_SCANLINE(tex, &vRight, &vLeft, vDy02.texcoord[0], vDy02.texcoord[1]); \ - } \ + if (vLeft.screen[0] < vRight.screen[0]) FUNC_SCANLINE(tex, &vLeft, &vRight, vDy02.texcoord[0], vDy02.texcoord[1]); \ + else FUNC_SCANLINE(tex, &vRight, &vLeft, vDy02.texcoord[0], vDy02.texcoord[1]); \ \ sw_add_vertex_grad_PTCH(&vLeft, &vDy02); \ vLeft.screen[0] += dx02; \ - \ sw_add_vertex_grad_PTCH(&vRight, &vDy01); \ vRight.screen[0] += dx01; \ } \ \ /* Scanline for the lower part of the triangle */ \ - \ vRight = *v1, vRight.screen[0] = x1; \ \ for (int y = yMiddle; y < yBottom; y++) \ { \ vLeft.screen[1] = vRight.screen[1] = y; \ \ - if (vLeft.screen[0] < vRight.screen[0]) { \ - FUNC_SCANLINE(tex, &vLeft, &vRight, vDy02.texcoord[0], vDy02.texcoord[1]); \ - } \ - else { \ - FUNC_SCANLINE(tex, &vRight, &vLeft, vDy02.texcoord[0], vDy02.texcoord[1]); \ - } \ + if (vLeft.screen[0] < vRight.screen[0]) FUNC_SCANLINE(tex, &vLeft, &vRight, vDy02.texcoord[0], vDy02.texcoord[1]); \ + else FUNC_SCANLINE(tex, &vRight, &vLeft, vDy02.texcoord[0], vDy02.texcoord[1]); \ \ sw_add_vertex_grad_PTCH(&vLeft, &vDy02); \ vLeft.screen[0] += dx02; \ - \ sw_add_vertex_grad_PTCH(&vRight, &vDy12); \ vRight.screen[0] += dx12; \ } \ @@ -2736,21 +2749,19 @@ DEFINE_TRIANGLE_RASTER(sw_triangle_raster_TEX_DEPTH_BLEND, sw_triangle_raster_sc static inline void sw_triangle_render(void) { - if (RLSW.stateFlags & SW_STATE_CULL_FACE) { - if (!sw_triangle_face_culling()) { - return; - } + if (RLSW.stateFlags & SW_STATE_CULL_FACE) + { + if (!sw_triangle_face_culling()) return; } sw_triangle_clip_and_project(); - if (RLSW.vertexCounter < 3) { - return; - } + if (RLSW.vertexCounter < 3) return; -# define TRIANGLE_RASTER(RASTER_FUNC) \ + #define TRIANGLE_RASTER(RASTER_FUNC) \ { \ - for (int i = 0; i < RLSW.vertexCounter - 2; i++) { \ + for (int i = 0; i < RLSW.vertexCounter - 2; i++) \ + { \ RASTER_FUNC( \ &RLSW.vertexBuffer[0], \ &RLSW.vertexBuffer[i + 1], \ @@ -2760,35 +2771,19 @@ static inline void sw_triangle_render(void) } \ } - if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) { - TRIANGLE_RASTER(sw_triangle_raster_TEX_DEPTH_BLEND) - } - else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) { - TRIANGLE_RASTER(sw_triangle_raster_DEPTH_BLEND) - } - else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_BLEND)) { - TRIANGLE_RASTER(sw_triangle_raster_TEX_BLEND) - } - else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_DEPTH_TEST)) { - TRIANGLE_RASTER(sw_triangle_raster_TEX_DEPTH) - } - else if (SW_STATE_CHECK(SW_STATE_BLEND)) { - TRIANGLE_RASTER(sw_triangle_raster_BLEND) - } - else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST)) { - TRIANGLE_RASTER(sw_triangle_raster_DEPTH) - } - else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D)) { - TRIANGLE_RASTER(sw_triangle_raster_TEX) - } - else { - TRIANGLE_RASTER(sw_triangle_raster) - } + if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) TRIANGLE_RASTER(sw_triangle_raster_TEX_DEPTH_BLEND) + else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) TRIANGLE_RASTER(sw_triangle_raster_DEPTH_BLEND) + else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_BLEND)) TRIANGLE_RASTER(sw_triangle_raster_TEX_BLEND) + else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_DEPTH_TEST)) TRIANGLE_RASTER(sw_triangle_raster_TEX_DEPTH) + else if (SW_STATE_CHECK(SW_STATE_BLEND)) TRIANGLE_RASTER(sw_triangle_raster_BLEND) + else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST)) TRIANGLE_RASTER(sw_triangle_raster_DEPTH) + else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D)) TRIANGLE_RASTER(sw_triangle_raster_TEX) + else TRIANGLE_RASTER(sw_triangle_raster) -# undef TRIANGLE_RASTER + #undef TRIANGLE_RASTER } -/* === Quad Rendering Part === */ +// Quad rendering logic static inline bool sw_quad_face_culling(void) { @@ -2802,12 +2797,12 @@ static inline bool sw_quad_face_culling(void) // winding test on this first triangle. // Preload homogeneous coordinates into local variables - const float* h0 = RLSW.vertexBuffer[0].homogeneous; - const float* h1 = RLSW.vertexBuffer[1].homogeneous; - const float* h2 = RLSW.vertexBuffer[2].homogeneous; + const float *h0 = RLSW.vertexBuffer[0].homogeneous; + const float *h1 = RLSW.vertexBuffer[1].homogeneous; + const float *h2 = RLSW.vertexBuffer[2].homogeneous; // NOTE: h3 is not needed for this test - // const float* h3 = RLSW.vertexBuffer[3].homogeneous; + // const float *h3 = RLSW.vertexBuffer[3].homogeneous; // Compute a value proportional to the signed area of the triangle P0 P1 P2 // in the projected 2D plane, calculated directly using homogeneous coordinates @@ -2817,14 +2812,14 @@ static inline bool sw_quad_face_culling(void) // in homogeneous space and its relationship to the projected 2D winding order, // even with negative w values. // The determinant formula used here is: - // h0.x * (h1.y * h2.w - h2.y * h1.w) + - // h1.x * (h2.y * h0.w - h0.y * h2.w) + - // h2.x * (h0.y * h1.w - h1.y * h0.w) + // h0.x*(h1.y*h2.w - h2.y*h1.w) + + // h1.x*(h2.y*h0.w - h0.y*h2.w) + + // h2.x*(h0.y*h1.w - h1.y*h0.w) const float hSgnArea = - h0[0] * (h1[1] * h2[3] - h2[1] * h1[3]) + - h1[0] * (h2[1] * h0[3] - h0[1] * h2[3]) + - h2[0] * (h0[1] * h1[3] - h1[1] * h0[3]); + h0[0]*(h1[1]*h2[3] - h2[1]*h1[3]) + + h1[0]*(h2[1]*h0[3] - h0[1]*h2[3]) + + h2[0]*(h0[1]*h1[3] - h1[1]*h0[3]); // Perform face culling based on the winding order determined by the sign // of the homogeneous area/determinant of triangle P0 P1 P2. @@ -2846,18 +2841,19 @@ static inline bool sw_quad_face_culling(void) static inline void sw_quad_clip_and_project(void) { - sw_vertex_t* polygon = RLSW.vertexBuffer; - int* vertexCounter = &RLSW.vertexCounter; - - if (sw_polygon_clip(polygon, vertexCounter)) { + sw_vertex_t *polygon = RLSW.vertexBuffer; + int *vertexCounter = &RLSW.vertexCounter; + if (sw_polygon_clip(polygon, vertexCounter)) + { // Transformation to screen space and normalization - for (int i = 0; i < *vertexCounter; i++) { + for (int i = 0; i < *vertexCounter; i++) + { sw_vertex_t *v = &polygon[i]; // Calculation of the reciprocal of W for normalization // as well as perspective-correct attributes - const float invW = 1.0f / v->homogeneous[3]; + const float invW = 1.0f/v->homogeneous[3]; v->homogeneous[3] = invW; // Division of XYZ coordinates by weight @@ -2874,7 +2870,7 @@ static inline void sw_quad_clip_and_project(void) v->color[1] *= invW; v->color[2] *= invW; v->color[3] *= invW; - + // Transformation to screen space sw_project_ndc_to_screen(v->screen, v->homogeneous); } @@ -2888,32 +2884,23 @@ static inline bool sw_quad_is_axis_aligned(void) for (int i = 0; i < 4; i++) { - if (RLSW.vertexBuffer[i].homogeneous[3] != 1.0f) { - return false; - } + if (RLSW.vertexBuffer[i].homogeneous[3] != 1.0f) return false; - const float* v0 = RLSW.vertexBuffer[i].position; - const float* v1 = RLSW.vertexBuffer[(i + 1) % 4].position; + const float *v0 = RLSW.vertexBuffer[i].position; + const float *v1 = RLSW.vertexBuffer[(i + 1)%4].position; float dx = v1[0] - v0[0]; float dy = v1[1] - v0[1]; - if (fabsf(dx) > 1e-6f && fabsf(dy) < 1e-6f) { - horizontal++; - } - else if (fabsf(dy) > 1e-6f && fabsf(dx) < 1e-6f) { - vertical++; - } - else { - // Diagonal edge -> not axis-aligned - return false; - } + if (fabsf(dx) > 1e-6f && fabsf(dy) < 1e-6f) horizontal++; + else if (fabsf(dy) > 1e-6f && fabsf(dx) < 1e-6f) vertical++; + else return false; // Diagonal edge -> not axis-aligned } - return (horizontal == 2 && vertical == 2); + return ((horizontal == 2) && (vertical == 2)); } -static inline void sw_quad_sort_cw(const sw_vertex_t** output) +static inline void sw_quad_sort_cw(const sw_vertex_t* *output) { // Sort 4 quad vertices into clockwise order with fixed layout: // @@ -2926,58 +2913,56 @@ static inline void sw_quad_sort_cw(const sw_vertex_t** output) // - v1: top-right (minimum Y row, maximum X) // - v2: bottom-right (maximum Y, maximum X) // - v3: bottom-left (maximum Y, minimum X) - - const sw_vertex_t* input = RLSW.vertexBuffer; + const sw_vertex_t *input = RLSW.vertexBuffer; // Separate vertices into top and bottom based on Y-coordinate - const sw_vertex_t* top[2] = {NULL, NULL}; - const sw_vertex_t* bottom[2] = {NULL, NULL}; + const sw_vertex_t *top[2] = {NULL, NULL}; + const sw_vertex_t *bottom[2] = {NULL, NULL}; int topCount = 0, bottomCount = 0; // Find minimum and maximum Y float minY = input[0].screen[1]; float maxY = input[0].screen[1]; - for (int i = 1; i < 4; i++) { + for (int i = 1; i < 4; i++) + { if (input[i].screen[1] < minY) minY = input[i].screen[1]; if (input[i].screen[1] > maxY) maxY = input[i].screen[1]; } // Separate vertices based on Y-coordinate - for (int i = 0; i < 4; i++) { - if (input[i].screen[1] == minY && topCount < 2) { - top[topCount++] = &input[i]; - } - else if (input[i].screen[1] == maxY && bottomCount < 2) { - bottom[bottomCount++] = &input[i]; - } + for (int i = 0; i < 4; i++) + { + if (input[i].screen[1] == minY && topCount < 2) top[topCount++] = &input[i]; + else if (input[i].screen[1] == maxY && bottomCount < 2) bottom[bottomCount++] = &input[i]; } // If we don't have enough top/bottom vertices (e.g., Y values are all different), // classify vertices as top or bottom based on whether they're closer to minY or maxY - for (int i = 0; i < 4; i++) { - if (topCount < 2 && &input[i] != top[0] && &input[i] != bottom[0] && &input[i] != bottom[1]) { - if (fabs(input[i].screen[1] - minY) <= fabs(input[i].screen[1] - maxY)) { - top[topCount++] = &input[i]; - } + for (int i = 0; i < 4; i++) + { + if ((topCount < 2) && (&input[i] != top[0]) && (&input[i] != bottom[0]) && (&input[i] != bottom[1])) + { + if (fabsf(input[i].screen[1] - minY) <= fabsf(input[i].screen[1] - maxY)) top[topCount++] = &input[i]; } - if (bottomCount < 2 && &input[i] != top[0] && &input[i] != top[1] && &input[i] != bottom[0]) { - if (fabs(input[i].screen[1] - maxY) < fabs(input[i].screen[1] - minY)) { - bottom[bottomCount++] = &input[i]; - } + if ((bottomCount < 2) && (&input[i] != top[0]) && (&input[i] != top[1]) && (&input[i] != bottom[0])) + { + if (fabsf(input[i].screen[1] - maxY) < fabsf(input[i].screen[1] - minY)) bottom[bottomCount++] = &input[i]; } } // Sort top vertices by X (left to right) - if (topCount == 2 && top[0]->screen[0] > top[1]->screen[0]) { - const sw_vertex_t* temp = top[0]; + if ((topCount == 2) && (top[0]->screen[0] > top[1]->screen[0])) + { + const sw_vertex_t *temp = top[0]; top[0] = top[1]; top[1] = temp; } // Sort bottom vertices by X (left to right) - if (bottomCount == 2 && bottom[0]->screen[0] > bottom[1]->screen[0]) { - const sw_vertex_t* temp = bottom[0]; + if (bottomCount == 2 && bottom[0]->screen[0] > bottom[1]->screen[0]) + { + const sw_vertex_t *temp = bottom[0]; bottom[0] = bottom[1]; bottom[1] = temp; } @@ -2989,21 +2974,21 @@ static inline void sw_quad_sort_cw(const sw_vertex_t** output) output[3] = bottom[0]; // v3: bottom-left } -// REVIEW: Could a perfectly aligned quad, where one of the four points has a different depth, still appear perfectly aligned from a certain point of view? -// Because in that case, we would still need to perform perspective division for textures and colors... +// TODO: REVIEW: Could a perfectly aligned quad, where one of the four points has a different depth, +// still appear perfectly aligned from a certain point of view? +// Because in that case, we would still need to perform perspective division for textures and colors... #define DEFINE_QUAD_RASTER_AXIS_ALIGNED(FUNC_NAME, ENABLE_TEXTURE, ENABLE_DEPTH_TEST, ENABLE_COLOR_BLEND) \ static inline void FUNC_NAME(void) \ { \ - const sw_vertex_t* sortedVerts[4]; \ + const sw_vertex_t *sortedVerts[4]; \ sw_quad_sort_cw(sortedVerts); \ \ - const sw_vertex_t* v0 = sortedVerts[0]; \ - const sw_vertex_t* v1 = sortedVerts[1]; \ - const sw_vertex_t* v2 = sortedVerts[2]; \ - const sw_vertex_t* v3 = sortedVerts[3]; \ + const sw_vertex_t *v0 = sortedVerts[0]; \ + const sw_vertex_t *v1 = sortedVerts[1]; \ + const sw_vertex_t *v2 = sortedVerts[2]; \ + const sw_vertex_t *v3 = sortedVerts[3]; \ \ /* Screen bounds (axis-aligned) */ \ - \ int xMin = (int)(v0->screen[0] + 0.5f); \ int yMin = (int)(v0->screen[1] + 0.5f); \ int xMax = (int)(v2->screen[0] + 0.5f); \ @@ -3014,42 +2999,38 @@ static inline void FUNC_NAME(void) \ if (width == 0 || height == 0) return; \ \ - float wRcp = (width > 0.0f) ? 1.0f / width : 0.0f; \ - float hRcp = (height > 0.0f) ? 1.0f / height : 0.0f; \ + float wRcp = (width > 0.0f)? 1.0f/width : 0.0f; \ + float hRcp = (height > 0.0f)? 1.0f/height : 0.0f; \ \ /* Calculation of vertex gradients in X and Y */ \ - \ float tcDx[2], tcDy[2]; \ if (ENABLE_TEXTURE) { \ - tcDx[0] = (v1->texcoord[0] - v0->texcoord[0]) * wRcp; \ - tcDx[1] = (v1->texcoord[1] - v0->texcoord[1]) * wRcp; \ - tcDy[0] = (v3->texcoord[0] - v0->texcoord[0]) * hRcp; \ - tcDy[1] = (v3->texcoord[1] - v0->texcoord[1]) * hRcp; \ + tcDx[0] = (v1->texcoord[0] - v0->texcoord[0])*wRcp; \ + tcDx[1] = (v1->texcoord[1] - v0->texcoord[1])*wRcp; \ + tcDy[0] = (v3->texcoord[0] - v0->texcoord[0])*hRcp; \ + tcDy[1] = (v3->texcoord[1] - v0->texcoord[1])*hRcp; \ } \ \ float cDx[4], cDy[4]; \ - cDx[0] = (v1->color[0] - v0->color[0]) * wRcp; \ - cDx[1] = (v1->color[1] - v0->color[1]) * wRcp; \ - cDx[2] = (v1->color[2] - v0->color[2]) * wRcp; \ - cDx[3] = (v1->color[3] - v0->color[3]) * wRcp; \ - cDy[0] = (v3->color[0] - v0->color[0]) * hRcp; \ - cDy[1] = (v3->color[1] - v0->color[1]) * hRcp; \ - cDy[2] = (v3->color[2] - v0->color[2]) * hRcp; \ - cDy[3] = (v3->color[3] - v0->color[3]) * hRcp; \ + cDx[0] = (v1->color[0] - v0->color[0])*wRcp; \ + cDx[1] = (v1->color[1] - v0->color[1])*wRcp; \ + cDx[2] = (v1->color[2] - v0->color[2])*wRcp; \ + cDx[3] = (v1->color[3] - v0->color[3])*wRcp; \ + cDy[0] = (v3->color[0] - v0->color[0])*hRcp; \ + cDy[1] = (v3->color[1] - v0->color[1])*hRcp; \ + cDy[2] = (v3->color[2] - v0->color[2])*hRcp; \ + cDy[3] = (v3->color[3] - v0->color[3])*hRcp; \ \ float zDx, zDy; \ - zDx = (v1->homogeneous[2] - v0->homogeneous[2]) * wRcp; \ - zDy = (v3->homogeneous[2] - v0->homogeneous[2]) * hRcp; \ + zDx = (v1->homogeneous[2] - v0->homogeneous[2])*wRcp; \ + zDy = (v3->homogeneous[2] - v0->homogeneous[2])*hRcp; \ \ /* Start of quad rasterization */ \ + const sw_texture_t *tex; \ + if (ENABLE_TEXTURE) tex = &RLSW.loadedTextures[RLSW.currentTexture]; \ \ - const sw_texture_t* tex; \ - if (ENABLE_TEXTURE) { \ - tex = &RLSW.loadedTextures[RLSW.currentTexture]; \ - } \ - \ - void* cDstBase = RLSW.framebuffer.color; \ - void* dDstBase = RLSW.framebuffer.depth; \ + void *cDstBase = RLSW.framebuffer.color; \ + void *dDstBase = RLSW.framebuffer.depth; \ int wDst = RLSW.framebuffer.width; \ \ float zScanline = v0->homogeneous[2]; \ @@ -3065,8 +3046,8 @@ static inline void FUNC_NAME(void) \ for (int y = yMin; y < yMax; y++) \ { \ - void* cptr = sw_framebuffer_get_color_addr(cDstBase, y * wDst + xMin); \ - void* dptr = sw_framebuffer_get_depth_addr(dDstBase, y * wDst + xMin); \ + void *cptr = sw_framebuffer_get_color_addr(cDstBase, y*wDst + xMin); \ + void *dptr = sw_framebuffer_get_depth_addr(dDstBase, y*wDst + xMin); \ \ float z = zScanline; \ float u = uScanline; \ @@ -3080,11 +3061,9 @@ static inline void FUNC_NAME(void) }; \ \ /* Scanline rasterization */ \ - \ for (int x = xMin; x < xMax; x++) \ { \ /* Test and write depth */ \ - \ if (ENABLE_DEPTH_TEST) \ { \ /* TODO: Implement different depth funcs? */ \ @@ -3095,7 +3074,6 @@ static inline void FUNC_NAME(void) sw_framebuffer_write_depth(dptr, z); \ \ /* Pixel color computation */ \ - \ float srcColor[4] = { \ color[0], \ color[1], \ @@ -3126,21 +3104,17 @@ static inline void FUNC_NAME(void) \ sw_framebuffer_write_color(cptr, dstColor); \ } \ - else \ - { \ - sw_framebuffer_write_color(cptr, srcColor); \ - } \ + else sw_framebuffer_write_color(cptr, srcColor); \ \ discard: \ - \ z += zDx; \ - \ color[0] += cDx[0]; \ color[1] += cDx[1]; \ color[2] += cDx[2]; \ color[3] += cDx[3]; \ \ - if (ENABLE_TEXTURE) { \ + if (ENABLE_TEXTURE) \ + { \ u += tcDx[0]; \ v += tcDx[1]; \ } \ @@ -3150,13 +3124,13 @@ static inline void FUNC_NAME(void) } \ \ zScanline += zDy; \ - \ colorScanline[0] += cDy[0]; \ colorScanline[1] += cDy[1]; \ colorScanline[2] += cDy[2]; \ colorScanline[3] += cDy[3]; \ \ - if (ENABLE_TEXTURE) { \ + if (ENABLE_TEXTURE) \ + { \ uScanline += tcDy[0]; \ vScanline += tcDy[1]; \ } \ @@ -3174,50 +3148,32 @@ DEFINE_QUAD_RASTER_AXIS_ALIGNED(sw_quad_raster_axis_aligned_TEX_DEPTH_BLEND, 1, static inline void sw_quad_render(void) { - if (RLSW.stateFlags & SW_STATE_CULL_FACE) { - if (!sw_quad_face_culling()) { - return; - } + if (RLSW.stateFlags & SW_STATE_CULL_FACE) + { + if (!sw_quad_face_culling()) return; } sw_quad_clip_and_project(); - if (RLSW.vertexCounter < 3) { - return; - } + if (RLSW.vertexCounter < 3) return; if (RLSW.vertexCounter == 4 && sw_quad_is_axis_aligned()) { - if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) { - sw_quad_raster_axis_aligned_TEX_DEPTH_BLEND(); - } - else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) { - sw_quad_raster_axis_aligned_DEPTH_BLEND(); - } - else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_BLEND)) { - sw_quad_raster_axis_aligned_TEX_BLEND(); - } - else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_DEPTH_TEST)) { - sw_quad_raster_axis_aligned_TEX_DEPTH(); - } - else if (SW_STATE_CHECK(SW_STATE_BLEND)) { - sw_quad_raster_axis_aligned_BLEND(); - } - else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST)) { - sw_quad_raster_axis_aligned_DEPTH(); - } - else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D)) { - sw_quad_raster_axis_aligned_TEX(); - } - else { - sw_quad_raster_axis_aligned(); - } + if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) sw_quad_raster_axis_aligned_TEX_DEPTH_BLEND(); + else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) sw_quad_raster_axis_aligned_DEPTH_BLEND(); + else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_BLEND)) sw_quad_raster_axis_aligned_TEX_BLEND(); + else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_DEPTH_TEST)) sw_quad_raster_axis_aligned_TEX_DEPTH(); + else if (SW_STATE_CHECK(SW_STATE_BLEND)) sw_quad_raster_axis_aligned_BLEND(); + else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST)) sw_quad_raster_axis_aligned_DEPTH(); + else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D)) sw_quad_raster_axis_aligned_TEX(); + else sw_quad_raster_axis_aligned(); return; } -# define TRIANGLE_RASTER(RASTER_FUNC) \ + #define TRIANGLE_RASTER(RASTER_FUNC) \ { \ - for (int i = 0; i < RLSW.vertexCounter - 2; i++) { \ + for (int i = 0; i < RLSW.vertexCounter - 2; i++) \ + { \ RASTER_FUNC( \ &RLSW.vertexBuffer[0], \ &RLSW.vertexBuffer[i + 1], \ @@ -3227,51 +3183,38 @@ static inline void sw_quad_render(void) } \ } - if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) { - TRIANGLE_RASTER(sw_triangle_raster_TEX_DEPTH_BLEND) - } - else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) { - TRIANGLE_RASTER(sw_triangle_raster_DEPTH_BLEND) - } - else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_BLEND)) { - TRIANGLE_RASTER(sw_triangle_raster_TEX_BLEND) - } - else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_DEPTH_TEST)) { - TRIANGLE_RASTER(sw_triangle_raster_TEX_DEPTH) - } - else if (SW_STATE_CHECK(SW_STATE_BLEND)) { - TRIANGLE_RASTER(sw_triangle_raster_BLEND) - } - else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST)) { - TRIANGLE_RASTER(sw_triangle_raster_DEPTH) - } - else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D)) { - TRIANGLE_RASTER(sw_triangle_raster_TEX) - } - else { - TRIANGLE_RASTER(sw_triangle_raster) - } + if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) TRIANGLE_RASTER(sw_triangle_raster_TEX_DEPTH_BLEND) + else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) TRIANGLE_RASTER(sw_triangle_raster_DEPTH_BLEND) + else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_BLEND)) TRIANGLE_RASTER(sw_triangle_raster_TEX_BLEND) + else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D | SW_STATE_DEPTH_TEST)) TRIANGLE_RASTER(sw_triangle_raster_TEX_DEPTH) + else if (SW_STATE_CHECK(SW_STATE_BLEND)) TRIANGLE_RASTER(sw_triangle_raster_BLEND) + else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST)) TRIANGLE_RASTER(sw_triangle_raster_DEPTH) + else if (SW_STATE_CHECK(SW_STATE_TEXTURE_2D)) TRIANGLE_RASTER(sw_triangle_raster_TEX) + else TRIANGLE_RASTER(sw_triangle_raster) -# undef TRIANGLE_RASTER + #undef TRIANGLE_RASTER } -/* === Line Rendering Part === */ +// Line rendering logic -static inline bool sw_line_clip_coord(float q, float p, float* t0, float* t1) +static inline bool sw_line_clip_coord(float q, float p, float *t0, float *t1) { - if (fabsf(p) < SW_CLIP_EPSILON) { + if (fabsf(p) < SW_CLIP_EPSILON) + { // Check if the line is entirely outside the window if (q < -SW_CLIP_EPSILON) return 0; // Completely outside - return 1; // Completely inside or on the edges + return 1; // Completely inside or on the edges } - const float r = q / p; + const float r = q/p; - if (p < 0) { + if (p < 0) + { if (r > *t1) return 0; if (r > *t0) *t0 = r; } - else { + else + { if (r < *t0) return 0; if (r < *t1) *t1 = r; } @@ -3279,12 +3222,13 @@ static inline bool sw_line_clip_coord(float q, float p, float* t0, float* t1) return 1; } -static inline bool sw_line_clip(sw_vertex_t* v0, sw_vertex_t* v1) +static inline bool sw_line_clip(sw_vertex_t *v0, sw_vertex_t *v1) { float t0 = 0.0f, t1 = 1.0f; float dH[4], dC[4]; - for (int i = 0; i < 4; i++) { + for (int i = 0; i < 4; i++) + { dH[i] = v1->homogeneous[i] - v0->homogeneous[i]; dC[i] = v1->color[i] - v0->color[i]; } @@ -3298,40 +3242,45 @@ static inline bool sw_line_clip(sw_vertex_t* v0, sw_vertex_t* v1) if (!sw_line_clip_coord(v0->homogeneous[3] + v0->homogeneous[2], -dH[3] - dH[2], &t0, &t1)) return false; // Clipping Scissor - if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) { - if (!sw_line_clip_coord(v0->homogeneous[0] - RLSW.scClipMin[0] * v0->homogeneous[3], RLSW.scClipMin[0] * dH[3] - dH[0], &t0, &t1)) return false; - if (!sw_line_clip_coord(RLSW.scClipMax[0] * v0->homogeneous[3] - v0->homogeneous[0], dH[0] - RLSW.scClipMax[0] * dH[3], &t0, &t1)) return false; - if (!sw_line_clip_coord(v0->homogeneous[1] - RLSW.scClipMin[1] * v0->homogeneous[3], RLSW.scClipMin[1] * dH[3] - dH[1], &t0, &t1)) return false; - if (!sw_line_clip_coord(RLSW.scClipMax[1] * v0->homogeneous[3] - v0->homogeneous[1], dH[1] - RLSW.scClipMax[1] * dH[3], &t0, &t1)) return false; + if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) + { + if (!sw_line_clip_coord(v0->homogeneous[0] - RLSW.scClipMin[0]*v0->homogeneous[3], RLSW.scClipMin[0]*dH[3] - dH[0], &t0, &t1)) return false; + if (!sw_line_clip_coord(RLSW.scClipMax[0]*v0->homogeneous[3] - v0->homogeneous[0], dH[0] - RLSW.scClipMax[0]*dH[3], &t0, &t1)) return false; + if (!sw_line_clip_coord(v0->homogeneous[1] - RLSW.scClipMin[1]*v0->homogeneous[3], RLSW.scClipMin[1]*dH[3] - dH[1], &t0, &t1)) return false; + if (!sw_line_clip_coord(RLSW.scClipMax[1]*v0->homogeneous[3] - v0->homogeneous[1], dH[1] - RLSW.scClipMax[1]*dH[3], &t0, &t1)) return false; } // Interpolation of new coordinates - if (t1 < 1.0f) { - for (int i = 0; i < 4; i++) { - v1->homogeneous[i] = v0->homogeneous[i] + t1 * dH[i]; - v1->color[i] = v0->color[i] + t1 * dC[i]; + if (t1 < 1.0f) + { + for (int i = 0; i < 4; i++) + { + v1->homogeneous[i] = v0->homogeneous[i] + t1*dH[i]; + v1->color[i] = v0->color[i] + t1*dC[i]; } } - if (t0 > 0.0f) { - for (int i = 0; i < 4; i++) { - v0->homogeneous[i] += t0 * dH[i]; - v0->color[i] += t0 * dC[i]; + + if (t0 > 0.0f) + { + for (int i = 0; i < 4; i++) + { + v0->homogeneous[i] += t0*dH[i]; + v0->color[i] += t0*dC[i]; } } return true; } -static inline bool sw_line_clip_and_project(sw_vertex_t* v0, sw_vertex_t* v1) +static inline bool sw_line_clip_and_project(sw_vertex_t *v0, sw_vertex_t *v1) { - if (!sw_line_clip(v0, v1)) { - return false; - } + if (!sw_line_clip(v0, v1)) return false; // Convert homogeneous coordinates to NDC - v0->homogeneous[3] = 1.0f / v0->homogeneous[3]; - v1->homogeneous[3] = 1.0f / v1->homogeneous[3]; - for (int i = 0; i < 3; i++) { + v0->homogeneous[3] = 1.0f/v0->homogeneous[3]; + v1->homogeneous[3] = 1.0f/v1->homogeneous[3]; + for (int i = 0; i < 3; i++) + { v0->homogeneous[i] *= v0->homogeneous[3]; v1->homogeneous[i] *= v1->homogeneous[3]; } @@ -3344,7 +3293,7 @@ static inline bool sw_line_clip_and_project(sw_vertex_t* v0, sw_vertex_t* v1) } #define DEFINE_LINE_RASTER(FUNC_NAME, ENABLE_DEPTH_TEST, ENABLE_COLOR_BLEND) \ -static inline void FUNC_NAME(const sw_vertex_t* v0, const sw_vertex_t* v1) \ +static inline void FUNC_NAME(const sw_vertex_t *v0, const sw_vertex_t *v1) \ { \ int x1 = (int)(v0->screen[0] + 0.5f); \ int y1 = (int)(v0->screen[1] + 0.5f); \ @@ -3355,8 +3304,8 @@ static inline void FUNC_NAME(const sw_vertex_t* v0, const sw_vertex_t* v1) \ int dy = y2 - y1; \ \ /* Handling of lines that are more horizontal or vertical */ \ - \ - if (dx == 0 && dy == 0) { \ + if (dx == 0 && dy == 0) \ + { \ /* TODO: A point should be rendered here */ \ return; \ } \ @@ -3364,36 +3313,33 @@ static inline void FUNC_NAME(const sw_vertex_t* v0, const sw_vertex_t* v1) \ bool yLonger = (abs(dy) > abs(dx)); \ int longLen, shortLen; \ \ - if (yLonger) { \ + if (yLonger) \ + { \ longLen = dy; \ shortLen = dx; \ } \ - else { \ + else \ + { \ longLen = dx; \ shortLen = dy; \ } \ \ /* Handling of traversal direction */ \ - \ - int sgnInc = (longLen < 0) ? -1 : 1; \ + int sgnInc = (longLen < 0)? -1 : 1; \ int abslongLen = abs(longLen); \ \ /* Calculation of the increment step for the shorter coordinate */ \ - \ int decInc = 0; \ - if (abslongLen != 0) { \ - decInc = (shortLen << 16) / abslongLen; \ - } \ + if (abslongLen != 0) decInc = (shortLen << 16)/abslongLen; \ \ - float longLenRcp = (abslongLen != 0) ? (1.0f / abslongLen) : 0.0f; \ + float longLenRcp = (abslongLen != 0)? (1.0f/abslongLen) : 0.0f; \ \ /* Calculation of interpolation steps */ \ - \ - const float zStep = (v1->homogeneous[2] - v0->homogeneous[2]) * longLenRcp; \ - const float rStep = (v1->color[0] - v0->color[0]) * longLenRcp; \ - const float gStep = (v1->color[1] - v0->color[1]) * longLenRcp; \ - const float bStep = (v1->color[2] - v0->color[2]) * longLenRcp; \ - const float aStep = (v1->color[3] - v0->color[3]) * longLenRcp; \ + const float zStep = (v1->homogeneous[2] - v0->homogeneous[2])*longLenRcp; \ + const float rStep = (v1->color[0] - v0->color[0])*longLenRcp; \ + const float gStep = (v1->color[1] - v0->color[1])*longLenRcp; \ + const float bStep = (v1->color[2] - v0->color[2])*longLenRcp; \ + const float aStep = (v1->color[3] - v0->color[3])*longLenRcp; \ \ float z = v0->homogeneous[2]; \ \ @@ -3405,27 +3351,26 @@ static inline void FUNC_NAME(const sw_vertex_t* v0, const sw_vertex_t* v1) \ }; \ \ const int fbWidth = RLSW.framebuffer.width; \ - void* cBuffer = RLSW.framebuffer.color; \ - void* dBuffer = RLSW.framebuffer.depth; \ + void *cBuffer = RLSW.framebuffer.color; \ + void *dBuffer = RLSW.framebuffer.depth; \ \ int j = 0; \ - \ if (yLonger) \ { \ for (int i = 0; i != longLen; i += sgnInc) \ { \ - int offset = (y1 + i) * fbWidth + (x1 + (j >> 16)); \ + int offset = (y1 + i)*fbWidth + (x1 + (j >> 16)); \ + void *dptr = sw_framebuffer_get_depth_addr(dBuffer, offset); \ \ - void* dptr = sw_framebuffer_get_depth_addr(dBuffer, offset); \ - \ - if (ENABLE_DEPTH_TEST) { \ + if (ENABLE_DEPTH_TEST) \ + { \ float depth = sw_framebuffer_read_depth(dptr); \ if (z > depth) goto discardA; \ } \ \ sw_framebuffer_write_depth(dptr, z); \ \ - void* cptr = sw_framebuffer_get_color_addr(cBuffer, offset); \ + void *cptr = sw_framebuffer_get_color_addr(cBuffer, offset); \ \ if (ENABLE_COLOR_BLEND) \ { \ @@ -3435,10 +3380,7 @@ static inline void FUNC_NAME(const sw_vertex_t* v0, const sw_vertex_t* v1) \ sw_blend_colors(dstColor, color); \ sw_framebuffer_write_color(cptr, dstColor); \ } \ - else \ - { \ - sw_framebuffer_write_color(cptr, color); \ - } \ + else sw_framebuffer_write_color(cptr, color); \ \ discardA: \ j += decInc; \ @@ -3453,18 +3395,18 @@ static inline void FUNC_NAME(const sw_vertex_t* v0, const sw_vertex_t* v1) \ { \ for (int i = 0; i != longLen; i += sgnInc) \ { \ - int offset = (y1 + (j >> 16)) * fbWidth + (x1 + i); \ + int offset = (y1 + (j >> 16))*fbWidth + (x1 + i); \ + void *dptr = sw_framebuffer_get_depth_addr(dBuffer, offset); \ \ - void* dptr = sw_framebuffer_get_depth_addr(dBuffer, offset); \ - \ - if (ENABLE_DEPTH_TEST) { \ + if (ENABLE_DEPTH_TEST) \ + { \ float depth = sw_framebuffer_read_depth(dptr); \ if (z > depth) goto discardB; \ } \ \ sw_framebuffer_write_depth(dptr, z); \ \ - void* cptr = sw_framebuffer_get_color_addr(cBuffer, offset); \ + void *cptr = sw_framebuffer_get_color_addr(cBuffer, offset); \ \ if (ENABLE_COLOR_BLEND) \ { \ @@ -3474,10 +3416,7 @@ static inline void FUNC_NAME(const sw_vertex_t* v0, const sw_vertex_t* v1) \ sw_blend_colors(dstColor, color); \ sw_framebuffer_write_color(cptr, dstColor); \ } \ - else \ - { \ - sw_framebuffer_write_color(cptr, color); \ - } \ + else sw_framebuffer_write_color(cptr, color); \ \ discardB: \ j += decInc; \ @@ -3491,7 +3430,7 @@ static inline void FUNC_NAME(const sw_vertex_t* v0, const sw_vertex_t* v1) \ } #define DEFINE_LINE_THICK_RASTER(FUNC_NAME, RASTER_FUNC) \ -void FUNC_NAME(const sw_vertex_t* v1, const sw_vertex_t* v2) \ +void FUNC_NAME(const sw_vertex_t *v1, const sw_vertex_t *v2) \ { \ sw_vertex_t tv1, tv2; \ \ @@ -3505,10 +3444,12 @@ void FUNC_NAME(const sw_vertex_t* v1, const sw_vertex_t* v2) \ \ RASTER_FUNC(v1, v2); \ \ - if (dx != 0 && abs(dy / dx) < 1) { \ - int wy = (int)((RLSW.lineWidth - 1.0f) * abs(dx) / sqrtf(dx * dx + dy * dy)); \ - wy >>= 1; /* Division by 2 via bit shift */ \ - for (int i = 1; i <= wy; i++) { \ + if (dx != 0 && abs(dy/dx) < 1) \ + { \ + int wy = (int)((RLSW.lineWidth - 1.0f)*abs(dx)/sqrtf(dx*dx + dy*dy)); \ + wy >>= 1; \ + for (int i = 1; i <= wy; i++) \ + { \ tv1 = *v1, tv2 = *v2; \ tv1.screen[1] -= i; \ tv2.screen[1] -= i; \ @@ -3519,10 +3460,12 @@ void FUNC_NAME(const sw_vertex_t* v1, const sw_vertex_t* v2) \ RASTER_FUNC(&tv1, &tv2); \ } \ } \ - else if (dy != 0) { \ - int wx = (int)((RLSW.lineWidth - 1.0f) * abs(dy) / sqrtf(dx * dx + dy * dy)); \ - wx >>= 1; /* Division by 2 via bit shift */ \ - for (int i = 1; i <= wx; i++) { \ + else if (dy != 0) \ + { \ + int wx = (int)((RLSW.lineWidth - 1.0f)*abs(dy)/sqrtf(dx*dx + dy*dy)); \ + wx >>= 1; \ + for (int i = 1; i <= wx; i++) \ + { \ tv1 = *v1, tv2 = *v2; \ tv1.screen[0] -= i; \ tv2.screen[0] -= i; \ @@ -3545,53 +3488,38 @@ DEFINE_LINE_THICK_RASTER(sw_line_thick_raster_DEPTH, sw_line_raster_DEPTH) DEFINE_LINE_THICK_RASTER(sw_line_thick_raster_BLEND, sw_line_raster_BLEND) DEFINE_LINE_THICK_RASTER(sw_line_thick_raster_DEPTH_BLEND, sw_line_raster_DEPTH_BLEND) -static inline void sw_line_render(sw_vertex_t* vertices) +static inline void sw_line_render(sw_vertex_t *vertices) { - if (!sw_line_clip_and_project(&vertices[0], &vertices[1])) { - return; - } + if (!sw_line_clip_and_project(&vertices[0], &vertices[1])) return; - if (RLSW.lineWidth >= 2.0f) { - if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) { - sw_line_thick_raster_DEPTH_BLEND(&vertices[0], &vertices[1]); - } - else if (SW_STATE_CHECK(SW_STATE_BLEND)) { - sw_line_thick_raster_BLEND(&vertices[0], &vertices[1]); - } - else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST)) { - sw_line_thick_raster_DEPTH(&vertices[0], &vertices[1]); - } - else { - sw_line_thick_raster(&vertices[0], &vertices[1]); - } + if (RLSW.lineWidth >= 2.0f) + { + if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) sw_line_thick_raster_DEPTH_BLEND(&vertices[0], &vertices[1]); + else if (SW_STATE_CHECK(SW_STATE_BLEND)) sw_line_thick_raster_BLEND(&vertices[0], &vertices[1]); + else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST)) sw_line_thick_raster_DEPTH(&vertices[0], &vertices[1]); + else sw_line_thick_raster(&vertices[0], &vertices[1]); } - else { - if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) { - sw_line_raster_DEPTH_BLEND(&vertices[0], &vertices[1]); - } - else if (SW_STATE_CHECK(SW_STATE_BLEND)) { - sw_line_raster_BLEND(&vertices[0], &vertices[1]); - } - else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST)) { - sw_line_raster_DEPTH(&vertices[0], &vertices[1]); - } - else { - sw_line_raster(&vertices[0], &vertices[1]); - } + else + { + if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) sw_line_raster_DEPTH_BLEND(&vertices[0], &vertices[1]); + else if (SW_STATE_CHECK(SW_STATE_BLEND)) sw_line_raster_BLEND(&vertices[0], &vertices[1]); + else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST)) sw_line_raster_DEPTH(&vertices[0], &vertices[1]); + else sw_line_raster(&vertices[0], &vertices[1]); } } -/* === Point Rendering Part === */ +// Point rendering logic -static inline bool sw_point_clip_and_project(sw_vertex_t* v) +static inline bool sw_point_clip_and_project(sw_vertex_t *v) { - if (v->homogeneous[3] != 1.0f) { - for (int_fast8_t i = 0; i < 3; i++) { - if (v->homogeneous[i] < -v->homogeneous[3] || v->homogeneous[i] > v->homogeneous[3]) { - return false; - } + if (v->homogeneous[3] != 1.0f) + { + for (int_fast8_t i = 0; i < 3; i++) + { + if ((v->homogeneous[i] < -v->homogeneous[3]) || (v->homogeneous[i] > v->homogeneous[3])) return false; } - v->homogeneous[3] = 1.0f / v->homogeneous[3]; + + v->homogeneous[3] = 1.0f/v->homogeneous[3]; v->homogeneous[0] *= v->homogeneous[3]; v->homogeneous[1] *= v->homogeneous[3]; v->homogeneous[2] *= v->homogeneous[3]; @@ -3599,24 +3527,23 @@ static inline bool sw_point_clip_and_project(sw_vertex_t* v) sw_project_ndc_to_screen(v->screen, v->homogeneous); - const int *min, *max; + const int *min = NULL, *max = NULL; - if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) { + if (RLSW.stateFlags & SW_STATE_SCISSOR_TEST) + { min = RLSW.scMin; max = RLSW.scMax; } - else { + else + { min = RLSW.vpMin; max = RLSW.vpMax; } - bool insideX = v->screen[0] - RLSW.pointRadius < max[0] - && v->screen[0] + RLSW.pointRadius > min[0]; + bool insideX = (v->screen[0] - RLSW.pointRadius < max[0]) && (v->screen[0] + RLSW.pointRadius > min[0]); + bool insideY = (v->screen[1] - RLSW.pointRadius < max[1]) && (v->screen[1] + RLSW.pointRadius > min[1]); - bool insideY = v->screen[1] - RLSW.pointRadius < max[1] - && v->screen[1] + RLSW.pointRadius > min[1]; - - return insideX && insideY; + return (insideX && insideY); } #define DEFINE_POINT_RASTER(FUNC_NAME, ENABLE_DEPTH_TEST, ENABLE_COLOR_BLEND, CHECK_BOUNDS) \ @@ -3633,11 +3560,9 @@ static inline void FUNC_NAME(int x, int y, float z, const float color[4]) \ if (y < RLSW.scMin[1] || y >= RLSW.scMax[1]) return; \ } \ \ - int offset = y * RLSW.framebuffer.width + x; \ + int offset = y*RLSW.framebuffer.width + x; \ \ - void* dptr = sw_framebuffer_get_depth_addr( \ - RLSW.framebuffer.depth, offset \ - ); \ + void *dptr = sw_framebuffer_get_depth_addr(RLSW.framebuffer.depth, offset); \ \ if (ENABLE_DEPTH_TEST) \ { \ @@ -3647,9 +3572,7 @@ static inline void FUNC_NAME(int x, int y, float z, const float color[4]) \ \ sw_framebuffer_write_depth(dptr, z); \ \ - void* cptr = sw_framebuffer_get_color_addr( \ - RLSW.framebuffer.color, offset \ - ); \ + void *cptr = sw_framebuffer_get_color_addr(RLSW.framebuffer.color, offset); \ \ if (ENABLE_COLOR_BLEND) \ { \ @@ -3659,41 +3582,40 @@ static inline void FUNC_NAME(int x, int y, float z, const float color[4]) \ sw_blend_colors(dstColor, color); \ sw_framebuffer_write_color(cptr, dstColor); \ } \ - else \ - { \ - sw_framebuffer_write_color(cptr, color); \ - } \ + else sw_framebuffer_write_color(cptr, color); \ } #define DEFINE_POINT_THICK_RASTER(FUNC_NAME, RASTER_FUNC) \ -static inline void FUNC_NAME(sw_vertex_t* v) \ +static inline void FUNC_NAME(sw_vertex_t *v) \ { \ int cx = v->screen[0]; \ int cy = v->screen[1]; \ float cz = v->homogeneous[2]; \ int radius = RLSW.pointRadius; \ - const float* color = v->color; \ + const float *color = v->color; \ \ int x = 0; \ int y = radius; \ - int d = 3 - 2 * radius; \ + int d = 3 - 2*radius; \ \ - while (x <= y) { \ - for (int i = -x; i <= x; i++) { \ + while (x <= y) \ + { \ + for (int i = -x; i <= x; i++) \ + { \ RASTER_FUNC(cx + i, cy + y, cz, color); \ RASTER_FUNC(cx + i, cy - y, cz, color); \ } \ - for (int i = -y; i <= y; i++) { \ + for (int i = -y; i <= y; i++) \ + { \ RASTER_FUNC(cx + i, cy + x, cz, color); \ RASTER_FUNC(cx + i, cy - x, cz, color); \ } \ - if (d > 0) { \ + if (d > 0) \ + { \ y--; \ - d = d + 4 * (x - y) + 10; \ - } \ - else { \ - d = d + 4 * x + 6; \ + d = d + 4*(x - y) + 10; \ } \ + else d = d + 4*x + 6; \ x++; \ } \ } @@ -3723,114 +3645,65 @@ DEFINE_POINT_THICK_RASTER(sw_point_thick_raster_DEPTH_SCISSOR, sw_point_raster_D DEFINE_POINT_THICK_RASTER(sw_point_thick_raster_BLEND_SCISSOR, sw_point_raster_BLEND_CHECK_SCISSOR) DEFINE_POINT_THICK_RASTER(sw_point_thick_raster_DEPTH_BLEND_SCISSOR, sw_point_raster_DEPTH_BLEND_CHECK_SCISSOR) -static inline void sw_point_render(sw_vertex_t* v) +static inline void sw_point_render(sw_vertex_t *v) { - if (!sw_point_clip_and_project(v)) { - return; - } + if (!sw_point_clip_and_project(v)) return; - if (RLSW.pointRadius >= 1.0f) { - if (SW_STATE_CHECK(SW_STATE_SCISSOR_TEST)) { - if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) { - sw_point_thick_raster_DEPTH_BLEND_SCISSOR(v); - } - else if (SW_STATE_CHECK(SW_STATE_BLEND)) { - sw_point_thick_raster_BLEND_SCISSOR(v); - } - else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST)) { - sw_point_thick_raster_DEPTH_SCISSOR(v); - } - else { - sw_point_thick_raster_SCISSOR(v); - } + if (RLSW.pointRadius >= 1.0f) + { + if (SW_STATE_CHECK(SW_STATE_SCISSOR_TEST)) + { + if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) sw_point_thick_raster_DEPTH_BLEND_SCISSOR(v); + else if (SW_STATE_CHECK(SW_STATE_BLEND)) sw_point_thick_raster_BLEND_SCISSOR(v); + else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST)) sw_point_thick_raster_DEPTH_SCISSOR(v); + else sw_point_thick_raster_SCISSOR(v); } - else { - if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) { - sw_point_thick_raster_DEPTH_BLEND(v); - } - else if (SW_STATE_CHECK(SW_STATE_BLEND)) { - sw_point_thick_raster_BLEND(v); - } - else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST)) { - sw_point_thick_raster_DEPTH(v); - } - else { - sw_point_thick_raster(v); - } + else + { + if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) sw_point_thick_raster_DEPTH_BLEND(v); + else if (SW_STATE_CHECK(SW_STATE_BLEND)) sw_point_thick_raster_BLEND(v); + else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST)) sw_point_thick_raster_DEPTH(v); + else sw_point_thick_raster(v); } } - else { - if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) { - sw_point_raster_DEPTH_BLEND( - v->screen[0], v->screen[1], - v->homogeneous[2], v->color - ); - } - else if (SW_STATE_CHECK(SW_STATE_BLEND)) { - sw_point_raster_BLEND( - v->screen[0], v->screen[1], - v->homogeneous[2], v->color - ); - } - else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST)) { - sw_point_raster_DEPTH( - v->screen[0], v->screen[1], - v->homogeneous[2], v->color - ); - } - else { - sw_point_raster( - v->screen[0], v->screen[1], - v->homogeneous[2], v->color - ); - } + else + { + if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST | SW_STATE_BLEND)) sw_point_raster_DEPTH_BLEND(v->screen[0], v->screen[1], v->homogeneous[2], v->color); + else if (SW_STATE_CHECK(SW_STATE_BLEND)) sw_point_raster_BLEND(v->screen[0], v->screen[1], v->homogeneous[2], v->color); + else if (SW_STATE_CHECK(SW_STATE_DEPTH_TEST)) sw_point_raster_DEPTH(v->screen[0], v->screen[1], v->homogeneous[2], v->color); + else sw_point_raster(v->screen[0], v->screen[1], v->homogeneous[2], v->color); } } -/* === Polygon Modes Rendering Part === */ +// Polygon modes mendering logic static inline void sw_poly_point_render(void) { - for (int i = 0; i < RLSW.vertexCounter; i++) { - sw_point_render(&RLSW.vertexBuffer[i]); - } + for (int i = 0; i < RLSW.vertexCounter; i++) sw_point_render(&RLSW.vertexBuffer[i]); } static inline void sw_poly_line_render(void) { - const sw_vertex_t* vertices = RLSW.vertexBuffer; + const sw_vertex_t *vertices = RLSW.vertexBuffer; int cm1 = RLSW.vertexCounter - 1; - for (int i = 0; i < cm1; i++) { - sw_line_render((sw_vertex_t[2]){ - vertices[i], vertices[i + 1] - }); - } + for (int i = 0; i < cm1; i++) sw_line_render((sw_vertex_t[2]){ vertices[i], vertices[i + 1] }); - sw_line_render((sw_vertex_t[2]){ - vertices[cm1], vertices[0] - }); + sw_line_render((sw_vertex_t[2]){ vertices[cm1], vertices[0] }); } static inline void sw_poly_fill_render(void) { - switch (RLSW.drawMode) { - case SW_POINTS: - sw_point_render(&RLSW.vertexBuffer[0]); - break; - case SW_LINES: - sw_line_render(RLSW.vertexBuffer); - break; - case SW_TRIANGLES: - sw_triangle_render(); - break; - case SW_QUADS: - sw_quad_render(); - break; + switch (RLSW.drawMode) + { + case SW_POINTS: sw_point_render(&RLSW.vertexBuffer[0]); break; + case SW_LINES: sw_line_render(RLSW.vertexBuffer); break; + case SW_TRIANGLES: sw_triangle_render(); break; + case SW_QUADS: sw_quad_render(); break; } } -/* === Some Validity Check Helper === */ +// Validity check helper functions static inline bool sw_is_texture_valid(uint32_t id) { @@ -3857,15 +3730,13 @@ static inline bool sw_is_draw_mode_valid(int mode) { bool result = false; - switch (mode) { - case SW_POINTS: - case SW_LINES: - case SW_TRIANGLES: - case SW_QUADS: - result = true; - break; - default: - break; + switch (mode) + { + case SW_POINTS: + case SW_LINES: + case SW_TRIANGLES: + case SW_QUADS: result = true; break; + default: break; } return result; @@ -3875,14 +3746,12 @@ static inline bool sw_is_poly_mode_valid(int mode) { bool result = false; - switch (mode) { - case SW_POINT: - case SW_LINE: - case SW_FILL: - result = true; - break; - default: - break; + switch (mode) + { + case SW_POINT: + case SW_LINE: + case SW_FILL: result = true; break; + default: break; } return result; @@ -3897,22 +3766,20 @@ static inline bool sw_is_blend_src_factor_valid(int blend) { bool result = false; - switch (blend) { - case SW_ZERO: - case SW_ONE: - case SW_SRC_COLOR: - case SW_ONE_MINUS_SRC_COLOR: - case SW_SRC_ALPHA: - case SW_ONE_MINUS_SRC_ALPHA: - case SW_DST_ALPHA: - case SW_ONE_MINUS_DST_ALPHA: - case SW_DST_COLOR: - case SW_ONE_MINUS_DST_COLOR: - case SW_SRC_ALPHA_SATURATE: - result = true; - break; - default: - break; + switch (blend) + { + case SW_ZERO: + case SW_ONE: + case SW_SRC_COLOR: + case SW_ONE_MINUS_SRC_COLOR: + case SW_SRC_ALPHA: + case SW_ONE_MINUS_SRC_ALPHA: + case SW_DST_ALPHA: + case SW_ONE_MINUS_DST_ALPHA: + case SW_DST_COLOR: + case SW_ONE_MINUS_DST_COLOR: + case SW_SRC_ALPHA_SATURATE: result = true; break; + default: break; } return result; @@ -3922,41 +3789,38 @@ static inline bool sw_is_blend_dst_factor_valid(int blend) { bool result = false; - switch (blend) { - case SW_ZERO: - case SW_ONE: - case SW_SRC_COLOR: - case SW_ONE_MINUS_SRC_COLOR: - case SW_SRC_ALPHA: - case SW_ONE_MINUS_SRC_ALPHA: - case SW_DST_ALPHA: - case SW_ONE_MINUS_DST_ALPHA: - case SW_DST_COLOR: - case SW_ONE_MINUS_DST_COLOR: - result = true; - break; - default: - break; + switch (blend) + { + case SW_ZERO: + case SW_ONE: + case SW_SRC_COLOR: + case SW_ONE_MINUS_SRC_COLOR: + case SW_SRC_ALPHA: + case SW_ONE_MINUS_SRC_ALPHA: + case SW_DST_ALPHA: + case SW_ONE_MINUS_DST_ALPHA: + case SW_DST_COLOR: + case SW_ONE_MINUS_DST_COLOR: result = true; break; + default: break; } return result; } -/* === Public Implementation === */ - +//---------------------------------------------------------------------------------- +// Module Functions Definition +//---------------------------------------------------------------------------------- bool swInit(int w, int h) { - if (!sw_framebuffer_load(w, h)) { - swClose(); return false; - } + if (!sw_framebuffer_load(w, h)) { swClose(); return false; } swViewport(0, 0, w, h); swScissor(0, 0, w, h); - RLSW.loadedTextures = SW_MALLOC(SW_MAX_TEXTURES * sizeof(sw_texture_t)); + RLSW.loadedTextures = SW_MALLOC(SW_MAX_TEXTURES*sizeof(sw_texture_t)); if (RLSW.loadedTextures == NULL) { swClose(); return false; } - RLSW.freeTextureIds = SW_MALLOC(SW_MAX_TEXTURES * sizeof(uint32_t)); + RLSW.freeTextureIds = SW_MALLOC(SW_MAX_TEXTURES*sizeof(uint32_t)); if (RLSW.loadedTextures == NULL) { swClose(); return false; } RLSW.clearColor[0] = 0.0f; @@ -3995,8 +3859,7 @@ bool swInit(int w, int h) RLSW.polyMode = SW_FILL; RLSW.cullFace = SW_BACK; - static const float defTex[3*2*2] = - { + static const float defTex[3*2*2] = { 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, @@ -4024,11 +3887,10 @@ bool swInit(int w, int h) void swClose(void) { - for (int i = 1; i < RLSW.loadedTextureCount; i++) { - sw_texture_t* texture = &RLSW.loadedTextures[i]; - if (sw_is_texture_valid(i) && texture->copy) { - SW_FREE(texture->pixels.ptr); - } + for (int i = 1; i < RLSW.loadedTextureCount; i++) + { + sw_texture_t *texture = &RLSW.loadedTextures[i]; + if (sw_is_texture_valid(i) && texture->copy) SW_FREE(texture->pixels.ptr); } SW_FREE(RLSW.framebuffer.color); @@ -4044,147 +3906,89 @@ bool swResizeFramebuffer(int w, int h) return sw_framebuffer_resize(w, h); } -void swCopyFramebuffer(int x, int y, int w, int h, SWformat format, SWtype type, void* pixels) +void swCopyFramebuffer(int x, int y, int w, int h, SWformat format, SWtype type, void *pixels) { sw_pixelformat_t pFormat = sw_get_pixel_format(format, type); - if (w <= 0) { + if (w <= 0) + { RLSW.errCode = SW_INVALID_VALUE; return; } - if (h <= 0) { + if (h <= 0) + { RLSW.errCode = SW_INVALID_VALUE; return; } - if (w > RLSW.framebuffer.width) - w = RLSW.framebuffer.width; - - if (h > RLSW.framebuffer.height) - h = RLSW.framebuffer.height; + if (w > RLSW.framebuffer.width) w = RLSW.framebuffer.width; + if (h > RLSW.framebuffer.height) h = RLSW.framebuffer.height; x = sw_clampi(x, 0, w); y = sw_clampi(y, 0, h); - switch (pFormat) { - case SW_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: - sw_framebuffer_copy_to_GRAYALPHA(x, y, w, h, pixels); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: - sw_framebuffer_copy_to_GRAYALPHA(x, y, w, h, pixels); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R5G6B5: - sw_framebuffer_copy_to_R5G6B5(x, y, w, h, pixels); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8: - sw_framebuffer_copy_to_R8G8B8(x, y, w, h, pixels); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: - sw_framebuffer_copy_to_R5G5B5A1(x, y, w, h, pixels); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: - sw_framebuffer_copy_to_R4G4B4A4(x, y, w, h, pixels); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: - sw_framebuffer_copy_to_R8G8B8A8(x, y, w, h, pixels); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R32: - sw_framebuffer_copy_to_R32(x, y, w, h, pixels); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32: - sw_framebuffer_copy_to_R32G32B32(x, y, w, h, pixels); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: - sw_framebuffer_copy_to_R32G32B32A32(x, y, w, h, pixels); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R16: - sw_framebuffer_copy_to_R16(x, y, w, h, pixels); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16: - sw_framebuffer_copy_to_R16G16B16(x, y, w, h, pixels); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: - sw_framebuffer_copy_to_R16G16B16A16(x, y, w, h, pixels); - break; - default: - RLSW.errCode = SW_INVALID_ENUM; - break; + switch (pFormat) + { + case SW_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: sw_framebuffer_copy_to_GRAYALPHA(x, y, w, h, pixels); break; + case SW_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: sw_framebuffer_copy_to_GRAYALPHA(x, y, w, h, pixels); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R5G6B5: sw_framebuffer_copy_to_R5G6B5(x, y, w, h, pixels); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8: sw_framebuffer_copy_to_R8G8B8(x, y, w, h, pixels); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: sw_framebuffer_copy_to_R5G5B5A1(x, y, w, h, pixels); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: sw_framebuffer_copy_to_R4G4B4A4(x, y, w, h, pixels); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: sw_framebuffer_copy_to_R8G8B8A8(x, y, w, h, pixels); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R32: sw_framebuffer_copy_to_R32(x, y, w, h, pixels); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32: sw_framebuffer_copy_to_R32G32B32(x, y, w, h, pixels); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: sw_framebuffer_copy_to_R32G32B32A32(x, y, w, h, pixels); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R16: sw_framebuffer_copy_to_R16(x, y, w, h, pixels); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16: sw_framebuffer_copy_to_R16G16B16(x, y, w, h, pixels); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: sw_framebuffer_copy_to_R16G16B16A16(x, y, w, h, pixels); break; + default: RLSW.errCode = SW_INVALID_ENUM; break; } } -void swBlitFramebuffer(int xDst, int yDst, int wDst, int hDst, - int xSrc, int ySrc, int wSrc, int hSrc, - SWformat format, SWtype type, void* pixels) +void swBlitFramebuffer(int xDst, int yDst, int wDst, int hDst, int xSrc, int ySrc, int wSrc, int hSrc, SWformat format, SWtype type, void *pixels) { sw_pixelformat_t pFormat = sw_get_pixel_format(format, type); - if (wSrc <= 0) { + if (wSrc <= 0) + { RLSW.errCode = SW_INVALID_VALUE; return; } - if (hSrc <= 0) { + if (hSrc <= 0) + { RLSW.errCode = SW_INVALID_VALUE; return; } - if (wSrc > RLSW.framebuffer.width) - wSrc = RLSW.framebuffer.width; - - if (hSrc > RLSW.framebuffer.height) - hSrc = RLSW.framebuffer.height; + if (wSrc > RLSW.framebuffer.width) wSrc = RLSW.framebuffer.width; + if (hSrc > RLSW.framebuffer.height) hSrc = RLSW.framebuffer.height; xSrc = sw_clampi(xSrc, 0, wSrc); ySrc = sw_clampi(ySrc, 0, hSrc); - switch (pFormat) { - case SW_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: - sw_framebuffer_blit_to_GRAYALPHA(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: - sw_framebuffer_blit_to_GRAYALPHA(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R5G6B5: - sw_framebuffer_blit_to_R5G6B5(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8: - sw_framebuffer_blit_to_R8G8B8(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: - sw_framebuffer_blit_to_R5G5B5A1(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: - sw_framebuffer_blit_to_R4G4B4A4(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: - sw_framebuffer_blit_to_R8G8B8A8(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R32: - sw_framebuffer_blit_to_R32(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32: - sw_framebuffer_blit_to_R32G32B32(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: - sw_framebuffer_blit_to_R32G32B32A32(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R16: - sw_framebuffer_blit_to_R16(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16: - sw_framebuffer_blit_to_R16G16B16(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); - break; - case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: - sw_framebuffer_blit_to_R16G16B16A16(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); - break; - default: - RLSW.errCode = SW_INVALID_ENUM; - break; + switch (pFormat) + { + case SW_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: sw_framebuffer_blit_to_GRAYALPHA(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break; + case SW_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: sw_framebuffer_blit_to_GRAYALPHA(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R5G6B5: sw_framebuffer_blit_to_R5G6B5(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8: sw_framebuffer_blit_to_R8G8B8(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: sw_framebuffer_blit_to_R5G5B5A1(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: sw_framebuffer_blit_to_R4G4B4A4(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: sw_framebuffer_blit_to_R8G8B8A8(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R32: sw_framebuffer_blit_to_R32(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32: sw_framebuffer_blit_to_R32G32B32(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: sw_framebuffer_blit_to_R32G32B32A32(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R16: sw_framebuffer_blit_to_R16(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16: sw_framebuffer_blit_to_R16G16B16(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break; + case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: sw_framebuffer_blit_to_R16G16B16A16(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break; + default: RLSW.errCode = SW_INVALID_ENUM; break; } } -void* swGetColorBuffer(int* w, int* h) +void *swGetColorBuffer(int *w, int *h) { if (w) *w = RLSW.framebuffer.width; if (h) *h = RLSW.framebuffer.height; @@ -4194,136 +3998,102 @@ void* swGetColorBuffer(int* w, int* h) void swEnable(SWstate state) { - switch (state) { - case SW_SCISSOR_TEST: - RLSW.stateFlags |= SW_STATE_SCISSOR_TEST; - break; - case SW_TEXTURE_2D: - RLSW.stateFlags |= SW_STATE_TEXTURE_2D; - break; - case SW_DEPTH_TEST: - RLSW.stateFlags |= SW_STATE_DEPTH_TEST; - break; - case SW_CULL_FACE: - RLSW.stateFlags |= SW_STATE_CULL_FACE; - break; - case SW_BLEND: - RLSW.stateFlags |= SW_STATE_BLEND; - break; - default: - RLSW.errCode = SW_INVALID_ENUM; - break; + switch (state) + { + case SW_SCISSOR_TEST: RLSW.stateFlags |= SW_STATE_SCISSOR_TEST; break; + case SW_TEXTURE_2D: RLSW.stateFlags |= SW_STATE_TEXTURE_2D; break; + case SW_DEPTH_TEST: RLSW.stateFlags |= SW_STATE_DEPTH_TEST; break; + case SW_CULL_FACE: RLSW.stateFlags |= SW_STATE_CULL_FACE; break; + case SW_BLEND: RLSW.stateFlags |= SW_STATE_BLEND; break; + default: RLSW.errCode = SW_INVALID_ENUM; break; } } void swDisable(SWstate state) { - switch (state) { - case SW_SCISSOR_TEST: - RLSW.stateFlags &= ~SW_STATE_SCISSOR_TEST; - break; - case SW_TEXTURE_2D: - RLSW.stateFlags &= ~SW_STATE_TEXTURE_2D; - break; - case SW_DEPTH_TEST: - RLSW.stateFlags &= ~SW_STATE_DEPTH_TEST; - break; - case SW_CULL_FACE: - RLSW.stateFlags &= ~SW_STATE_CULL_FACE; - break; - case SW_BLEND: - RLSW.stateFlags &= ~SW_STATE_BLEND; - break; - default: - RLSW.errCode = SW_INVALID_ENUM; - break; + switch (state) + { + case SW_SCISSOR_TEST: RLSW.stateFlags &= ~SW_STATE_SCISSOR_TEST; break; + case SW_TEXTURE_2D: RLSW.stateFlags &= ~SW_STATE_TEXTURE_2D; break; + case SW_DEPTH_TEST: RLSW.stateFlags &= ~SW_STATE_DEPTH_TEST; break; + case SW_CULL_FACE: RLSW.stateFlags &= ~SW_STATE_CULL_FACE; break; + case SW_BLEND: RLSW.stateFlags &= ~SW_STATE_BLEND; break; + default: RLSW.errCode = SW_INVALID_ENUM; break; } } -void swGetIntegerv(SWget name, int* v) +void swGetIntegerv(SWget name, int *v) { - switch (name) { - case SW_MODELVIEW_STACK_DEPTH: - *v = SW_MODELVIEW_STACK_DEPTH; - break; - case SW_PROJECTION_STACK_DEPTH: - *v = SW_PROJECTION_STACK_DEPTH; - break; - case SW_TEXTURE_STACK_DEPTH: - *v = SW_TEXTURE_STACK_DEPTH; - break; - default: - RLSW.errCode = SW_INVALID_ENUM; - break; + switch (name) + { + case SW_MODELVIEW_STACK_DEPTH: *v = SW_MODELVIEW_STACK_DEPTH; break; + case SW_PROJECTION_STACK_DEPTH: *v = SW_PROJECTION_STACK_DEPTH; break; + case SW_TEXTURE_STACK_DEPTH: *v = SW_TEXTURE_STACK_DEPTH; break; + default: RLSW.errCode = SW_INVALID_ENUM; break; } } -void swGetFloatv(SWget name, float* v) +void swGetFloatv(SWget name, float *v) { - switch (name) { - case SW_COLOR_CLEAR_VALUE: - v[0] = RLSW.clearColor[0]; - v[1] = RLSW.clearColor[1]; - v[2] = RLSW.clearColor[2]; - v[3] = RLSW.clearColor[3]; - break; - case SW_CURRENT_COLOR: - v[0] = RLSW.vertexBuffer[RLSW.vertexCounter - 1].color[0]; - v[1] = RLSW.vertexBuffer[RLSW.vertexCounter - 1].color[1]; - v[2] = RLSW.vertexBuffer[RLSW.vertexCounter - 1].color[2]; - v[3] = RLSW.vertexBuffer[RLSW.vertexCounter - 1].color[3]; - break; - case SW_CURRENT_TEXTURE_COORDS: - v[0] = RLSW.vertexBuffer[RLSW.vertexCounter - 1].texcoord[0]; - v[1] = RLSW.vertexBuffer[RLSW.vertexCounter - 1].texcoord[1]; - break; - case SW_POINT_SIZE: - v[0] = 2.0f * RLSW.pointRadius; - break; - case SW_LINE_WIDTH: - v[0] = RLSW.lineWidth; - break; - case SW_MODELVIEW_MATRIX: - for (int i = 0; i < 16; i++) { - v[i] = RLSW.stackModelview[RLSW.stackModelviewCounter - 1][i]; - } - break; - case SW_PROJECTION_MATRIX: - for (int i = 0; i < 16; i++) { - v[i] = RLSW.stackProjection[RLSW.stackProjectionCounter - 1][i]; - } - break; - case SW_TEXTURE_MATRIX: - for (int i = 0; i < 16; i++) { - v[i] = RLSW.stackTexture[RLSW.stackTextureCounter - 1][i]; - } - break; - default: - RLSW.errCode = SW_INVALID_ENUM; - break; + switch (name) + { + case SW_COLOR_CLEAR_VALUE: + { + v[0] = RLSW.clearColor[0]; + v[1] = RLSW.clearColor[1]; + v[2] = RLSW.clearColor[2]; + v[3] = RLSW.clearColor[3]; + } break; + case SW_CURRENT_COLOR: + { + v[0] = RLSW.vertexBuffer[RLSW.vertexCounter - 1].color[0]; + v[1] = RLSW.vertexBuffer[RLSW.vertexCounter - 1].color[1]; + v[2] = RLSW.vertexBuffer[RLSW.vertexCounter - 1].color[2]; + v[3] = RLSW.vertexBuffer[RLSW.vertexCounter - 1].color[3]; + } break; + case SW_CURRENT_TEXTURE_COORDS: + { + v[0] = RLSW.vertexBuffer[RLSW.vertexCounter - 1].texcoord[0]; + v[1] = RLSW.vertexBuffer[RLSW.vertexCounter - 1].texcoord[1]; + } break; + case SW_POINT_SIZE: + { + v[0] = 2.0f*RLSW.pointRadius; + } break; + case SW_LINE_WIDTH: + { + v[0] = RLSW.lineWidth; + } break; + case SW_MODELVIEW_MATRIX: + { + for (int i = 0; i < 16; i++) v[i] = RLSW.stackModelview[RLSW.stackModelviewCounter - 1][i]; + + } break; + case SW_PROJECTION_MATRIX: + { + for (int i = 0; i < 16; i++) v[i] = RLSW.stackProjection[RLSW.stackProjectionCounter - 1][i]; + + } break; + case SW_TEXTURE_MATRIX: + { + for (int i = 0; i < 16; i++) v[i] = RLSW.stackTexture[RLSW.stackTextureCounter - 1][i]; + + } break; + default: RLSW.errCode = SW_INVALID_ENUM; break; } } -const char* swGetString(SWget name) +const char *swGetString(SWget name) { - const char* result = NULL; + const char *result = NULL; - switch (name) { - case SW_VENDOR: - result = "RLSW Header"; - break; - case SW_RENDERER: - result = "RLSW Software Renderer"; - break; - case SW_VERSION: - result = "RLSW 1.0"; - break; - case SW_EXTENSIONS: - result = "None"; - break; - default: - RLSW.errCode = SW_INVALID_ENUM; - break; + switch (name) + { + case SW_VENDOR: result = "RLSW Header"; break; + case SW_RENDERER: result = "RLSW Software Renderer"; break; + case SW_VERSION: result = "RLSW 1.0"; break; + case SW_EXTENSIONS: result = "None"; break; + default: RLSW.errCode = SW_INVALID_ENUM; break; } return result; @@ -4338,7 +4108,8 @@ SWerrcode swGetError(void) void swViewport(int x, int y, int width, int height) { - if (width < 0 || height < 0) { + if ((width < 0) || (height < 0)) + { RLSW.errCode = SW_INVALID_VALUE; return; } @@ -4346,8 +4117,8 @@ void swViewport(int x, int y, int width, int height) RLSW.vpSize[0] = width; RLSW.vpSize[1] = height; - RLSW.vpHalfSize[0] = (int)(width / 2.0f + 0.5f); - RLSW.vpHalfSize[1] = (int)(height / 2.0f + 0.5f); + RLSW.vpHalfSize[0] = (int)(width/2.0f + 0.5f); + RLSW.vpHalfSize[1] = (int)(height/2.0f + 0.5f); RLSW.vpCenter[0] = x + RLSW.vpHalfSize[0]; RLSW.vpCenter[1] = y + RLSW.vpHalfSize[1]; @@ -4360,7 +4131,8 @@ void swViewport(int x, int y, int width, int height) void swScissor(int x, int y, int width, int height) { - if (width < 0 || height < 0) { + if ((width < 0) || (height < 0)) + { RLSW.errCode = SW_INVALID_VALUE; return; } @@ -4370,10 +4142,10 @@ void swScissor(int x, int y, int width, int height) RLSW.scMax[0] = sw_clampi(x + width, 0, RLSW.framebuffer.width - 1); RLSW.scMax[1] = sw_clampi(y + height, 0, RLSW.framebuffer.height - 1); - RLSW.scClipMin[0] = (2.0f * (float)RLSW.scMin[0] / (float)RLSW.vpSize[0]) - 1.0f; - RLSW.scClipMax[0] = (2.0f * (float)RLSW.scMax[0] / (float)RLSW.vpSize[0]) - 1.0f; - RLSW.scClipMax[1] = 1.0f - (2.0f * (float)RLSW.scMin[1] / (float)RLSW.vpSize[1]); - RLSW.scClipMin[1] = 1.0f - (2.0f * (float)RLSW.scMax[1] / (float)RLSW.vpSize[1]); + RLSW.scClipMin[0] = (2.0f*(float)RLSW.scMin[0]/(float)RLSW.vpSize[0]) - 1.0f; + RLSW.scClipMax[0] = (2.0f*(float)RLSW.scMax[0]/(float)RLSW.vpSize[0]) - 1.0f; + RLSW.scClipMax[1] = 1.0f - (2.0f*(float)RLSW.scMin[1]/(float)RLSW.vpSize[1]); + RLSW.scClipMin[1] = 1.0f - (2.0f*(float)RLSW.scMax[1]/(float)RLSW.vpSize[1]); } void swClearColor(float r, float g, float b, float a) @@ -4386,126 +4158,92 @@ void swClearColor(float r, float g, float b, float a) void swClear(uint32_t bitmask) { - int size = RLSW.framebuffer.width * RLSW.framebuffer.height; + int size = RLSW.framebuffer.width*RLSW.framebuffer.height; - if ((bitmask & (SW_COLOR_BUFFER_BIT | SW_DEPTH_BUFFER_BIT)) == (SW_COLOR_BUFFER_BIT | SW_DEPTH_BUFFER_BIT)) { - sw_framebuffer_fill( - RLSW.framebuffer.color, RLSW.framebuffer.depth, - size, RLSW.clearColor, RLSW.clearDepth - ); + if ((bitmask & (SW_COLOR_BUFFER_BIT | SW_DEPTH_BUFFER_BIT)) == (SW_COLOR_BUFFER_BIT | SW_DEPTH_BUFFER_BIT)) + { + sw_framebuffer_fill(RLSW.framebuffer.color, RLSW.framebuffer.depth,size, RLSW.clearColor, RLSW.clearDepth); } - else if (bitmask & (SW_COLOR_BUFFER_BIT)) { + else if (bitmask & (SW_COLOR_BUFFER_BIT)) + { sw_framebuffer_fill_color(RLSW.framebuffer.color, size, RLSW.clearColor); } - else if (bitmask & SW_DEPTH_BUFFER_BIT) { + else if (bitmask & SW_DEPTH_BUFFER_BIT) + { sw_framebuffer_fill_depth(RLSW.framebuffer.depth, size, RLSW.clearDepth); } } void swBlendFunc(SWfactor sfactor, SWfactor dfactor) { - if (!sw_is_blend_src_factor_valid(sfactor) - || !sw_is_blend_dst_factor_valid(dfactor)) { + if (!sw_is_blend_src_factor_valid(sfactor) || + !sw_is_blend_dst_factor_valid(dfactor)) + { RLSW.errCode = SW_INVALID_ENUM; return; } + RLSW.srcFactor = sfactor; RLSW.dstFactor = dfactor; - switch (sfactor) { - case SW_ZERO: - RLSW.srcFactorFunc = sw_factor_zero; - break; - case SW_ONE: - RLSW.srcFactorFunc = sw_factor_one; - break; - case SW_SRC_COLOR: - RLSW.srcFactorFunc = sw_factor_src_color; - break; - case SW_ONE_MINUS_SRC_COLOR: - RLSW.srcFactorFunc = sw_factor_one_minus_src_color; - break; - case SW_SRC_ALPHA: - RLSW.srcFactorFunc = sw_factor_src_alpha; - break; - case SW_ONE_MINUS_SRC_ALPHA: - RLSW.srcFactorFunc = sw_factor_one_minus_src_alpha; - break; - case SW_DST_ALPHA: - RLSW.srcFactorFunc = sw_factor_dst_alpha; - break; - case SW_ONE_MINUS_DST_ALPHA: - RLSW.srcFactorFunc = sw_factor_one_minus_dst_alpha; - break; - case SW_DST_COLOR: - RLSW.srcFactorFunc = sw_factor_dst_color; - break; - case SW_ONE_MINUS_DST_COLOR: - RLSW.srcFactorFunc = sw_factor_one_minus_dst_color; - break; - case SW_SRC_ALPHA_SATURATE: - RLSW.srcFactorFunc = sw_factor_src_alpha_saturate; - break; + switch (sfactor) + { + case SW_ZERO: RLSW.srcFactorFunc = sw_factor_zero; break; + case SW_ONE: RLSW.srcFactorFunc = sw_factor_one; break; + case SW_SRC_COLOR: RLSW.srcFactorFunc = sw_factor_src_color; break; + case SW_ONE_MINUS_SRC_COLOR: RLSW.srcFactorFunc = sw_factor_one_minus_src_color; break; + case SW_SRC_ALPHA: RLSW.srcFactorFunc = sw_factor_src_alpha; break; + case SW_ONE_MINUS_SRC_ALPHA: RLSW.srcFactorFunc = sw_factor_one_minus_src_alpha; break; + case SW_DST_ALPHA: RLSW.srcFactorFunc = sw_factor_dst_alpha; break; + case SW_ONE_MINUS_DST_ALPHA: RLSW.srcFactorFunc = sw_factor_one_minus_dst_alpha; break; + case SW_DST_COLOR: RLSW.srcFactorFunc = sw_factor_dst_color; break; + case SW_ONE_MINUS_DST_COLOR: RLSW.srcFactorFunc = sw_factor_one_minus_dst_color; break; + case SW_SRC_ALPHA_SATURATE: RLSW.srcFactorFunc = sw_factor_src_alpha_saturate; break; + default: break; } - switch (dfactor) { - case SW_ZERO: - RLSW.dstFactorFunc = sw_factor_zero; - break; - case SW_ONE: - RLSW.dstFactorFunc = sw_factor_one; - break; - case SW_SRC_COLOR: - RLSW.dstFactorFunc = sw_factor_src_color; - break; - case SW_ONE_MINUS_SRC_COLOR: - RLSW.dstFactorFunc = sw_factor_one_minus_src_color; - break; - case SW_SRC_ALPHA: - RLSW.dstFactorFunc = sw_factor_src_alpha; - break; - case SW_ONE_MINUS_SRC_ALPHA: - RLSW.dstFactorFunc = sw_factor_one_minus_src_alpha; - break; - case SW_DST_ALPHA: - RLSW.dstFactorFunc = sw_factor_dst_alpha; - break; - case SW_ONE_MINUS_DST_ALPHA: - RLSW.dstFactorFunc = sw_factor_one_minus_dst_alpha; - break; - case SW_DST_COLOR: - RLSW.dstFactorFunc = sw_factor_dst_color; - break; - case SW_ONE_MINUS_DST_COLOR: - RLSW.dstFactorFunc = sw_factor_one_minus_dst_color; - break; - case SW_SRC_ALPHA_SATURATE: - // NOTE: Should never be reached - break; + switch (dfactor) + { + case SW_ZERO: RLSW.dstFactorFunc = sw_factor_zero; break; + case SW_ONE: RLSW.dstFactorFunc = sw_factor_one; break; + case SW_SRC_COLOR: RLSW.dstFactorFunc = sw_factor_src_color; break; + case SW_ONE_MINUS_SRC_COLOR: RLSW.dstFactorFunc = sw_factor_one_minus_src_color; break; + case SW_SRC_ALPHA: RLSW.dstFactorFunc = sw_factor_src_alpha; break; + case SW_ONE_MINUS_SRC_ALPHA: RLSW.dstFactorFunc = sw_factor_one_minus_src_alpha; break; + case SW_DST_ALPHA: RLSW.dstFactorFunc = sw_factor_dst_alpha; break; + case SW_ONE_MINUS_DST_ALPHA: RLSW.dstFactorFunc = sw_factor_one_minus_dst_alpha; break; + case SW_DST_COLOR: RLSW.dstFactorFunc = sw_factor_dst_color; break; + case SW_ONE_MINUS_DST_COLOR: RLSW.dstFactorFunc = sw_factor_one_minus_dst_color; break; + case SW_SRC_ALPHA_SATURATE: break; + default: break; } } void swPolygonMode(SWpoly mode) { - if (!sw_is_poly_mode_valid(mode)) { + if (!sw_is_poly_mode_valid(mode)) + { RLSW.errCode = SW_INVALID_ENUM; return; } + RLSW.polyMode = mode; } void swCullFace(SWface face) { - if (!sw_is_face_valid(face)) { + if (!sw_is_face_valid(face)) + { RLSW.errCode = SW_INVALID_ENUM; return; } + RLSW.cullFace = face; } void swPointSize(float size) { - RLSW.pointRadius = floorf(size * 0.5f); + RLSW.pointRadius = floorf(size*0.5f); } void swLineWidth(float width) @@ -4515,19 +4253,12 @@ void swLineWidth(float width) void swMatrixMode(SWmatrix mode) { - switch (mode) { - case SW_PROJECTION: - RLSW.currentMatrix = &RLSW.stackProjection[RLSW.stackProjectionCounter - 1]; - break; - case SW_MODELVIEW: - RLSW.currentMatrix = &RLSW.stackModelview[RLSW.stackModelviewCounter - 1]; - break; - case SW_TEXTURE: - RLSW.currentMatrix = &RLSW.stackTexture[RLSW.stackTextureCounter - 1]; - break; - default: - RLSW.errCode = SW_INVALID_ENUM; - return; + switch (mode) + { + case SW_PROJECTION: RLSW.currentMatrix = &RLSW.stackProjection[RLSW.stackProjectionCounter - 1]; break; + case SW_MODELVIEW: RLSW.currentMatrix = &RLSW.stackModelview[RLSW.stackModelviewCounter - 1]; break; + case SW_TEXTURE: RLSW.currentMatrix = &RLSW.stackTexture[RLSW.stackTextureCounter - 1]; break; + default: RLSW.errCode = SW_INVALID_ENUM; return; } RLSW.currentMatrixMode = mode; @@ -4535,10 +4266,12 @@ void swMatrixMode(SWmatrix mode) void swPushMatrix(void) { - switch (RLSW.currentMatrixMode) { - case SW_PROJECTION: + switch (RLSW.currentMatrixMode) + { + case SW_PROJECTION: { - if (RLSW.stackProjectionCounter >= SW_MAX_PROJECTION_STACK_SIZE) { + if (RLSW.stackProjectionCounter >= SW_MAX_PROJECTION_STACK_SIZE) + { RLSW.errCode = SW_STACK_OVERFLOW; return; } @@ -4546,16 +4279,17 @@ void swPushMatrix(void) int iOld = RLSW.stackProjectionCounter - 1; int iNew = RLSW.stackProjectionCounter++; - for (int i = 0; i < 16; i++) { + for (int i = 0; i < 16; i++) + { RLSW.stackProjection[iNew][i] = RLSW.stackProjection[iOld][i]; } RLSW.currentMatrix = &RLSW.stackProjection[iNew]; - } - break; - case SW_MODELVIEW: + } break; + case SW_MODELVIEW: { - if (RLSW.stackModelviewCounter >= SW_MAX_MODELVIEW_STACK_SIZE) { + if (RLSW.stackModelviewCounter >= SW_MAX_MODELVIEW_STACK_SIZE) + { RLSW.errCode = SW_STACK_OVERFLOW; return; } @@ -4563,16 +4297,17 @@ void swPushMatrix(void) int iOld = RLSW.stackModelviewCounter - 1; int iNew = RLSW.stackModelviewCounter++; - for (int i = 0; i < 16; i++) { + for (int i = 0; i < 16; i++) + { RLSW.stackModelview[iNew][i] = RLSW.stackModelview[iOld][i]; } RLSW.currentMatrix = &RLSW.stackModelview[iNew]; - } - break; - case SW_TEXTURE: + } break; + case SW_TEXTURE: { - if (RLSW.stackTextureCounter >= SW_MAX_TEXTURE_STACK_SIZE) { + if (RLSW.stackTextureCounter >= SW_MAX_TEXTURE_STACK_SIZE) + { RLSW.errCode = SW_STACK_OVERFLOW; return; } @@ -4580,60 +4315,61 @@ void swPushMatrix(void) int iOld = RLSW.stackTextureCounter - 1; int iNew = RLSW.stackTextureCounter++; - for (int i = 0; i < 16; i++) { + for (int i = 0; i < 16; i++) + { RLSW.stackTexture[iNew][i] = RLSW.stackTexture[iOld][i]; } RLSW.currentMatrix = &RLSW.stackTexture[iNew]; - } - break; + } break; + default: break; } } void swPopMatrix(void) { - switch (RLSW.currentMatrixMode) { - case SW_PROJECTION: + switch (RLSW.currentMatrixMode) + { + case SW_PROJECTION: { - if (RLSW.stackProjectionCounter <= 0) { + if (RLSW.stackProjectionCounter <= 0) + { RLSW.errCode = SW_STACK_UNDERFLOW; return; } RLSW.currentMatrix = &RLSW.stackProjection[--RLSW.stackProjectionCounter]; RLSW.isDirtyMVP = true; //< The MVP is considered to have been changed - } - break; - case SW_MODELVIEW: + } break; + case SW_MODELVIEW: { - if (RLSW.stackModelviewCounter <= 0) { + if (RLSW.stackModelviewCounter <= 0) + { RLSW.errCode = SW_STACK_UNDERFLOW; return; } RLSW.currentMatrix = &RLSW.stackModelview[--RLSW.stackModelviewCounter]; RLSW.isDirtyMVP = true; //< The MVP is considered to have been changed - } - break; - case SW_TEXTURE: + } break; + case SW_TEXTURE: { - if (RLSW.stackTextureCounter <= 0) { + if (RLSW.stackTextureCounter <= 0) + { RLSW.errCode = SW_STACK_UNDERFLOW; return; } RLSW.currentMatrix = &RLSW.stackTexture[--RLSW.stackTextureCounter]; - } - break; + } break; + default: break; } } void swLoadIdentity(void) { sw_matrix_id(*RLSW.currentMatrix); - if (RLSW.currentMatrixMode != SW_TEXTURE) { - RLSW.isDirtyMVP = true; - } + if (RLSW.currentMatrixMode != SW_TEXTURE) RLSW.isDirtyMVP = true; } void swTranslatef(float x, float y, float z) @@ -4647,9 +4383,7 @@ void swTranslatef(float x, float y, float z) sw_matrix_mul(*RLSW.currentMatrix, mat, *RLSW.currentMatrix); - if (RLSW.currentMatrixMode != SW_TEXTURE) { - RLSW.isDirtyMVP = true; - } + if (RLSW.currentMatrixMode != SW_TEXTURE) RLSW.isDirtyMVP = true; } void swRotatef(float angle, float x, float y, float z) @@ -4658,7 +4392,8 @@ void swRotatef(float angle, float x, float y, float z) float lengthSq = x*x + y*y + z*z; - if (lengthSq != 1.0f && lengthSq != 0.0f) { + if (lengthSq != 1.0f && lengthSq != 0.0f) + { float invLength = 1.0f/sqrtf(lengthSq); x *= invLength; y *= invLength; @@ -4693,9 +4428,7 @@ void swRotatef(float angle, float x, float y, float z) sw_matrix_mul(*RLSW.currentMatrix, mat, *RLSW.currentMatrix); - if (RLSW.currentMatrixMode != SW_TEXTURE) { - RLSW.isDirtyMVP = true; - } + if (RLSW.currentMatrixMode != SW_TEXTURE) RLSW.isDirtyMVP = true; } void swScalef(float x, float y, float z) @@ -4709,18 +4442,14 @@ void swScalef(float x, float y, float z) sw_matrix_mul(*RLSW.currentMatrix, mat, *RLSW.currentMatrix); - if (RLSW.currentMatrixMode != SW_TEXTURE) { - RLSW.isDirtyMVP = true; - } + if (RLSW.currentMatrixMode != SW_TEXTURE) RLSW.isDirtyMVP = true; } -void swMultMatrixf(const float* mat) +void swMultMatrixf(const float *mat) { sw_matrix_mul(*RLSW.currentMatrix, mat, *RLSW.currentMatrix); - if (RLSW.currentMatrixMode != SW_TEXTURE) { - RLSW.isDirtyMVP = true; - } + if (RLSW.currentMatrixMode != SW_TEXTURE) RLSW.isDirtyMVP = true; } void swFrustum(double left, double right, double bottom, double top, double znear, double zfar) @@ -4731,19 +4460,19 @@ void swFrustum(double left, double right, double bottom, double top, double znea double tb = top - bottom; double fn = zfar - znear; - mat[0] = (znear*2.0)/rl; + mat[0] = (float)(znear*2.0)/rl; mat[1] = 0.0f; mat[2] = 0.0f; mat[3] = 0.0f; mat[4] = 0.0f; - mat[5] = (znear*2.0)/tb; + mat[5] = (float)(znear*2.0)/tb; mat[6] = 0.0f; mat[7] = 0.0f; - mat[8] = (right + left)/rl; - mat[9] = (top + bottom)/tb; - mat[10] = -(zfar + znear)/fn; + mat[8] = (float)(right + left)/rl; + mat[9] = (float)(top + bottom)/tb; + mat[10] = -(float)(zfar + znear)/fn; mat[11] = -1.0f; mat[12] = 0.0f; @@ -4753,9 +4482,7 @@ void swFrustum(double left, double right, double bottom, double top, double znea sw_matrix_mul(*RLSW.currentMatrix, *RLSW.currentMatrix, mat); - if (RLSW.currentMatrixMode != SW_TEXTURE) { - RLSW.isDirtyMVP = true; - } + if (RLSW.currentMatrixMode != SW_TEXTURE) RLSW.isDirtyMVP = true; } void swOrtho(double left, double right, double bottom, double top, double znear, double zfar) @@ -4766,72 +4493,60 @@ void swOrtho(double left, double right, double bottom, double top, double znear, double tb = top - bottom; double fn = zfar - znear; - mat[0] = 2.0f/rl; + mat[0] = 2.0f/(float)rl; mat[1] = 0.0f; mat[2] = 0.0f; mat[3] = 0.0f; mat[4] = 0.0f; - mat[5] = 2.0f/tb; + mat[5] = 2.0f/(float)tb; mat[6] = 0.0f; mat[7] = 0.0f; mat[8] = 0.0f; mat[9] = 0.0f; - mat[10] = -2.0f/fn; + mat[10] = -2.0f/(float)fn; mat[11] = 0.0f; - mat[12] = -(left + right)/rl; - mat[13] = -(top + bottom)/tb; - mat[14] = -(zfar + znear)/fn; + mat[12] = -(float)(left + right)/rl; + mat[13] = -(float)(top + bottom)/tb; + mat[14] = -(float)(zfar + znear)/fn; mat[15] = 1.0f; sw_matrix_mul(*RLSW.currentMatrix, *RLSW.currentMatrix, mat); - if (RLSW.currentMatrixMode != SW_TEXTURE) { - RLSW.isDirtyMVP = true; - } + if (RLSW.currentMatrixMode != SW_TEXTURE) RLSW.isDirtyMVP = true; } void swBegin(SWdraw mode) { - /* --- Check if the draw mode is valid --- */ - - if (!sw_is_draw_mode_valid(mode)) { + // Check if the draw mode is valid + if (!sw_is_draw_mode_valid(mode)) + { RLSW.errCode = SW_INVALID_ENUM; return; } - /* --- Recalculate the MVP if this is needed --- */ - - if (RLSW.isDirtyMVP) { - sw_matrix_mul_rst( - RLSW.matMVP, + // Recalculate the MVP if this is needed + if (RLSW.isDirtyMVP) + { + sw_matrix_mul_rst(RLSW.matMVP, RLSW.stackModelview[RLSW.stackModelviewCounter - 1], - RLSW.stackProjection[RLSW.stackProjectionCounter - 1] - ); + RLSW.stackProjection[RLSW.stackProjectionCounter - 1]); + RLSW.isDirtyMVP = false; } - /* --- Obtaining the number of vertices needed for this primitive --- */ - - switch (mode) { - case SW_POINTS: - RLSW.reqVertices = 1; - break; - case SW_LINES: - RLSW.reqVertices = 2; - break; - case SW_TRIANGLES: - RLSW.reqVertices = 3; - break; - case SW_QUADS: - RLSW.reqVertices = 4; - break; + // Obtain the number of vertices needed for this primitive + switch (mode) + { + case SW_POINTS: RLSW.reqVertices = 1; break; + case SW_LINES: RLSW.reqVertices = 2; break; + case SW_TRIANGLES: RLSW.reqVertices = 3; break; + case SW_QUADS: RLSW.reqVertices = 4; break; } - - /* --- Initialize some values --- */ + // Initialize required values RLSW.vertexCounter = 0; RLSW.drawMode = mode; } @@ -4853,7 +4568,7 @@ void swVertex2f(float x, float y) swVertex4fv(v); } -void swVertex2fv(const float* v) +void swVertex2fv(const float *v) { const float v4[4] = { v[0], v[1], 0.0f, 1.0f }; swVertex4fv(v4); @@ -4871,7 +4586,7 @@ void swVertex3f(float x, float y, float z) swVertex4fv(v); } -void swVertex3fv(const float* v) +void swVertex3fv(const float *v) { const float v4[4] = { v[0], v[1], v[2], 1.0f }; swVertex4fv(v4); @@ -4889,49 +4604,34 @@ void swVertex4f(float x, float y, float z, float w) swVertex4fv(v); } -void swVertex4fv(const float* v) +void swVertex4fv(const float *v) { - /* --- Copy the position in the current vertex --- */ + // Copy the position in the current vertex + sw_vertex_t *vertex = &RLSW.vertexBuffer[RLSW.vertexCounter++]; + for (int i = 0; i < 4; i++) vertex->position[i] = v[i]; - sw_vertex_t* vertex = &RLSW.vertexBuffer[RLSW.vertexCounter++]; + // Copy additonal vertex data + for (int i = 0; i < 2; i++) vertex->texcoord[i] = RLSW.current.texcoord[i]; + for (int i = 0; i < 4; i++) vertex->color[i] = RLSW.current.color[i]; - for (int i = 0; i < 4; i++) { - vertex->position[i] = v[i]; - } + // Calculation of homogeneous coordinates + const float *m = RLSW.matMVP; + vertex->homogeneous[0] = m[0]*v[0] + m[4]*v[1] + m[8]*v[2] + m[12]*v[3]; + vertex->homogeneous[1] = m[1]*v[0] + m[5]*v[1] + m[9]*v[2] + m[13]*v[3]; + vertex->homogeneous[2] = m[2]*v[0] + m[6]*v[1] + m[10]*v[2] + m[14]*v[3]; + vertex->homogeneous[3] = m[3]*v[0] + m[7]*v[1] + m[11]*v[2] + m[15]*v[3]; - /* --- Copy additonal vertex data --- */ - - for (int i = 0; i < 2; i++) { - vertex->texcoord[i] = RLSW.current.texcoord[i]; - } - - for (int i = 0; i < 4; i++) { - vertex->color[i] = RLSW.current.color[i]; - } - - /* --- Calculation of homogeneous coordinates --- */ - - const float* m = RLSW.matMVP; - - vertex->homogeneous[0] = m[0] * v[0] + m[4] * v[1] + m[8] * v[2] + m[12] * v[3]; - vertex->homogeneous[1] = m[1] * v[0] + m[5] * v[1] + m[9] * v[2] + m[13] * v[3]; - vertex->homogeneous[2] = m[2] * v[0] + m[6] * v[1] + m[10] * v[2] + m[14] * v[3]; - vertex->homogeneous[3] = m[3] * v[0] + m[7] * v[1] + m[11] * v[2] + m[15] * v[3]; - - /* --- Immediate rendering of the primitive if the required number is reached --- */ - - if (RLSW.vertexCounter == RLSW.reqVertices) { - switch (RLSW.polyMode) { - case SW_FILL: - sw_poly_fill_render(); - break; - case SW_LINE: - sw_poly_line_render(); - break; - case SW_POINT: - sw_poly_point_render(); - break; + // Immediate rendering of the primitive if the required number is reached + if (RLSW.vertexCounter == RLSW.reqVertices) + { + switch (RLSW.polyMode) + { + case SW_FILL: sw_poly_fill_render(); break; + case SW_LINE: sw_poly_line_render(); break; + case SW_POINT: sw_poly_point_render(); break; + default: break; } + RLSW.vertexCounter = 0; } } @@ -4939,20 +4639,20 @@ void swVertex4fv(const float* v) void swColor3ub(uint8_t r, uint8_t g, uint8_t b) { float cv[4]; - cv[0] = (float)r / 255; - cv[1] = (float)g / 255; - cv[2] = (float)b / 255; + cv[0] = (float)r/255; + cv[1] = (float)g/255; + cv[2] = (float)b/255; cv[3] = 1.0f; swColor4fv(cv); } -void swColor3ubv(const uint8_t* v) +void swColor3ubv(const uint8_t *v) { float cv[4]; - cv[0] = (float)v[0] / 255; - cv[1] = (float)v[1] / 255; - cv[2] = (float)v[2] / 255; + cv[0] = (float)v[0]/255; + cv[1] = (float)v[1]/255; + cv[2] = (float)v[2]/255; cv[3] = 1.0f; swColor4fv(cv); @@ -4969,7 +4669,7 @@ void swColor3f(float r, float g, float b) swColor4fv(cv); } -void swColor3fv(const float* v) +void swColor3fv(const float *v) { float cv[4]; cv[0] = v[0]; @@ -4983,21 +4683,21 @@ void swColor3fv(const float* v) void swColor4ub(uint8_t r, uint8_t g, uint8_t b, uint8_t a) { float cv[4]; - cv[0] = (float)r / 255; - cv[1] = (float)g / 255; - cv[2] = (float)b / 255; - cv[3] = (float)a / 255; + cv[0] = (float)r/255; + cv[1] = (float)g/255; + cv[2] = (float)b/255; + cv[3] = (float)a/255; swColor4fv(cv); } -void swColor4ubv(const uint8_t* v) +void swColor4ubv(const uint8_t *v) { float cv[4]; - cv[0] = (float)v[0] / 255; - cv[1] = (float)v[1] / 255; - cv[2] = (float)v[2] / 255; - cv[3] = (float)v[3] / 255; + cv[0] = (float)v[0]/255; + cv[1] = (float)v[1]/255; + cv[2] = (float)v[2]/255; + cv[3] = (float)v[3]/255; swColor4fv(cv); } @@ -5013,49 +4713,42 @@ void swColor4f(float r, float g, float b, float a) swColor4fv(cv); } -void swColor4fv(const float* v) +void swColor4fv(const float *v) { - for (int i = 0; i < 4; i++) { - RLSW.current.color[i] = v[i]; - } + for (int i = 0; i < 4; i++) RLSW.current.color[i] = v[i]; } void swTexCoord2f(float u, float v) { - const float* m = RLSW.stackTexture[RLSW.stackTextureCounter - 1]; + const float *m = RLSW.stackTexture[RLSW.stackTextureCounter - 1]; - RLSW.current.texcoord[0] = m[0] * u + m[4] * v + m[12]; - RLSW.current.texcoord[1] = m[1] * u + m[5] * v + m[13]; + RLSW.current.texcoord[0] = m[0]*u + m[4]*v + m[12]; + RLSW.current.texcoord[1] = m[1]*u + m[5]*v + m[13]; } -void swTexCoord2fv(const float* v) +void swTexCoord2fv(const float *v) { - const float* m = RLSW.stackTexture[RLSW.stackTextureCounter - 1]; + const float *m = RLSW.stackTexture[RLSW.stackTextureCounter - 1]; - RLSW.current.texcoord[0] = m[0] * v[0] + m[4] * v[1] + m[12]; - RLSW.current.texcoord[1] = m[1] * v[0] + m[5] * v[1] + m[13]; + RLSW.current.texcoord[0] = m[0]*v[0] + m[4]*v[1] + m[12]; + RLSW.current.texcoord[1] = m[1]*v[0] + m[5]*v[1] + m[13]; } void swBindArray(SWarray type, void *buffer) { - switch (type) { - case SW_VERTEX_ARRAY: - RLSW.array.positions = buffer; - break; - case SW_TEXTURE_COORD_ARRAY: - RLSW.array.texcoords = buffer; - break; - case SW_COLOR_ARRAY: - RLSW.array.colors = buffer; - break; - default: - break; + switch (type) + { + case SW_VERTEX_ARRAY: RLSW.array.positions = buffer; break; + case SW_TEXTURE_COORD_ARRAY: RLSW.array.texcoords = buffer; break; + case SW_COLOR_ARRAY: RLSW.array.colors = buffer; break; + default: break; } } void swDrawArrays(SWdraw mode, int offset, int count) { - if (RLSW.array.positions == 0) { + if (RLSW.array.positions == 0) + { RLSW.errCode = SW_INVALID_OPERATION; return; } @@ -5065,98 +4758,105 @@ void swDrawArrays(SWdraw mode, int offset, int count) swTexCoord2f(0.0f, 0.0f); swColor4f(1.0f, 1.0f, 1.0f, 1.0f); - for (int i = offset; i < count; i++) { - if (RLSW.array.texcoords) swTexCoord2fv(RLSW.array.texcoords + 2 * i); - if (RLSW.array.colors) swColor4ubv(RLSW.array.colors + 4 * i); - swVertex3fv(RLSW.array.positions + 3 * i); + for (int i = offset; i < count; i++) + { + if (RLSW.array.texcoords) swTexCoord2fv(RLSW.array.texcoords + 2*i); + if (RLSW.array.colors) swColor4ubv(RLSW.array.colors + 4*i); + swVertex3fv(RLSW.array.positions + 3*i); } } swEnd(); } -void swGenTextures(int count, uint32_t* textures) +void swGenTextures(int count, uint32_t *textures) { - if (count == 0 || textures == NULL) { - return; - } + if ((count == 0) || (textures == NULL)) return; - for (int i = 0; i < count; i++) { - if (RLSW.loadedTextureCount >= SW_MAX_TEXTURES) { - RLSW.errCode = SW_STACK_OVERFLOW; //< Out of memory, not really stack overflow + for (int i = 0; i < count; i++) + { + if (RLSW.loadedTextureCount >= SW_MAX_TEXTURES) + { + RLSW.errCode = SW_STACK_OVERFLOW; // WARNING: Out of memory, not really stack overflow return; } + uint32_t id = 0; - if (RLSW.freeTextureIdCount > 0) { - id = RLSW.freeTextureIds[--RLSW.freeTextureIdCount]; - } - else { - id = RLSW.loadedTextureCount++; - } + if (RLSW.freeTextureIdCount > 0) id = RLSW.freeTextureIds[--RLSW.freeTextureIdCount]; + else id = RLSW.loadedTextureCount++; + RLSW.loadedTextures[id] = RLSW.loadedTextures[0]; textures[i] = id; } } -void swDeleteTextures(int count, uint32_t* textures) +void swDeleteTextures(int count, uint32_t *textures) { - if (count == 0 || textures == NULL) { - return; - } + if ((count == 0) || (textures == NULL)) return; - for (int i = 0; i < count; i++) { - if (!sw_is_texture_valid(textures[i])) { + for (int i = 0; i < count; i++) + { + if (!sw_is_texture_valid(textures[i])) + { RLSW.errCode = SW_INVALID_VALUE; continue; } - if (RLSW.loadedTextures[textures[i]].copy) { + + if (RLSW.loadedTextures[textures[i]].copy) + { SW_FREE(RLSW.loadedTextures[textures[i]].pixels.ptr); } + RLSW.loadedTextures[textures[i]].pixels.cptr = NULL; RLSW.freeTextureIds[RLSW.freeTextureIdCount++] = textures[i]; } } -void swTexImage2D(int width, int height, SWformat format, SWtype type, bool copy, const void* data) +void swTexImage2D(int width, int height, SWformat format, SWtype type, bool copy, const void *data) { uint32_t id = RLSW.currentTexture; - if (!sw_is_texture_valid(id)) { + if (!sw_is_texture_valid(id)) + { RLSW.errCode = SW_INVALID_VALUE; return; } int pixelFormat = sw_get_pixel_format(format, type); - if (pixelFormat <= SW_PIXELFORMAT_UNKNOWN) { + if (pixelFormat <= SW_PIXELFORMAT_UNKNOWN) + { RLSW.errCode = SW_INVALID_ENUM; return; } - sw_texture_t* texture = &RLSW.loadedTextures[id]; + sw_texture_t *texture = &RLSW.loadedTextures[id]; - if (copy) { + if (copy) + { int bytes = sw_get_pixel_bytes(pixelFormat); - int size = bytes * width * height; + int size = bytes*width*height; texture->pixels.ptr = SW_MALLOC(size); - if (texture->pixels.ptr == NULL) { - RLSW.errCode = SW_STACK_OVERFLOW; //< Out of memory... + + if (texture->pixels.ptr == NULL) + { + RLSW.errCode = SW_STACK_OVERFLOW; // WARING: Out of memory... return; } - for (int i = 0; i < size; i++) { - ((uint8_t*)texture->pixels.ptr)[i] = ((uint8_t*)data)[i]; + + for (int i = 0; i < size; i++) + { + ((uint8_t *)texture->pixels.ptr)[i] = ((uint8_t *)data)[i]; } } - else { - texture->pixels.cptr = data; - } + else texture->pixels.cptr = data; texture->width = width; texture->height = height; texture->wMinus1 = width - 1; texture->hMinus1 = height - 1; texture->format = pixelFormat; - texture->tx = 1.0f / width; - texture->ty = 1.0f / height; + texture->tx = 1.0f/width; + texture->ty = 1.0f/height; texture->copy = copy; } @@ -5164,62 +4864,70 @@ void swTexParameteri(int param, int value) { uint32_t id = RLSW.currentTexture; - if (!sw_is_texture_valid(id)) { + if (!sw_is_texture_valid(id)) + { RLSW.errCode = SW_INVALID_VALUE; return; } - sw_texture_t* texture = &RLSW.loadedTextures[id]; + sw_texture_t *texture = &RLSW.loadedTextures[id]; - switch (param) { + switch (param) + { + case SW_TEXTURE_MIN_FILTER: + { + if (!sw_is_texture_filter_valid(value)) + { + RLSW.errCode = SW_INVALID_ENUM; + return; + } - case SW_TEXTURE_MIN_FILTER: - if (!sw_is_texture_filter_valid(value)) { - RLSW.errCode = SW_INVALID_ENUM; - return; - } - texture->minFilter = value; - break; + texture->minFilter = value; + } break; + case SW_TEXTURE_MAG_FILTER: + { + if (!sw_is_texture_filter_valid(value)) + { + RLSW.errCode = SW_INVALID_ENUM; + return; + } - case SW_TEXTURE_MAG_FILTER: - if (!sw_is_texture_filter_valid(value)) { - RLSW.errCode = SW_INVALID_ENUM; - return; - } - texture->magFilter = value; - break; + texture->magFilter = value; + } break; + case SW_TEXTURE_WRAP_S: + { + if (!sw_is_texture_wrap_valid(value)) + { + RLSW.errCode = SW_INVALID_ENUM; + return; + } - case SW_TEXTURE_WRAP_S: - if (!sw_is_texture_wrap_valid(value)) { - RLSW.errCode = SW_INVALID_ENUM; - return; - } - texture->sWrap = value; - break; - - case SW_TEXTURE_WRAP_T: - if (!sw_is_texture_wrap_valid(value)) { - RLSW.errCode = SW_INVALID_ENUM; - return; - } - texture->tWrap = value; - break; - - default: - RLSW.errCode = SW_INVALID_ENUM; - return; + texture->sWrap = value; + } break; + case SW_TEXTURE_WRAP_T: + { + if (!sw_is_texture_wrap_valid(value)) + { + RLSW.errCode = SW_INVALID_ENUM; + return; + } + texture->tWrap = value; + } break; + default: RLSW.errCode = SW_INVALID_ENUM; break; } } void swBindTexture(uint32_t id) { - if (id >= SW_MAX_TEXTURES) { + if (id >= SW_MAX_TEXTURES) + { RLSW.errCode = SW_INVALID_VALUE; return; } - if (RLSW.loadedTextures[id].pixels.cptr == NULL) { + if (RLSW.loadedTextures[id].pixels.cptr == NULL) + { RLSW.errCode = SW_INVALID_OPERATION; return; } @@ -5227,4 +4935,4 @@ void swBindTexture(uint32_t id) RLSW.currentTexture = id; } -#endif // RLSW_IMPL +#endif // RLSW_IMPLEMENTATION diff --git a/src/platforms/rcore_desktop_sdl.c b/src/platforms/rcore_desktop_sdl.c index 00a6ccc47..6655db460 100644 --- a/src/platforms/rcore_desktop_sdl.c +++ b/src/platforms/rcore_desktop_sdl.c @@ -1233,7 +1233,7 @@ void SwapScreenBuffer(void) { #if defined(GRAPHICS_API_OPENGL_11_SOFTWARE) // NOTE: We use a preprocessor condition here because `rlCopyFramebuffer` is only declared for software rendering - SDL_Surface* surface = SDL_GetWindowSurface(platform.window); + SDL_Surface *surface = SDL_GetWindowSurface(platform.window); rlCopyFramebuffer(0, 0, CORE.Window.render.width, CORE.Window.render.height, PIXELFORMAT_UNCOMPRESSED_R8G8B8A8, surface->pixels); SDL_UpdateWindowSurface(platform.window); #else diff --git a/src/platforms/rcore_drm.c b/src/platforms/rcore_drm.c index fe0ac5fd8..e067fd82a 100644 --- a/src/platforms/rcore_drm.c +++ b/src/platforms/rcore_drm.c @@ -818,14 +818,14 @@ void SwapScreenBuffer(void) platform.prevBO = bo; #else // Software rendering buffer swap - if ((-1 == platform.fd) || !platform.connector || (platform.modeIndex < 0)) + if ((platform.fd == -1) || !platform.connector || (platform.modeIndex < 0)) { TRACELOG(LOG_ERROR, "DISPLAY: DRM initialization failed to swap"); return; } // Get the software rendered color buffer - int bufferWidth, bufferHeight; + int bufferWidth = 0, bufferHeight = 0; void *colorBuffer = swGetColorBuffer(&bufferWidth, &bufferHeight); if (!colorBuffer) { @@ -849,7 +849,7 @@ void SwapScreenBuffer(void) #endif // Create a dumb buffer for software rendering - struct drm_mode_create_dumb creq = {0}; + struct drm_mode_create_dumb creq = { 0 }; creq.width = width; creq.height = height; creq.bpp = bpp; @@ -863,28 +863,25 @@ void SwapScreenBuffer(void) // Create framebuffer with the correct format uint32_t fb = 0; - result = drmModeAddFB(platform.fd, - width, height, - depth, bpp, creq.pitch, - creq.handle, &fb); + result = drmModeAddFB(platform.fd, width, height, depth, bpp, creq.pitch, creq.handle, &fb); if (result != 0) { TRACELOG(LOG_ERROR, "DISPLAY: drmModeAddFB() failed with result: %d (%s)", result, strerror(errno)); - struct drm_mode_destroy_dumb dreq = {0}; + struct drm_mode_destroy_dumb dreq = { 0 }; dreq.handle = creq.handle; drmIoctl(platform.fd, DRM_IOCTL_MODE_DESTROY_DUMB, &dreq); return; } // Map the dumb buffer to copy our software rendered buffer - struct drm_mode_map_dumb mreq = {0}; + struct drm_mode_map_dumb mreq = { 0 }; mreq.handle = creq.handle; result = drmIoctl(platform.fd, DRM_IOCTL_MODE_MAP_DUMB, &mreq); if (result != 0) { TRACELOG(LOG_ERROR, "DISPLAY: Failed to map dumb buffer: %s", strerror(errno)); drmModeRmFB(platform.fd, fb); - struct drm_mode_destroy_dumb dreq = {0}; + struct drm_mode_destroy_dumb dreq = { 0 }; dreq.handle = creq.handle; drmIoctl(platform.fd, DRM_IOCTL_MODE_DESTROY_DUMB, &dreq); return; @@ -896,7 +893,7 @@ void SwapScreenBuffer(void) { TRACELOG(LOG_ERROR, "DISPLAY: Failed to mmap dumb buffer: %s", strerror(errno)); drmModeRmFB(platform.fd, fb); - struct drm_mode_destroy_dumb dreq = {0}; + struct drm_mode_destroy_dumb dreq = { 0 }; dreq.handle = creq.handle; drmIoctl(platform.fd, DRM_IOCTL_MODE_DESTROY_DUMB, &dreq); return; @@ -919,10 +916,7 @@ void SwapScreenBuffer(void) // Find a CRTC compatible with the connector uint32_t crtcId = 0; - if (platform.crtc) - { - crtcId = platform.crtc->crtc_id; - } + if (platform.crtc) crtcId = platform.crtc->crtc_id; else { // Find a CRTC that's compatible with this connector @@ -939,10 +933,7 @@ void SwapScreenBuffer(void) // Check which CRTCs are compatible with this connector drmModeEncoder *encoder = NULL; - if (platform.connector->encoder_id) - { - encoder = drmModeGetEncoder(platform.fd, platform.connector->encoder_id); - } + if (platform.connector->encoder_id) encoder = drmModeGetEncoder(platform.fd, platform.connector->encoder_id); if (encoder && encoder->crtc_id) { @@ -962,6 +953,7 @@ void SwapScreenBuffer(void) platform.crtc = crtc; break; } + if (crtc) drmModeFreeCrtc(crtc); } } @@ -981,9 +973,7 @@ void SwapScreenBuffer(void) } // Set CRTC with better error handling - result = drmModeSetCrtc(platform.fd, crtcId, fb, 0, 0, - &platform.connector->connector_id, 1, - mode); + result = drmModeSetCrtc(platform.fd, crtcId, fb, 0, 0, &platform.connector->connector_id, 1, mode); if (result != 0) { TRACELOG(LOG_ERROR, "DISPLAY: drmModeSetCrtc() failed with result: %d (%s)", result, strerror(errno)); @@ -1001,10 +991,7 @@ void SwapScreenBuffer(void) if (platform.prevFB) { result = drmModeRmFB(platform.fd, platform.prevFB); - if (result != 0) - { - TRACELOG(LOG_WARNING, "DISPLAY: drmModeRmFB() failed with result: %d", result); - } + if (result != 0) TRACELOG(LOG_WARNING, "DISPLAY: drmModeRmFB() failed with result: %d", result); } platform.prevFB = fb; @@ -1249,7 +1236,7 @@ int InitPlatform(void) // In certain cases the status of the conneciton is reported as UKNOWN, but it is still connected // This might be a hardware or software limitation like on Raspberry Pi Zero with composite output // WARNING: Accept CONNECTED, UNKNOWN and even those without encoder_id connectors for software mode - if (((con->connection == DRM_MODE_CONNECTED) || (con->connection == DRM_MODE_UNKNOWNCONNECTION)) && (con->count_modes > 0)//(con->encoder_id)) + if (((con->connection == DRM_MODE_CONNECTED) || (con->connection == DRM_MODE_UNKNOWNCONNECTION)) && (con->count_modes > 0)) { #if !defined(GRAPHICS_API_OPENGL_11_SOFTWARE) // For hardware rendering, we need an encoder_id @@ -1259,10 +1246,7 @@ int InitPlatform(void) platform.connector = con; break; } - else - { - TRACELOG(LOG_TRACE, "DISPLAY: DRM connector %i connected but no encoder", i); - } + else TRACELOG(LOG_TRACE, "DISPLAY: DRM connector %i connected but no encoder", i); #else // For software rendering, we can accept even without encoder_id TRACELOG(LOG_TRACE, "DISPLAY: DRM connector %i suitable for software rendering", i); diff --git a/src/rlgl.h b/src/rlgl.h index 5e8cf2bfa..ecd3795a9 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -776,8 +776,8 @@ RLAPI void rlFramebufferAttach(unsigned int fboId, unsigned int texId, int attac RLAPI bool rlFramebufferComplete(unsigned int id); // Verify framebuffer is complete RLAPI void rlUnloadFramebuffer(unsigned int id); // Delete framebuffer from GPU #if defined(GRAPHICS_API_OPENGL_11_SOFTWARE) -RLAPI void rlCopyFramebuffer(int x, int y, int w, int h, int format, void* pixels); -RLAPI void rlResizeFramebuffer(int width, int height); +RLAPI void rlCopyFramebuffer(int x, int y, int width, int height, int format, void *pixels); // Copy framebuffer pixel data to internal buffer +RLAPI void rlResizeFramebuffer(int width, int height); // Resize internal framebuffer #endif // Shaders management @@ -846,7 +846,7 @@ RLAPI void rlLoadDrawQuad(void); // Load and draw a quad #if defined(GRAPHICS_API_OPENGL_11) #if defined(GRAPHICS_API_OPENGL_11_SOFTWARE) - #define RLSW_IMPL + #define RLSW_IMPLEMENTATION #define SW_MALLOC(sz) RL_MALLOC(sz) #define SW_REALLOC(ptr, newSz) RL_REALLOC(ptr, newSz) #define SW_FREE(ptr) RL_FREE(ptr) @@ -2357,9 +2357,10 @@ void rlglInit(int width, int height) #endif #if defined(GRAPHICS_API_OPENGL_11_SOFTWARE) - if (!swInit(width, height)) + int result = swInit(width, height); // Initialize software renderer backend + if (result == 0) { - TRACELOG(RL_LOG_ERROR, "RLGL: Software renderer initialization failed!"); + TRACELOG(RL_LOG_ERROR, "RLSW: Software renderer initialization failed!"); exit(-1); } #endif @@ -2385,14 +2386,14 @@ void rlglClose(void) #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) rlUnloadRenderBatch(RLGL.defaultBatch); - rlUnloadShaderDefault(); // Unload default shader + rlUnloadShaderDefault(); // Unload default shader glDeleteTextures(1, &RLGL.State.defaultTextureId); // Unload default texture TRACELOG(RL_LOG_INFO, "TEXTURE: [ID %i] Default texture unloaded successfully", RLGL.State.defaultTextureId); #endif #if defined(GRAPHICS_API_OPENGL_11_SOFTWARE) - swClose(); + swClose(); // Unload sofware renderer resources #endif } @@ -2703,6 +2704,7 @@ void *rlGetProcAddress(const char *procName) int rlGetVersion(void) { int glVersion = 0; + #if defined(GRAPHICS_API_OPENGL_11_SOFTWARE) glVersion = RL_OPENGL_11_SOFTWARE; #elif defined(GRAPHICS_API_OPENGL_11) @@ -3747,13 +3749,15 @@ void *rlReadTexturePixels(unsigned int id, int width, int height, int format) } #if defined(GRAPHICS_API_OPENGL_11_SOFTWARE) -void rlCopyFramebuffer(int x, int y, int w, int h, int format, void* pixels) +// Copy framebuffer pixel data to internal buffer +void rlCopyFramebuffer(int x, int y, int width, int height, int format, void* pixels) { unsigned int glInternalFormat, glFormat, glType; - rlGetGlTextureFormats(format, &glInternalFormat, &glFormat, &glType); - swCopyFramebuffer(x, y, w, h, glFormat, glType, pixels); + rlGetGlTextureFormats(format, &glInternalFormat, &glFormat, &glType); // Get OpenGL texture format + swCopyFramebuffer(x, y, width, height, glFormat, glType, pixels); } +// Resize internal framebuffer void rlResizeFramebuffer(int width, int height) { swResizeFramebuffer(width, height); From 37149082e85cfa40550bed7c9b3d53638c71994f Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 29 Sep 2025 18:05:16 +0200 Subject: [PATCH 23/23] Avoid warnings --- src/rtext.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/rtext.c b/src/rtext.c index edfe33c8b..ce9f381c4 100644 --- a/src/rtext.c +++ b/src/rtext.c @@ -1452,7 +1452,7 @@ Rectangle GetGlyphAtlasRec(Font font, int codepoint) char **LoadTextLines(const char *text, int *count) { int lineCount = 1; - int textSize = strlen(text); + int textSize = (int)strlen(text); // Text pass to get required line count for (int i = 0; i < textSize; i++) @@ -1679,7 +1679,7 @@ char *GetTextBetween(const char *text, const char *begin, const char *end) if (beginIndex > -1) { - int beginLen = strlen(begin); + int beginLen = (int)strlen(begin); int endIndex = TextFindIndex(text + beginIndex + beginLen, end); if (endIndex > -1) @@ -1758,15 +1758,15 @@ char *TextReplaceBetween(const char *text, const char *begin, const char *end, c if (beginIndex > -1) { - int beginLen = strlen(begin); + int beginLen = (int)strlen(begin); int endIndex = TextFindIndex(text + beginIndex + beginLen, end); if (endIndex > -1) { endIndex += (beginIndex + beginLen); - int textLen = strlen(text); - int replaceLen = (replacement == NULL)? 0 : strlen(replacement); + int textLen = (int)strlen(text); + int replaceLen = (replacement == NULL)? 0 : (int)strlen(replacement); int toreplaceLen = endIndex - beginIndex - beginLen; result = (char *)RL_CALLOC(textLen + replaceLen - toreplaceLen + 1, sizeof(char));