iris/kaizen
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Squashed 'external/SDL/' changes from f317581c919..95c3ee77c10

Browse Source 
95c3ee77c10 Removed testing code
ea640894d32 Fixed SDL_DEFINE_STDBOOL logic if __bool_true_false_are_defined is defined
46fb2c6f1bf Added a script to help with the bool rename
23f855a9703 render: Integrate fix-shaders.sh into build-shaders.sh
d658ef66279 Don't guess about the size of an int, assert it!
32fd1878a09 Provide a definition of bool if needed for your environment
1834c83d5a2 testplatform: make sure bool is 1 byte
026d3c2306f Sync SDL3 wiki -> header
95f7e532331 Added the examples directory to the API renaming tool
a90ad3b0e28 Removed SDL_bool in favor of plain bool
9dd88592407 Sync SDL3 wiki -> header
32cf23d392f Added video/x11/edid.h to third party code list
407ccadfd72 Added copyright header to edid.h
bd04459cde1 Fix typos (thanks @qndel!)
e4f987f2996 tests: Fix testdropfile on high-DPI displays
8caf25f7b30 testautomation_stdlib.c (stdlib_strtox): fix warning from gcc-4.9:
03ae792df35 Fixed the recording field in audio device events
c68e9e157cd Fixed typo
bc9780299c0 Don't define backends if SDL_GPU_DISABLED is set
8481d1a12b0 Sync SDL3 wiki -> header
807b8a9d4de Allow initializing hints and properties from any thread
d0edf687741 Added Uint32 versions of the atomic functions
8d223b3037e Renamed atomic functions to match SDL 3.0 naming convention
f3e419596b1 Removed SDL_INIT_TIMER
9275c533ca2 Added thread-safe initialization/cleanup support
7edd43c276e Don't define render_drivers if SDL_RENDER_DISABLED is set
98cd8b34a76 Close the other file descriptors after redirection has taken place
4b3058d58db render: Don't try to rebuild D3D11, D3D12, Metal shaders without spirv-cross
13500bbf508 render: Fix detection of fxc, dxc in build-shaders.sh
11129761e7e v4l2: return success if the device is ready
ab9c68d9ffc pipewire: Always destroy hotplug loop during deinitialization
1ffb9f22aa5 build-release.py fixes from SDL2 port
231ea07617d Added SDL_LogTrace()
6180da00e1d Skip a lock/unlock when logging known categories
c499f79fe93 GPU: Fix multisample texture usage validation
926d1439660 Sync SDL3 wiki -> header
1bbc897e48e Updated documentation for bool return type
4a2683e2c10 Sync SDL3 wiki -> header
dc639956baa Improve logging performance and make log priorities thread-safe
f006d61bd12 Sync SDL3 wiki -> header
fd1fcfc951b Sync SDL3 wiki -> header
9416917353c GPU: Rework MSAA (#10859)
e59344ad469 Update proguard-rules.pro in-line with commit 9ff3446
0f85fdefc84 Fixed warning: "SDL_VIDEO_RENDER_D3D12" is not defined, evaluates to 0
4f722d372ae GPU: Metal vertex buffer indices should grow upward (#10837)
0548050fc5a Verify that the subsystems were successfully initialized
5b5b1a89267 Fixed cleaning up dependent subsystems if initialization fails
97d40b92180 Removed SDL_CleanupEnvironment()
a7f1deae8d1 Sync SDL3 wiki -> header
28b94c47585 Re-added SDL_getenv() as a thread-safe getenv() implementation
718845a33d0 Fixed warning C4701: potentially uninitialized local variable 'startup_info' used
19243092c67 Renamed SDL_GpuGraphicsPipelineTargetInfo to SDL_GPUGraphicsPipelineTargetInfo
604d0c519ec If posix_spawn() is available, so is sigaction
ec5d280c900 Make sure we ignore SIGPIPE so we don't crash if we write when the pipe is closed
34b2f4ffcab Use non-blocking pipes for process I/O on Windows
dd07cc89910 SDL_Process: WAIT_TIMEOUT means the process has not exited yet
1f3fd65c4c7 cpuinfo: Rename SDL_GetCPUCount to SDL_GetNumLogicalCPUCores
93bf5342684 testgpu_simple_clear: Fixed AppInit return values.
e5bd3bbcd6e add missing includes
8569bde053f Fixed typo
706aaaf2802 Sync SDL3 wiki -> header
3bc03477618 Revert "Sync SDL3 wiki -> header"
c2e4b14a828 Revert "stdinc: Added missing `\param` to SDL_CreateEnvironment."
11c9975caa9 Revert "Sync SDL3 wiki -> header"
ba65767afa2 Sync SDL3 wiki -> header
919f8d3e2b9 stdinc: Added missing `\param` to SDL_CreateEnvironment.
35427ff9ec7 Sync SDL3 wiki -> header
dcb2a8c2fe2 Use CreateProcessW() to handle non-ASCII file paths and arguments
e97f6365906 SDL_PROP_PROCESS_CREATE_ENVIRONMENT_POINTER is an SDL_Environment pointer
56fc4b790c4 Reduce strcmp() calls in hashtable lookup
e6734794491 Removed SDL_WriteProcess()
a833ee2e63e SDL_gpu.c: fixed build when SDL_GPU_DISABLED is defined.
f6f49de1342 Add convenience functions to get process IOStreams
7ff015ceaee Close file descriptors not used by the child process
fed0149172e Switched wayland messageboxes to use the new process API
aa7357a14d7 SDL_CreateEnvironment() fills the environment with a non-zero parameter
76c469910ee Added SDL_PROP_PROCESS_CREATE_BACKGROUND_BOOLEAN
44c6cfda053 Switched zenity dialogs to use the new process API
3166a05c18b cmake: don't prepend absolute CMAKE_INSTALL_{INCLUDE,LIB}DIR with ${prefix}
27862907c65 Update src/process/windows/SDL_windowsprocess.c
82b33a7d3f6 Update src/process/windows/SDL_windowsprocess.c
3cf54675bb0 Windows process: escape backslashes before quotes
90e01040c52 Added thread-safe environment functions
16ff7503b7b gpu: Update GPU support queries to better match naming conventions
d21c1de6518 Sync SDL3 wiki -> header
9eea8234e67 Add SDL_Process subsystem
6c83491116e Added SDL_FlushIO()
93caf1cd21a Fixed typo
1c5b063ade7 Sync SDL3 wiki -> header
f1d0a716292 Fixed the documentation for SDL_SetError()
d483886ec57 Sync SDL3 wiki -> header
84361bcf0ab stdlib: Remove test cases with impl-defined results
eb199176e68 stdlib: Conditionally undef some SDL_strtox tests
59ec0344128 stdlib: Use macros to define SDL_strtox tests
7d94bf528db stdlib: Document SDL_strtox functions
8092e35287e stdlib: Improve SDL_strtod
a78f612d4b2 stdlib: Add some tests for SDL_strtod
56a48763cd7 stdlib: Bring SDL_wcstol in line with SDL_strtol
61bc856b043 stdlib: Use new parser for scanf %p specifier
e109aa09aa3 stdlib: Rewrite SDL_strto(ll?|ul) impl
e326540a45d stdlib: Add failing tests for SDL_strto(ll?|ul)
fb82772fb31 stdlib: Rewrite SDL_strtoull impl
5331f36789d stdlib: Add failing tests for SDL_strtoull
88d3cb4f900 Remove unnecessary include from SDL_pen_c.h
4efbe1ca285 stdlib: Assert that signed integers use two's complement arithmetic
fd53b3e112b stdlib: Rewrite SDL_wcstol impl
5d30980df46 stdlib: Add failing tests for SDL_wcstol
ee377793fe0 Spell "unknown" correctly
ee65176eec3 SDL_test: add SDLTest_LogEscapedString
6a305e1532e SDL_test: fix SDLTest_CommonQuit with NULL state
0160e9eac64 gpu: Add SDL_QueryGPUSupport
262ffa27e7f Sync SDL3 wiki -> header
96e147b2b95 gpu: Rework driver name queries, add GetGPUShaderFormats
6d92de5d3a6 wayland: Ensure that a NULL internal structure isn't dereferenced when destroying a window
9d9721cd4c8 wayland: Fix some incorrect buffer scale calculations
94436a938d0 GPU: Remove unused and incorrect D16 format checks from Vulkan driver
5771b502f84 GPU: Fix D3D11/D3D12 vertex strides for multiple vertex buffers (#10818)
371cfaf8fe4 gpu: Implement support for SDL_GPU_DISABLED
d3932b1ba2e Sync SDL3 wiki -> header
a45a2caf493 GPU: Rename VertexBinding to VertexBufferDescription (#10811)
446ee3e7c54 Fix bug with SDL_ShowMessageBox not working with wayland (#10810)
b7dc30ca246 pulseaudio: Hotplug thread fixes.
c36982d45c2 vulkan: Avoid redundant commands for dynamic states
66489f91bb4 GPU: Cube Arrays (#10800)
9ea0a837aeb vulkan: Use a spinlock instead of a mutex for descriptor pools
f8d4c492641 Sync SDL3 wiki -> header
d5e1385c91d Fixed typos in SDL_gpu.h
6e2f2428bac Sync SDL3 wiki -> header
ddd5723e2ee GPU: Remove pitch parameters from indirect draw calls (#10803)
3d7e8c9bb7b Add missing SDL_WPRINTF_VARARG_FUNCV in gendynapi.py
d03c7cdf17b Removing extra semicolons
fd2a266549f Adding void to empty function prototype parenthesis
b15fab02070 Fixed typo in SDL_dialog.h
d62e3c3791e Fix SDL_GPUShaderFormat flag values
4d135fb696d Fixed color scale when rendering to an sRGB render target
3f7f6f624b0 testcolorspace: don't tonemap from HDR to SDR when reading pixels
4e43da684c7 Added texture colorspace testing
86e393b5235 Clarify that INPUTTYPE_UNSPECIFIED is correct for RGB textures
92255d36d4b We already have functions for converting between sRGB and linear space
667a3e40e9a Use the correct namespace for structures
77c569496df SDL_GPUShaderFormat isn't an enum anymore
37c9fb490ef Changed enums to use XXX_COUNT for the count or number of values
64f12bea4a9 GPU: Remove unnecessary texture format swizzles in Vulkan (#10693)
4123023d3ed Renamed sdlgpu to gpu
c77e51c0844 Use SDL_unsetenv()
3166f912826 GPU: Defer setting blend state on D3D11
6fca867ffe3 Fix testoffscreen.c: bool literal returned from 'main'
eeb465e2fcb Sync SDL3 wiki -> header
2b8a349b262 Add SDL_BindGPUComputeSamplers (#10778)
323b60abf1a SDL_test_harness.c: Fix warning -Wcast-function-type-strict
0b6f993deac GPU: Zero-init handling (#10786)
b8dbc7086d4 Disable GameInput mouse and keyboard support
76ce83801ad Removed pipewire client version check
9c8c6da4760 pipewire: If hotplug initialization fails, clean up any partial success
817f1b3da81 Revert "Changed SDL_GPU_TEXTUREFORMAT_INVALID to 0"
b51c6551d6e Changed SDL_GPU_TEXTUREFORMAT_INVALID to 0
1e9ff723adb GPU: fix SDL_GetGPUSwapchainTextureFormat error return value
640559eba68 Added migration documentation for SDL_strtoll(), SDL_strtoull(), SDL_lltoa(), and SDL_ulltoa().
4eb43705000 SDL_strtoll(), SDL_strtoull(), SDL_lltoa(), and SDL_ulltoa() use long long values
68c61ff3a8f Sync SDL3 wiki -> header
6fc6e3dc7eb Use SDL_bool where appropriate in SDL events
7d1bbae6b25 Sync SDL3 wiki -> header
af37056c0d0 stdinc: Fix typos and reword comments about aliasing
8eb194b6f86 stdinc: Document number parsing APIs
eda459ac49e stdinc: Fix up some printf definitions
d6caf2abe78 Remove SDL_RESTRICT in favor of doc comments
731939fca16 stdinc: Document memcpy APIs
8cea4bd3c94 stdinc: Document memory allocation APIs
f4c2c09f782 examples: Link to SDL integer types in code examples, too.
7713a7eec7d x11vulkan: Use the correct SONAME of libX11-xcb.so.1 on Linux, etc.
412a8244b66 audio: Make system-specific audio format types part of SDL_AudioFormat.
d3091b95389 Remove SDL_GPUDepthStencilValue struct
80e541d1fcb Fixed calling SDL_utf8strlcpy() with dst_bytes of 0
668e2f82d21 Add load op and clear color to SDL_BlitGPUTexture (#10767)
47283250442 pipewire: Give hotplug threads a more indicative name
c797ae16192 Fix -Wtype-limits warning
6e885d96193 Sync SDL3 wiki -> header
301f3ffa9dd Sync SDL3 wiki -> header
050aa4d084a include: Filling in more documentation gaps.
a57f6c4af30 Fix additional calloc-transposed-args warnings
d2ef15d8e6a Fix warnings: calloc-transposed-args
0da2bd49c8c Remove unused includes. This only removes includes that aren't used at all, not even in comments.
aa6a0be7a87 Fix warning: redefinition of typedef 'SDLTest_TestSuiteRunner'
7df1caba7cf Clarified that the contents of new textures aren't defined.
ac0b1b207f6 SDL_hints: fix gpu direct3d11 driver name in documentation
257385277d3 SDL_realloc() with size 0 now always defaults to size 1
4c0cb94b961 vulkan: VULKAN_CreateTexture returns a boolean
3eb49ac8627 vulken: VULKAN_CreateTexture returns a boolean
1ba99c53d48 Sync SDL3 wiki -> header
2b77b2e4ef0 Sync SDL3 wiki -> header
4f6e81cf622 include: Fixed up some minor documentation gaps.
7ec998819d1 Sync SDL3 wiki -> header
090e30dbca3 docs: Remove README-winrt.md, again.
fd6056307f0 fix trailing doc comments
1a13acac092 Always blit to the swapchain in GPU_RenderPresent
fa892d15b7d include files with required types directly
e9c7b36fbd7 Sync SDL3 wiki -> header
68a9991ec99 GPU: Document structs (#10742)
cf9613fe632 The GPU log category ate one of the SDL reserved categories
a01e8a5e105 The GPU log category ate one of the SDL reserved categories
18492057331 Fix GDK builds after renames done in #10730
0a44ea1b0b3 Amend use of non-standard compiler syntax
0a8bf663b7d Fix VisualC project filter
1d59be67fc7 Fixed crash if PIPEWIRE_PREFERRED_Init() fails and then pipewire is used anyway
f42da35ef96 Sync SDL3 wiki -> header
9730f62e8cb GPU: Rename struct members and parameters for SDL3 naming conventions (#10730)
e21f70c5936 pipewire : check minimum client library version early
845855d6573 Revert "stdinc: Document more symbols."
c93f76436fc stdinc: Document more symbols.
73b294cb1cd SDL_platform_defines.h: Added documentation, and a little whitespace.
4c8357a37da Clarified why the WINDOWS driver is lower than the RAWINPUT driver
66b4c080c06 Clarified why the WGI driver is lower than the WINDOWS driver
8f46cb771c7 SDL_XINPUT_Enabled() returns false until XInput DLL is successfully loaded
6da97c63da9 Sync SDL3 wiki -> header
ac08dde1b22 windows: Clean out things that should be using `defined(SDL_PLATFORM_WINDOWS)`.
154452a7263 winrt: Removed WinRT/Windows Phone/UWP support.
6d7c211fafd Fixed race condition at startup that could cause a crash in the XInput driver
6e5bd58c4cc Include the Steam controller driver on Android
1381cc85543 Add a step to fix generated shader code
104642ffe79 Sorted API symbols
4c382aafcdc Fixed building on Raspberry Pi
360bc667a82 SDL_Log: restore SDL2's SDL_LogCategory order
26728c321fa SDL_test: add include for SDLTest_CommonState
b4c3df1189c SDL_test: whitespace header fixes
db96ddca344 SDL_test: use SDLCALL calling convention
379aea5c2df Fixed warnings building with Visual Studio
8edb901724a Fixed crashes in Metal renderer due to ARC releasing references on random memory in newly allocated structs
e7969553f88 Sync SDL3 wiki -> header
702ed83f72a Initialize interface structures so they can be extended in the future
434193d1534 testmultiaudio: initialize audio through SDL_test framework
102b3b480bb SDL_test: move argument parsing into SDL_test
09af4a80866 SDL_test: make argument parsing extendable
396dd16471d SDL_test: Remove unused common_usage_* static char pointers
872608b8af2 Don't allocate in SDLTest_GenerateRunSeed
2f4b2df5959 SDL_test: pass data pointer to unit tests
741c04b339f Sync SDL3 wiki -> header
baa1a5e2f47 Add SDL_strpbrk
55934bc85e4 include: add SDL_RESTRICT for restricted pointer aliasing
2d4eb29c379 Add SDL_SetGPUBlendConstants, SDL_SetGPUStencilReference (#10704)
04a732881a3 Add a test to verify structure alignment
9e850bdcfaa docs: Update the migration doc with SDL_SetWindowModalFor() changes
c0b15e57f46 cmake: disable GPU backends for winrt
f494658f9c4 SDL_gpu.c: remove BOM.
cb2919ac55f [GPU] MinGW build fixes:
22aeb1bbba2 Sync SDL3 wiki -> header
a46e7027ce7 video: Allow setting the parents of toplevel windows
af4c6682ce6 Sync SDL3 wiki -> header
cba5ccb9cf3 GPU: Fix documentation formatting
42a0df91bfe Add padding for non-32-bit-aligned types in structs (#10701)
387774ab8a3 Build config flags are either defined or undefined, never 0
e3fd581acac GPU: vulkan: Respect swapchain minImageCount
b00bb215074 Added -Wl,--no-undefined-version to Android.mk
5db00cef96c Android.mk: allow to compile with storage functions
a0f36fb85b4 Use atomic variables for thread communication
41810c823d6 Compilation without vulkan: SDL_GPU_VULKAN is always defined for some plateform (at android, macos), test against 0 or 1
defbf673069 SDL_migration.cocci: add SDL_TTF/mixer/image function names to be upgraded from int returned type to bool.
f61d4db39af GPU: `colorAttachmentDescriptions` should be `const`
249a74e4363 Sync SDL3 wiki -> header
1c8c0144811 GPU: Document opaque handles and enums (#10700)
20d0a1a3d1a Added a defensive check against XINPUTGETCAPABILITIES being NULL
ff1e2524134 testautomation: remove SDLTest_TestCaseFp casts
abd2ac5992c Set the desired channel count when opening audio on Android
e2c9a0a4273 Updated Android audio log messages
1788be85477 GPU: Add const to some function parameters (#10694)

git-subtree-dir: external/SDL
git-subtree-split: 95c3ee77c101c60aab69663be2bc4eee3d4302b2
This commit is contained in:
SimoneN64
2024-09-18 20:42:08 +02:00
parent 8821e99ab5
commit 3a7f96fd99
641 changed files with 31269 additions and 30646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

160
test/testautomation_surface.c
View File

@@ -25,9 +25,9 @@
#define CHECK_FUNC(FUNC, PARAMS) \
{ \
SDL_bool result = FUNC PARAMS; \
bool result = FUNC PARAMS; \
if (!result) { \
SDLTest_AssertCheck(result, "Validate result from %s, expected: SDL_TRUE, got: SDL_FALSE, %s", #FUNC, SDL_GetError()); \
SDLTest_AssertCheck(result, "Validate result from %s, expected: true, got: false, %s", #FUNC, SDL_GetError()); \
} \
}
@@ -41,7 +41,7 @@ static SDL_Surface *testSurface = NULL;
/* Fixture */
/* Create a 32-bit writable surface for blitting tests */
static void surfaceSetUp(void *arg)
static void SDLCALL surfaceSetUp(void **arg)
{
int result;
SDL_BlendMode blendMode = SDL_BLENDMODE_NONE;
@@ -53,18 +53,18 @@ static void surfaceSetUp(void *arg)
if (testSurface != NULL) {
/* Disable blend mode for target surface */
result = SDL_SetSurfaceBlendMode(testSurface, blendMode);
SDLTest_AssertCheck(result == SDL_TRUE, "Validate result from SDL_SetSurfaceBlendMode, expected: SDL_TRUE, got: %i", result);
SDLTest_AssertCheck(result == true, "Validate result from SDL_SetSurfaceBlendMode, expected: true, got: %i", result);
result = SDL_GetSurfaceBlendMode(testSurface, &currentBlendMode);
SDLTest_AssertCheck(result == SDL_TRUE, "Validate result from SDL_GetSurfaceBlendMode, expected: SDL_TRUE, got: %i", result);
SDLTest_AssertCheck(result == true, "Validate result from SDL_GetSurfaceBlendMode, expected: true, got: %i", result);
SDLTest_AssertCheck(currentBlendMode == blendMode, "Validate blendMode, expected: %" SDL_PRIu32 ", got: %" SDL_PRIu32, blendMode, currentBlendMode);
/* Clear the target surface */
result = SDL_FillSurfaceRect(testSurface, NULL, SDL_MapSurfaceRGBA(testSurface, 0, 0, 0, 255));
SDLTest_AssertCheck(result == SDL_TRUE, "Validate result from SDL_FillSurfaceRect, expected: SDL_TRUE, got: %i", result);
SDLTest_AssertCheck(result == true, "Validate result from SDL_FillSurfaceRect, expected: true, got: %i", result);
}
}
static void surfaceTearDown(void *arg)
static void SDLCALL surfaceTearDown(void *arg)
{
SDL_DestroySurface(referenceSurface);
referenceSurface = NULL;
@@ -133,7 +133,7 @@ static void testBlitBlendModeWithFormats(int mode, SDL_PixelFormat src_format, S
}
ret = SDL_FillSurfaceRect(dst, NULL, color);
SDLTest_AssertPass("Call to SDL_FillSurfaceRect()");
SDLTest_AssertCheck(ret == SDL_TRUE, "Verify result from SDL_FillSurfaceRect, expected: SDL_TRUE, got: %i", ret);
SDLTest_AssertCheck(ret == true, "Verify result from SDL_FillSurfaceRect, expected: true, got: %i", ret);
SDL_GetRGBA(color, SDL_GetPixelFormatDetails(dst->format), SDL_GetSurfacePalette(dst), &dstR, &dstG, &dstB, &dstA);
/* Create src surface */
@@ -153,35 +153,35 @@ static void testBlitBlendModeWithFormats(int mode, SDL_PixelFormat src_format, S
/* Reset alpha modulation */
ret = SDL_SetSurfaceAlphaMod(src, 255);
SDLTest_AssertPass("Call to SDL_SetSurfaceAlphaMod()");
SDLTest_AssertCheck(ret == SDL_TRUE, "Verify result from SDL_SetSurfaceAlphaMod(), expected: SDL_TRUE, got: %i", ret);
SDLTest_AssertCheck(ret == true, "Verify result from SDL_SetSurfaceAlphaMod(), expected: true, got: %i", ret);
/* Reset color modulation */
ret = SDL_SetSurfaceColorMod(src, 255, 255, 255);
SDLTest_AssertPass("Call to SDL_SetSurfaceColorMod()");
SDLTest_AssertCheck(ret == SDL_TRUE, "Verify result from SDL_SetSurfaceColorMod(), expected: SDL_TRUE, got: %i", ret);
SDLTest_AssertCheck(ret == true, "Verify result from SDL_SetSurfaceColorMod(), expected: true, got: %i", ret);
/* Reset color key */
ret = SDL_SetSurfaceColorKey(src, SDL_FALSE, 0);
ret = SDL_SetSurfaceColorKey(src, false, 0);
SDLTest_AssertPass("Call to SDL_SetSurfaceColorKey()");
SDLTest_AssertCheck(ret == SDL_TRUE, "Verify result from SDL_SetSurfaceColorKey(), expected: SDL_TRUE, got: %i", ret);
SDLTest_AssertCheck(ret == true, "Verify result from SDL_SetSurfaceColorKey(), expected: true, got: %i", ret);
/* Clear surface. */
color = SDL_MapSurfaceRGBA(src, srcR, srcG, srcB, srcA);
SDLTest_AssertPass("Call to SDL_MapSurfaceRGBA()");
ret = SDL_FillSurfaceRect(src, NULL, color);
SDLTest_AssertPass("Call to SDL_FillSurfaceRect()");
SDLTest_AssertCheck(ret == SDL_TRUE, "Verify result from SDL_FillSurfaceRect, expected: SDL_TRUE, got: %i", ret);
SDLTest_AssertCheck(ret == true, "Verify result from SDL_FillSurfaceRect, expected: true, got: %i", ret);
SDL_GetRGBA(color, SDL_GetPixelFormatDetails(src->format), SDL_GetSurfacePalette(src), &srcR, &srcG, &srcB, &srcA);
/* Set blend mode. */
if (mode >= 0) {
ret = SDL_SetSurfaceBlendMode(src, (SDL_BlendMode)mode);
SDLTest_AssertPass("Call to SDL_SetSurfaceBlendMode()");
SDLTest_AssertCheck(ret == SDL_TRUE, "Verify result from SDL_SetSurfaceBlendMode(..., %i), expected: SDL_TRUE, got: %i", mode, ret);
SDLTest_AssertCheck(ret == true, "Verify result from SDL_SetSurfaceBlendMode(..., %i), expected: true, got: %i", mode, ret);
} else {
ret = SDL_SetSurfaceBlendMode(src, SDL_BLENDMODE_BLEND);
SDLTest_AssertPass("Call to SDL_SetSurfaceBlendMode()");
SDLTest_AssertCheck(ret == SDL_TRUE, "Verify result from SDL_SetSurfaceBlendMode(..., %i), expected: SDL_TRUE, got: %i", mode, ret);
SDLTest_AssertCheck(ret == true, "Verify result from SDL_SetSurfaceBlendMode(..., %i), expected: true, got: %i", mode, ret);
}
/* Test blend mode. */
@@ -190,7 +190,7 @@ static void testBlitBlendModeWithFormats(int mode, SDL_PixelFormat src_format, S
case -1:
/* Set color mod. */
ret = SDL_SetSurfaceColorMod(src, srcR, srcG, srcB);
SDLTest_AssertCheck(ret == SDL_TRUE, "Validate results from calls to SDL_SetSurfaceColorMod, expected: SDL_TRUE, got: %i", ret);
SDLTest_AssertCheck(ret == true, "Validate results from calls to SDL_SetSurfaceColorMod, expected: true, got: %i", ret);
expectedR = (Uint8)SDL_roundf(SDL_clamp((FLOAT(srcR) * FLOAT(srcR)) * FLOAT(srcA) + FLOAT(dstR) * (1.0f - FLOAT(srcA)), 0.0f, 1.0f) * 255.0f);
expectedG = (Uint8)SDL_roundf(SDL_clamp((FLOAT(srcG) * FLOAT(srcG)) * FLOAT(srcA) + FLOAT(dstG) * (1.0f - FLOAT(srcA)), 0.0f, 1.0f) * 255.0f);
expectedB = (Uint8)SDL_roundf(SDL_clamp((FLOAT(srcB) * FLOAT(srcB)) * FLOAT(srcA) + FLOAT(dstB) * (1.0f - FLOAT(srcA)), 0.0f, 1.0f) * 255.0f);
@@ -199,7 +199,7 @@ static void testBlitBlendModeWithFormats(int mode, SDL_PixelFormat src_format, S
case -2:
/* Set alpha mod. */
ret = SDL_SetSurfaceAlphaMod(src, srcA);
SDLTest_AssertCheck(ret == SDL_TRUE, "Validate results from calls to SDL_SetSurfaceAlphaMod, expected: SDL_TRUE, got: %i", ret);
SDLTest_AssertCheck(ret == true, "Validate results from calls to SDL_SetSurfaceAlphaMod, expected: true, got: %i", ret);
expectedR = (Uint8)SDL_roundf(SDL_clamp(FLOAT(srcR) * (FLOAT(srcA) * FLOAT(srcA)) + FLOAT(dstR) * (1.0f - (FLOAT(srcA) * FLOAT(srcA))), 0.0f, 1.0f) * 255.0f);
expectedG = (Uint8)SDL_roundf(SDL_clamp(FLOAT(srcG) * (FLOAT(srcA) * FLOAT(srcA)) + FLOAT(dstG) * (1.0f - (FLOAT(srcA) * FLOAT(srcA))), 0.0f, 1.0f) * 255.0f);
expectedB = (Uint8)SDL_roundf(SDL_clamp(FLOAT(srcB) * (FLOAT(srcA) * FLOAT(srcA)) + FLOAT(dstB) * (1.0f - (FLOAT(srcA) * FLOAT(srcA))), 0.0f, 1.0f) * 255.0f);
@@ -262,7 +262,7 @@ static void testBlitBlendModeWithFormats(int mode, SDL_PixelFormat src_format, S
/* Blitting. */
ret = SDL_BlitSurface(src, NULL, dst, NULL);
SDLTest_AssertCheck(ret == SDL_TRUE, "Validate results from calls to SDL_BlitSurface, expected: SDL_TRUE, got: %i: %s", ret, !ret ? SDL_GetError() : "success");
SDLTest_AssertCheck(ret == true, "Validate results from calls to SDL_BlitSurface, expected: true, got: %i: %s", ret, !ret ? SDL_GetError() : "success");
if (ret) {
SDL_ReadSurfacePixel(dst, 0, 0, &actualR, &actualG, &actualB, &actualA);
deltaR = SDL_abs((int)actualR - expectedR);
@@ -316,7 +316,7 @@ static void AssertFileExist(const char *filename)
/**
* Tests sprite saving and loading
*/
static int surface_testSaveLoadBitmap(void *arg)
static int SDLCALL surface_testSaveLoadBitmap(void *arg)
{
int ret;
const char *sampleFilename = "testSaveLoadBitmap.bmp";
@@ -336,7 +336,7 @@ static int surface_testSaveLoadBitmap(void *arg)
/* Save a surface */
ret = SDL_SaveBMP(face, sampleFilename);
SDLTest_AssertPass("Call to SDL_SaveBMP()");
SDLTest_AssertCheck(ret == SDL_TRUE, "Verify result from SDL_SaveBMP, expected: SDL_TRUE, got: %i", ret);
SDLTest_AssertCheck(ret == true, "Verify result from SDL_SaveBMP, expected: true, got: %i", ret);
AssertFileExist(sampleFilename);
/* Load a surface */
@@ -363,7 +363,7 @@ static int surface_testSaveLoadBitmap(void *arg)
/**
* Tests tiled blitting.
*/
static int surface_testBlitTiled(void *arg)
static int SDLCALL surface_testBlitTiled(void *arg)
{
SDL_Surface *face = NULL;
SDL_Surface *testSurface2x = NULL;
@@ -380,7 +380,7 @@ static int surface_testBlitTiled(void *arg)
/* Tiled blit - 1.0 scale */
{
ret = SDL_BlitSurfaceTiled(face, NULL, testSurface, NULL);
SDLTest_AssertCheck(ret == SDL_TRUE, "Verify result from SDL_BlitSurfaceTiled expected: SDL_TRUE, got: %i", ret);
SDLTest_AssertCheck(ret == true, "Verify result from SDL_BlitSurfaceTiled expected: true, got: %i", ret);
/* See if it's the same */
SDL_DestroySurface(referenceSurface);
@@ -394,15 +394,15 @@ static int surface_testBlitTiled(void *arg)
testSurface2x = SDL_CreateSurface(testSurface->w * 2, testSurface->h * 2, testSurface->format);
SDLTest_AssertCheck(testSurface != NULL, "Check that testSurface2x is not NULL");
ret = SDL_FillSurfaceRect(testSurface2x, NULL, SDL_MapSurfaceRGBA(testSurface2x, 0, 0, 0, 255));
SDLTest_AssertCheck(ret == SDL_TRUE, "Validate result from SDL_FillSurfaceRect, expected: SDL_TRUE, got: %i", ret);
SDLTest_AssertCheck(ret == true, "Validate result from SDL_FillSurfaceRect, expected: true, got: %i", ret);
ret = SDL_BlitSurfaceTiledWithScale(face, NULL, 2.0f, SDL_SCALEMODE_NEAREST, testSurface2x, NULL);
SDLTest_AssertCheck(ret == SDL_TRUE, "Validate results from call to SDL_BlitSurfaceTiledWithScale, expected: SDL_TRUE, got: %i", ret);
SDLTest_AssertCheck(ret == true, "Validate results from call to SDL_BlitSurfaceTiledWithScale, expected: true, got: %i", ret);
/* See if it's the same */
referenceSurface2x = SDL_CreateSurface(referenceSurface->w * 2, referenceSurface->h * 2, referenceSurface->format);
SDL_BlitSurfaceScaled(referenceSurface, NULL, referenceSurface2x, NULL, SDL_SCALEMODE_NEAREST);
SDLTest_AssertCheck(ret == SDL_TRUE, "Validate results from call to SDL_BlitSurfaceScaled, expected: SDL_TRUE, got: %i", ret);
SDLTest_AssertCheck(ret == true, "Validate results from call to SDL_BlitSurfaceScaled, expected: true, got: %i", ret);
ret = SDLTest_CompareSurfaces(testSurface2x, referenceSurface2x, 0);
SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
}
@@ -488,7 +488,7 @@ static void Fill9GridReferenceSurface(SDL_Surface *surface, int left_width, int
/**
* Tests 9-grid blitting.
*/
static int surface_testBlit9Grid(void *arg)
static int SDLCALL surface_testBlit9Grid(void *arg)
{
SDL_Surface *source = NULL;
int x, y;
@@ -512,7 +512,7 @@ static int surface_testBlit9Grid(void *arg)
Fill9GridReferenceSurface(referenceSurface, 1, 1, 1, 1);
ret = SDL_BlitSurface9Grid(source, NULL, 1, 1, 1, 1, 0.0f, SDL_SCALEMODE_NEAREST, testSurface, NULL);
SDLTest_AssertCheck(ret == SDL_TRUE, "Validate result from SDL_BlitSurface9Grid, expected: SDL_TRUE, got: %i", ret);
SDLTest_AssertCheck(ret == true, "Validate result from SDL_BlitSurface9Grid, expected: true, got: %i", ret);
ret = SDLTest_CompareSurfaces(testSurface, referenceSurface, 0);
SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
@@ -527,7 +527,7 @@ static int surface_testBlit9Grid(void *arg)
Fill9GridReferenceSurface(referenceSurface, 2, 2, 2, 2);
ret = SDL_BlitSurface9Grid(source, NULL, 1, 1, 1, 1, 2.0f, SDL_SCALEMODE_NEAREST, testSurface, NULL);
SDLTest_AssertCheck(ret == SDL_TRUE, "Validate result from SDL_BlitSurface9Grid, expected: SDL_TRUE, got: %i", ret);
SDLTest_AssertCheck(ret == true, "Validate result from SDL_BlitSurface9Grid, expected: true, got: %i", ret);
ret = SDLTest_CompareSurfaces(testSurface, referenceSurface, 0);
SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
@@ -579,7 +579,7 @@ static int surface_testBlit9Grid(void *arg)
Fill9GridReferenceSurface(referenceSurface, 1, 2, 1, 2);
ret = SDL_BlitSurface9Grid(source, NULL, 1, 2, 1, 2, 0.0f, SDL_SCALEMODE_NEAREST, testSurface, NULL);
SDLTest_AssertCheck(ret == SDL_TRUE, "Validate result from SDL_BlitSurface9Grid, expected: SDL_TRUE, got: %i", ret);
SDLTest_AssertCheck(ret == true, "Validate result from SDL_BlitSurface9Grid, expected: true, got: %i", ret);
ret = SDLTest_CompareSurfaces(testSurface, referenceSurface, 0);
SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
@@ -595,7 +595,7 @@ static int surface_testBlit9Grid(void *arg)
Fill9GridReferenceSurface(referenceSurface, 2, 4, 2, 4);
ret = SDL_BlitSurface9Grid(source, NULL, 1, 2, 1, 2, 2.0f, SDL_SCALEMODE_NEAREST, testSurface, NULL);
SDLTest_AssertCheck(ret == SDL_TRUE, "Validate result from SDL_BlitSurface9Grid, expected: SDL_TRUE, got: %i", ret);
SDLTest_AssertCheck(ret == true, "Validate result from SDL_BlitSurface9Grid, expected: true, got: %i", ret);
ret = SDLTest_CompareSurfaces(testSurface, referenceSurface, 0);
SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
@@ -610,7 +610,7 @@ static int surface_testBlit9Grid(void *arg)
/**
* Tests blitting between multiple surfaces of the same format
*/
static int surface_testBlitMultiple(void *arg)
static int SDLCALL surface_testBlitMultiple(void *arg)
{
SDL_Surface *source, *surface;
SDL_Palette *palette;
@@ -675,7 +675,7 @@ static int surface_testBlitMultiple(void *arg)
/**
* Tests surface conversion.
*/
static int surface_testSurfaceConversion(void *arg)
static int SDLCALL surface_testSurfaceConversion(void *arg)
{
SDL_Surface *rface = NULL, *face = NULL;
int ret = 0;
@@ -689,9 +689,9 @@ static int surface_testSurfaceConversion(void *arg)
/* Set transparent pixel as the pixel at (0,0) */
if (SDL_GetSurfacePalette(face)) {
ret = SDL_SetSurfaceColorKey(face, SDL_TRUE, *(Uint8 *)face->pixels);
ret = SDL_SetSurfaceColorKey(face, true, *(Uint8 *)face->pixels);
SDLTest_AssertPass("Call to SDL_SetSurfaceColorKey()");
SDLTest_AssertCheck(ret == SDL_TRUE, "Verify result from SDL_SetSurfaceColorKey, expected: SDL_TRUE, got: %i", ret);
SDLTest_AssertCheck(ret == true, "Verify result from SDL_SetSurfaceColorKey, expected: true, got: %i", ret);
}
/* Convert to 32 bit to compare. */
@@ -715,7 +715,7 @@ static int surface_testSurfaceConversion(void *arg)
/**
* Tests surface conversion across all pixel formats.
*/
static int surface_testCompleteSurfaceConversion(void *arg)
static int SDLCALL surface_testCompleteSurfaceConversion(void *arg)
{
Uint32 pixel_formats[] = {
SDL_PIXELFORMAT_INDEX8,
@@ -764,9 +764,9 @@ static int surface_testCompleteSurfaceConversion(void *arg)
/* Set transparent pixel as the pixel at (0,0) */
if (SDL_GetSurfacePalette(face)) {
ret = SDL_SetSurfaceColorKey(face, SDL_TRUE, *(Uint8 *)face->pixels);
ret = SDL_SetSurfaceColorKey(face, true, *(Uint8 *)face->pixels);
SDLTest_AssertPass("Call to SDL_SetSurfaceColorKey()");
SDLTest_AssertCheck(ret == SDL_TRUE, "Verify result from SDL_SetSurfaceColorKey, expected: SDL_TRUE, got: %i", ret);
SDLTest_AssertCheck(ret == true, "Verify result from SDL_SetSurfaceColorKey, expected: true, got: %i", ret);
}
for (i = 0; i < SDL_arraysize(pixel_formats); ++i) {
@@ -813,7 +813,7 @@ static int surface_testCompleteSurfaceConversion(void *arg)
/**
* Tests sprite loading. A failure case.
*/
static int surface_testLoadFailure(void *arg)
static int SDLCALL surface_testLoadFailure(void *arg)
{
SDL_Surface *face = SDL_LoadBMP("nonexistant.bmp");
SDLTest_AssertCheck(face == NULL, "SDL_CreateLoadBmp");
@@ -824,7 +824,7 @@ static int surface_testLoadFailure(void *arg)
/**
* Tests some blitting routines.
*/
static int surface_testBlit(void *arg)
static int SDLCALL surface_testBlit(void *arg)
{
/* Basic blitting */
testBlitBlendMode(SDL_BLENDMODE_NONE);
@@ -835,7 +835,7 @@ static int surface_testBlit(void *arg)
/**
* Tests some blitting routines with color mod
*/
static int surface_testBlitColorMod(void *arg)
static int SDLCALL surface_testBlitColorMod(void *arg)
{
/* Basic blitting with color mod */
testBlitBlendMode(-1);
@@ -846,7 +846,7 @@ static int surface_testBlitColorMod(void *arg)
/**
* Tests some blitting routines with alpha mod
*/
static int surface_testBlitAlphaMod(void *arg)
static int SDLCALL surface_testBlitAlphaMod(void *arg)
{
/* Basic blitting with alpha mod */
testBlitBlendMode(-2);
@@ -857,7 +857,7 @@ static int surface_testBlitAlphaMod(void *arg)
/**
* Tests some more blitting routines.
*/
static int surface_testBlitBlendBlend(void *arg)
static int SDLCALL surface_testBlitBlendBlend(void *arg)
{
/* Blend blitting */
testBlitBlendMode(SDL_BLENDMODE_BLEND);
@@ -868,7 +868,7 @@ static int surface_testBlitBlendBlend(void *arg)
/**
* @brief Tests some more blitting routines.
*/
static int surface_testBlitBlendPremultiplied(void *arg)
static int SDLCALL surface_testBlitBlendPremultiplied(void *arg)
{
/* Blend premultiplied blitting */
testBlitBlendMode(SDL_BLENDMODE_BLEND_PREMULTIPLIED);
@@ -879,7 +879,7 @@ static int surface_testBlitBlendPremultiplied(void *arg)
/**
* Tests some more blitting routines.
*/
static int surface_testBlitBlendAdd(void *arg)
static int SDLCALL surface_testBlitBlendAdd(void *arg)
{
/* Add blitting */
testBlitBlendMode(SDL_BLENDMODE_ADD);
@@ -890,7 +890,7 @@ static int surface_testBlitBlendAdd(void *arg)
/**
* Tests some more blitting routines.
*/
static int surface_testBlitBlendAddPremultiplied(void *arg)
static int SDLCALL surface_testBlitBlendAddPremultiplied(void *arg)
{
/* Add premultiplied blitting */
testBlitBlendMode(SDL_BLENDMODE_ADD_PREMULTIPLIED);
@@ -901,7 +901,7 @@ static int surface_testBlitBlendAddPremultiplied(void *arg)
/**
* Tests some more blitting routines.
*/
static int surface_testBlitBlendMod(void *arg)
static int SDLCALL surface_testBlitBlendMod(void *arg)
{
/* Mod blitting */
testBlitBlendMode(SDL_BLENDMODE_MOD);
@@ -912,7 +912,7 @@ static int surface_testBlitBlendMod(void *arg)
/**
* Tests some more blitting routines.
*/
static int surface_testBlitBlendMul(void *arg)
static int SDLCALL surface_testBlitBlendMul(void *arg)
{
/* Mod blitting */
testBlitBlendMode(SDL_BLENDMODE_MUL);
@@ -920,7 +920,7 @@ static int surface_testBlitBlendMul(void *arg)
return TEST_COMPLETED;
}
static int surface_testOverflow(void *arg)
static int SDLCALL surface_testOverflow(void *arg)
{
char buf[1024];
const char *expectedError;
@@ -1135,7 +1135,7 @@ static int surface_testOverflow(void *arg)
return TEST_COMPLETED;
}
static int surface_testFlip(void *arg)
static int SDLCALL surface_testFlip(void *arg)
{
SDL_Surface *surface;
Uint8 *pixels;
@@ -1182,7 +1182,7 @@ static int surface_testFlip(void *arg)
return TEST_COMPLETED;
}
static int surface_testPalette(void *arg)
static int SDLCALL surface_testPalette(void *arg)
{
SDL_Surface *source, *surface, *output;
SDL_Palette *palette;
@@ -1266,7 +1266,7 @@ static int surface_testPalette(void *arg)
return TEST_COMPLETED;
}
static int surface_testPalettization(void *arg)
static int SDLCALL surface_testPalettization(void *arg)
{
const SDL_Color palette_colors[] = {
{ 0x80, 0x00, 0x00, 0xff },
@@ -1321,11 +1321,11 @@ static int surface_testPalettization(void *arg)
SDLTest_AssertCheck(source->format == SDL_PIXELFORMAT_RGBA8888, "Expected source->format == SDL_PIXELFORMAT_RGBA8888, got 0x%x (%s)", source->format, SDL_GetPixelFormatName(source->format));
for (i = 0; i < SDL_arraysize(colors); i++) {
result = SDL_WriteSurfacePixel(source, i, 0, colors[i].c.r, colors[i].c.g, colors[i].c.b, colors[i].c.a);
SDLTest_AssertCheck(result == SDL_TRUE, "SDL_WriteSurfacePixel");
SDLTest_AssertCheck(result == true, "SDL_WriteSurfacePixel");
}
for (i = 0; i < SDL_arraysize(palette_colors); i++) {
result = SDL_WriteSurfacePixel(source, SDL_arraysize(colors) + i, 0, palette_colors[i].r, palette_colors[i].g, palette_colors[i].b, palette_colors[i].a);
SDLTest_AssertCheck(result == SDL_TRUE, "SDL_WriteSurfacePixel");
SDLTest_AssertCheck(result == true, "SDL_WriteSurfacePixel");
}
output = SDL_ConvertSurfaceAndColorspace(source, SDL_PIXELFORMAT_INDEX8, palette, SDL_COLORSPACE_UNKNOWN, 0);
@@ -1339,7 +1339,7 @@ static int surface_testPalettization(void *arg)
int idx = i;
Uint8 actual = pixels[idx];
Uint8 expected = colors[i].e;
SDLTest_AssertCheck(0 <= actual && actual < SDL_arraysize(palette_colors), "0 <= output->pixels[%d] < %d", idx, (int)SDL_arraysize(palette_colors));
SDLTest_AssertCheck(actual < SDL_arraysize(palette_colors), "output->pixels[%d] < %d", idx, (int)SDL_arraysize(palette_colors));
SDLTest_AssertCheck(actual == expected, "Expected output->pixels[%d] == %u, got %u", idx, expected, actual);
}
SDLTest_AssertPass("Check palette 1:1 mapping");
@@ -1347,7 +1347,7 @@ static int surface_testPalettization(void *arg)
int idx = SDL_arraysize(colors) + i;
Uint8 actual = pixels[idx];
Uint8 expected = i;
SDLTest_AssertCheck(0 <= actual && actual < SDL_arraysize(palette_colors), "0 <= output->pixels[%d] < %d", idx, (int)SDL_arraysize(palette_colors));
SDLTest_AssertCheck(actual < SDL_arraysize(palette_colors), "output->pixels[%d] < %d", idx, (int)SDL_arraysize(palette_colors));
SDLTest_AssertCheck(actual == expected, "Expected output->pixels[%d] == %u, got %u", idx, expected, actual);
}
SDL_DestroyPalette(palette);
@@ -1357,7 +1357,7 @@ static int surface_testPalettization(void *arg)
return TEST_COMPLETED;
}
static int surface_testClearSurface(void *arg)
static int SDLCALL surface_testClearSurface(void *arg)
{
SDL_PixelFormat formats[] = {
SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_RGBA8888,
@@ -1383,9 +1383,9 @@ static int surface_testClearSurface(void *arg)
surface = SDL_CreateSurface(1, 1, format);
SDLTest_AssertCheck(surface != NULL, "SDL_CreateSurface()");
ret = SDL_ClearSurface(surface, srcR, srcG, srcB, srcA);
SDLTest_AssertCheck(ret == SDL_TRUE, "SDL_ClearSurface()");
SDLTest_AssertCheck(ret == true, "SDL_ClearSurface()");
ret = SDL_ReadSurfacePixelFloat(surface, 0, 0, &actualR, &actualG, &actualB, &actualA);
SDLTest_AssertCheck(ret == SDL_TRUE, "SDL_ReadSurfacePixelFloat()");
SDLTest_AssertCheck(ret == true, "SDL_ReadSurfacePixelFloat()");
deltaR = SDL_fabsf(actualR - srcR);
deltaG = SDL_fabsf(actualG - srcG);
deltaB = SDL_fabsf(actualB - srcB);
@@ -1405,7 +1405,7 @@ static int surface_testClearSurface(void *arg)
return TEST_COMPLETED;
}
static int surface_testPremultiplyAlpha(void *arg)
static int SDLCALL surface_testPremultiplyAlpha(void *arg)
{
SDL_PixelFormat formats[] = {
SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_RGBA8888,
@@ -1433,13 +1433,13 @@ static int surface_testPremultiplyAlpha(void *arg)
surface = SDL_CreateSurface(1, 1, format);
SDLTest_AssertCheck(surface != NULL, "SDL_CreateSurface()");
ret = SDL_SetSurfaceColorspace(surface, SDL_COLORSPACE_SRGB);
SDLTest_AssertCheck(ret == SDL_TRUE, "SDL_SetSurfaceColorspace()");
SDLTest_AssertCheck(ret == true, "SDL_SetSurfaceColorspace()");
ret = SDL_ClearSurface(surface, srcR, srcG, srcB, srcA);
SDLTest_AssertCheck(ret == SDL_TRUE, "SDL_ClearSurface()");
ret = SDL_PremultiplySurfaceAlpha(surface, SDL_FALSE);
SDLTest_AssertCheck(ret == SDL_TRUE, "SDL_PremultiplySurfaceAlpha()");
SDLTest_AssertCheck(ret == true, "SDL_ClearSurface()");
ret = SDL_PremultiplySurfaceAlpha(surface, false);
SDLTest_AssertCheck(ret == true, "SDL_PremultiplySurfaceAlpha()");
ret = SDL_ReadSurfacePixelFloat(surface, 0, 0, &actualR, &actualG, &actualB, NULL);
SDLTest_AssertCheck(ret == SDL_TRUE, "SDL_ReadSurfacePixelFloat()");
SDLTest_AssertCheck(ret == true, "SDL_ReadSurfacePixelFloat()");
deltaR = SDL_fabsf(actualR - expectedR);
deltaG = SDL_fabsf(actualG - expectedG);
deltaB = SDL_fabsf(actualB - expectedB);
@@ -1462,67 +1462,67 @@ static int surface_testPremultiplyAlpha(void *arg)
/* Surface test cases */
static const SDLTest_TestCaseReference surfaceTestSaveLoadBitmap = {
(SDLTest_TestCaseFp)surface_testSaveLoadBitmap, "surface_testSaveLoadBitmap", "Tests sprite saving and loading.", TEST_ENABLED
surface_testSaveLoadBitmap, "surface_testSaveLoadBitmap", "Tests sprite saving and loading.", TEST_ENABLED
};
static const SDLTest_TestCaseReference surfaceTestBlit = {
(SDLTest_TestCaseFp)surface_testBlit, "surface_testBlit", "Tests basic blitting.", TEST_ENABLED
surface_testBlit, "surface_testBlit", "Tests basic blitting.", TEST_ENABLED
};
static const SDLTest_TestCaseReference surfaceTestBlitTiled = {
(SDLTest_TestCaseFp)surface_testBlitTiled, "surface_testBlitTiled", "Tests tiled blitting.", TEST_ENABLED
surface_testBlitTiled, "surface_testBlitTiled", "Tests tiled blitting.", TEST_ENABLED
};
static const SDLTest_TestCaseReference surfaceTestBlit9Grid = {
(SDLTest_TestCaseFp)surface_testBlit9Grid, "surface_testBlit9Grid", "Tests 9-grid blitting.", TEST_ENABLED
surface_testBlit9Grid, "surface_testBlit9Grid", "Tests 9-grid blitting.", TEST_ENABLED
};
static const SDLTest_TestCaseReference surfaceTestBlitMultiple = {
(SDLTest_TestCaseFp)surface_testBlitMultiple, "surface_testBlitMultiple", "Tests blitting between multiple surfaces of the same format.", TEST_ENABLED
surface_testBlitMultiple, "surface_testBlitMultiple", "Tests blitting between multiple surfaces of the same format.", TEST_ENABLED
};
static const SDLTest_TestCaseReference surfaceTestLoadFailure = {
(SDLTest_TestCaseFp)surface_testLoadFailure, "surface_testLoadFailure", "Tests sprite loading. A failure case.", TEST_ENABLED
surface_testLoadFailure, "surface_testLoadFailure", "Tests sprite loading. A failure case.", TEST_ENABLED
};
static const SDLTest_TestCaseReference surfaceTestSurfaceConversion = {
(SDLTest_TestCaseFp)surface_testSurfaceConversion, "surface_testSurfaceConversion", "Tests surface conversion.", TEST_ENABLED
surface_testSurfaceConversion, "surface_testSurfaceConversion", "Tests surface conversion.", TEST_ENABLED
};
static const SDLTest_TestCaseReference surfaceTestCompleteSurfaceConversion = {
(SDLTest_TestCaseFp)surface_testCompleteSurfaceConversion, "surface_testCompleteSurfaceConversion", "Tests surface conversion across all pixel formats", TEST_ENABLED
surface_testCompleteSurfaceConversion, "surface_testCompleteSurfaceConversion", "Tests surface conversion across all pixel formats", TEST_ENABLED
};
static const SDLTest_TestCaseReference surfaceTestBlitColorMod = {
(SDLTest_TestCaseFp)surface_testBlitColorMod, "surface_testBlitColorMod", "Tests some blitting routines with color mod.", TEST_ENABLED
surface_testBlitColorMod, "surface_testBlitColorMod", "Tests some blitting routines with color mod.", TEST_ENABLED
};
static const SDLTest_TestCaseReference surfaceTestBlitAlphaMod = {
(SDLTest_TestCaseFp)surface_testBlitAlphaMod, "surface_testBlitAlphaMod", "Tests some blitting routines with alpha mod.", TEST_ENABLED
surface_testBlitAlphaMod, "surface_testBlitAlphaMod", "Tests some blitting routines with alpha mod.", TEST_ENABLED
};
static const SDLTest_TestCaseReference surfaceTestBlitBlendBlend = {
(SDLTest_TestCaseFp)surface_testBlitBlendBlend, "surface_testBlitBlendBlend", "Tests blitting routines with blend blending mode.", TEST_ENABLED
surface_testBlitBlendBlend, "surface_testBlitBlendBlend", "Tests blitting routines with blend blending mode.", TEST_ENABLED
};
static const SDLTest_TestCaseReference surfaceTestBlitBlendPremultiplied = {
(SDLTest_TestCaseFp)surface_testBlitBlendPremultiplied, "surface_testBlitBlendPremultiplied", "Tests blitting routines with premultiplied blending mode.", TEST_ENABLED
surface_testBlitBlendPremultiplied, "surface_testBlitBlendPremultiplied", "Tests blitting routines with premultiplied blending mode.", TEST_ENABLED
};
static const SDLTest_TestCaseReference surfaceTestBlitBlendAdd = {
(SDLTest_TestCaseFp)surface_testBlitBlendAdd, "surface_testBlitBlendAdd", "Tests blitting routines with add blending mode.", TEST_ENABLED
surface_testBlitBlendAdd, "surface_testBlitBlendAdd", "Tests blitting routines with add blending mode.", TEST_ENABLED
};
static const SDLTest_TestCaseReference surfaceTestBlitBlendAddPremultiplied = {
(SDLTest_TestCaseFp)surface_testBlitBlendAddPremultiplied, "surface_testBlitBlendAddPremultiplied", "Tests blitting routines with premultiplied add blending mode.", TEST_ENABLED
surface_testBlitBlendAddPremultiplied, "surface_testBlitBlendAddPremultiplied", "Tests blitting routines with premultiplied add blending mode.", TEST_ENABLED
};
static const SDLTest_TestCaseReference surfaceTestBlitBlendMod = {
(SDLTest_TestCaseFp)surface_testBlitBlendMod, "surface_testBlitBlendMod", "Tests blitting routines with mod blending mode.", TEST_ENABLED
surface_testBlitBlendMod, "surface_testBlitBlendMod", "Tests blitting routines with mod blending mode.", TEST_ENABLED
};
static const SDLTest_TestCaseReference surfaceTestBlitBlendMul = {
(SDLTest_TestCaseFp)surface_testBlitBlendMul, "surface_testBlitBlendMul", "Tests blitting routines with mul blending mode.", TEST_ENABLED
surface_testBlitBlendMul, "surface_testBlitBlendMul", "Tests blitting routines with mul blending mode.", TEST_ENABLED
};
static const SDLTest_TestCaseReference surfaceTestOverflow = {