Cleanup add brace (#6545)

* Add braces after if conditions * More add braces after if conditions * Add braces after while() conditions * Fix compilation because of macro being modified * Add braces to for loop * Add braces after if/goto * Move comments up * Remove extra () in the 'return ...;' statements * More remove extra () in the 'return ...;' statements * More remove extra () in the 'return ...;' statements after merge * Fix inconsistent patterns are xxx == NULL vs !xxx * More "{}" for "if() break;" and "if() continue;" * More "{}" after if() short statement * More "{}" after "if () return;" statement * More fix inconsistent patterns are xxx == NULL vs !xxx * Revert some modificaion on SDL_RLEaccel.c * SDL_RLEaccel: no short statement * Cleanup 'if' where the bracket is in a new line * Cleanup 'while' where the bracket is in a new line * Cleanup 'for' where the bracket is in a new line * Cleanup 'else' where the bracket is in a new line (cherry picked from commit 6a2200823c to reduce conflicts merging between SDL2 and SDL3)
2026-07-15 13:40:35 +00:00 · 2022-11-27 17:38:43 +01:00
parent 0739d237ad
commit fb0ce375f0
386 changed files with 6103 additions and 4637 deletions
--- a/src/render/SDL_render.c
+++ b/src/render/SDL_render.c
@@ -336,7 +336,7 @@ AllocateRenderCommand(SDL_Renderer *renderer)
        retval->next = NULL;
    } else {
        retval = SDL_calloc(1, sizeof (*retval));
-        if (!retval) {
+        if (retval == NULL) {
            SDL_OutOfMemory();
            return NULL;
        }
@@ -969,7 +969,7 @@ SDL_CreateRenderer(SDL_Window * window, int index, Uint32 flags)
    Android_ActivityMutex_Lock_Running();
 #endif

-    if (!window) {
+    if (window == NULL) {
        SDL_InvalidParamError("window");
        goto error;
    }
@@ -1005,7 +1005,7 @@ SDL_CreateRenderer(SDL_Window * window, int index, Uint32 flags)
            }
        }

-        if (!renderer) {
+        if (renderer == NULL) {
            for (index = 0; index < n; ++index) {
                const SDL_RenderDriver *driver = render_drivers[index];

@@ -1019,7 +1019,7 @@ SDL_CreateRenderer(SDL_Window * window, int index, Uint32 flags)
                }
            }
        }
-        if (!renderer) {
+        if (renderer == NULL) {
            SDL_SetError("Couldn't find matching render driver");
            goto error;
        }
@@ -1032,7 +1032,7 @@ SDL_CreateRenderer(SDL_Window * window, int index, Uint32 flags)
        /* Create a new renderer instance */
        renderer = render_drivers[index]->CreateRenderer(window, flags);
        batching = SDL_FALSE;
-        if (!renderer) {
+        if (renderer == NULL) {
            goto error;
        }
    }
@@ -1257,7 +1257,7 @@ static SDL_ScaleMode SDL_GetScaleMode(void)
 {
    const char *hint = SDL_GetHint(SDL_HINT_RENDER_SCALE_QUALITY);

-    if (!hint || SDL_strcasecmp(hint, "nearest") == 0) {
+    if (hint == NULL || SDL_strcasecmp(hint, "nearest") == 0) {
        return SDL_ScaleModeNearest;
    } else if (SDL_strcasecmp(hint, "linear") == 0) {
        return SDL_ScaleModeLinear;
@@ -1299,7 +1299,7 @@ SDL_CreateTexture(SDL_Renderer * renderer, Uint32 format, int access, int w, int
        return NULL;
    }
    texture = (SDL_Texture *) SDL_calloc(1, sizeof(*texture));
-    if (!texture) {
+    if (texture == NULL) {
        SDL_OutOfMemory();
        return NULL;
    }
@@ -1391,7 +1391,7 @@ SDL_CreateTextureFromSurface(SDL_Renderer * renderer, SDL_Surface * surface)

    CHECK_RENDERER_MAGIC(renderer, NULL);

-    if (!surface) {
+    if (surface == NULL) {
        SDL_InvalidParamError("SDL_CreateTextureFromSurface(): surface");
        return NULL;
    }
@@ -1455,7 +1455,7 @@ SDL_CreateTextureFromSurface(SDL_Renderer * renderer, SDL_Surface * surface)

    texture = SDL_CreateTexture(renderer, format, SDL_TEXTUREACCESS_STATIC,
                                surface->w, surface->h);
-    if (!texture) {
+    if (texture == NULL) {
        return NULL;
    }

@@ -1499,7 +1499,7 @@ SDL_CreateTextureFromSurface(SDL_Renderer * renderer, SDL_Surface * surface)

        /* Set up a destination surface for the texture update */
        dst_fmt = SDL_AllocFormat(format);
-        if (!dst_fmt) {
+        if (dst_fmt == NULL) {
           SDL_DestroyTexture(texture);
           return NULL;
        }
@@ -1730,7 +1730,7 @@ SDL_UpdateTextureYUV(SDL_Texture * texture, const SDL_Rect * rect,
        const size_t alloclen = rect->h * temp_pitch;
        if (alloclen > 0) {
            void *temp_pixels = SDL_malloc(alloclen);
-            if (!temp_pixels) {
+            if (temp_pixels == NULL) {
                return SDL_OutOfMemory();
            }
            SDL_SW_CopyYUVToRGB(texture->yuv, rect, native->format,
@@ -1771,7 +1771,7 @@ SDL_UpdateTextureNative(SDL_Texture * texture, const SDL_Rect * rect,
        const size_t alloclen = rect->h * temp_pitch;
        if (alloclen > 0) {
            void *temp_pixels = SDL_malloc(alloclen);
-            if (!temp_pixels) {
+            if (temp_pixels == NULL) {
                return SDL_OutOfMemory();
            }
            SDL_ConvertPixels(rect->w, rect->h,
@@ -1792,7 +1792,7 @@ SDL_UpdateTexture(SDL_Texture * texture, const SDL_Rect * rect,

    CHECK_TEXTURE_MAGIC(texture, -1);

-    if (!pixels) {
+    if (pixels == NULL) {
        return SDL_InvalidParamError("pixels");
    }
    if (!pitch) {
@@ -1867,7 +1867,7 @@ SDL_UpdateTextureYUVPlanar(SDL_Texture * texture, const SDL_Rect * rect,
        const size_t alloclen = rect->h * temp_pitch;
        if (alloclen > 0) {
            void *temp_pixels = SDL_malloc(alloclen);
-            if (!temp_pixels) {
+            if (temp_pixels == NULL) {
                return SDL_OutOfMemory();
            }
            SDL_SW_CopyYUVToRGB(texture->yuv, rect, native->format,
@@ -1918,7 +1918,7 @@ SDL_UpdateTextureNVPlanar(SDL_Texture * texture, const SDL_Rect * rect,
        const size_t alloclen = rect->h * temp_pitch;
        if (alloclen > 0) {
            void *temp_pixels = SDL_malloc(alloclen);
-            if (!temp_pixels) {
+            if (temp_pixels == NULL) {
                return SDL_OutOfMemory();
            }
            SDL_SW_CopyYUVToRGB(texture->yuv, rect, native->format,
@@ -1944,19 +1944,19 @@ int SDL_UpdateYUVTexture(SDL_Texture * texture, const SDL_Rect * rect,

    CHECK_TEXTURE_MAGIC(texture, -1);

-    if (!Yplane) {
+    if (Yplane == NULL) {
        return SDL_InvalidParamError("Yplane");
    }
    if (!Ypitch) {
        return SDL_InvalidParamError("Ypitch");
    }
-    if (!Uplane) {
+    if (Uplane == NULL) {
        return SDL_InvalidParamError("Uplane");
    }
    if (!Upitch) {
        return SDL_InvalidParamError("Upitch");
    }
-    if (!Vplane) {
+    if (Vplane == NULL) {
        return SDL_InvalidParamError("Vplane");
    }
    if (!Vpitch) {
@@ -2010,13 +2010,13 @@ int SDL_UpdateNVTexture(SDL_Texture * texture, const SDL_Rect * rect,

    CHECK_TEXTURE_MAGIC(texture, -1);

-    if (!Yplane) {
+    if (Yplane == NULL) {
        return SDL_InvalidParamError("Yplane");
    }
    if (!Ypitch) {
        return SDL_InvalidParamError("Ypitch");
    }
-    if (!UVplane) {
+    if (UVplane == NULL) {
        return SDL_InvalidParamError("UVplane");
    }
    if (!UVpitch) {
@@ -2095,7 +2095,7 @@ SDL_LockTexture(SDL_Texture * texture, const SDL_Rect * rect,
        return SDL_SetError("SDL_LockTexture(): texture must be streaming");
    }

-    if (!rect) {
+    if (rect == NULL) {
        full_rect.x = 0;
        full_rect.y = 0;
        full_rect.w = texture->w;
@@ -2230,7 +2230,7 @@ SDL_UnlockTexture(SDL_Texture * texture)
 SDL_bool
 SDL_RenderTargetSupported(SDL_Renderer *renderer)
 {
-    if (!renderer || !renderer->SetRenderTarget) {
+    if (renderer == NULL || !renderer->SetRenderTarget) {
        return SDL_FALSE;
    }
    return (renderer->info.flags & SDL_RENDERER_TARGETTEXTURE) != 0;
@@ -2344,7 +2344,7 @@ UpdateLogicalSize(SDL_Renderer *renderer, SDL_bool flush_viewport_cmd)
    }

    hint = SDL_GetHint(SDL_HINT_RENDER_LOGICAL_SIZE_MODE);
-    if (hint && (*hint == '1' || SDL_strcasecmp(hint, "overscan") == 0))  {
+    if (hint && (*hint == '1' || SDL_strcasecmp(hint, "overscan") == 0)) {
 #if SDL_VIDEO_RENDER_D3D
        SDL_bool overscan_supported = SDL_TRUE;
        /* Unfortunately, Direct3D 9 doesn't support negative viewport numbers
@@ -2742,7 +2742,7 @@ RenderDrawPointsWithRects(SDL_Renderer * renderer,
    }

    frects = SDL_small_alloc(SDL_FRect, count, &isstack);
-    if (!frects) {
+    if (frects == NULL) {
        return SDL_OutOfMemory();
    }

@@ -2771,7 +2771,7 @@ SDL_RenderDrawPoints(SDL_Renderer * renderer,

    CHECK_RENDERER_MAGIC(renderer, -1);

-    if (!points) {
+    if (points == NULL) {
        return SDL_InvalidParamError("SDL_RenderDrawPoints(): points");
    }
    if (count < 1) {
@@ -2789,7 +2789,7 @@ SDL_RenderDrawPoints(SDL_Renderer * renderer,
        retval = RenderDrawPointsWithRects(renderer, points, count);
    } else {
        fpoints = SDL_small_alloc(SDL_FPoint, count, &isstack);
-        if (!fpoints) {
+        if (fpoints == NULL) {
            return SDL_OutOfMemory();
        }
        for (i = 0; i < count; ++i) {
@@ -2818,7 +2818,7 @@ RenderDrawPointsWithRectsF(SDL_Renderer * renderer,
    }

    frects = SDL_small_alloc(SDL_FRect, count, &isstack);
-    if (!frects) {
+    if (frects == NULL) {
        return SDL_OutOfMemory();
    }

@@ -2844,7 +2844,7 @@ SDL_RenderDrawPointsF(SDL_Renderer * renderer,

    CHECK_RENDERER_MAGIC(renderer, -1);

-    if (!points) {
+    if (points == NULL) {
        return SDL_InvalidParamError("SDL_RenderDrawPointsF(): points");
    }
    if (count < 1) {
@@ -2938,7 +2938,7 @@ static int RenderDrawLineBresenham(SDL_Renderer *renderer, int x1, int y1, int x
    }

    points = SDL_small_alloc(SDL_FPoint, numpixels, &isstack);
-    if (!points) {
+    if (points == NULL) {
        return SDL_OutOfMemory();
    }
    for (i = 0; i < numpixels; ++i) {
@@ -2982,7 +2982,7 @@ RenderDrawLinesWithRectsF(SDL_Renderer * renderer,
    SDL_bool draw_last = SDL_FALSE;

    frects = SDL_small_alloc(SDL_FRect, count-1, &isstack);
-    if (!frects) {
+    if (frects == NULL) {
        return SDL_OutOfMemory();
    }

@@ -3053,7 +3053,7 @@ SDL_RenderDrawLines(SDL_Renderer * renderer,

    CHECK_RENDERER_MAGIC(renderer, -1);

-    if (!points) {
+    if (points == NULL) {
        return SDL_InvalidParamError("SDL_RenderDrawLines(): points");
    }
    if (count < 2) {
@@ -3068,7 +3068,7 @@ SDL_RenderDrawLines(SDL_Renderer * renderer,
 #endif

    fpoints = SDL_small_alloc(SDL_FPoint, count, &isstack);
-    if (!fpoints) {
+    if (fpoints == NULL) {
        return SDL_OutOfMemory();
    }

@@ -3092,7 +3092,7 @@ SDL_RenderDrawLinesF(SDL_Renderer * renderer,

    CHECK_RENDERER_MAGIC(renderer, -1);

-    if (!points) {
+    if (points == NULL) {
        return SDL_InvalidParamError("SDL_RenderDrawLinesF(): points");
    }
    if (count < 2) {
@@ -3266,7 +3266,7 @@ SDL_RenderDrawRectF(SDL_Renderer * renderer, const SDL_FRect * rect)
    CHECK_RENDERER_MAGIC(renderer, -1);

    /* If 'rect' == NULL, then outline the whole surface */
-    if (!rect) {
+    if (rect == NULL) {
        RenderGetViewportSize(renderer, &frect);
        rect = &frect;
    }
@@ -3292,7 +3292,7 @@ SDL_RenderDrawRects(SDL_Renderer * renderer,

    CHECK_RENDERER_MAGIC(renderer, -1);

-    if (!rects) {
+    if (rects == NULL) {
        return SDL_InvalidParamError("SDL_RenderDrawRects(): rects");
    }
    if (count < 1) {
@@ -3322,7 +3322,7 @@ SDL_RenderDrawRectsF(SDL_Renderer * renderer,

    CHECK_RENDERER_MAGIC(renderer, -1);

-    if (!rects) {
+    if (rects == NULL) {
        return SDL_InvalidParamError("SDL_RenderDrawRectsF(): rects");
    }
    if (count < 1) {
@@ -3371,7 +3371,7 @@ SDL_RenderFillRectF(SDL_Renderer * renderer, const SDL_FRect * rect)
    CHECK_RENDERER_MAGIC(renderer, -1);

    /* If 'rect' == NULL, then outline the whole surface */
-    if (!rect) {
+    if (rect == NULL) {
        RenderGetViewportSize(renderer, &frect);
        rect = &frect;
    }
@@ -3389,7 +3389,7 @@ SDL_RenderFillRects(SDL_Renderer * renderer,

    CHECK_RENDERER_MAGIC(renderer, -1);

-    if (!rects) {
+    if (rects == NULL) {
        return SDL_InvalidParamError("SDL_RenderFillRects(): rects");
    }
    if (count < 1) {
@@ -3404,7 +3404,7 @@ SDL_RenderFillRects(SDL_Renderer * renderer,
 #endif

    frects = SDL_small_alloc(SDL_FRect, count, &isstack);
-    if (!frects) {
+    if (frects == NULL) {
        return SDL_OutOfMemory();
    }
    for (i = 0; i < count; ++i) {
@@ -3432,7 +3432,7 @@ SDL_RenderFillRectsF(SDL_Renderer * renderer,

    CHECK_RENDERER_MAGIC(renderer, -1);

-    if (!rects) {
+    if (rects == NULL) {
        return SDL_InvalidParamError("SDL_RenderFillRectsF(): rects");
    }
    if (count < 1) {
@@ -3447,7 +3447,7 @@ SDL_RenderFillRectsF(SDL_Renderer * renderer,
 #endif

    frects = SDL_small_alloc(SDL_FRect, count, &isstack);
-    if (!frects) {
+    if (frects == NULL) {
        return SDL_OutOfMemory();
    }
    for (i = 0; i < count; ++i) {
@@ -3999,7 +3999,7 @@ SDL_SW_RenderGeometryRaw(SDL_Renderer *renderer,
            x2 = xy2_[0]; y2 = xy2_[1];

            /* Check if triangle A B C is rectangle */
-            if ((x0 == x2 && y1 == y2) || (y0 == y2 && x1 == x2)){
+            if ((x0 == x2 && y1 == y2) || (y0 == y2 && x1 == x2)) {
                /* ok */
            } else {
                is_quad = 0;
@@ -4012,7 +4012,7 @@ SDL_SW_RenderGeometryRaw(SDL_Renderer *renderer,
            x2 = xy2_[0]; y2 = xy2_[1];

            /* Check if triangle A B C2 is rectangle */
-            if ((x0 == x2 && y1 == y2) || (y0 == y2 && x1 == x2)){
+            if ((x0 == x2 && y1 == y2) || (y0 == y2 && x1 == x2)) {
                /* ok */
            } else {
                is_quad = 0;
@@ -4121,7 +4121,7 @@ SDL_SW_RenderGeometryRaw(SDL_Renderer *renderer,
            prev[1] = k1;
            prev[2] = k2;
        }
-    } /* End for(), next triangle */
+    } /* End for (), next triangle */

    if (prev[0] != -1) {
        /* flush the last triangle */
@@ -4173,15 +4173,15 @@ SDL_RenderGeometryRaw(SDL_Renderer *renderer,
        }
    }

-    if (!xy) {
+    if (xy == NULL) {
        return SDL_InvalidParamError("xy");
    }

-    if (!color) {
+    if (color == NULL) {
        return SDL_InvalidParamError("color");
    }

-    if (texture && !uv) {
+    if (texture && uv == NULL) {
        return SDL_InvalidParamError("uv");
    }

--- a/src/render/SDL_yuv_sw.c
+++ b/src/render/SDL_yuv_sw.c
@@ -49,7 +49,7 @@ SDL_SW_CreateYUVTexture(Uint32 format, int w, int h)
    }

    swdata = (SDL_SW_YUVTexture *) SDL_calloc(1, sizeof(*swdata));
-    if (!swdata) {
+    if (swdata == NULL) {
        SDL_OutOfMemory();
        return NULL;
    }
@@ -125,7 +125,7 @@ SDL_SW_CreateYUVTexture(Uint32 format, int w, int h)
    }

    /* We're all done.. */
-    return (swdata);
+    return swdata;
 }

 int
@@ -346,8 +346,7 @@ SDL_SW_LockYUVTexture(SDL_SW_YUVTexture * swdata, const SDL_Rect * rect,
        if (rect
            && (rect->x != 0 || rect->y != 0 || rect->w != swdata->w
                || rect->h != swdata->h)) {
-            return SDL_SetError
-                ("YV12, IYUV, NV12, NV21 textures only support full surface locks");
+            return SDL_SetError("YV12, IYUV, NV12, NV21 textures only support full surface locks");
        }
        break;
    }
@@ -407,7 +406,7 @@ SDL_SW_CopyYUVToRGB(SDL_SW_YUVTexture * swdata, const SDL_Rect * srcrect,
                SDL_CreateRGBSurfaceFrom(pixels, w, h, bpp, pitch, Rmask,
                                         Gmask, Bmask, Amask);
            if (!swdata->display) {
-                return (-1);
+                return -1;
            }
        }
        if (!swdata->stretch) {
@@ -418,7 +417,7 @@ SDL_SW_CopyYUVToRGB(SDL_SW_YUVTexture * swdata, const SDL_Rect * srcrect,
                SDL_CreateRGBSurface(0, swdata->w, swdata->h, bpp, Rmask,
                                     Gmask, Bmask, Amask);
            if (!swdata->stretch) {
-                return (-1);
+                return -1;
            }
        }
        pixels = swdata->stretch->pixels;
--- a/src/render/direct3d/SDL_render_d3d.c
+++ b/src/render/direct3d/SDL_render_d3d.c
@@ -551,7 +551,7 @@ D3D_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
    DWORD usage;

    texturedata = (D3D_TextureData *) SDL_calloc(1, sizeof(*texturedata));
-    if (!texturedata) {
+    if (texturedata == NULL) {
        return SDL_OutOfMemory();
    }
    texturedata->scaleMode = (texture->scaleMode == SDL_ScaleModeNearest) ? D3DTEXF_POINT : D3DTEXF_LINEAR;
@@ -590,7 +590,7 @@ D3D_RecreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
    D3D_RenderData *data = (D3D_RenderData *)renderer->driverdata;
    D3D_TextureData *texturedata = (D3D_TextureData *)texture->driverdata;

-    if (!texturedata) {
+    if (texturedata == NULL) {
        return 0;
    }

@@ -618,7 +618,7 @@ D3D_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
    D3D_RenderData *data = (D3D_RenderData *)renderer->driverdata;
    D3D_TextureData *texturedata = (D3D_TextureData *) texture->driverdata;

-    if (!texturedata) {
+    if (texturedata == NULL) {
        return SDL_SetError("Texture is not currently available");
    }

@@ -655,7 +655,7 @@ D3D_UpdateTextureYUV(SDL_Renderer * renderer, SDL_Texture * texture,
    D3D_RenderData *data = (D3D_RenderData *)renderer->driverdata;
    D3D_TextureData *texturedata = (D3D_TextureData *) texture->driverdata;

-    if (!texturedata) {
+    if (texturedata == NULL) {
        return SDL_SetError("Texture is not currently available");
    }

@@ -680,7 +680,7 @@ D3D_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
    D3D_TextureData *texturedata = (D3D_TextureData *)texture->driverdata;
    IDirect3DDevice9 *device = data->device;

-    if (!texturedata) {
+    if (texturedata == NULL) {
        return SDL_SetError("Texture is not currently available");
    }
 #if SDL_HAVE_YUV
@@ -731,7 +731,7 @@ D3D_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture)
    D3D_RenderData *data = (D3D_RenderData *)renderer->driverdata;
    D3D_TextureData *texturedata = (D3D_TextureData *)texture->driverdata;

-    if (!texturedata) {
+    if (texturedata == NULL) {
        return;
    }
 #if SDL_HAVE_YUV
@@ -741,8 +741,7 @@ D3D_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture)
            (void *) ((Uint8 *) texturedata->pixels + rect->y * texturedata->pitch +
                      rect->x * SDL_BYTESPERPIXEL(texture->format));
        D3D_UpdateTexture(renderer, texture, rect, pixels, texturedata->pitch);
-    }
-    else
+    } else
 #endif
    {
        IDirect3DTexture9_UnlockRect(texturedata->texture.staging, 0);
@@ -761,7 +760,7 @@ D3D_SetTextureScaleMode(SDL_Renderer * renderer, SDL_Texture * texture, SDL_Scal
 {
    D3D_TextureData *texturedata = (D3D_TextureData *)texture->driverdata;

-    if (!texturedata) {
+    if (texturedata == NULL) {
        return;
    }

@@ -789,7 +788,7 @@ D3D_SetRenderTargetInternal(SDL_Renderer * renderer, SDL_Texture * texture)
    }

    texturedata = (D3D_TextureData *)texture->driverdata;
-    if (!texturedata) {
+    if (texturedata == NULL) {
        return SDL_SetError("Texture is not currently available");
    }

@@ -812,11 +811,11 @@ D3D_SetRenderTargetInternal(SDL_Renderer * renderer, SDL_Texture * texture)
    }

    result = IDirect3DTexture9_GetSurfaceLevel(texturedata->texture.texture, 0, &data->currentRenderTarget);
-    if(FAILED(result)) {
+    if (FAILED(result)) {
        return D3D_SetError("GetSurfaceLevel()", result);
    }
    result = IDirect3DDevice9_SetRenderTarget(data->device, 0, data->currentRenderTarget);
-    if(FAILED(result)) {
+    if (FAILED(result)) {
        return D3D_SetError("SetRenderTarget()", result);
    }

@@ -848,7 +847,7 @@ D3D_QueueDrawPoints(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_F
    Vertex *verts = (Vertex *) SDL_AllocateRenderVertices(renderer, vertslen, 0, &cmd->data.draw.first);
    int i;

-    if (!verts) {
+    if (verts == NULL) {
        return -1;
    }

@@ -874,7 +873,7 @@ D3D_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *t
    int count = indices ? num_indices : num_vertices;
    Vertex *verts = (Vertex *) SDL_AllocateRenderVertices(renderer, count * sizeof (Vertex), 0, &cmd->data.draw.first);

-    if (!verts) {
+    if (verts == NULL) {
        return -1;
    }

@@ -974,7 +973,7 @@ SetupTextureState(D3D_RenderData *data, SDL_Texture * texture, LPDIRECT3DPIXELSH

    SDL_assert(*shader == NULL);

-    if (!texturedata) {
+    if (texturedata == NULL) {
        return SDL_SetError("Texture is not currently available");
    }

@@ -1031,7 +1030,7 @@ SetDrawState(D3D_RenderData *data, const SDL_RenderCommand *cmd)
            IDirect3DDevice9_SetTexture(data->device, 0, NULL);
        }
 #if SDL_HAVE_YUV
-        if ((!newtexturedata || !newtexturedata->yuv) && (oldtexturedata && oldtexturedata->yuv)) {
+        if ((newtexturedata == NULL || !newtexturedata->yuv) && (oldtexturedata && oldtexturedata->yuv)) {
            IDirect3DDevice9_SetTexture(data->device, 1, NULL);
            IDirect3DDevice9_SetTexture(data->device, 2, NULL);
        }
@@ -1422,7 +1421,7 @@ D3D_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture)
 #endif
    }

-    if (!data) {
+    if (data == NULL) {
        return;
    }

@@ -1597,13 +1596,13 @@ D3D_CreateRenderer(SDL_Window * window, Uint32 flags)
    int displayIndex;

    renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));
-    if (!renderer) {
+    if (renderer == NULL) {
        SDL_OutOfMemory();
        return NULL;
    }

    data = (D3D_RenderData *) SDL_calloc(1, sizeof(*data));
-    if (!data) {
+    if (data == NULL) {
        SDL_free(renderer);
        SDL_OutOfMemory();
        return NULL;
--- a/src/render/direct3d11/SDL_render_d3d11.c
+++ b/src/render/direct3d11/SDL_render_d3d11.c
@@ -391,7 +391,7 @@ D3D11_CreateBlendState(SDL_Renderer * renderer, SDL_BlendMode blendMode)
    }

    blendModes = (D3D11_BlendMode *)SDL_realloc(data->blendModes, (data->blendModesCount + 1) * sizeof(*blendModes));
-    if (!blendModes) {
+    if (blendModes == NULL) {
        SAFE_RELEASE(blendState);
        SDL_OutOfMemory();
        return NULL;
@@ -450,7 +450,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
    }

    CreateDXGIFactoryFunc = (PFN_CREATE_DXGI_FACTORY)SDL_LoadFunction(data->hDXGIMod, "CreateDXGIFactory");
-    if (!CreateDXGIFactoryFunc) {
+    if (CreateDXGIFactoryFunc == NULL) {
        result = E_FAIL;
        goto done;
    }
@@ -1102,7 +1102,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
    }

    textureData = (D3D11_TextureData*) SDL_calloc(1, sizeof(*textureData));
-    if (!textureData) {
+    if (textureData == NULL) {
        SDL_OutOfMemory();
        return -1;
    }
@@ -1272,7 +1272,7 @@ D3D11_DestroyTexture(SDL_Renderer * renderer,
 {
    D3D11_TextureData *data = (D3D11_TextureData *)texture->driverdata;

-    if (!data) {
+    if (data == NULL) {
        return;
    }

@@ -1382,7 +1382,7 @@ D3D11_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
    D3D11_RenderData *rendererData = (D3D11_RenderData *)renderer->driverdata;
    D3D11_TextureData *textureData = (D3D11_TextureData *)texture->driverdata;

-    if (!textureData) {
+    if (textureData == NULL) {
        return SDL_SetError("Texture is not currently available");
    }

@@ -1428,7 +1428,7 @@ D3D11_UpdateTextureYUV(SDL_Renderer * renderer, SDL_Texture * texture,
    D3D11_RenderData *rendererData = (D3D11_RenderData *)renderer->driverdata;
    D3D11_TextureData *textureData = (D3D11_TextureData *)texture->driverdata;

-    if (!textureData) {
+    if (textureData == NULL) {
        return SDL_SetError("Texture is not currently available");
    }

@@ -1453,7 +1453,7 @@ D3D11_UpdateTextureNV(SDL_Renderer * renderer, SDL_Texture * texture,
    D3D11_RenderData *rendererData = (D3D11_RenderData *)renderer->driverdata;
    D3D11_TextureData *textureData = (D3D11_TextureData *)texture->driverdata;

-    if (!textureData) {
+    if (textureData == NULL) {
        return SDL_SetError("Texture is not currently available");
    }

@@ -1478,7 +1478,7 @@ D3D11_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
    D3D11_TEXTURE2D_DESC stagingTextureDesc;
    D3D11_MAPPED_SUBRESOURCE textureMemory;

-    if (!textureData) {
+    if (textureData == NULL) {
        return SDL_SetError("Texture is not currently available");
    }
 #if SDL_HAVE_YUV
@@ -1559,7 +1559,7 @@ D3D11_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture)
    D3D11_RenderData *rendererData = (D3D11_RenderData *) renderer->driverdata;
    D3D11_TextureData *textureData = (D3D11_TextureData *) texture->driverdata;
    
-    if (!textureData) {
+    if (textureData == NULL) {
        return;
    }
 #if SDL_HAVE_YUV
@@ -1596,7 +1596,7 @@ D3D11_SetTextureScaleMode(SDL_Renderer * renderer, SDL_Texture * texture, SDL_Sc
 {
    D3D11_TextureData *textureData = (D3D11_TextureData *) texture->driverdata;
    
-    if (!textureData) {
+    if (textureData == NULL) {
        return;
    }

@@ -1642,7 +1642,7 @@ D3D11_QueueDrawPoints(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL
    color.b = cmd->data.draw.b;
    color.a = cmd->data.draw.a;

-    if (!verts) {
+    if (verts == NULL) {
        return -1;
    }

@@ -1670,7 +1670,7 @@ D3D11_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture
    int count = indices ? num_indices : num_vertices;
    VertexPositionColor *verts = (VertexPositionColor *) SDL_AllocateRenderVertices(renderer, count * sizeof (VertexPositionColor), 0, &cmd->data.draw.first);

-    if (!verts) {
+    if (verts == NULL) {
        return -1;
    }

@@ -1882,8 +1882,7 @@ D3D11_GetCurrentRenderTargetView(SDL_Renderer * renderer)
    D3D11_RenderData *data = (D3D11_RenderData *)renderer->driverdata;
    if (data->currentOffscreenRenderTargetView) {
        return data->currentOffscreenRenderTargetView;
-    }
-    else {
+    } else {
        return data->mainRenderTargetView;
    }
 }
@@ -1951,9 +1950,9 @@ D3D11_SetDrawState(SDL_Renderer * renderer, const SDL_RenderCommand *cmd, ID3D11
                break;
            }
        }
-        if (!blendState) {
+        if (blendState == NULL) {
            blendState = D3D11_CreateBlendState(renderer, blendMode);
-            if (!blendState) {
+            if (blendState == NULL) {
                return -1;
            }
        }
@@ -2369,13 +2368,13 @@ D3D11_CreateRenderer(SDL_Window * window, Uint32 flags)
    D3D11_RenderData *data;

    renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));
-    if (!renderer) {
+    if (renderer == NULL) {
        SDL_OutOfMemory();
        return NULL;
    }

    data = (D3D11_RenderData *) SDL_calloc(1, sizeof(*data));
-    if (!data) {
+    if (data == NULL) {
        SDL_free(renderer);
        SDL_OutOfMemory();
        return NULL;
--- a/src/render/direct3d11/SDL_render_winrt.cpp
+++ b/src/render/direct3d11/SDL_render_winrt.cpp
@@ -47,7 +47,7 @@ extern "C" void *
 D3D11_GetCoreWindowFromSDLRenderer(SDL_Renderer * renderer)
 {
    SDL_Window * sdlWindow = renderer->window;
-    if ( ! renderer->window ) {
+    if (renderer->window == NULL) {
        return NULL;
    }

--- a/src/render/direct3d12/SDL_render_d3d12.c
+++ b/src/render/direct3d12/SDL_render_d3d12.c
@@ -268,7 +268,7 @@ static const GUID SDL_IID_ID3D12InfoQueue = { 0x0742a90b, 0xc387, 0x483f, { 0xb9
 UINT
 D3D12_Align(UINT location, UINT alignment)
 {
-    return ((location + (alignment - 1)) & ~(alignment - 1));
+    return (location + (alignment - 1)) & ~(alignment - 1);
 }

 Uint32
@@ -404,8 +404,7 @@ D3D12_CPUtoGPUHandle(ID3D12DescriptorHeap * heap, D3D12_CPU_DESCRIPTOR_HANDLE CP
 static void
 D3D12_WaitForGPU(D3D12_RenderData * data)
 {
-    if (data->commandQueue && data->fence && data->fenceEvent)
-    {
+    if (data->commandQueue && data->fence && data->fenceEvent) {
        D3D_CALL(data->commandQueue, Signal, data->fence, data->fenceValue);
        if (D3D_CALL(data->fence, GetCompletedValue) < data->fenceValue) {
            D3D_CALL(data->fence, SetEventOnCompletion,
@@ -648,7 +647,7 @@ D3D12_CreatePipelineState(SDL_Renderer * renderer,
    }

    pipelineStates = (D3D12_PipelineState*)SDL_realloc(data->pipelineStates, (data->pipelineStateCount + 1) * sizeof(*pipelineStates));
-    if (!pipelineStates) {
+    if (pipelineStates == NULL) {
        SAFE_RELEASE(pipelineState);
        SDL_OutOfMemory();
        return NULL;
@@ -766,7 +765,7 @@ D3D12_CreateDeviceResources(SDL_Renderer* renderer)
        }
    }
 #endif
-    if (!CreateEventExFunc) {
+    if (CreateEventExFunc == NULL) {
        result = E_FAIL;
        goto done;
    }
@@ -779,7 +778,7 @@ D3D12_CreateDeviceResources(SDL_Renderer* renderer)
    }

    CreateDXGIFactoryFunc = (PFN_CREATE_DXGI_FACTORY)SDL_LoadFunction(data->hDXGIMod, "CreateDXGIFactory2");
-    if (!CreateDXGIFactoryFunc) {
+    if (CreateDXGIFactoryFunc == NULL) {
        result = E_FAIL;
        goto done;
    }
@@ -823,7 +822,7 @@ D3D12_CreateDeviceResources(SDL_Renderer* renderer)

        /* If the debug hint is set, also create the DXGI factory in debug mode */
        DXGIGetDebugInterfaceFunc = (PFN_CREATE_DXGI_FACTORY)SDL_LoadFunction(data->hDXGIMod, "DXGIGetDebugInterface1");
-        if (!DXGIGetDebugInterfaceFunc) {
+        if (DXGIGetDebugInterfaceFunc == NULL) {
            result = E_FAIL;
            goto done;
        }
@@ -1474,12 +1473,11 @@ D3D12_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
    D3D12_SHADER_RESOURCE_VIEW_DESC resourceViewDesc;

    if (textureFormat == DXGI_FORMAT_UNKNOWN) {
-        return SDL_SetError("%s, An unsupported SDL pixel format (0x%x) was specified",
-            __FUNCTION__, texture->format);
+        return SDL_SetError("%s, An unsupported SDL pixel format (0x%x) was specified", __FUNCTION__, texture->format);
    }

    textureData = (D3D12_TextureData*) SDL_calloc(1, sizeof(*textureData));
-    if (!textureData) {
+    if (textureData == NULL) {
        SDL_OutOfMemory();
        return -1;
    }
@@ -1666,7 +1664,7 @@ D3D12_DestroyTexture(SDL_Renderer * renderer,
    D3D12_RenderData *rendererData = (D3D12_RenderData*)renderer->driverdata;
    D3D12_TextureData *textureData = (D3D12_TextureData *)texture->driverdata;

-    if (!textureData) {
+    if (textureData == NULL) {
        return;
    }

@@ -1850,7 +1848,7 @@ D3D12_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
    D3D12_RenderData *rendererData = (D3D12_RenderData *)renderer->driverdata;
    D3D12_TextureData *textureData = (D3D12_TextureData *)texture->driverdata;

-    if (!textureData) {
+    if (textureData == NULL) {
        return SDL_SetError("Texture is not currently available");
    }

@@ -1896,7 +1894,7 @@ D3D12_UpdateTextureYUV(SDL_Renderer * renderer, SDL_Texture * texture,
    D3D12_RenderData *rendererData = (D3D12_RenderData *)renderer->driverdata;
    D3D12_TextureData *textureData = (D3D12_TextureData *)texture->driverdata;

-    if (!textureData) {
+    if (textureData == NULL) {
        return SDL_SetError("Texture is not currently available");
    }

@@ -1921,7 +1919,7 @@ D3D12_UpdateTextureNV(SDL_Renderer * renderer, SDL_Texture * texture,
    D3D12_RenderData *rendererData = (D3D12_RenderData *)renderer->driverdata;
    D3D12_TextureData *textureData = (D3D12_TextureData *)texture->driverdata;

-    if (!textureData) {
+    if (textureData == NULL) {
        return SDL_SetError("Texture is not currently available");
    }

@@ -1951,7 +1949,7 @@ D3D12_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
    BYTE *textureMemory;
    int bpp;

-    if (!textureData) {
+    if (textureData == NULL) {
        return SDL_SetError("Texture is not currently available");
    }
 #if SDL_HAVE_YUV
@@ -2043,8 +2041,7 @@ D3D12_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
    pitchedDesc.Depth = 1;
    if (pitchedDesc.Format == DXGI_FORMAT_R8_UNORM) {
        bpp = 1;
-    }
-    else {
+    } else {
        bpp = 4;
    }
    pitchedDesc.RowPitch = D3D12_Align(rect->w * bpp, D3D12_TEXTURE_DATA_PITCH_ALIGNMENT);
@@ -2075,7 +2072,7 @@ D3D12_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture)
    D3D12_TEXTURE_COPY_LOCATION dstLocation;
    int bpp;
    
-    if (!textureData) {
+    if (textureData == NULL) {
        return;
    }
 #if SDL_HAVE_YUV
@@ -2103,8 +2100,7 @@ D3D12_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture)
    pitchedDesc.Depth = 1;
    if (pitchedDesc.Format == DXGI_FORMAT_R8_UNORM) {
        bpp = 1;
-    }
-    else {
+    } else {
        bpp = 4;
    }
    pitchedDesc.RowPitch = D3D12_Align(textureData->lockedRect.w * bpp, D3D12_TEXTURE_DATA_PITCH_ALIGNMENT);
@@ -2149,7 +2145,7 @@ D3D12_SetTextureScaleMode(SDL_Renderer * renderer, SDL_Texture * texture, SDL_Sc
 {
    D3D12_TextureData *textureData = (D3D12_TextureData *) texture->driverdata;
    
-    if (!textureData) {
+    if (textureData == NULL) {
        return;
    }

@@ -2210,7 +2206,7 @@ D3D12_QueueDrawPoints(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL
    color.b = cmd->data.draw.b;
    color.a = cmd->data.draw.a;

-    if (!verts) {
+    if (verts == NULL) {
        return -1;
    }

@@ -2238,7 +2234,7 @@ D3D12_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture
    int count = indices ? num_indices : num_vertices;
    VertexPositionColor *verts = (VertexPositionColor *) SDL_AllocateRenderVertices(renderer, count * sizeof (VertexPositionColor), 0, &cmd->data.draw.first);

-    if (!verts) {
+    if (verts == NULL) {
        return -1;
    }

@@ -2614,8 +2610,8 @@ D3D12_SetCopyState(SDL_Renderer * renderer, const SDL_RenderCommand *cmd, const
        D3D12_TransitionResource(rendererData, textureData->mainTextureV, textureData->mainResourceStateV, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
        textureData->mainResourceStateV = D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE;

-        return D3D12_SetDrawState(renderer, cmd, shader, D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE,
-            SDL_arraysize(shaderResources), shaderResources, textureSampler, matrix);
+        return D3D12_SetDrawState(renderer, cmd, shader, D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE, SDL_arraysize(shaderResources), shaderResources,
+                                  textureSampler, matrix);
    } else if (textureData->nv12) {
        D3D12_CPU_DESCRIPTOR_HANDLE shaderResources[] = {
            textureData->mainTextureResourceView,
@@ -2643,14 +2639,14 @@ D3D12_SetCopyState(SDL_Renderer * renderer, const SDL_RenderCommand *cmd, const
        D3D12_TransitionResource(rendererData, textureData->mainTextureNV, textureData->mainResourceStateNV, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
        textureData->mainResourceStateNV = D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE;

-        return D3D12_SetDrawState(renderer, cmd, shader, D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE,
-            SDL_arraysize(shaderResources), shaderResources, textureSampler, matrix);
+        return D3D12_SetDrawState(renderer, cmd, shader, D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE, SDL_arraysize(shaderResources), shaderResources,
+                                  textureSampler, matrix);
    }
 #endif /* SDL_HAVE_YUV */
    D3D12_TransitionResource(rendererData, textureData->mainTexture, textureData->mainResourceState, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
    textureData->mainResourceState = D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE;
-    return D3D12_SetDrawState(renderer, cmd, SHADER_RGB, D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE,
-                              1, &textureData->mainTextureResourceView, textureSampler, matrix);
+    return D3D12_SetDrawState(renderer, cmd, SHADER_RGB, D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE, 1, &textureData->mainTextureResourceView,
+                              textureSampler, matrix);
 }

 static void
@@ -3045,13 +3041,13 @@ D3D12_CreateRenderer(SDL_Window * window, Uint32 flags)
    D3D12_RenderData *data;

    renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));
-    if (!renderer) {
+    if (renderer == NULL) {
        SDL_OutOfMemory();
        return NULL;
    }

    data = (D3D12_RenderData *) SDL_calloc(1, sizeof(*data));
-    if (!data) {
+    if (data == NULL) {
        SDL_free(renderer);
        SDL_OutOfMemory();
        return NULL;
--- a/src/render/opengl/SDL_render_gl.c
+++ b/src/render/opengl/SDL_render_gl.c
@@ -173,8 +173,7 @@ GL_ClearErrors(SDL_Renderer *renderer)
 {
    GL_RenderData *data = (GL_RenderData *) renderer->driverdata;

-    if (!data->debug_enabled)
-    {
+    if (!data->debug_enabled) {
        return;
    }
    if (data->GL_ARB_debug_output_supported) {
@@ -201,8 +200,7 @@ GL_CheckAllErrors (const char *prefix, SDL_Renderer *renderer, const char *file,
    GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
    int ret = 0;

-    if (!data->debug_enabled)
-    {
+    if (!data->debug_enabled) {
        return 0;
    }
    if (data->GL_ARB_debug_output_supported) {
@@ -313,7 +311,7 @@ GL_GetFBO(GL_RenderData *data, Uint32 w, Uint32 h)
        result = result->next;
    }

-    if (!result) {
+    if (result == NULL) {
        result = SDL_malloc(sizeof(GL_FBOList));
        if (result) {
            result->w = w;
@@ -478,7 +476,7 @@ GL_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
    }

    data = (GL_TextureData *) SDL_calloc(1, sizeof(*data));
-    if (!data) {
+    if (data == NULL) {
        return SDL_OutOfMemory();
    }

@@ -580,8 +578,7 @@ GL_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
        renderdata->glTexImage2D(textype, 0, internalFormat, texture_w,
                                 texture_h, 0, format, type, data->pixels);
        renderdata->glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE);
-    }
-    else
+    } else
 #endif
    {
        renderdata->glTexImage2D(textype, 0, internalFormat, texture_w,
@@ -938,7 +935,7 @@ GL_QueueDrawPoints(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_FP
    GLfloat *verts = (GLfloat *) SDL_AllocateRenderVertices(renderer, count * 2 * sizeof (GLfloat), 0, &cmd->data.draw.first);
    int i;

-    if (!verts) {
+    if (verts == NULL) {
        return -1;
    }

@@ -959,7 +956,7 @@ GL_QueueDrawLines(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_FPo
    const size_t vertlen = (sizeof (GLfloat) * 2) * count;
    GLfloat *verts = (GLfloat *) SDL_AllocateRenderVertices(renderer, vertlen, 0, &cmd->data.draw.first);

-    if (!verts) {
+    if (verts == NULL) {
        return -1;
    }
    cmd->data.draw.count = count;
@@ -1005,7 +1002,7 @@ GL_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *te
    size_t sz = 2 * sizeof(GLfloat) + 4 * sizeof(Uint8) + (texture ? 2 : 0) * sizeof(GLfloat);

    verts = (GLfloat *) SDL_AllocateRenderVertices(renderer, count * sz, 0, &cmd->data.draw.first);
-    if (!verts) {
+    if (verts == NULL) {
        return -1;
    }

@@ -1459,7 +1456,7 @@ GL_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,

    temp_pitch = rect->w * SDL_BYTESPERPIXEL(temp_format);
    temp_pixels = SDL_malloc(rect->h * temp_pitch);
-    if (!temp_pixels) {
+    if (temp_pixels == NULL) {
        return SDL_OutOfMemory();
    }

@@ -1526,7 +1523,7 @@ GL_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture)
        renderdata->drawstate.target = NULL;
    }

-    if (!data) {
+    if (data == NULL) {
        return;
    }
    if (data->texture) {
@@ -1760,13 +1757,13 @@ GL_CreateRenderer(SDL_Window * window, Uint32 flags)
 #endif

    renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));
-    if (!renderer) {
+    if (renderer == NULL) {
        SDL_OutOfMemory();
        goto error;
    }

    data = (GL_RenderData *) SDL_calloc(1, sizeof(*data));
-    if (!data) {
+    if (data == NULL) {
        SDL_free(renderer);
        SDL_OutOfMemory();
        goto error;
@@ -1861,7 +1858,7 @@ GL_CreateRenderer(SDL_Window * window, Uint32 flags)
    }

    hint = SDL_getenv("GL_ARB_texture_non_power_of_two");
-    if (!hint || *hint != '0') {
+    if (hint == NULL || *hint != '0') {
        SDL_bool isGL2 = SDL_FALSE;
        const char *verstr = (const char *)data->glGetString(GL_VERSION);
        if (verstr) {
--- a/src/render/opengl/SDL_shaders_gl.c
+++ b/src/render/opengl/SDL_shaders_gl.c
@@ -479,7 +479,7 @@ CompileShaderProgram(GL_ShaderContext *ctx, int index, GL_ShaderData *data)
    }
    ctx->glUseProgramObjectARB(0);

-    return (ctx->glGetError() == GL_NO_ERROR);
+    return ctx->glGetError() == GL_NO_ERROR;
 }

 static void
@@ -498,7 +498,7 @@ GL_CreateShaderContext(void)
    int i;

    ctx = (GL_ShaderContext *)SDL_calloc(1, sizeof(*ctx));
-    if (!ctx) {
+    if (ctx == NULL) {
        return NULL;
    }

--- a/src/render/opengles/SDL_render_gles.c
+++ b/src/render/opengles/SDL_render_gles.c
@@ -329,7 +329,7 @@ GLES_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
    }

    data = (GLES_TextureData *) SDL_calloc(1, sizeof(*data));
-    if (!data) {
+    if (data == NULL) {
        return SDL_OutOfMemory();
    }

@@ -424,7 +424,7 @@ GLES_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
    src = (Uint8 *)pixels;
    if (pitch != srcPitch) {
        blob = (Uint8 *)SDL_malloc(srcPitch * rect->h);
-        if (!blob) {
+        if (blob == NULL) {
            return SDL_OutOfMemory();
        }
        src = blob;
@@ -544,7 +544,7 @@ GLES_QueueDrawPoints(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_
    GLfloat *verts = (GLfloat *) SDL_AllocateRenderVertices(renderer, count * 2 * sizeof (GLfloat), 0, &cmd->data.draw.first);
    int i;

-    if (!verts) {
+    if (verts == NULL) {
        return -1;
    }

@@ -565,7 +565,7 @@ GLES_QueueDrawLines(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_F
    const size_t vertlen = (sizeof (GLfloat) * 2) * count;
    GLfloat *verts = (GLfloat *) SDL_AllocateRenderVertices(renderer, vertlen, 0, &cmd->data.draw.first);

-    if (!verts) {
+    if (verts == NULL) {
        return -1;
    }
    cmd->data.draw.count = count;
@@ -611,7 +611,7 @@ GLES_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *
    int sz = 2 + 4 + (texture ? 2 : 0);

    verts = (GLfloat *) SDL_AllocateRenderVertices(renderer, count * sz * sizeof (GLfloat), 0, &cmd->data.draw.first);
-    if (!verts) {
+    if (verts == NULL) {
        return -1;
    }

@@ -918,7 +918,7 @@ GLES_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,

    temp_pitch = rect->w * SDL_BYTESPERPIXEL(temp_format);
    temp_pixels = SDL_malloc(rect->h * temp_pitch);
-    if (!temp_pixels) {
+    if (temp_pixels == NULL) {
        return SDL_OutOfMemory();
    }

@@ -979,7 +979,7 @@ GLES_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture)
        renderdata->drawstate.target = NULL;
    }

-    if (!data) {
+    if (data == NULL) {
        return;
    }
    if (data->texture) {
@@ -1095,13 +1095,13 @@ GLES_CreateRenderer(SDL_Window * window, Uint32 flags)
    }

    renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));
-    if (!renderer) {
+    if (renderer == NULL) {
        SDL_OutOfMemory();
        goto error;
    }

    data = (GLES_RenderData *) SDL_calloc(1, sizeof(*data));
-    if (!data) {
+    if (data == NULL) {
        GLES_DestroyRenderer(renderer);
        SDL_OutOfMemory();
        goto error;
--- a/src/render/opengles2/SDL_render_gles2.c
+++ b/src/render/opengles2/SDL_render_gles2.c
@@ -421,7 +421,7 @@ GLES2_CacheProgram(GLES2_RenderData *data, GLuint vertex, GLuint fragment)

    /* Create a program cache entry */
    entry = (GLES2_ProgramCacheEntry *)SDL_calloc(1, sizeof(GLES2_ProgramCacheEntry));
-    if (!entry) {
+    if (entry == NULL) {
        SDL_OutOfMemory();
        return NULL;
    }
@@ -500,7 +500,7 @@ GLES2_CacheShader(GLES2_RenderData *data, GLES2_ShaderType type, GLenum shader_t
    const GLchar *shader_src_list[3];
    const GLchar *shader_body = GLES2_GetShader(type);

-    if (!shader_body) {
+    if (shader_body == NULL) {
        SDL_SetError("No shader body src");
        return 0;
    }
@@ -711,7 +711,7 @@ GLES2_SelectProgram(GLES2_RenderData *data, GLES2_ImageSource source, int w, int

    /* Generate a matching program */
    program = GLES2_CacheProgram(data, vertex, fragment);
-    if (!program) {
+    if (program == NULL) {
        goto fault;
    }

@@ -746,7 +746,7 @@ GLES2_QueueDrawPoints(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL
    color.b = cmd->data.draw.b;
    color.a = cmd->data.draw.a;

-    if (!verts) {
+    if (verts == NULL) {
        return -1;
    }

@@ -780,7 +780,7 @@ GLES2_QueueDrawLines(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_
    color.b = cmd->data.draw.b;
    color.a = cmd->data.draw.a;

-    if (!verts) {
+    if (verts == NULL) {
        return -1;
    }

@@ -839,7 +839,7 @@ GLES2_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture

    if (texture) {
        SDL_Vertex *verts = (SDL_Vertex *) SDL_AllocateRenderVertices(renderer, count * sizeof (*verts), 0, &cmd->data.draw.first);
-        if (!verts) {
+        if (verts == NULL) {
            return -1;
        }

@@ -879,7 +879,7 @@ GLES2_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture

    } else {
        SDL_VertexSolid *verts = (SDL_VertexSolid *) SDL_AllocateRenderVertices(renderer, count * sizeof (*verts), 0, &cmd->data.draw.first);
-        if (!verts) {
+        if (verts == NULL) {
            return -1;
        }

@@ -1455,7 +1455,7 @@ GLES2_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture)

    /* Allocate a texture struct */
    data = (GLES2_TextureData *)SDL_calloc(1, sizeof(GLES2_TextureData));
-    if (!data) {
+    if (data == NULL) {
        return SDL_OutOfMemory();
    }
    data->texture = 0;
@@ -1591,12 +1591,11 @@ GLES2_TexSubImage2D(GLES2_RenderData *data, GLenum target, GLint xoffset, GLint
    src = (Uint8 *)pixels;
    if (pitch != src_pitch) {
        blob = (Uint8 *)SDL_malloc(src_pitch * height);
-        if (!blob) {
+        if (blob == NULL) {
            return SDL_OutOfMemory();
        }
        src = blob;
-        for (y = 0; y < height; ++y)
-        {
+        for (y = 0; y < height; ++y) {
            SDL_memcpy(src, pixels, src_pitch);
            src += src_pitch;
            pixels = (Uint8 *)pixels + pitch;
@@ -1609,7 +1608,7 @@ GLES2_TexSubImage2D(GLES2_RenderData *data, GLenum target, GLint xoffset, GLint
        int i;
        Uint32 *src32 = (Uint32 *)src;
        blob2 = (Uint32 *)SDL_malloc(src_pitch * height);
-        if (!blob2) {
+        if (blob2 == NULL) {
            if (blob) {
                SDL_free(blob);
            }
@@ -1946,7 +1945,7 @@ GLES2_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
    }

    temp_pixels = SDL_malloc(buflen);
-    if (!temp_pixels) {
+    if (temp_pixels == NULL) {
        return SDL_OutOfMemory();
    }

@@ -2110,13 +2109,13 @@ GLES2_CreateRenderer(SDL_Window *window, Uint32 flags)

    /* Create the renderer struct */
    renderer = (SDL_Renderer *)SDL_calloc(1, sizeof(SDL_Renderer));
-    if (!renderer) {
+    if (renderer == NULL) {
        SDL_OutOfMemory();
        goto error;
    }

    data = (GLES2_RenderData *)SDL_calloc(1, sizeof(GLES2_RenderData));
-    if (!data) {
+    if (data == NULL) {
        SDL_free(renderer);
        SDL_OutOfMemory();
        goto error;
--- a/src/render/opengles2/SDL_shaders_gles2.c
+++ b/src/render/opengles2/SDL_shaders_gles2.c
@@ -382,12 +382,15 @@ GLES2_ShaderIncludeType GLES2_GetTexCoordPrecisionEnumFromHint()
    const char *texcoord_hint = SDL_GetHint("SDL_RENDER_OPENGLES2_TEXCOORD_PRECISION");
    GLES2_ShaderIncludeType value = GLES2_SHADER_FRAGMENT_INCLUDE_BEST_TEXCOORD_PRECISION;
    if (texcoord_hint) {
-        if (SDL_strcmp(texcoord_hint, "undefined") == 0)
+        if (SDL_strcmp(texcoord_hint, "undefined") == 0) {
            return GLES2_SHADER_FRAGMENT_INCLUDE_UNDEF_PRECISION;
-        if (SDL_strcmp(texcoord_hint, "high") == 0)
+        }
+        if (SDL_strcmp(texcoord_hint, "high") == 0) {
            return GLES2_SHADER_FRAGMENT_INCLUDE_HIGH_TEXCOORD_PRECISION;
-        if (SDL_strcmp(texcoord_hint, "medium") == 0)
+        }
+        if (SDL_strcmp(texcoord_hint, "medium") == 0) {
            return GLES2_SHADER_FRAGMENT_INCLUDE_MEDIUM_TEXCOORD_PRECISION;
+        }
    }
    return value;
 }
--- a/src/render/ps2/SDL_render_ps2.c
+++ b/src/render/ps2/SDL_render_ps2.c
@@ -66,7 +66,9 @@ static int vsync_handler()
 /* Copy of gsKit_sync_flip, but without the 'flip' */
 static void gsKit_sync(GSGLOBAL *gsGlobal)
 {
-   if (!gsGlobal->FirstFrame) WaitSema(vsync_sema_id);
+   if (!gsGlobal->FirstFrame) {
+      WaitSema(vsync_sema_id);
+   }
   while (PollSema(vsync_sema_id) >= 0)
   	;
 }
@@ -74,10 +76,8 @@ static void gsKit_sync(GSGLOBAL *gsGlobal)
 /* Copy of gsKit_sync_flip, but without the 'sync' */
 static void gsKit_flip(GSGLOBAL *gsGlobal)
 {
-   if (!gsGlobal->FirstFrame)
-   {
-      if (gsGlobal->DoubleBuffering == GS_SETTING_ON)
-      {
+   if (!gsGlobal->FirstFrame) {
+      if (gsGlobal->DoubleBuffering == GS_SETTING_ON) {
         GS_SET_DISPFB2( gsGlobal->ScreenBuffer[
               gsGlobal->ActiveBuffer & 1] / 8192,
               gsGlobal->Width / 64, gsGlobal->PSM, 0, 0 );
@@ -111,16 +111,16 @@ PS2_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
 {
    GSTEXTURE* ps2_tex = (GSTEXTURE*) SDL_calloc(1, sizeof(GSTEXTURE));

-    if (!ps2_tex)
+    if (ps2_tex == NULL) {
        return SDL_OutOfMemory();
+    }

    ps2_tex->Width = texture->w;
    ps2_tex->Height = texture->h;
    ps2_tex->PSM = PixelFormatToPS2PSM(texture->format);
    ps2_tex->Mem = memalign(128, gsKit_texture_size_ee(ps2_tex->Width, ps2_tex->Height, ps2_tex->PSM));

-    if (!ps2_tex->Mem)
-    {
+    if (!ps2_tex->Mem) {
        SDL_free(ps2_tex);
        return SDL_OutOfMemory();
    }
@@ -215,7 +215,7 @@ PS2_QueueDrawPoints(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_F
    gs_rgbaq rgbaq;
    int i;

-    if (!vertices) {
+    if (vertices == NULL) {
        return -1;
    }

@@ -250,7 +250,7 @@ PS2_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *t
    if (texture) {
        GSPRIMSTQPOINT *vertices = (GSPRIMSTQPOINT *) SDL_AllocateRenderVertices(renderer, count * sizeof (GSPRIMSTQPOINT), 4, &cmd->data.draw.first);
        
-        if (!vertices) {
+        if (vertices == NULL) {
            return -1;
        }

@@ -283,7 +283,7 @@ PS2_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *t
    } else {
        GSPRIMPOINT *vertices = (GSPRIMPOINT *) SDL_AllocateRenderVertices(renderer, count * sizeof (GSPRIMPOINT), 4, &cmd->data.draw.first);

-        if (!vertices) {
+        if (vertices == NULL) {
            return -1;
        }

@@ -333,7 +333,7 @@ PS2_RenderSetClipRect(SDL_Renderer *renderer, SDL_RenderCommand *cmd)

    const SDL_Rect *rect = &cmd->data.cliprect.rect;

-    if(cmd->data.cliprect.enabled){
+    if (cmd->data.cliprect.enabled) {
        gsKit_set_scissor(data->gsGlobal, GS_SETREG_SCISSOR(rect->x, rect->y, rect->w, rect->h));
    } else {
        gsKit_set_scissor(data->gsGlobal, GS_SCISSOR_RESET);
@@ -521,18 +521,20 @@ PS2_RenderPresent(SDL_Renderer * renderer)
    PS2_RenderData *data = (PS2_RenderData *) renderer->driverdata;

    if (data->gsGlobal->DoubleBuffering == GS_SETTING_OFF) {
-		if (data->vsync == 2) // Dynamic
+		if (data->vsync == 2) { // Dynamic
            gsKit_sync(data->gsGlobal);
-        else if (data->vsync == 1)
+        } else if (data->vsync == 1) {
            gsKit_vsync_wait();
+        }
 		gsKit_queue_exec(data->gsGlobal);
    } else {
 		gsKit_queue_exec(data->gsGlobal);
 		gsKit_finish();
-		if (data->vsync == 2) // Dynamic
+		if (data->vsync == 2) { // Dynamic
            gsKit_sync(data->gsGlobal);
-        else if (data->vsync == 1)
+        } else if (data->vsync == 1) {
            gsKit_vsync_wait();
+        }
 		gsKit_flip(data->gsGlobal);
 	}
 	gsKit_TexManager_nextFrame(data->gsGlobal);
@@ -546,11 +548,13 @@ PS2_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture)
    GSTEXTURE *ps2_texture = (GSTEXTURE *) texture->driverdata;
    PS2_RenderData *data = (PS2_RenderData *)renderer->driverdata;

-    if (data == NULL)
+    if (data == NULL) {
        return;
+    }

-    if(ps2_texture == NULL)
+    if (ps2_texture == NULL) {
        return;
+    }

    // Free from vram
    gsKit_TexManager_free(data->gsGlobal, ps2_texture);
@@ -574,8 +578,9 @@ PS2_DestroyRenderer(SDL_Renderer * renderer)
        SDL_free(data);
    }

-    if (vsync_sema_id >= 0)
+    if (vsync_sema_id >= 0) {
        DeleteSema(vsync_sema_id);
+    }

    SDL_free(renderer);
 }
@@ -599,13 +604,13 @@ PS2_CreateRenderer(SDL_Window * window, Uint32 flags)
    SDL_bool dynamicVsync;

    renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));
-    if (!renderer) {
+    if (renderer == NULL) {
        SDL_OutOfMemory();
        return NULL;
    }

    data = (PS2_RenderData *) SDL_calloc(1, sizeof(*data));
-    if (!data) {
+    if (data == NULL) {
        PS2_DestroyRenderer(renderer);
        SDL_OutOfMemory();
        return NULL;
--- a/src/render/psp/SDL_render_psp.c
+++ b/src/render/psp/SDL_render_psp.c
@@ -182,19 +182,22 @@ static int
 TextureNextPow2(unsigned int w)
 {
    unsigned int n = 2;
-    if(w == 0)
+    if (w == 0) {
        return 0;
+    }

-    while(w > n)
+    while (w > n) {
        n <<= 1;
+    }

    return n;
 }

 static void psp_on_vblank(u32 sub, PSP_RenderData *data)
 {
-   if (data)
+   if (data) {
      data->vblank_not_reached = SDL_FALSE;
+   }
 }


@@ -218,10 +221,10 @@ PixelFormatToPSPFMT(Uint32 format)
 ///SECTION render target LRU management
 static void
 LRUTargetRelink(PSP_TextureData* psp_texture) {
-    if(psp_texture->prevhotw) {
+    if (psp_texture->prevhotw) {
        psp_texture->prevhotw->nexthotw = psp_texture->nexthotw;
    }
-    if(psp_texture->nexthotw) {
+    if (psp_texture->nexthotw) {
        psp_texture->nexthotw->prevhotw = psp_texture->prevhotw;
    }
 }
@@ -229,11 +232,11 @@ LRUTargetRelink(PSP_TextureData* psp_texture) {
 static void
 LRUTargetPushFront(PSP_RenderData* data, PSP_TextureData* psp_texture) {
    psp_texture->nexthotw = data->most_recent_target;
-    if(data->most_recent_target) {
+    if (data->most_recent_target) {
        data->most_recent_target->prevhotw = psp_texture;
    }
    data->most_recent_target = psp_texture;
-    if(!data->least_recent_target) {
+    if (!data->least_recent_target) {
        data->least_recent_target = psp_texture;
    }
 }
@@ -241,10 +244,10 @@ LRUTargetPushFront(PSP_RenderData* data, PSP_TextureData* psp_texture) {
 static void
 LRUTargetRemove(PSP_RenderData* data, PSP_TextureData* psp_texture) {
    LRUTargetRelink(psp_texture);
-    if(data->most_recent_target == psp_texture) {
+    if (data->most_recent_target == psp_texture) {
        data->most_recent_target = psp_texture->nexthotw;
    }
-    if(data->least_recent_target == psp_texture) {
+    if (data->least_recent_target == psp_texture) {
        data->least_recent_target = psp_texture->prevhotw;
    }
    psp_texture->prevhotw = NULL;
@@ -253,7 +256,7 @@ LRUTargetRemove(PSP_RenderData* data, PSP_TextureData* psp_texture) {

 static void
 LRUTargetBringFront(PSP_RenderData* data, PSP_TextureData* psp_texture) {
-    if(data->most_recent_target == psp_texture) {
+    if (data->most_recent_target == psp_texture) {
        return; //nothing to do
    }
    LRUTargetRemove(data, psp_texture);
@@ -262,7 +265,7 @@ LRUTargetBringFront(PSP_RenderData* data, PSP_TextureData* psp_texture) {

 static void
 TextureStorageFree(void* storage) {
-    if(InVram(storage)) {
+    if (InVram(storage)) {
        vfree(storage);
    } else {
        SDL_free(storage);
@@ -279,8 +282,9 @@ TextureSwizzle(PSP_TextureData *psp_texture, void* dst)
    unsigned int *src = NULL;
    unsigned char *data = NULL;

-    if(psp_texture->swizzled)
+    if (psp_texture->swizzled) {
        return 1;
+    }

    bytewidth = psp_texture->textureWidth*(psp_texture->bits>>3);
    height = psp_texture->size / bytewidth;
@@ -291,21 +295,21 @@ TextureSwizzle(PSP_TextureData *psp_texture, void* dst)
    src = (unsigned int*) psp_texture->data;

    data = dst;
-    if(!data) {
+    if (data == NULL) {
        data = SDL_malloc(psp_texture->size);
    }

-    if(!data) {
+    if (data == NULL) {
        return SDL_OutOfMemory();
    }

-    for(j = 0; j < height; j++, blockaddress += 16)
+    for (j = 0; j < height; j++, blockaddress += 16)
    {
        unsigned int *block;

        block = (unsigned int*)&data[blockaddress];

-        for(i = 0; i < rowblocks; i++)
+        for (i = 0; i < rowblocks; i++)
        {
            *block++ = *src++;
            *block++ = *src++;
@@ -314,8 +318,9 @@ TextureSwizzle(PSP_TextureData *psp_texture, void* dst)
            block += 28;
        }

-        if((j & 0x7) == 0x7)
+        if ((j & 0x7) == 0x7) {
            blockaddress += rowblocksadd;
+        }
    }

    TextureStorageFree(psp_texture->data);
@@ -338,8 +343,9 @@ TextureUnswizzle(PSP_TextureData *psp_texture, void* dst)
    unsigned char *data = NULL;
    unsigned char *ydst = NULL;

-    if(!psp_texture->swizzled)
+    if (!psp_texture->swizzled) {
        return 1;
+    }

    bytewidth = psp_texture->textureWidth*(psp_texture->bits>>3);
    height = psp_texture->size / bytewidth;
@@ -354,26 +360,27 @@ TextureUnswizzle(PSP_TextureData *psp_texture, void* dst)

    data = dst;

-    if(!data) {
+    if (data == NULL) {
        data = SDL_malloc(psp_texture->size);
    }

-    if(!data)
+    if (data == NULL) {
        return SDL_OutOfMemory();
+    }

    ydst = (unsigned char *)data;

-    for(blocky = 0; blocky < heightblocks; ++blocky)
+    for (blocky = 0; blocky < heightblocks; ++blocky)
    {
        unsigned char *xdst = ydst;

-        for(blockx = 0; blockx < widthblocks; ++blockx)
+        for (blockx = 0; blockx < widthblocks; ++blockx)
        {
            unsigned int *block;

            block = (unsigned int*)xdst;

-            for(j = 0; j < 8; ++j)
+            for (j = 0; j < 8; ++j)
            {
                *(block++) = *(src++);
                *(block++) = *(src++);
@@ -402,10 +409,10 @@ static int
 TextureSpillToSram(PSP_RenderData* data, PSP_TextureData* psp_texture)
 {
    // Assumes the texture is in VRAM
-    if(psp_texture->swizzled) {
+    if (psp_texture->swizzled) {
        //Texture was swizzled in vram, just copy to system memory
        void* sdata = SDL_malloc(psp_texture->size);
-        if(!sdata) {
+        if (sdata == NULL) {
            return SDL_OutOfMemory();
        }

@@ -423,7 +430,7 @@ TexturePromoteToVram(PSP_RenderData* data, PSP_TextureData* psp_texture, SDL_boo
 {
    // Assumes texture in sram and a large enough continuous block in vram
    void* tdata = vramalloc(psp_texture->size);
-    if(psp_texture->swizzled && target) {
+    if (psp_texture->swizzled && target) {
        return TextureUnswizzle(psp_texture, tdata);
    } else {
        SDL_memcpy(tdata, psp_texture->data, psp_texture->size);
@@ -436,8 +443,8 @@ TexturePromoteToVram(PSP_RenderData* data, PSP_TextureData* psp_texture, SDL_boo
 static int
 TextureSpillLRU(PSP_RenderData* data, size_t wanted) {
    PSP_TextureData* lru = data->least_recent_target;
-    if(lru) {
-        if(TextureSpillToSram(data, lru) < 0) {
+    if (lru) {
+        if (TextureSpillToSram(data, lru) < 0) {
            return -1;
        }
        LRUTargetRemove(data, lru);
@@ -451,8 +458,8 @@ TextureSpillLRU(PSP_RenderData* data, size_t wanted) {
 static int
 TextureSpillTargetsForSpace(PSP_RenderData* data, size_t size)
 {
-    while(vlargestblock() < size) {
-        if(TextureSpillLRU(data, size) < 0) {
+    while (vlargestblock() < size) {
+        if (TextureSpillLRU(data, size) < 0) {
            return -1;
        }
    }
@@ -463,12 +470,12 @@ static int
 TextureBindAsTarget(PSP_RenderData* data, PSP_TextureData* psp_texture) {
    unsigned int dstFormat;

-    if(!InVram(psp_texture->data)) {
+    if (!InVram(psp_texture->data)) {
        // Bring back the texture in vram
-        if(TextureSpillTargetsForSpace(data, psp_texture->size) < 0) {
+        if (TextureSpillTargetsForSpace(data, psp_texture->size) < 0) {
            return -1;
        }
-        if(TexturePromoteToVram(data, psp_texture, SDL_TRUE) < 0) {
+        if (TexturePromoteToVram(data, psp_texture, SDL_TRUE) < 0) {
            return -1;
        }
    }
@@ -477,7 +484,7 @@ TextureBindAsTarget(PSP_RenderData* data, PSP_TextureData* psp_texture) {

    // Stencil alpha dst hack
    dstFormat = psp_texture->format;
-    if(dstFormat == GU_PSM_5551) {
+    if (dstFormat == GU_PSM_5551) {
        sceGuEnable(GU_STENCIL_TEST);
        sceGuStencilOp(GU_REPLACE, GU_REPLACE, GU_REPLACE);
        sceGuStencilFunc(GU_GEQUAL, 0xff, 0xff);
@@ -502,8 +509,9 @@ PSP_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
    PSP_RenderData *data = renderer->driverdata;
    PSP_TextureData* psp_texture = (PSP_TextureData*) SDL_calloc(1, sizeof(*psp_texture));

-    if(!psp_texture)
+    if (psp_texture == NULL) {
        return SDL_OutOfMemory();
+    }

    psp_texture->swizzled = SDL_FALSE;
    psp_texture->width = texture->w;
@@ -531,21 +539,20 @@ PSP_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)

    psp_texture->pitch = psp_texture->textureWidth * SDL_BYTESPERPIXEL(texture->format);
    psp_texture->size = psp_texture->textureHeight*psp_texture->pitch;
-    if(texture->access & SDL_TEXTUREACCESS_TARGET) {
-        if(TextureSpillTargetsForSpace(renderer->driverdata, psp_texture->size) < 0){
+    if (texture->access & SDL_TEXTUREACCESS_TARGET) {
+        if (TextureSpillTargetsForSpace(renderer->driverdata, psp_texture->size) < 0) {
            SDL_free(psp_texture);
            return -1;
        }
        psp_texture->data = vramalloc(psp_texture->size);
-        if(psp_texture->data) {
+        if (psp_texture->data) {
            LRUTargetPushFront(data, psp_texture);
        }
    } else {
        psp_texture->data = SDL_calloc(1, psp_texture->size);
    }

-    if(!psp_texture->data)
-    {
+    if (!psp_texture->data) {
        SDL_free(psp_texture);
        return SDL_OutOfMemory();
    }
@@ -569,8 +576,7 @@ TextureActivate(SDL_Texture * texture)
    int scaleMode = (texture->scaleMode == SDL_ScaleModeNearest) ? GU_NEAREST : GU_LINEAR;

    /* Swizzling is useless with small textures. */
-    if (TextureShouldSwizzle(psp_texture, texture))
-    {
+    if (TextureShouldSwizzle(psp_texture, texture)) {
        TextureSwizzle(psp_texture, NULL);
    }

@@ -662,7 +668,7 @@ PSP_QueueDrawPoints(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_F
    VertV *verts = (VertV *) SDL_AllocateRenderVertices(renderer, count * sizeof (VertV), 4, &cmd->data.draw.first);
    int i;

-    if (!verts) {
+    if (verts == NULL) {
        return -1;
    }

@@ -692,7 +698,7 @@ PSP_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *t
    if (texture == NULL) {
        VertCV *verts;
        verts = (VertCV *) SDL_AllocateRenderVertices(renderer, count * sizeof (VertCV), 4, &cmd->data.draw.first);
-        if (!verts) {
+        if (verts == NULL) {
            return -1;
        }

@@ -725,7 +731,7 @@ PSP_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *t
        PSP_TextureData *psp_texture = (PSP_TextureData *) texture->driverdata;
        VertTCV *verts;
        verts = (VertTCV *) SDL_AllocateRenderVertices(renderer, count * sizeof (VertTCV), 4, &cmd->data.draw.first);
-        if (!verts) {
+        if (verts == NULL) {
            return -1;
        }

@@ -771,7 +777,7 @@ PSP_QueueFillRects(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_FR
    VertV *verts = (VertV *) SDL_AllocateRenderVertices(renderer, count * 2 * sizeof (VertV), 4, &cmd->data.draw.first);
    int i;

-    if (!verts) {
+    if (verts == NULL) {
        return -1;
    }

@@ -806,10 +812,9 @@ PSP_QueueCopy(SDL_Renderer * renderer, SDL_RenderCommand *cmd, SDL_Texture * tex
    const float u1 = srcrect->x + srcrect->w;
    const float v1 = srcrect->y + srcrect->h;

-    if((MathAbs(u1) - MathAbs(u0)) < 64.0f)
-    {
+    if ((MathAbs(u1) - MathAbs(u0)) < 64.0f) {
        verts = (VertTV *) SDL_AllocateRenderVertices(renderer, 2 * sizeof (VertTV), 4, &cmd->data.draw.first);
-        if (!verts) {
+        if (verts == NULL) {
            return -1;
        }

@@ -828,9 +833,7 @@ PSP_QueueCopy(SDL_Renderer * renderer, SDL_RenderCommand *cmd, SDL_Texture * tex
        verts->y = y + height;
        verts->z = 0;
        verts++;
-    }
-    else
-    {
+    } else {
        float start, end;
        float curU = u0;
        float curX = x;
@@ -840,18 +843,19 @@ PSP_QueueCopy(SDL_Renderer * renderer, SDL_RenderCommand *cmd, SDL_Texture * tex
        size_t i;
        float ustep = (u1 - u0)/width * slice;

-        if(ustep < 0.0f)
+        if (ustep < 0.0f) {
            ustep = -ustep;
+        }

        cmd->data.draw.count = count;

        verts = (VertTV *) SDL_AllocateRenderVertices(renderer, count * 2 * sizeof (VertTV), 4, &cmd->data.draw.first);
-        if (!verts) {
+        if (verts == NULL) {
            return -1;
        }


-        for(i = 0, start = 0, end = width; i < count; i++, start += slice)
+        for (i = 0, start = 0, end = width; i < count; i++, start += slice)
        {
            const float polyWidth = ((curX + slice) > endX) ? (endX - curX) : slice;
            const float sourceWidth = ((curU + ustep) > u1) ? (u1 - curU) : ustep;
@@ -900,7 +904,7 @@ PSP_QueueCopyEx(SDL_Renderer * renderer, SDL_RenderCommand *cmd, SDL_Texture * t
    float u1 = srcrect->x + srcrect->w;
    float v1 = srcrect->y + srcrect->h;

-    if (!verts) {
+    if (verts == NULL) {
        return -1;
    }

@@ -986,16 +990,16 @@ StartDrawing(SDL_Renderer * renderer)
    PSP_RenderData *data = (PSP_RenderData *) renderer->driverdata;

    // Check if we need to start GU displaylist
-    if(!data->displayListAvail) {
+    if (!data->displayListAvail) {
        sceGuStart(GU_DIRECT, DisplayList);
        data->displayListAvail = SDL_TRUE;
        //ResetBlendState(&data->blendState);
    }

    // Check if we need a draw buffer change
-    if(renderer->target != data->boundTarget) {
+    if (renderer->target != data->boundTarget) {
        SDL_Texture* texture = renderer->target;
-        if(texture) {
+        if (texture) {
            PSP_TextureData* psp_texture = (PSP_TextureData*) texture->driverdata;
            // Set target, registering LRU
            TextureBindAsTarget(data, psp_texture);
@@ -1044,16 +1048,16 @@ PSP_SetBlendState(PSP_RenderData* data, PSP_BlendState* state)
        }
    }

-    if(state->color != current->color) {
+    if (state->color != current->color) {
        sceGuColor(state->color);
    }

-    if(state->shadeModel != current->shadeModel) {
+    if (state->shadeModel != current->shadeModel) {
        sceGuShadeModel(state->shadeModel);
    }

-    if(state->texture != current->texture) {
-        if(state->texture != NULL) {
+    if (state->texture != current->texture) {
+        if (state->texture != NULL) {
            TextureActivate(state->texture);
            sceGuEnable(GU_TEXTURE_2D);
        } else {
@@ -1078,7 +1082,7 @@ PSP_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *verti
       rendering backends report a reasonable maximum, so the higher level can flush
       if we appear to be exceeding that. */
    gpumem = (Uint8 *) sceGuGetMemory(vertsize);
-    if (!gpumem) {
+    if (gpumem == NULL) {
        return SDL_SetError("Couldn't obtain a %d-byte vertex buffer!", (int) vertsize);
    }
    SDL_memcpy(gpumem, vertices, vertsize);
@@ -1099,7 +1103,7 @@ PSP_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *verti

            case SDL_RENDERCMD_SETCLIPRECT: {
                const SDL_Rect *rect = &cmd->data.cliprect.rect;
-                if(cmd->data.cliprect.enabled){
+                if (cmd->data.cliprect.enabled) {
                    sceGuEnable(GU_SCISSOR_TEST);
                    sceGuScissor(rect->x, rect->y, rect->w, rect->h);
                } else {
@@ -1264,8 +1268,9 @@ PSP_RenderPresent(SDL_Renderer * renderer)
    sceGuFinish();
    sceGuSync(0,0);

-    if ((data->vsync) && (data->vblank_not_reached))
+    if ((data->vsync) && (data->vblank_not_reached)) {
        sceDisplayWaitVblankStart();
+    }
    data->vblank_not_reached = SDL_TRUE;

    data->backbuffer = data->frontbuffer;
@@ -1280,11 +1285,13 @@ PSP_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture)
    PSP_RenderData *renderdata = (PSP_RenderData *) renderer->driverdata;
    PSP_TextureData *psp_texture = (PSP_TextureData *) texture->driverdata;

-    if (renderdata == NULL)
+    if (renderdata == NULL) {
        return;
+    }

-    if(psp_texture == NULL)
+    if (psp_texture == NULL) {
        return;
+    }

    LRUTargetRemove(renderdata, psp_texture);
    TextureStorageFree(psp_texture->data);
@@ -1297,8 +1304,9 @@ PSP_DestroyRenderer(SDL_Renderer * renderer)
 {
    PSP_RenderData *data = (PSP_RenderData *) renderer->driverdata;
    if (data) {
-        if (!data->initialized)
+        if (!data->initialized) {
            return;
+        }

        StartDrawing(renderer);

@@ -1335,13 +1343,13 @@ PSP_CreateRenderer(SDL_Window * window, Uint32 flags)
    void* doublebuffer = NULL;

    renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));
-    if (!renderer) {
+    if (renderer == NULL) {
        SDL_OutOfMemory();
        return NULL;
    }

    data = (PSP_RenderData *) SDL_calloc(1, sizeof(*data));
-    if (!data) {
+    if (data == NULL) {
        PSP_DestroyRenderer(renderer);
        SDL_OutOfMemory();
        return NULL;
--- a/src/render/software/SDL_blendfillrect.c
+++ b/src/render/software/SDL_blendfillrect.c
@@ -219,7 +219,7 @@ SDL_BlendFillRect(SDL_Surface * dst, const SDL_Rect * rect,
 {
    SDL_Rect clipped;

-    if (!dst) {
+    if (dst == NULL) {
        return SDL_InvalidParamError("SDL_BlendFillRect(): dst");
    }

@@ -290,7 +290,7 @@ SDL_BlendFillRects(SDL_Surface * dst, const SDL_Rect * rects, int count,
                SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a) = NULL;
    int status = 0;

-    if (!dst) {
+    if (dst == NULL) {
        return SDL_InvalidParamError("SDL_BlendFillRects(): dst");
    }

@@ -334,7 +334,7 @@ SDL_BlendFillRects(SDL_Surface * dst, const SDL_Rect * rects, int count,
        break;
    }

-    if (!func) {
+    if (func == NULL) {
        if (!dst->format->Amask) {
            func = SDL_BlendFillRect_RGB;
        } else {
--- a/src/render/software/SDL_blendline.c
+++ b/src/render/software/SDL_blendline.c
@@ -808,12 +808,12 @@ SDL_BlendLine(SDL_Surface * dst, int x1, int y1, int x2, int y2,
 {
    BlendLineFunc func;

-    if (!dst) {
+    if (dst == NULL) {
        return SDL_InvalidParamError("SDL_BlendLine(): dst");
    }

    func = SDL_CalculateBlendLineFunc(dst->format);
-    if (!func) {
+    if (func == NULL) {
        return SDL_SetError("SDL_BlendLine(): Unsupported surface format");
    }

@@ -837,12 +837,12 @@ SDL_BlendLines(SDL_Surface * dst, const SDL_Point * points, int count,
    SDL_bool draw_end;
    BlendLineFunc func;

-    if (!dst) {
+    if (dst == NULL) {
        return SDL_SetError("SDL_BlendLines(): Passed NULL destination surface");
    }

    func = SDL_CalculateBlendLineFunc(dst->format);
-    if (!func) {
+    if (func == NULL) {
        return SDL_SetError("SDL_BlendLines(): Unsupported surface format");
    }

--- a/src/render/software/SDL_blendpoint.c
+++ b/src/render/software/SDL_blendpoint.c
@@ -217,7 +217,7 @@ int
 SDL_BlendPoint(SDL_Surface * dst, int x, int y, SDL_BlendMode blendMode, Uint8 r,
               Uint8 g, Uint8 b, Uint8 a)
 {
-    if (!dst) {
+    if (dst == NULL) {
        return SDL_InvalidParamError("SDL_BlendPoint(): dst");
    }

@@ -286,7 +286,7 @@ SDL_BlendPoints(SDL_Surface * dst, const SDL_Point * points, int count,
                SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a) = NULL;
    int status = 0;

-    if (!dst) {
+    if (dst == NULL) {
        return SDL_InvalidParamError("SDL_BlendPoints(): dst");
    }

@@ -332,7 +332,7 @@ SDL_BlendPoints(SDL_Surface * dst, const SDL_Point * points, int count,
        break;
    }

-    if (!func) {
+    if (func == NULL) {
        if (!dst->format->Amask) {
            func = SDL_BlendPoint_RGB;
        } else {
--- a/src/render/software/SDL_drawline.c
+++ b/src/render/software/SDL_drawline.c
@@ -143,12 +143,12 @@ SDL_DrawLine(SDL_Surface * dst, int x1, int y1, int x2, int y2, Uint32 color)
 {
    DrawLineFunc func;

-    if (!dst) {
+    if (dst == NULL) {
        return SDL_InvalidParamError("SDL_DrawLine(): dst");
    }

    func = SDL_CalculateDrawLineFunc(dst->format);
-    if (!func) {
+    if (func == NULL) {
        return SDL_SetError("SDL_DrawLine(): Unsupported surface format");
    }

@@ -172,12 +172,12 @@ SDL_DrawLines(SDL_Surface * dst, const SDL_Point * points, int count,
    SDL_bool draw_end;
    DrawLineFunc func;

-    if (!dst) {
+    if (dst == NULL) {
        return SDL_InvalidParamError("SDL_DrawLines(): dst");
    }

    func = SDL_CalculateDrawLineFunc(dst->format);
-    if (!func) {
+    if (func == NULL) {
        return SDL_SetError("SDL_DrawLines(): Unsupported surface format");
    }

--- a/src/render/software/SDL_drawpoint.c
+++ b/src/render/software/SDL_drawpoint.c
@@ -29,7 +29,7 @@
 int
 SDL_DrawPoint(SDL_Surface * dst, int x, int y, Uint32 color)
 {
-    if (!dst) {
+    if (dst == NULL) {
        return SDL_InvalidParamError("SDL_DrawPoint(): dst");
    }

@@ -70,7 +70,7 @@ SDL_DrawPoints(SDL_Surface * dst, const SDL_Point * points, int count,
    int i;
    int x, y;

-    if (!dst) {
+    if (dst == NULL) {
        return SDL_InvalidParamError("SDL_DrawPoints(): dst");
    }

--- a/src/render/software/SDL_render_sw.c
+++ b/src/render/software/SDL_render_sw.c
@@ -142,8 +142,9 @@ SW_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
    int row;
    size_t length;

-    if(SDL_MUSTLOCK(surface))
+    if (SDL_MUSTLOCK(surface)) {
        SDL_LockSurface(surface);
+    }
    src = (Uint8 *) pixels;
    dst = (Uint8 *) surface->pixels +
                        rect->y * surface->pitch +
@@ -154,8 +155,9 @@ SW_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
        src += pitch;
        dst += surface->pitch;
    }
-    if(SDL_MUSTLOCK(surface))
+    if (SDL_MUSTLOCK(surface)) {
        SDL_UnlockSurface(surface);
+    }
    return 0;
 }

@@ -207,7 +209,7 @@ SW_QueueDrawPoints(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_FP
    SDL_Point *verts = (SDL_Point *) SDL_AllocateRenderVertices(renderer, count * sizeof (SDL_Point), 0, &cmd->data.draw.first);
    int i;

-    if (!verts) {
+    if (verts == NULL) {
        return -1;
    }

@@ -227,7 +229,7 @@ SW_QueueFillRects(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_FRe
    SDL_Rect *verts = (SDL_Rect *) SDL_AllocateRenderVertices(renderer, count * sizeof (SDL_Rect), 0, &cmd->data.draw.first);
    int i;

-    if (!verts) {
+    if (verts == NULL) {
        return -1;
    }

@@ -249,7 +251,7 @@ SW_QueueCopy(SDL_Renderer * renderer, SDL_RenderCommand *cmd, SDL_Texture * text
 {
    SDL_Rect *verts = (SDL_Rect *) SDL_AllocateRenderVertices(renderer, 2 * sizeof (SDL_Rect), 0, &cmd->data.draw.first);

-    if (!verts) {
+    if (verts == NULL) {
        return -1;
    }

@@ -284,7 +286,7 @@ SW_QueueCopyEx(SDL_Renderer * renderer, SDL_RenderCommand *cmd, SDL_Texture * te
 {
    CopyExData *verts = (CopyExData *) SDL_AllocateRenderVertices(renderer, sizeof (CopyExData), 0, &cmd->data.draw.first);

-    if (!verts) {
+    if (verts == NULL) {
        return -1;
    }

@@ -340,7 +342,7 @@ SW_RenderCopyEx(SDL_Renderer * renderer, SDL_Surface *surface, SDL_Texture * tex
    int blitRequired = SDL_FALSE;
    int isOpaque = SDL_FALSE;

-    if (!surface) {
+    if (surface == NULL) {
        return -1;
    }

@@ -559,7 +561,7 @@ SW_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *te
    int sz = texture ? sizeof (GeometryCopyData) : sizeof (GeometryFillData);

    verts = (void *) SDL_AllocateRenderVertices(renderer, count * sz, 0, &cmd->data.draw.first);
-    if (!verts) {
+    if (verts == NULL) {
        return -1;
    }

@@ -684,7 +686,7 @@ SW_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *vertic
    SDL_Surface *surface = SW_ActivateRenderer(renderer);
    SW_DrawStateCache drawstate;

-    if (!surface) {
+    if (surface == NULL) {
        return -1;
    }

@@ -960,7 +962,7 @@ SW_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
    Uint32 src_format;
    void *src_pixels;

-    if (!surface) {
+    if (surface == NULL) {
        return -1;
    }

@@ -988,7 +990,7 @@ SW_RenderPresent(SDL_Renderer * renderer)
 {
    SDL_Window *window = renderer->window;

-    if (!window) {
+    if (window == NULL) {
        return -1;
    }
    return SDL_UpdateWindowSurface(window);
@@ -1017,19 +1019,19 @@ SW_CreateRendererForSurface(SDL_Surface * surface)
    SDL_Renderer *renderer;
    SW_RenderData *data;

-    if (!surface) {
+    if (surface == NULL) {
        SDL_InvalidParamError("surface");
        return NULL;
    }

    renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));
-    if (!renderer) {
+    if (renderer == NULL) {
        SDL_OutOfMemory();
        return NULL;
    }

    data = (SW_RenderData *) SDL_calloc(1, sizeof(*data));
-    if (!data) {
+    if (data == NULL) {
        SW_DestroyRenderer(renderer);
        SDL_OutOfMemory();
        return NULL;
@@ -1075,7 +1077,7 @@ SW_CreateRenderer(SDL_Window * window, Uint32 flags)

    /* Set the vsync hint based on our flags, if it's not already set */
    hint = SDL_GetHint(SDL_HINT_RENDER_VSYNC);
-    if (!hint || !*hint) {
+    if (hint == NULL || !*hint) {
        no_hint_set = SDL_TRUE;
    } else {
        no_hint_set = SDL_FALSE;
@@ -1092,7 +1094,7 @@ SW_CreateRenderer(SDL_Window * window, Uint32 flags)
        SDL_SetHint(SDL_HINT_RENDER_VSYNC, "");
    }

-    if (!surface) {
+    if (surface == NULL) {
        return NULL;
    }
    return SW_CreateRendererForSurface(surface);
--- a/src/render/software/SDL_rotate.c
+++ b/src/render/software/SDL_rotate.c
@@ -152,10 +152,13 @@ SDLgfx_rotozoomSurfaceSizeTrig(int width, int height, double angle, const SDL_FP
    {
        /* The trig code below gets the wrong size (due to FP inaccuracy?) when angle is a multiple of 90 degrees */
        int angle90 = (int)(angle/90);
-        if(angle90 == angle/90) { /* if the angle is a multiple of 90 degrees */
+        if (angle90 == angle/90) { /* if the angle is a multiple of 90 degrees */
            angle90 %= 4;
-            if(angle90 < 0) angle90 += 4; /* 0:0 deg, 1:90 deg, 2:180 deg, 3:270 deg */
-            if(angle90 & 1) {
+            if (angle90 < 0) {
+                angle90 += 4; /* 0:0 deg, 1:90 deg, 2:180 deg, 3:270 deg */
+            }
+
+            if (angle90 & 1) {
                rect_dest->w  = height;
                rect_dest->h = width;
                *cangle = 0;
@@ -284,8 +287,12 @@ transformSurfaceRGBA(SDL_Surface * src, SDL_Surface * dst, int isin, int icos,
            for (x = 0; x < dst->w; x++) {
                int dx = (sdx >> 16);
                int dy = (sdy >> 16);
-                if (flipx) dx = sw - dx;
-                if (flipy) dy = sh - dy;
+                if (flipx) {
+                    dx = sw - dx;
+                }
+                if (flipy) {
+                    dy = sh - dy;
+                }
                if ((dx > -1) && (dy > -1) && (dx < (src->w-1)) && (dy < (src->h-1))) {
                    int ex, ey;
                    int t1, t2;
@@ -341,8 +348,12 @@ transformSurfaceRGBA(SDL_Surface * src, SDL_Surface * dst, int isin, int icos,
                int dx = (sdx >> 16);
                int dy = (sdy >> 16);
                if ((unsigned)dx < (unsigned)src->w && (unsigned)dy < (unsigned)src->h) {
-                    if(flipx) dx = sw - dx;
-                    if(flipy) dy = sh - dy;
+                    if (flipx) {
+                        dx = sw - dx;
+                    }
+                    if (flipy) {
+                        dy = sh - dy;
+                    }
                    *pc = *((tColorRGBA *)((Uint8 *)src->pixels + src->pitch * dy) + dx);
                }
                sdx += icos;
@@ -411,8 +422,12 @@ transformSurfaceY(SDL_Surface * src, SDL_Surface * dst, int isin, int icos, int
            int dx = (sdx >> 16);
            int dy = (sdy >> 16);
            if ((unsigned)dx < (unsigned)src->w && (unsigned)dy < (unsigned)src->h) {
-                if (flipx) dx = sw - dx;
-                if (flipy) dy = sh- dy;
+                if (flipx) {
+                    dx = sw - dx;
+                }
+                if (flipy) {
+                    dy = sh - dy;
+                }
                *pc = *((tColorY *)src->pixels + src->pitch * dy + dx);
            }
            sdx += icos;
@@ -463,8 +478,9 @@ SDLgfx_rotateSurface(SDL_Surface * src, double angle, int smooth, int flipx, int
    double sangleinv, cangleinv;

    /* Sanity check */
-    if (src == NULL)
+    if (src == NULL) {
        return NULL;
+    }

    if (SDL_HasColorKey(src)) {
        if (SDL_GetColorKey(src, &colorkey) == 0) {
@@ -473,8 +489,9 @@ SDLgfx_rotateSurface(SDL_Surface * src, double angle, int smooth, int flipx, int
    }
    /* This function requires a 32-bit surface or 8-bit surface with a colorkey */
    is8bit = src->format->BitsPerPixel == 8 && colorKeyAvailable;
-    if (!(is8bit || (src->format->BitsPerPixel == 32 && src->format->Amask)))
+    if (!(is8bit || (src->format->BitsPerPixel == 32 && src->format->Amask))) {
        return NULL;
+    }

    /* Calculate target factors from sine/cosine and zoom */
    sangleinv = sangle*65536.0;
@@ -501,8 +518,9 @@ SDLgfx_rotateSurface(SDL_Surface * src, double angle, int smooth, int flipx, int
    }

    /* Check target */
-    if (rz_dst == NULL)
+    if (rz_dst == NULL) {
        return NULL;
+    }

    /* Adjust for guard rows */
    rz_dst->h = rect_dest->h;
@@ -542,14 +560,17 @@ SDLgfx_rotateSurface(SDL_Surface * src, double angle, int smooth, int flipx, int
    angle90 = (int)(angle/90);
    if (angle90 == angle/90) {
        angle90 %= 4;
-        if (angle90 < 0) angle90 += 4; /* 0:0 deg, 1:90 deg, 2:180 deg, 3:270 deg */
+        if (angle90 < 0) {
+            angle90 += 4; /* 0:0 deg, 1:90 deg, 2:180 deg, 3:270 deg */
+        }
+
    } else {
        angle90 = -1;
    }

    if (is8bit) {
        /* Call the 8-bit transformation routine to do the rotation */
-        if(angle90 >= 0) {
+        if (angle90 >= 0) {
            transformSurfaceY90(src, rz_dst, angle90, flipx, flipy);
        } else {
            transformSurfaceY(src, rz_dst, (int)sangleinv, (int)cangleinv,
--- a/src/render/software/SDL_triangle.c
+++ b/src/render/software/SDL_triangle.c
@@ -520,14 +520,26 @@ int SDL_SW_BlitTriangle(
        maxx = srcrect.x + srcrect.w;
        maxy = srcrect.y + srcrect.h;
        if (srcrect.w > 0) {
-            if (s0->x == maxx) s0->x--;
-            if (s1->x == maxx) s1->x--;
-            if (s2->x == maxx) s2->x--;
+            if (s0->x == maxx) {
+                s0->x--;
+            }
+            if (s1->x == maxx) {
+                s1->x--;
+            }
+            if (s2->x == maxx) {
+                s2->x--;
+            }
        }
        if (srcrect.h > 0) {
-            if (s0->y == maxy) s0->y--;
-            if (s1->y == maxy) s1->y--;
-            if (s2->y == maxy) s2->y--;
+            if (s0->y == maxy) {
+                s0->y--;
+            }
+            if (s1->y == maxy) {
+                s1->y--;
+            }
+            if (s2->y == maxy) {
+                s2->y--;
+            }
        }
    }

--- a/src/render/vitagxm/SDL_render_vita_gxm.c
+++ b/src/render/vitagxm/SDL_render_vita_gxm.c
@@ -228,13 +228,13 @@ VITA_GXM_CreateRenderer(SDL_Window *window, Uint32 flags)
    VITA_GXM_RenderData *data;

    renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));
-    if (!renderer) {
+    if (renderer == NULL) {
        SDL_OutOfMemory();
        return NULL;
    }

    data = (VITA_GXM_RenderData *) SDL_calloc(1, sizeof(VITA_GXM_RenderData));
-    if (!data) {
+    if (data == NULL) {
        SDL_free(renderer);
        SDL_OutOfMemory();
        return NULL;
@@ -282,8 +282,7 @@ VITA_GXM_CreateRenderer(SDL_Window *window, Uint32 flags)
    sceSysmoduleLoadModule( SCE_SYSMODULE_RAZOR_CAPTURE );
 #endif

-    if (gxm_init(renderer) != 0)
-    {
+    if (gxm_init(renderer) != 0) {
        SDL_free(data);
        SDL_free(renderer);
        return NULL;
@@ -310,7 +309,7 @@ VITA_GXM_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture)
    VITA_GXM_RenderData *data = (VITA_GXM_RenderData *) renderer->driverdata;
    VITA_GXM_TextureData* vita_texture = (VITA_GXM_TextureData*) SDL_calloc(1, sizeof(VITA_GXM_TextureData));

-    if (!vita_texture) {
+    if (vita_texture == NULL) {
        return SDL_OutOfMemory();
    }

@@ -649,8 +648,7 @@ VITA_GXM_SetRenderTarget(SDL_Renderer *renderer, SDL_Texture *texture)
 static void
 VITA_GXM_SetBlendMode(VITA_GXM_RenderData *data, int blendMode)
 {
-    if (blendMode != data->currentBlendMode)
-    {
+    if (blendMode != data->currentBlendMode) {
        fragment_programs *in = &data->blendFragmentPrograms.blend_mode_blend;

        switch (blendMode)
@@ -711,8 +709,7 @@ VITA_GXM_QueueDrawPoints(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const
    cmd->data.draw.first = (size_t)vertex;
    cmd->data.draw.count = count;

-    for (int i = 0; i < count; i++)
-    {
+    for (int i = 0; i < count; i++) {
        vertex[i].x = points[i].x;
        vertex[i].y = points[i].y;
        vertex[i].color = color;
@@ -735,8 +732,7 @@ VITA_GXM_QueueDrawLines(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const S
    cmd->data.draw.first = (size_t)vertex;
    cmd->data.draw.count = (count-1) * 2;

-    for (int i = 0; i < count - 1; i++)
-    {
+    for (int i = 0; i < count - 1; i++) {
        vertex[i*2].x = points[i].x;
        vertex[i*2].y = points[i].y;
        vertex[i*2].color = color;
@@ -770,7 +766,7 @@ VITA_GXM_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Textu
                data,
                count * sizeof(texture_vertex));

-        if (!vertices) {
+        if (vertices == NULL) {
            return -1;
        }

@@ -810,7 +806,7 @@ VITA_GXM_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Textu
                data,
                count * sizeof(color_vertex));

-        if (!vertices) {
+        if (vertices == NULL) {
            return -1;
        }

@@ -1148,7 +1144,7 @@ VITA_GXM_RenderReadPixels(SDL_Renderer *renderer, const SDL_Rect *rect,
    }

    temp_pixels = SDL_malloc(buflen);
-    if (!temp_pixels) {
+    if (temp_pixels == NULL) {
        return SDL_OutOfMemory();
    }

@@ -1236,14 +1232,17 @@ VITA_GXM_DestroyTexture(SDL_Renderer *renderer, SDL_Texture *texture)
    VITA_GXM_RenderData *data = (VITA_GXM_RenderData *) renderer->driverdata;
    VITA_GXM_TextureData *vita_texture = (VITA_GXM_TextureData *) texture->driverdata;

-    if (data == NULL)
+    if (data == NULL) {
        return;
+    }

-    if(vita_texture == NULL)
+    if (vita_texture == NULL) {
        return;
+    }

-    if(vita_texture->tex == NULL)
+    if (vita_texture->tex == NULL) {
        return;
+    }

    sceGxmFinish(data->gxm_context);

@@ -1259,8 +1258,9 @@ VITA_GXM_DestroyRenderer(SDL_Renderer *renderer)
 {
    VITA_GXM_RenderData *data = (VITA_GXM_RenderData *) renderer->driverdata;
    if (data) {
-        if (!data->initialized)
+        if (!data->initialized) {
            return;
+        }

        gxm_finish(renderer);

--- a/src/render/vitagxm/SDL_render_vita_gxm_memory.c
+++ b/src/render/vitagxm/SDL_render_vita_gxm_memory.c
@@ -38,14 +38,17 @@ vita_mem_alloc(unsigned int type, unsigned int size, unsigned int alignment, uns

    *uid = sceKernelAllocMemBlock("gpu_mem", type, size, NULL);

-    if (*uid < 0)
+    if (*uid < 0) {
        return NULL;
+    }

-    if (sceKernelGetMemBlockBase(*uid, &mem) < 0)
+    if (sceKernelGetMemBlockBase(*uid, &mem) < 0) {
        return NULL;
+    }

-    if (sceGxmMapMemory(mem, size, attribs) < 0)
+    if (sceGxmMapMemory(mem, size, attribs) < 0) {
        return NULL;
+    }

    return mem;
 }
@@ -54,8 +57,9 @@ void
 vita_mem_free(SceUID uid)
 {
    void *mem = NULL;
-    if (sceKernelGetMemBlockBase(uid, &mem) < 0)
+    if (sceKernelGetMemBlockBase(uid, &mem) < 0) {
        return;
+    }
    sceGxmUnmapMemory(mem);
    sceKernelFreeMemBlock(uid);
 }
@@ -82,8 +86,7 @@ vita_gpu_mem_alloc(VITA_GXM_RenderData *data, unsigned int size)
        }

        ret = sceKernelGetMemBlockBase(data->texturePoolUID, &mem);
-        if ( ret < 0)
-        {
+        if ( ret < 0) {
            return NULL;
        }
        data->texturePool = sceClibMspaceCreate(mem, poolsize);
@@ -92,8 +95,7 @@ vita_gpu_mem_alloc(VITA_GXM_RenderData *data, unsigned int size)
            return NULL;
        }
        ret = sceGxmMapMemory(mem, poolsize, SCE_GXM_MEMORY_ATTRIB_READ | SCE_GXM_MEMORY_ATTRIB_WRITE);
-        if (ret < 0)
-        {
+        if (ret < 0) {
            return NULL;
        }
    }
@@ -103,8 +105,7 @@ vita_gpu_mem_alloc(VITA_GXM_RenderData *data, unsigned int size)
 void
 vita_gpu_mem_free(VITA_GXM_RenderData *data, void* ptr)
 {
-    if (data->texturePool != NULL)
-    {
+    if (data->texturePool != NULL) {
        sceClibMspaceFree(data->texturePool, ptr);
    }
 }
@@ -113,12 +114,12 @@ void
 vita_gpu_mem_destroy(VITA_GXM_RenderData *data)
 {
    void *mem = NULL;
-    if (data->texturePool != NULL)
-    {
+    if (data->texturePool != NULL) {
        sceClibMspaceDestroy(data->texturePool);
        data->texturePool = NULL;
-        if (sceKernelGetMemBlockBase(data->texturePoolUID, &mem) < 0)
+        if (sceKernelGetMemBlockBase(data->texturePoolUID, &mem) < 0) {
            return;
+        }
        sceGxmUnmapMemory(mem);
        sceKernelFreeMemBlock(data->texturePoolUID);
    }
@@ -132,10 +133,12 @@ vita_mem_vertex_usse_alloc(unsigned int size, SceUID *uid, unsigned int *usse_of
    size = ALIGN(size, 4096);
    *uid = sceKernelAllocMemBlock("vertex_usse", SCE_KERNEL_MEMBLOCK_TYPE_USER_RW_UNCACHE, size, NULL);

-    if (sceKernelGetMemBlockBase(*uid, &mem) < 0)
+    if (sceKernelGetMemBlockBase(*uid, &mem) < 0) {
        return NULL;
-    if (sceGxmMapVertexUsseMemory(mem, size, usse_offset) < 0)
+    }
+    if (sceGxmMapVertexUsseMemory(mem, size, usse_offset) < 0) {
        return NULL;
+    }

    return mem;
 }
@@ -144,8 +147,9 @@ void
 vita_mem_vertex_usse_free(SceUID uid)
 {
    void *mem = NULL;
-    if (sceKernelGetMemBlockBase(uid, &mem) < 0)
+    if (sceKernelGetMemBlockBase(uid, &mem) < 0) {
        return;
+    }
    sceGxmUnmapVertexUsseMemory(mem);
    sceKernelFreeMemBlock(uid);
 }
@@ -158,10 +162,12 @@ vita_mem_fragment_usse_alloc(unsigned int size, SceUID *uid, unsigned int *usse_
    size = ALIGN(size, 4096);
    *uid = sceKernelAllocMemBlock("fragment_usse", SCE_KERNEL_MEMBLOCK_TYPE_USER_RW_UNCACHE, size, NULL);

-    if (sceKernelGetMemBlockBase(*uid, &mem) < 0)
+    if (sceKernelGetMemBlockBase(*uid, &mem) < 0) {
        return NULL;
-    if (sceGxmMapFragmentUsseMemory(mem, size, usse_offset) < 0)
+    }
+    if (sceGxmMapFragmentUsseMemory(mem, size, usse_offset) < 0) {
        return NULL;
+    }

    return mem;
 }
@@ -170,8 +176,9 @@ void
 vita_mem_fragment_usse_free(SceUID uid)
 {
    void *mem = NULL;
-    if (sceKernelGetMemBlockBase(uid, &mem) < 0)
+    if (sceKernelGetMemBlockBase(uid, &mem) < 0) {
        return;
+    }
    sceGxmUnmapFragmentUsseMemory(mem);
    sceKernelFreeMemBlock(uid);
 }
--- a/src/render/vitagxm/SDL_render_vita_gxm_tools.c
+++ b/src/render/vitagxm/SDL_render_vita_gxm_tools.c
@@ -260,7 +260,7 @@ set_stencil_mask(VITA_GXM_RenderData *data, float x, float y, float w, float h)
 void
 set_clip_rectangle(VITA_GXM_RenderData *data, int x_min, int y_min, int x_max, int y_max)
 {
-    if(data->drawing) {
+    if (data->drawing) {
        // clear the stencil buffer to 0
        sceGxmSetFrontStencilFunc(
            data->gxm_context,
@@ -750,8 +750,7 @@ gxm_init(SDL_Renderer *renderer)
        &data->linearIndicesUid
    );

-    for (i = 0; i <= UINT16_MAX; ++i)
-    {
+    for (i = 0; i <= UINT16_MAX; ++i) {
        data->linearIndices[i] = i;
    }

@@ -929,8 +928,7 @@ void gxm_finish(SDL_Renderer *renderer)
    // clean up display queue
    vita_mem_free(data->depthBufferUid);

-    for (size_t i = 0; i < VITA_GXM_BUFFERS; i++)
-    {
+    for (size_t i = 0; i < VITA_GXM_BUFFERS; i++) {
        // clear the buffer then deallocate
        SDL_memset(data->displayBufferData[i], 0, VITA_GXM_SCREEN_HEIGHT * VITA_GXM_SCREEN_STRIDE * 4);
        vita_mem_free(data->displayBufferUid[i]);
@@ -1050,8 +1048,9 @@ create_gxm_texture(VITA_GXM_RenderData *data, unsigned int w, unsigned int h, Sc
        tex_size += (((aligned_w + 1) / 2) * ((h + 1) / 2)) * 2;
    }

-    if (!texture)
+    if (texture == NULL) {
        return NULL;
+    }

    *return_w = w;
    *return_h = h;
@@ -1064,7 +1063,7 @@ create_gxm_texture(VITA_GXM_RenderData *data, unsigned int w, unsigned int h, Sc
    );

    /* Try SCE_KERNEL_MEMBLOCK_TYPE_USER_RW_UNCACHE in case we're out of VRAM */
-    if (!texture_data) {
+    if (texture_data == NULL) {
        SDL_LogWarn(SDL_LOG_CATEGORY_RENDER, "CDRAM texture allocation failed\n");
        texture_data = vita_mem_alloc(
            SCE_KERNEL_MEMBLOCK_TYPE_USER_RW_UNCACHE,
@@ -1078,7 +1077,7 @@ create_gxm_texture(VITA_GXM_RenderData *data, unsigned int w, unsigned int h, Sc
        texture->cdram = 1;
    }

-    if (!texture_data) {
+    if (texture_data == NULL) {
        SDL_free(texture);
        return NULL;
    }
@@ -1211,8 +1210,7 @@ void gxm_minimal_term_for_common_dialog(void)

 void gxm_init_for_common_dialog(void)
 {
-    for (int i = 0; i < VITA_GXM_BUFFERS; i += 1)
-    {
+    for (int i = 0; i < VITA_GXM_BUFFERS; i += 1) {
        buffer_for_common_dialog[i].displayData.wait_vblank = SDL_TRUE;
        buffer_for_common_dialog[i].displayData.address = vita_mem_alloc(
            SCE_KERNEL_MEMBLOCK_TYPE_USER_CDRAM_RW,
@@ -1260,8 +1258,7 @@ void gxm_swap_for_common_dialog(void)
 void gxm_term_for_common_dialog(void)
 {
    sceGxmDisplayQueueFinish();
-    for (int i = 0; i < VITA_GXM_BUFFERS; i += 1)
-    {
+    for (int i = 0; i < VITA_GXM_BUFFERS; i += 1) {
        vita_mem_free(buffer_for_common_dialog[i].uid);
        sceGxmSyncObjectDestroy(buffer_for_common_dialog[i].sync);
    }