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] patch

patch_bug_4484_simd_aligned_memory.diff (text/plain), 2.74 KB, created by Sylvain on 2019-02-01 14:21:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sylvain

Created: 2019-02-01 14:21:17 UTC

Size: 2.74 KB

patch

obsolete

>diff -r 1fc2169984ad include/SDL_surface.h
>--- a/include/SDL_surface.h	Thu Jan 31 19:52:47 2019 -0400
>+++ b/include/SDL_surface.h	Fri Feb 01 15:18:37 2019 +0100
>@@ -53,7 +53,6 @@
> #define SDL_PREALLOC        0x00000001  /**< Surface uses preallocated memory */
> #define SDL_RLEACCEL        0x00000002  /**< Surface is RLE encoded */
> #define SDL_DONTFREE        0x00000004  /**< Surface is referenced internally */
>-#define SDL_MEMALIGNED      0x00000008  /**< Surface uses aligned memory */
> /* @} *//* Surface flags */
> 
> /**
>diff -r 1fc2169984ad src/video/SDL_RLEaccel.c
>--- a/src/video/SDL_RLEaccel.c	Thu Jan 31 19:52:47 2019 -0400
>+++ b/src/video/SDL_RLEaccel.c	Fri Feb 01 15:18:37 2019 +0100
>@@ -1220,7 +1220,7 @@
> 
>     /* Now that we have it encoded, release the original pixels */
>     if (!(surface->flags & SDL_PREALLOC)) {
>-        SDL_free(surface->pixels);
>+        SDL_SIMDFree(surface->pixels);
>         surface->pixels = NULL;
>     }
> 
>@@ -1383,7 +1383,7 @@
> 
>     /* Now that we have it encoded, release the original pixels */
>     if (!(surface->flags & SDL_PREALLOC)) {
>-        SDL_free(surface->pixels);
>+        SDL_SIMDFree(surface->pixels);
>         surface->pixels = NULL;
>     }
> 
>@@ -1484,7 +1484,7 @@
>         uncopy_opaque = uncopy_transl = uncopy_32;
>     }
> 
>-    surface->pixels = SDL_malloc(surface->h * surface->pitch);
>+    surface->pixels = SDL_SIMDAlloc(surface->h * surface->pitch);
>     if (!surface->pixels) {
>         return (SDL_FALSE);
>     }
>@@ -1549,7 +1549,7 @@
>                 SDL_Rect full;
> 
>                 /* re-create the original surface */
>-                surface->pixels = SDL_malloc(surface->h * surface->pitch);
>+                surface->pixels = SDL_SIMDAlloc(surface->h * surface->pitch);
>                 if (!surface->pixels) {
>                     /* Oh crap... */
>                     surface->flags |= SDL_RLEACCEL;
>diff -r 1fc2169984ad src/video/SDL_surface.c
>--- a/src/video/SDL_surface.c	Thu Jan 31 19:52:47 2019 -0400
>+++ b/src/video/SDL_surface.c	Fri Feb 01 15:18:37 2019 +0100
>@@ -120,7 +120,7 @@
>             return NULL;
>         }
> 
>-        surface->pixels = SDL_malloc((size_t)size);
>+        surface->pixels = SDL_SIMDAlloc((size_t)size);
>         if (!surface->pixels) {
>             SDL_FreeSurface(surface);
>             SDL_OutOfMemory();
>@@ -1259,14 +1259,8 @@
>         SDL_FreeFormat(surface->format);
>         surface->format = NULL;
>     }
>-    if (surface->flags & SDL_PREALLOC) {
>-        /* Don't free */
>-    } else if (surface->flags & SDL_MEMALIGNED) {
>-        /* Free aligned */
>+    if (!(surface->flags & SDL_PREALLOC)) {
>         SDL_SIMDFree(surface->pixels);
>-    } else {
>-        /* Normal */
>-        SDL_free(surface->pixels);
>     }
>     if (surface->map) {
>         SDL_FreeBlitMap(surface->map);

Actions: View | Diff

Attachments on bug 4484: 3590

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.