From cebf4986e09e76e2876ad57b1abe06fb4b08ef74 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Sat, 30 Sep 2023 17:50:02 +0300
Subject: [PATCH] updated testlib from latest SDL2
---
src/test/SDL_test_common.c | 1 +
src/test/SDL_test_compare.c | 26 ++++++++++++++++++++++++--
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/test/SDL_test_common.c b/src/test/SDL_test_common.c
index 5636fd7..80c6275 100644
--- a/src/test/SDL_test_common.c
+++ b/src/test/SDL_test_common.c
@@ -134,6 +134,7 @@ int SDLTest_CommonArg(SDLTest_CommonState *state, int index)
return -1;
}
state->videodriver = argv[index];
+ SDL_SetHint(SDL_HINT_VIDEODRIVER, state->videodriver);
return 2;
}
if (SDL_strcasecmp(argv[index], "--renderer") == 0) {
diff --git a/src/test/SDL_test_compare.c b/src/test/SDL_test_compare.c
index 9c4adf2..b840880 100644
--- a/src/test/SDL_test_compare.c
+++ b/src/test/SDL_test_compare.c
@@ -36,6 +36,25 @@
/* Counter for _CompareSurface calls; used for filename creation when comparisons fail */
static int _CompareSurfaceCount = 0;
+static Uint32
+GetPixel(Uint8 *p, size_t bytes_per_pixel)
+{
+ Uint32 ret = 0;
+
+ SDL_assert(bytes_per_pixel <= sizeof(ret));
+
+ /* Fill the appropriate number of least-significant bytes of ret,
+ * leaving the most-significant bytes set to zero, so that ret can
+ * be decoded with SDL_GetRGBA afterwards. */
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+ SDL_memcpy(((Uint8 *) &ret) + (sizeof(ret) - bytes_per_pixel), p, bytes_per_pixel);
+#else
+ SDL_memcpy(&ret, p, bytes_per_pixel);
+#endif
+
+ return ret;
+}
+
/* Compare surfaces */
int SDLTest_CompareSurfaces(SDL_Surface *surface, SDL_Surface *referenceSurface, int allowable_error)
{
@@ -74,11 +93,14 @@ int SDLTest_CompareSurfaces(SDL_Surface *surface, SDL_Surface *referenceSurface,
/* Compare image - should be same format. */
for (j = 0; j < surface->h; j++) {
for (i = 0; i < surface->w; i++) {
+ Uint32 pixel;
p = (Uint8 *)surface->pixels + j * surface->pitch + i * bpp;
p_reference = (Uint8 *)referenceSurface->pixels + j * referenceSurface->pitch + i * bpp_reference;
- SDL_GetRGBA(*(Uint32 *)p, surface->format, &R, &G, &B, &A);
- SDL_GetRGBA(*(Uint32 *)p_reference, referenceSurface->format, &Rd, &Gd, &Bd, &Ad);
+ pixel = GetPixel(p, bpp);
+ SDL_GetRGBA(pixel, surface->format, &R, &G, &B, &A);
+ pixel = GetPixel(p_reference, bpp_reference);
+ SDL_GetRGBA(pixel, referenceSurface->format, &Rd, &Gd, &Bd, &Ad);
dist = 0;
dist += (R - Rd) * (R - Rd);