We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] [SDL1.2] SDL_blit: use a named enum for required hardware features bits in dispatch tables

0004-SDL_blit-use-a-named-enum-for-required-hardware-feat.patch (text/plain), 6.60 KB, created by Ben Avison on 2019-02-28 19:58:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Avison

Created: 2019-02-28 19:58:53 UTC

Size: 6.60 KB

patch

obsolete

>From a39017f7366f7178d2d516da565de4842a58a7e2 Mon Sep 17 00:00:00 2001
>From: Ben Avison <bavison@riscosopen.org>
>Date: Tue, 30 Aug 2016 15:17:22 +0100
>Subject: [PATCH 04/11] SDL_blit: use a named enum for required hardware
> features bits in dispatch tables
>
>---
> src/video/SDL_blit_N.c | 47 ++++++++++++++++++++++++------------------
> 1 file changed, 27 insertions(+), 20 deletions(-)
>
>diff --git a/src/video/SDL_blit_N.c b/src/video/SDL_blit_N.c
>index 146a10007..08bb4a8a0 100644
>--- a/src/video/SDL_blit_N.c
>+++ b/src/video/SDL_blit_N.c
>@@ -28,6 +28,12 @@
> 
> /* Functions to blit from N-bit surfaces to other surfaces */
> 
>+enum blit_features {
>+	BLIT_FEATURE_HAS_MMX = 1,
>+	BLIT_FEATURE_HAS_ALTIVEC = 2,
>+	BLIT_FEATURE_ALTIVEC_DONT_USE_PREFETCH = 4
>+};
>+
> #if SDL_ALTIVEC_BLITTERS
> #if __MWERKS__
> #pragma altivec_model on
>@@ -818,24 +824,25 @@ static void ConvertAltivec32to32_prefetch(SDL_BlitInfo *info)
>     vec_dss(DST_CHAN_DEST);
> }
> 
>-static Uint32 GetBlitFeatures( void )
>+static enum blit_features GetBlitFeatures( void )
> {
>-    static Uint32 features = 0xffffffff;
>-    if (features == 0xffffffff) {
>+    static enum blit_features features = -1;
>+    if (features == (enum blit_features) -1) {
>         /* Provide an override for testing .. */
>         char *override = SDL_getenv("SDL_ALTIVEC_BLIT_FEATURES");
>         if (override) {
>-            features = 0;
>-            SDL_sscanf(override, "%u", &features);
>+            unsigned int features_as_uint = 0;
>+            SDL_sscanf(override, "%u", &features_as_uint);
>+            features = (enum blit_features) features_as_uint;
>         } else {
>             features = ( 0
>                 /* Feature 1 is has-MMX */
>-                | ((SDL_HasMMX()) ? 1 : 0)
>+                | ((SDL_HasMMX()) ? BLIT_FEATURE_HAS_MMX : 0)
>                 /* Feature 2 is has-AltiVec */
>-                | ((SDL_HasAltiVec()) ? 2 : 0)
>+                | ((SDL_HasAltiVec()) ? BLIT_FEATURE_HAS_ALTIVEC : 0)
>                 /* Feature 4 is dont-use-prefetch */
>                 /* !!!! FIXME: Check for G5 or later, not the cache size! Always prefetch on a G4. */
>-                | ((GetL3CacheSize() == 0) ? 4 : 0)
>+                | ((GetL3CacheSize() == 0) ? BLIT_FEATURE_ALTIVEC_DONT_USE_PREFETCH : 0)
>             );
>         }
>     }
>@@ -846,7 +853,7 @@ static Uint32 GetBlitFeatures( void )
> #endif
> #else
> /* Feature 1 is has-MMX */
>-#define GetBlitFeatures() ((Uint32)(SDL_HasMMX() ? 1 : 0))
>+#define GetBlitFeatures() (SDL_HasMMX() ? BLIT_FEATURE_HAS_MMX : 0)
> #endif
> 
> /* This is now endian dependent */
>@@ -2306,7 +2313,7 @@ struct blit_table {
> 	Uint32 srcR, srcG, srcB;
> 	int dstbpp;
> 	Uint32 dstR, dstG, dstB;
>-	Uint32 blit_features;
>+	enum blit_features blit_features;
> 	void *aux_data;
> 	SDL_loblit blitfunc;
> 	enum { NO_ALPHA=1, SET_ALPHA=2, COPY_ALPHA=4 } alpha;
>@@ -2326,9 +2333,9 @@ static const struct blit_table normal_blit_2[] = {
> #elif SDL_ALTIVEC_BLITTERS
>     /* has-altivec */
>     { 0x0000F800,0x000007E0,0x0000001F, 4, 0x00000000,0x00000000,0x00000000,
>-      2, NULL, Blit_RGB565_32Altivec, NO_ALPHA | COPY_ALPHA | SET_ALPHA },
>+      BLIT_FEATURE_HAS_ALTIVEC, NULL, Blit_RGB565_32Altivec, NO_ALPHA | COPY_ALPHA | SET_ALPHA },
>     { 0x00007C00,0x000003E0,0x0000001F, 4, 0x00000000,0x00000000,0x00000000,
>-      2, NULL, Blit_RGB555_32Altivec, NO_ALPHA | COPY_ALPHA | SET_ALPHA },
>+      BLIT_FEATURE_HAS_ALTIVEC, NULL, Blit_RGB555_32Altivec, NO_ALPHA | COPY_ALPHA | SET_ALPHA },
> #endif
>     { 0x0000F800,0x000007E0,0x0000001F, 4, 0x00FF0000,0x0000FF00,0x000000FF,
>       0, NULL, Blit_RGB565_ARGB8888, NO_ALPHA | COPY_ALPHA | SET_ALPHA },
>@@ -2349,23 +2356,23 @@ static const struct blit_table normal_blit_3[] = {
> static const struct blit_table normal_blit_4[] = {
> #if SDL_HERMES_BLITTERS
>     { 0x00FF0000,0x0000FF00,0x000000FF, 2, 0x0000F800,0x000007E0,0x0000001F,
>-      1, ConvertMMXpII32_16RGB565, ConvertMMX, NO_ALPHA },
>+      BLIT_FEATURE_HAS_MMX, ConvertMMXpII32_16RGB565, ConvertMMX, NO_ALPHA },
>     { 0x00FF0000,0x0000FF00,0x000000FF, 2, 0x0000F800,0x000007E0,0x0000001F,
>       0, ConvertX86p32_16RGB565, ConvertX86, NO_ALPHA },
>     { 0x00FF0000,0x0000FF00,0x000000FF, 2, 0x0000001F,0x000007E0,0x0000F800,
>-      1, ConvertMMXpII32_16BGR565, ConvertMMX, NO_ALPHA },
>+      BLIT_FEATURE_HAS_MMX, ConvertMMXpII32_16BGR565, ConvertMMX, NO_ALPHA },
>     { 0x00FF0000,0x0000FF00,0x000000FF, 2, 0x0000001F,0x000007E0,0x0000F800,
>       0, ConvertX86p32_16BGR565, ConvertX86, NO_ALPHA },
>     { 0x00FF0000,0x0000FF00,0x000000FF, 2, 0x00007C00,0x000003E0,0x0000001F,
>-      1, ConvertMMXpII32_16RGB555, ConvertMMX, NO_ALPHA },
>+      BLIT_FEATURE_HAS_MMX, ConvertMMXpII32_16RGB555, ConvertMMX, NO_ALPHA },
>     { 0x00FF0000,0x0000FF00,0x000000FF, 2, 0x00007C00,0x000003E0,0x0000001F,
>       0, ConvertX86p32_16RGB555, ConvertX86, NO_ALPHA },
>     { 0x00FF0000,0x0000FF00,0x000000FF, 2, 0x0000001F,0x000003E0,0x00007C00,
>-      1, ConvertMMXpII32_16BGR555, ConvertMMX, NO_ALPHA },
>+      BLIT_FEATURE_HAS_MMX, ConvertMMXpII32_16BGR555, ConvertMMX, NO_ALPHA },
>     { 0x00FF0000,0x0000FF00,0x000000FF, 2, 0x0000001F,0x000003E0,0x00007C00,
>       0, ConvertX86p32_16BGR555, ConvertX86, NO_ALPHA },
>     { 0x00FF0000,0x0000FF00,0x000000FF, 3, 0x00FF0000,0x0000FF00,0x000000FF,
>-      1, ConvertMMXpII32_24RGB888, ConvertMMX, NO_ALPHA },
>+      BLIT_FEATURE_HAS_MMX, ConvertMMXpII32_24RGB888, ConvertMMX, NO_ALPHA },
>     { 0x00FF0000,0x0000FF00,0x000000FF, 3, 0x00FF0000,0x0000FF00,0x000000FF,
>       0, ConvertX86p32_24RGB888, ConvertX86, NO_ALPHA },
>     { 0x00FF0000,0x0000FF00,0x000000FF, 3, 0x000000FF,0x0000FF00,0x00FF0000,
>@@ -2380,13 +2387,13 @@ static const struct blit_table normal_blit_4[] = {
> #if SDL_ALTIVEC_BLITTERS
>     /* has-altivec | dont-use-prefetch */
>     { 0x00000000,0x00000000,0x00000000, 4, 0x00000000,0x00000000,0x00000000,
>-      6, NULL, ConvertAltivec32to32_noprefetch, NO_ALPHA | COPY_ALPHA | SET_ALPHA },
>+      BLIT_FEATURE_HAS_ALTIVEC | BLIT_FEATURE_ALTIVEC_DONT_USE_PREFETCH, NULL, ConvertAltivec32to32_noprefetch, NO_ALPHA | COPY_ALPHA | SET_ALPHA },
>     /* has-altivec */
>     { 0x00000000,0x00000000,0x00000000, 4, 0x00000000,0x00000000,0x00000000,
>-      2, NULL, ConvertAltivec32to32_prefetch, NO_ALPHA | COPY_ALPHA | SET_ALPHA },
>+      BLIT_FEATURE_HAS_ALTIVEC, NULL, ConvertAltivec32to32_prefetch, NO_ALPHA | COPY_ALPHA | SET_ALPHA },
>     /* has-altivec */
>     { 0x00000000,0x00000000,0x00000000, 2, 0x0000F800,0x000007E0,0x0000001F,
>-      2, NULL, Blit_RGB888_RGB565Altivec, NO_ALPHA },
>+      BLIT_FEATURE_HAS_ALTIVEC, NULL, Blit_RGB888_RGB565Altivec, NO_ALPHA },
> #endif
>     { 0x00FF0000,0x0000FF00,0x000000FF, 2, 0x0000F800,0x000007E0,0x0000001F,
>       0, NULL, Blit_RGB888_RGB565, NO_ALPHA },
>-- 
>2.17.1
>

Actions: View | Diff

Attachments on bug 4365: 3452 | 3453 | 3454 | 3455 | 3456 | 3457 | 3458 | 3459 | 3460 | 3461 | 3462 | 3468 | 3469 | 3470 | 3471 | 3472 | 3473 | 3474 | 3475 | 3476 | 3477 | 3478 | 3479 | 3661 | 3662 | 3663 | 3664 | 3665 | 3666 | 3667 | 3668 | 3669 | 3670 | 3671 | 3672 | 3673 | 3674 | 3675 | 3676 | 3677 | 3678 | 3679 | 3680 | 3681 | 3682 | 3995 | 3996 | 3997 | 3998 | 3999 | 4000 | 4001 | 4002 | 4003 | 4004 | 4005 | 4006 | 4007 | 4008 | 4009 | 4010 | 4011 | 4012 | 4013 | 4014 | 4015 | 4016 | 4026 | 4027 | 4028 | 4029 | 4030 | 4031 | 4032 | 4033 | 4034 | 4035 | 4036

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.