Mercurial > sdl-ios-xcode

changeset 3053:aa34d1180d30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
When creating a software texture, synchronize the surface with the texture. When creating a texture from a surface, synchronize the texture with the surface.
author Sam Lantinga <slouken@libsdl.org>
date Fri, 30 Jan 2009 06:40:16 +0000
parents b7197d7e8566
children 8d93bfecb9dc
files src/video/SDL_renderer_sw.c src/video/SDL_video.c
diffstat 2 files changed, 24 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/video/SDL_renderer_sw.c	Fri Jan 30 06:38:44 2009 +0000
+++ b/src/video/SDL_renderer_sw.c	Fri Jan 30 06:40:16 2009 +0000
@@ -380,6 +380,12 @@
         texture->driverdata =
             SDL_CreateRGBSurface(0, texture->w, texture->h, bpp, Rmask, Gmask,
                                  Bmask, Amask);
+        SDL_SetSurfaceColorMod(texture->driverdata, texture->r, texture->g,
+                               texture->b);
+        SDL_SetSurfaceAlphaMod(texture->driverdata, texture->a);
+        SDL_SetSurfaceBlendMode(texture->driverdata, texture->blendMode);
+        SDL_SetSurfaceScaleMode(texture->driverdata, texture->scaleMode);
+
         if (texture->access == SDL_TEXTUREACCESS_STATIC) {
             SDL_SetSurfaceRLE(texture->driverdata, 1);
         }
--- a/src/video/SDL_video.c	Fri Jan 30 06:38:44 2009 +0000
+++ b/src/video/SDL_video.c	Fri Jan 30 06:40:16 2009 +0000
@@ -1635,6 +1635,24 @@
         }
     }
 
+    {
+        Uint8 r, g, b, a;
+        int blendMode;
+        int scaleMode;
+
+        SDL_GetSurfaceColorMod(surface, &r, &g, &b);
+        SDL_SetTextureColorMod(textureID, r, g, b);
+
+        SDL_GetSurfaceAlphaMod(surface, &a);
+        SDL_SetTextureAlphaMod(textureID, a);
+
+        SDL_GetSurfaceBlendMode(surface, &blendMode);
+        SDL_SetTextureBlendMode(textureID, blendMode);
+
+        SDL_GetSurfaceScaleMode(surface, &scaleMode);
+        SDL_SetTextureScaleMode(textureID, scaleMode);
+    }
+
     if (SDL_ISPIXELFORMAT_INDEXED(format) && fmt->palette) {
         SDL_SetTexturePalette(textureID, fmt->palette->colors, 0,
                               fmt->palette->ncolors);