commit 8cac51aa90a6a1537dd7f8aff08b05bfbc08b583
author Ryan C. Gordon <icculus@icculus.org> Wed Nov 14 22:38:58 2018 -0500
committer Ryan C. Gordon <icculus@icculus.org> Wed Nov 14 22:38:58 2018 -0500
tree 3b89b6f7c9200fc0151832f438d460f61d28c39f
parent 2005ea6ca255efda3cb0d8ee5c9ac9224848c341

software: fix blits with color mods that change during a command queue run.

--HG--
extra : rebase_source : f1b4087bb0bbf8955a9d418158b28b066ae79402

src/render/software/SDL_render_sw.c

diff --git a/src/render/software/SDL_render_sw.c b/src/render/software/SDL_render_sw.c
index 7effafa..1afc05b 100644
--- a/src/render/software/SDL_render_sw.c
+++ b/src/render/software/SDL_render_sw.c
@@ -554,20 +554,17 @@
     const SDL_BlendMode blend = cmd->data.draw.blend;
     SDL_Texture *texture = cmd->data.draw.texture;
     SDL_Surface *surface = (SDL_Surface *) texture->driverdata;
+    const SDL_bool colormod = ((r & g & b) != 0xFF);
+    const SDL_bool alphamod = (a != 0xFF);
+    const SDL_bool blending = ((blend == SDL_BLENDMODE_ADD) || (blend == SDL_BLENDMODE_MOD));
 
-    if (texture->modMode & SDL_TEXTUREMODULATE_COLOR) {
-        SDL_SetSurfaceRLE(surface, 0);
-        SDL_SetSurfaceColorMod(surface, r, g, b);
-    }
-
-    if ((texture->modMode & SDL_TEXTUREMODULATE_ALPHA) && surface->format->Amask) {
-        SDL_SetSurfaceRLE(surface, 0);
-        SDL_SetSurfaceAlphaMod(surface, a);
-    }
-
-    if ((blend == SDL_BLENDMODE_ADD) || (blend == SDL_BLENDMODE_MOD)) {
+    if (colormod || alphamod || blending) {
         SDL_SetSurfaceRLE(surface, 0);
     }
+
+    /* !!! FIXME: we can probably avoid some of these calls. */
+    SDL_SetSurfaceColorMod(surface, r, g, b);
+    SDL_SetSurfaceAlphaMod(surface, a);
     SDL_SetSurfaceBlendMode(surface, blend);
 }