# HG changeset patch # User Sam Lantinga # Date 1219718424 0 # Node ID 91f1706b27be912cff80dae7c8958878d5a5e95b # Parent e82a0e3e9b0e2b17940940844a9fdfabf3e42763 indent. *sigh* diff -r e82a0e3e9b0e -r 91f1706b27be src/video/directfb/SDL_DirectFB_render.c --- a/src/video/directfb/SDL_DirectFB_render.c Tue Aug 26 02:32:45 2008 +0000 +++ b/src/video/directfb/SDL_DirectFB_render.c Tue Aug 26 02:40:24 2008 +0000 @@ -694,29 +694,29 @@ } switch (texture->blendMode) { - case SDL_TEXTUREBLENDMODE_NONE: /**< No blending */ + case SDL_TEXTUREBLENDMODE_NONE: flags |= DSBLIT_NOFX; data->surface->SetSrcBlendFunction(data->surface, DSBF_ONE); data->surface->SetDstBlendFunction(data->surface, DSBF_ZERO); break; - case SDL_TEXTUREBLENDMODE_MASK: /**< dst = A ? src : dst (alpha is mask) */ + case SDL_TEXTUREBLENDMODE_MASK: flags |= DSBLIT_BLEND_ALPHACHANNEL; data->surface->SetSrcBlendFunction(data->surface, DSBF_SRCALPHA); data->surface->SetDstBlendFunction(data->surface, DSBF_INVSRCALPHA); break; - case SDL_TEXTUREBLENDMODE_BLEND:/**< dst = (src * A) + (dst * (1-A)) */ + case SDL_TEXTUREBLENDMODE_BLEND: flags |= DSBLIT_BLEND_ALPHACHANNEL; data->surface->SetSrcBlendFunction(data->surface, DSBF_SRCALPHA); data->surface->SetDstBlendFunction(data->surface, DSBF_INVSRCALPHA); break; - case SDL_TEXTUREBLENDMODE_ADD: /**< dst = (src * A) + dst */ + case SDL_TEXTUREBLENDMODE_ADD: flags |= DSBLIT_BLEND_ALPHACHANNEL; data->surface->SetSrcBlendFunction(data->surface, DSBF_SRCALPHA); data->surface->SetDstBlendFunction(data->surface, DSBF_ONE); break; - case SDL_TEXTUREBLENDMODE_MOD: /**< dst = src * dst */ + case SDL_TEXTUREBLENDMODE_MOD: flags |= DSBLIT_BLEND_ALPHACHANNEL; data->surface->SetSrcBlendFunction(data->surface, DSBF_DESTCOLOR); data->surface->SetDstBlendFunction(data->surface, DSBF_ZERO); diff -r e82a0e3e9b0e -r 91f1706b27be src/video/directfb/SDL_DirectFB_video.c --- a/src/video/directfb/SDL_DirectFB_video.c Tue Aug 26 02:32:45 2008 +0000 +++ b/src/video/directfb/SDL_DirectFB_video.c Tue Aug 26 02:40:24 2008 +0000 @@ -700,10 +700,8 @@ y = 0; } - desc.flags = - DWDESC_WIDTH | DWDESC_HEIGHT /*| DWDESC_CAPS */ | DWDESC_PIXELFORMAT - | - DWDESC_SURFACE_CAPS; + desc.flags = DWDESC_WIDTH | DWDESC_HEIGHT /*| DWDESC_CAPS */ | DWDESC_PIXELFORMAT + | DWDESC_SURFACE_CAPS; #if (DIRECTFB_MAJOR_VERSION == 1) && (DIRECTFB_MINOR_VERSION >= 0) /* Needed for 1.2 */