2006-07-10 21:04:37 +00:00
|
|
|
/*
|
2011-04-08 13:03:26 -07:00
|
|
|
Simple DirectMedia Layer
|
2016-01-02 10:10:34 -08:00
|
|
|
Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
|
2011-04-08 13:03:26 -07:00
|
|
|
|
|
|
|
This software is provided 'as-is', without any express or implied
|
|
|
|
warranty. In no event will the authors be held liable for any damages
|
|
|
|
arising from the use of this software.
|
|
|
|
|
|
|
|
Permission is granted to anyone to use this software for any purpose,
|
|
|
|
including commercial applications, and to alter it and redistribute it
|
|
|
|
freely, subject to the following restrictions:
|
|
|
|
|
|
|
|
1. The origin of this software must not be misrepresented; you must not
|
|
|
|
claim that you wrote the original software. If you use this software
|
|
|
|
in a product, an acknowledgment in the product documentation would be
|
|
|
|
appreciated but is not required.
|
|
|
|
2. Altered source versions must be plainly marked as such, and must not be
|
|
|
|
misrepresented as being the original software.
|
|
|
|
3. This notice may not be removed or altered from any source distribution.
|
2006-07-10 21:04:37 +00:00
|
|
|
*/
|
2013-11-24 23:56:17 -05:00
|
|
|
#include "../../SDL_internal.h"
|
2006-07-10 21:04:37 +00:00
|
|
|
|
2011-02-08 10:04:09 -08:00
|
|
|
#if !SDL_RENDER_DISABLED
|
|
|
|
|
2011-02-02 14:34:54 -08:00
|
|
|
#include "../SDL_sysrender.h"
|
2011-10-31 05:56:58 -04:00
|
|
|
#include "SDL_render_sw_c.h"
|
2012-06-01 19:51:08 -03:00
|
|
|
#include "SDL_hints.h"
|
2006-07-10 21:04:37 +00:00
|
|
|
|
2011-02-03 02:45:29 -08:00
|
|
|
#include "SDL_draw.h"
|
|
|
|
#include "SDL_blendfillrect.h"
|
|
|
|
#include "SDL_blendline.h"
|
|
|
|
#include "SDL_blendpoint.h"
|
|
|
|
#include "SDL_drawline.h"
|
|
|
|
#include "SDL_drawpoint.h"
|
2012-06-01 19:51:08 -03:00
|
|
|
#include "SDL_rotate.h"
|
2006-07-10 21:04:37 +00:00
|
|
|
|
|
|
|
/* SDL surface based renderer implementation */
|
|
|
|
|
2006-07-19 07:18:45 +00:00
|
|
|
static SDL_Renderer *SW_CreateRenderer(SDL_Window * window, Uint32 flags);
|
2011-02-01 19:19:43 -08:00
|
|
|
static void SW_WindowEvent(SDL_Renderer * renderer,
|
|
|
|
const SDL_WindowEvent *event);
|
2013-05-29 03:07:55 -07:00
|
|
|
static int SW_GetOutputSize(SDL_Renderer * renderer, int *w, int *h);
|
2006-07-19 07:18:45 +00:00
|
|
|
static int SW_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture);
|
2006-08-28 03:17:39 +00:00
|
|
|
static int SW_SetTextureColorMod(SDL_Renderer * renderer,
|
|
|
|
SDL_Texture * texture);
|
|
|
|
static int SW_SetTextureAlphaMod(SDL_Renderer * renderer,
|
|
|
|
SDL_Texture * texture);
|
2011-01-31 23:37:30 -08:00
|
|
|
static int SW_SetTextureBlendMode(SDL_Renderer * renderer,
|
|
|
|
SDL_Texture * texture);
|
2006-08-28 03:17:39 +00:00
|
|
|
static int SW_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
|
|
|
|
const SDL_Rect * rect, const void *pixels,
|
|
|
|
int pitch);
|
2006-07-19 07:18:45 +00:00
|
|
|
static int SW_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
|
2011-02-03 00:19:40 -08:00
|
|
|
const SDL_Rect * rect, void **pixels, int *pitch);
|
2006-07-19 07:18:45 +00:00
|
|
|
static void SW_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture);
|
2012-01-22 01:26:28 -05:00
|
|
|
static int SW_SetRenderTarget(SDL_Renderer * renderer, SDL_Texture * texture);
|
2011-02-15 13:59:59 -08:00
|
|
|
static int SW_UpdateViewport(SDL_Renderer * renderer);
|
2013-05-04 04:46:00 -07:00
|
|
|
static int SW_UpdateClipRect(SDL_Renderer * renderer);
|
2011-02-15 13:59:59 -08:00
|
|
|
static int SW_RenderClear(SDL_Renderer * renderer);
|
2009-12-23 01:55:00 +00:00
|
|
|
static int SW_RenderDrawPoints(SDL_Renderer * renderer,
|
2012-10-01 20:59:33 -07:00
|
|
|
const SDL_FPoint * points, int count);
|
2009-12-23 01:55:00 +00:00
|
|
|
static int SW_RenderDrawLines(SDL_Renderer * renderer,
|
2012-10-01 20:59:33 -07:00
|
|
|
const SDL_FPoint * points, int count);
|
2009-12-23 01:55:00 +00:00
|
|
|
static int SW_RenderFillRects(SDL_Renderer * renderer,
|
2012-10-01 20:59:33 -07:00
|
|
|
const SDL_FRect * rects, int count);
|
2006-07-19 07:18:45 +00:00
|
|
|
static int SW_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
|
2012-10-01 20:59:33 -07:00
|
|
|
const SDL_Rect * srcrect, const SDL_FRect * dstrect);
|
2012-06-01 19:51:08 -03:00
|
|
|
static int SW_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
|
2012-10-01 20:59:33 -07:00
|
|
|
const SDL_Rect * srcrect, const SDL_FRect * dstrect,
|
|
|
|
const double angle, const SDL_FPoint * center, const SDL_RendererFlip flip);
|
2009-11-09 05:20:11 +00:00
|
|
|
static int SW_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
|
2009-11-16 07:13:07 +00:00
|
|
|
Uint32 format, void * pixels, int pitch);
|
2006-07-19 07:18:45 +00:00
|
|
|
static void SW_RenderPresent(SDL_Renderer * renderer);
|
|
|
|
static void SW_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture);
|
|
|
|
static void SW_DestroyRenderer(SDL_Renderer * renderer);
|
|
|
|
|
|
|
|
|
|
|
|
SDL_RenderDriver SW_RenderDriver = {
|
|
|
|
SW_CreateRenderer,
|
2006-07-10 21:04:37 +00:00
|
|
|
{
|
|
|
|
"software",
|
2012-01-21 22:22:30 -05:00
|
|
|
SDL_RENDERER_SOFTWARE | SDL_RENDERER_TARGETTEXTURE,
|
2011-02-03 00:19:40 -08:00
|
|
|
8,
|
2006-07-10 21:04:37 +00:00
|
|
|
{
|
2006-08-05 17:09:42 +00:00
|
|
|
SDL_PIXELFORMAT_ARGB8888,
|
|
|
|
SDL_PIXELFORMAT_ABGR8888,
|
2014-06-21 21:46:42 -07:00
|
|
|
SDL_PIXELFORMAT_RGBA8888,
|
|
|
|
SDL_PIXELFORMAT_BGRA8888,
|
|
|
|
SDL_PIXELFORMAT_RGB888,
|
|
|
|
SDL_PIXELFORMAT_BGR888,
|
2014-06-22 09:42:43 -07:00
|
|
|
SDL_PIXELFORMAT_RGB565,
|
|
|
|
SDL_PIXELFORMAT_RGB555
|
2011-02-03 00:19:40 -08:00
|
|
|
},
|
2006-07-10 21:04:37 +00:00
|
|
|
0,
|
|
|
|
0}
|
|
|
|
};
|
|
|
|
|
|
|
|
typedef struct
|
|
|
|
{
|
2011-02-03 15:49:37 -08:00
|
|
|
SDL_Surface *surface;
|
2012-01-21 22:22:30 -05:00
|
|
|
SDL_Surface *window;
|
2006-07-19 07:18:45 +00:00
|
|
|
} SW_RenderData;
|
2006-07-10 21:04:37 +00:00
|
|
|
|
2006-07-15 09:46:36 +00:00
|
|
|
|
2011-02-15 13:59:59 -08:00
|
|
|
static SDL_Surface *
|
|
|
|
SW_ActivateRenderer(SDL_Renderer * renderer)
|
|
|
|
{
|
|
|
|
SW_RenderData *data = (SW_RenderData *) renderer->driverdata;
|
|
|
|
|
|
|
|
if (!data->surface) {
|
2012-01-21 22:22:30 -05:00
|
|
|
data->surface = data->window;
|
|
|
|
}
|
|
|
|
if (!data->surface) {
|
2013-05-29 03:07:55 -07:00
|
|
|
SDL_Surface *surface = SDL_GetWindowSurface(renderer->window);
|
|
|
|
if (surface) {
|
|
|
|
data->surface = data->window = surface;
|
|
|
|
|
|
|
|
SW_UpdateViewport(renderer);
|
2013-06-27 11:27:19 -07:00
|
|
|
SW_UpdateClipRect(renderer);
|
2013-05-29 03:07:55 -07:00
|
|
|
}
|
2011-02-15 13:59:59 -08:00
|
|
|
}
|
|
|
|
return data->surface;
|
|
|
|
}
|
|
|
|
|
2006-07-10 21:04:37 +00:00
|
|
|
SDL_Renderer *
|
2011-02-03 15:49:37 -08:00
|
|
|
SW_CreateRendererForSurface(SDL_Surface * surface)
|
2006-07-10 21:04:37 +00:00
|
|
|
{
|
|
|
|
SDL_Renderer *renderer;
|
2006-07-19 07:18:45 +00:00
|
|
|
SW_RenderData *data;
|
2006-07-10 21:04:37 +00:00
|
|
|
|
2011-02-03 15:49:37 -08:00
|
|
|
if (!surface) {
|
|
|
|
SDL_SetError("Can't create renderer for NULL surface");
|
2006-07-10 21:04:37 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));
|
|
|
|
if (!renderer) {
|
|
|
|
SDL_OutOfMemory();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2006-07-22 08:33:18 +00:00
|
|
|
data = (SW_RenderData *) SDL_calloc(1, sizeof(*data));
|
2006-07-10 21:04:37 +00:00
|
|
|
if (!data) {
|
2006-07-19 07:18:45 +00:00
|
|
|
SW_DestroyRenderer(renderer);
|
2006-07-10 21:04:37 +00:00
|
|
|
SDL_OutOfMemory();
|
|
|
|
return NULL;
|
|
|
|
}
|
2011-02-03 15:49:37 -08:00
|
|
|
data->surface = surface;
|
2014-07-13 09:04:55 -07:00
|
|
|
data->window = surface;
|
2011-02-03 15:49:37 -08:00
|
|
|
|
2011-02-01 19:19:43 -08:00
|
|
|
renderer->WindowEvent = SW_WindowEvent;
|
2013-05-29 03:07:55 -07:00
|
|
|
renderer->GetOutputSize = SW_GetOutputSize;
|
2011-02-02 14:34:54 -08:00
|
|
|
renderer->CreateTexture = SW_CreateTexture;
|
|
|
|
renderer->SetTextureColorMod = SW_SetTextureColorMod;
|
|
|
|
renderer->SetTextureAlphaMod = SW_SetTextureAlphaMod;
|
|
|
|
renderer->SetTextureBlendMode = SW_SetTextureBlendMode;
|
|
|
|
renderer->UpdateTexture = SW_UpdateTexture;
|
|
|
|
renderer->LockTexture = SW_LockTexture;
|
|
|
|
renderer->UnlockTexture = SW_UnlockTexture;
|
2012-01-22 01:26:28 -05:00
|
|
|
renderer->SetRenderTarget = SW_SetRenderTarget;
|
2011-02-15 13:59:59 -08:00
|
|
|
renderer->UpdateViewport = SW_UpdateViewport;
|
2013-05-04 04:46:00 -07:00
|
|
|
renderer->UpdateClipRect = SW_UpdateClipRect;
|
2011-02-15 13:59:59 -08:00
|
|
|
renderer->RenderClear = SW_RenderClear;
|
2009-12-23 01:55:00 +00:00
|
|
|
renderer->RenderDrawPoints = SW_RenderDrawPoints;
|
|
|
|
renderer->RenderDrawLines = SW_RenderDrawLines;
|
|
|
|
renderer->RenderFillRects = SW_RenderFillRects;
|
2006-07-19 07:18:45 +00:00
|
|
|
renderer->RenderCopy = SW_RenderCopy;
|
2012-06-01 19:51:08 -03:00
|
|
|
renderer->RenderCopyEx = SW_RenderCopyEx;
|
2009-11-09 05:20:11 +00:00
|
|
|
renderer->RenderReadPixels = SW_RenderReadPixels;
|
2006-07-19 07:18:45 +00:00
|
|
|
renderer->RenderPresent = SW_RenderPresent;
|
2012-01-21 22:22:30 -05:00
|
|
|
renderer->DestroyTexture = SW_DestroyTexture;
|
2006-07-19 07:18:45 +00:00
|
|
|
renderer->DestroyRenderer = SW_DestroyRenderer;
|
2011-02-02 14:34:54 -08:00
|
|
|
renderer->info = SW_RenderDriver.info;
|
2006-07-10 21:04:37 +00:00
|
|
|
renderer->driverdata = data;
|
|
|
|
|
2011-02-15 13:59:59 -08:00
|
|
|
SW_ActivateRenderer(renderer);
|
|
|
|
|
2011-02-03 15:49:37 -08:00
|
|
|
return renderer;
|
|
|
|
}
|
2006-07-15 09:46:36 +00:00
|
|
|
|
2011-02-03 15:49:37 -08:00
|
|
|
SDL_Renderer *
|
|
|
|
SW_CreateRenderer(SDL_Window * window, Uint32 flags)
|
|
|
|
{
|
|
|
|
SDL_Surface *surface;
|
2006-07-15 09:46:36 +00:00
|
|
|
|
2011-02-03 15:49:37 -08:00
|
|
|
surface = SDL_GetWindowSurface(window);
|
|
|
|
if (!surface) {
|
2006-07-15 09:46:36 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2011-02-03 15:49:37 -08:00
|
|
|
return SW_CreateRendererForSurface(surface);
|
2006-07-10 21:04:37 +00:00
|
|
|
}
|
|
|
|
|
2011-02-01 19:19:43 -08:00
|
|
|
static void
|
|
|
|
SW_WindowEvent(SDL_Renderer * renderer, const SDL_WindowEvent *event)
|
2006-08-06 04:39:13 +00:00
|
|
|
{
|
|
|
|
SW_RenderData *data = (SW_RenderData *) renderer->driverdata;
|
|
|
|
|
2011-02-12 19:02:14 -08:00
|
|
|
if (event->event == SDL_WINDOWEVENT_SIZE_CHANGED) {
|
2011-02-15 13:59:59 -08:00
|
|
|
data->surface = NULL;
|
2012-02-07 19:34:24 -05:00
|
|
|
data->window = NULL;
|
2006-08-06 04:39:13 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-05-29 03:07:55 -07:00
|
|
|
static int
|
|
|
|
SW_GetOutputSize(SDL_Renderer * renderer, int *w, int *h)
|
|
|
|
{
|
|
|
|
SDL_Surface *surface = SW_ActivateRenderer(renderer);
|
|
|
|
|
|
|
|
if (surface) {
|
|
|
|
if (w) {
|
|
|
|
*w = surface->w;
|
|
|
|
}
|
|
|
|
if (h) {
|
|
|
|
*h = surface->h;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
} else {
|
|
|
|
SDL_SetError("Software renderer doesn't have an output surface");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-07-10 21:04:37 +00:00
|
|
|
static int
|
2006-07-19 07:18:45 +00:00
|
|
|
SW_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
|
2006-07-10 21:04:37 +00:00
|
|
|
{
|
2011-02-03 00:19:40 -08:00
|
|
|
int bpp;
|
|
|
|
Uint32 Rmask, Gmask, Bmask, Amask;
|
2006-07-10 21:04:37 +00:00
|
|
|
|
2011-02-03 00:19:40 -08:00
|
|
|
if (!SDL_PixelFormatEnumToMasks
|
|
|
|
(texture->format, &bpp, &Rmask, &Gmask, &Bmask, &Amask)) {
|
2013-03-31 12:48:50 -04:00
|
|
|
return SDL_SetError("Unknown texture format");
|
2011-02-03 00:19:40 -08:00
|
|
|
}
|
2006-07-10 21:04:37 +00:00
|
|
|
|
2011-02-03 00:19:40 -08:00
|
|
|
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);
|
2009-01-30 06:40:16 +00:00
|
|
|
|
Fixed bug 3359 - Software renderer does incorrect blending with SDL_RenderCopyEx
Simon Hug
The software renderer produces incorrect results when blending textures at an angle with certain blend modes. It seems that there were some edge cases that weren't considered when the SW_RenderCopyEx function was last changed. Or another bug possibly covered up the problem. (More on that in another bug report.)
Most of the issues come from the fact that the rotating function sets a black colorkey. This is problematic because black is most likely appearing in the surface and the final blit will ignore these pixels. Unless a colorkey is already set (the software renderer currently never sets one), it's very hard to find a free color. Of course it could scan over the whole image until one is found, but that seems inefficient.
The following blend modes have issues when drawn at an angle.
NONE: The black pixels get ignored, making them essentially transparent. This breaks the 'dstRGBA = srcRGBA' definition of the NONE blend mode.
MOD: Again, the black pixels get ignored. This also breaks the 'dstRGB = dstRGB * srcRGB' definition of the MOD blend mode, where black pixels would make the destination black as well. A white colorkey will work though, with some preparations.
BLEND: There are some issues when blending a texture with a translucent RGBA target texture. I - uh - forgot what the problem here exactly is.
This patch fixes the issues mentioned above. It mainly changes the code so it tries to do things without the colorkey and removes the automatic format conversion part from the SDLgfx_rotateSurface function. Getting the format right is something the caller has to do now and the required code has been added to the SW_RenderCopyEx function.
There's a small change to the SW_CreateTexture function. RLE encoding a surface with an alpha mask can be a lossy process. Depending on how the user uses the RGBA channels, this may be undesired. The change that surfaces with an alpha mask don't get encoded makes the software renderer consistent with the other renderers.
The SW_RenderCopyEx function now does these steps: Lock the source surface if necessary. Create a clone of the source by using the pixel buffer directly. Check the format and set a flag if a conversion is necessary. Check if scaling or cropping is necessary and set the flag for that as well. Check if color and alpha modulation has to be done before the rotate. Check if the source is an opaque surface. If not, it creates a mask surface that is necessary for the NONE blend mode. If any of the flags were set, a new surface is created and the source will be converted, scaled, cropped, and modulated. The rest of the function stays somewhat the same. The mask also needs to be rotated of course and then there is the NONE blend mode...
It's surprisingly hard to get the pixel from a rotated surface to the destination buffer without affecting the pixel outside the rotated area. I found a way to do this with three blits which is pretty hard on the performance. Perhaps someone has an idea how to do this faster?
As mentioned above, the SDLgfx_rotateSurface now only takes 8-bit paletted or 32-bit with alpha mask surfaces. It additionally sets the new surfaces up for the MOD blend mode.
I shortly tested the 8-bit path of SDLgfx_rotateSurface and it seemed to work so far. This path is not used by the software renderer anyway.
2016-11-15 01:12:27 -08:00
|
|
|
/* Only RLE encode textures without an alpha channel since the RLE coder
|
|
|
|
* discards the color values of pixels with an alpha value of zero.
|
|
|
|
*/
|
|
|
|
if (texture->access == SDL_TEXTUREACCESS_STATIC && !Amask) {
|
2011-02-03 00:19:40 -08:00
|
|
|
SDL_SetSurfaceRLE(texture->driverdata, 1);
|
2006-07-10 21:04:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!texture->driverdata) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-08-28 03:17:39 +00:00
|
|
|
static int
|
|
|
|
SW_SetTextureColorMod(SDL_Renderer * renderer, SDL_Texture * texture)
|
|
|
|
{
|
2007-08-18 05:39:09 +00:00
|
|
|
SDL_Surface *surface = (SDL_Surface *) texture->driverdata;
|
2015-06-19 22:12:47 -07:00
|
|
|
/* If the color mod is ever enabled (non-white), permanently disable RLE (which doesn't support
|
|
|
|
* color mod) to avoid potentially frequent RLE encoding/decoding.
|
|
|
|
*/
|
|
|
|
if ((texture->r & texture->g & texture->b) != 255) {
|
|
|
|
SDL_SetSurfaceRLE(surface, 0);
|
|
|
|
}
|
2007-08-18 05:39:09 +00:00
|
|
|
return SDL_SetSurfaceColorMod(surface, texture->r, texture->g,
|
|
|
|
texture->b);
|
2006-08-28 03:17:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
SW_SetTextureAlphaMod(SDL_Renderer * renderer, SDL_Texture * texture)
|
|
|
|
{
|
2007-08-18 05:39:09 +00:00
|
|
|
SDL_Surface *surface = (SDL_Surface *) texture->driverdata;
|
2015-06-19 22:12:47 -07:00
|
|
|
/* If the texture ever has multiple alpha values (surface alpha plus alpha channel), permanently
|
|
|
|
* disable RLE (which doesn't support this) to avoid potentially frequent RLE encoding/decoding.
|
|
|
|
*/
|
|
|
|
if (texture->a != 255 && surface->format->Amask) {
|
|
|
|
SDL_SetSurfaceRLE(surface, 0);
|
|
|
|
}
|
2007-08-18 05:39:09 +00:00
|
|
|
return SDL_SetSurfaceAlphaMod(surface, texture->a);
|
2006-08-28 03:17:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
SW_SetTextureBlendMode(SDL_Renderer * renderer, SDL_Texture * texture)
|
|
|
|
{
|
2007-08-18 05:39:09 +00:00
|
|
|
SDL_Surface *surface = (SDL_Surface *) texture->driverdata;
|
2015-06-19 22:12:47 -07:00
|
|
|
/* If add or mod blending are ever enabled, permanently disable RLE (which doesn't support
|
|
|
|
* them) to avoid potentially frequent RLE encoding/decoding.
|
|
|
|
*/
|
|
|
|
if ((texture->blendMode == SDL_BLENDMODE_ADD || texture->blendMode == SDL_BLENDMODE_MOD)) {
|
|
|
|
SDL_SetSurfaceRLE(surface, 0);
|
|
|
|
}
|
2007-08-18 05:39:09 +00:00
|
|
|
return SDL_SetSurfaceBlendMode(surface, texture->blendMode);
|
2006-08-28 03:17:39 +00:00
|
|
|
}
|
|
|
|
|
2006-07-10 21:04:37 +00:00
|
|
|
static int
|
2006-07-19 07:18:45 +00:00
|
|
|
SW_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
|
|
|
|
const SDL_Rect * rect, const void *pixels, int pitch)
|
2006-07-10 21:04:37 +00:00
|
|
|
{
|
2011-02-03 00:19:40 -08:00
|
|
|
SDL_Surface *surface = (SDL_Surface *) texture->driverdata;
|
|
|
|
Uint8 *src, *dst;
|
|
|
|
int row;
|
|
|
|
size_t length;
|
|
|
|
|
2011-06-10 12:13:06 +03:00
|
|
|
if(SDL_MUSTLOCK(surface))
|
|
|
|
SDL_LockSurface(surface);
|
2011-02-03 00:19:40 -08:00
|
|
|
src = (Uint8 *) pixels;
|
|
|
|
dst = (Uint8 *) surface->pixels +
|
|
|
|
rect->y * surface->pitch +
|
|
|
|
rect->x * surface->format->BytesPerPixel;
|
|
|
|
length = rect->w * surface->format->BytesPerPixel;
|
|
|
|
for (row = 0; row < rect->h; ++row) {
|
|
|
|
SDL_memcpy(dst, src, length);
|
|
|
|
src += pitch;
|
|
|
|
dst += surface->pitch;
|
2006-07-10 21:04:37 +00:00
|
|
|
}
|
2011-06-10 12:13:06 +03:00
|
|
|
if(SDL_MUSTLOCK(surface))
|
|
|
|
SDL_UnlockSurface(surface);
|
2011-02-03 00:19:40 -08:00
|
|
|
return 0;
|
2006-07-10 21:04:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2006-07-19 07:18:45 +00:00
|
|
|
SW_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
|
2011-02-03 00:19:40 -08:00
|
|
|
const SDL_Rect * rect, void **pixels, int *pitch)
|
2006-07-10 21:04:37 +00:00
|
|
|
{
|
2011-02-03 00:19:40 -08:00
|
|
|
SDL_Surface *surface = (SDL_Surface *) texture->driverdata;
|
2006-07-10 21:04:37 +00:00
|
|
|
|
2011-02-03 00:19:40 -08:00
|
|
|
*pixels =
|
|
|
|
(void *) ((Uint8 *) surface->pixels + rect->y * surface->pitch +
|
|
|
|
rect->x * surface->format->BytesPerPixel);
|
|
|
|
*pitch = surface->pitch;
|
|
|
|
return 0;
|
2006-07-10 21:04:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2006-07-19 07:18:45 +00:00
|
|
|
SW_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture)
|
2006-07-10 21:04:37 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2012-01-21 22:22:30 -05:00
|
|
|
static int
|
2012-01-22 01:26:28 -05:00
|
|
|
SW_SetRenderTarget(SDL_Renderer * renderer, SDL_Texture * texture)
|
2012-01-21 22:22:30 -05:00
|
|
|
{
|
|
|
|
SW_RenderData *data = (SW_RenderData *) renderer->driverdata;
|
|
|
|
|
|
|
|
if (texture ) {
|
|
|
|
data->surface = (SDL_Surface *) texture->driverdata;
|
|
|
|
} else {
|
|
|
|
data->surface = data->window;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-02-15 13:59:59 -08:00
|
|
|
static int
|
|
|
|
SW_UpdateViewport(SDL_Renderer * renderer)
|
|
|
|
{
|
|
|
|
SW_RenderData *data = (SW_RenderData *) renderer->driverdata;
|
|
|
|
SDL_Surface *surface = data->surface;
|
|
|
|
|
|
|
|
if (!surface) {
|
|
|
|
/* We'll update the viewport after we recreate the surface */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-02-15 14:10:50 -08:00
|
|
|
SDL_SetClipRect(data->surface, &renderer->viewport);
|
2011-02-15 13:59:59 -08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-05-04 04:46:00 -07:00
|
|
|
static int
|
|
|
|
SW_UpdateClipRect(SDL_Renderer * renderer)
|
|
|
|
{
|
2013-06-27 11:27:19 -07:00
|
|
|
SW_RenderData *data = (SW_RenderData *) renderer->driverdata;
|
|
|
|
SDL_Surface *surface = data->surface;
|
|
|
|
if (surface) {
|
2014-04-19 13:15:41 -07:00
|
|
|
if (renderer->clipping_enabled) {
|
|
|
|
SDL_SetClipRect(surface, &renderer->clip_rect);
|
2013-06-27 11:27:19 -07:00
|
|
|
} else {
|
|
|
|
SDL_SetClipRect(surface, NULL);
|
|
|
|
}
|
2013-05-04 04:46:00 -07:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-02-15 13:59:59 -08:00
|
|
|
static int
|
|
|
|
SW_RenderClear(SDL_Renderer * renderer)
|
2011-02-07 20:06:26 -08:00
|
|
|
{
|
|
|
|
SDL_Surface *surface = SW_ActivateRenderer(renderer);
|
2011-02-15 13:59:59 -08:00
|
|
|
Uint32 color;
|
|
|
|
SDL_Rect clip_rect;
|
2011-02-07 20:06:26 -08:00
|
|
|
|
|
|
|
if (!surface) {
|
2011-02-15 13:59:59 -08:00
|
|
|
return -1;
|
2011-02-07 20:06:26 -08:00
|
|
|
}
|
2011-02-15 13:59:59 -08:00
|
|
|
|
|
|
|
color = SDL_MapRGBA(surface->format,
|
|
|
|
renderer->r, renderer->g, renderer->b, renderer->a);
|
|
|
|
|
|
|
|
/* By definition the clear ignores the clip rect */
|
|
|
|
clip_rect = surface->clip_rect;
|
|
|
|
SDL_SetClipRect(surface, NULL);
|
|
|
|
SDL_FillRect(surface, NULL, color);
|
|
|
|
SDL_SetClipRect(surface, &clip_rect);
|
|
|
|
return 0;
|
2011-02-07 20:06:26 -08:00
|
|
|
}
|
|
|
|
|
2008-12-21 17:39:41 +00:00
|
|
|
static int
|
2012-10-01 20:59:33 -07:00
|
|
|
SW_RenderDrawPoints(SDL_Renderer * renderer, const SDL_FPoint * points,
|
2009-12-23 01:55:00 +00:00
|
|
|
int count)
|
2008-12-21 17:39:41 +00:00
|
|
|
{
|
2011-02-03 15:49:37 -08:00
|
|
|
SDL_Surface *surface = SW_ActivateRenderer(renderer);
|
2012-10-01 20:59:33 -07:00
|
|
|
SDL_Point *final_points;
|
|
|
|
int i, status;
|
2009-12-09 15:56:56 +00:00
|
|
|
|
2011-02-03 15:49:37 -08:00
|
|
|
if (!surface) {
|
2011-02-01 19:19:43 -08:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2012-10-01 20:59:33 -07:00
|
|
|
final_points = SDL_stack_alloc(SDL_Point, count);
|
|
|
|
if (!final_points) {
|
2013-03-31 12:48:50 -04:00
|
|
|
return SDL_OutOfMemory();
|
2012-10-01 20:59:33 -07:00
|
|
|
}
|
2011-02-15 13:59:59 -08:00
|
|
|
if (renderer->viewport.x || renderer->viewport.y) {
|
2012-10-01 21:57:09 -07:00
|
|
|
int x = renderer->viewport.x;
|
|
|
|
int y = renderer->viewport.y;
|
2011-02-15 13:59:59 -08:00
|
|
|
|
|
|
|
for (i = 0; i < count; ++i) {
|
2012-10-01 20:59:33 -07:00
|
|
|
final_points[i].x = (int)(x + points[i].x);
|
|
|
|
final_points[i].y = (int)(y + points[i].y);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for (i = 0; i < count; ++i) {
|
|
|
|
final_points[i].x = (int)points[i].x;
|
|
|
|
final_points[i].y = (int)points[i].y;
|
2011-02-15 13:59:59 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-12-09 15:56:56 +00:00
|
|
|
/* Draw the points! */
|
2011-01-31 23:23:57 -08:00
|
|
|
if (renderer->blendMode == SDL_BLENDMODE_NONE) {
|
2011-02-03 15:49:37 -08:00
|
|
|
Uint32 color = SDL_MapRGBA(surface->format,
|
2009-12-09 15:56:56 +00:00
|
|
|
renderer->r, renderer->g, renderer->b,
|
|
|
|
renderer->a);
|
|
|
|
|
2012-10-01 20:59:33 -07:00
|
|
|
status = SDL_DrawPoints(surface, final_points, count, color);
|
2008-12-21 17:39:41 +00:00
|
|
|
} else {
|
2012-10-01 20:59:33 -07:00
|
|
|
status = SDL_BlendPoints(surface, final_points, count,
|
2011-02-15 13:59:59 -08:00
|
|
|
renderer->blendMode,
|
|
|
|
renderer->r, renderer->g, renderer->b,
|
|
|
|
renderer->a);
|
|
|
|
}
|
2012-10-01 20:59:33 -07:00
|
|
|
SDL_stack_free(final_points);
|
2011-02-15 13:59:59 -08:00
|
|
|
|
|
|
|
return status;
|
2008-12-21 17:39:41 +00:00
|
|
|
}
|
|
|
|
|
2008-12-20 13:14:28 +00:00
|
|
|
static int
|
2012-10-01 20:59:33 -07:00
|
|
|
SW_RenderDrawLines(SDL_Renderer * renderer, const SDL_FPoint * points,
|
2009-12-23 01:55:00 +00:00
|
|
|
int count)
|
2008-12-20 13:14:28 +00:00
|
|
|
{
|
2011-02-03 15:49:37 -08:00
|
|
|
SDL_Surface *surface = SW_ActivateRenderer(renderer);
|
2012-10-01 20:59:33 -07:00
|
|
|
SDL_Point *final_points;
|
|
|
|
int i, status;
|
2009-12-09 15:56:56 +00:00
|
|
|
|
2011-02-03 15:49:37 -08:00
|
|
|
if (!surface) {
|
2011-02-01 19:19:43 -08:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2012-10-01 20:59:33 -07:00
|
|
|
final_points = SDL_stack_alloc(SDL_Point, count);
|
|
|
|
if (!final_points) {
|
2013-03-31 12:48:50 -04:00
|
|
|
return SDL_OutOfMemory();
|
2012-10-01 20:59:33 -07:00
|
|
|
}
|
2011-02-15 13:59:59 -08:00
|
|
|
if (renderer->viewport.x || renderer->viewport.y) {
|
2012-10-01 21:57:09 -07:00
|
|
|
int x = renderer->viewport.x;
|
|
|
|
int y = renderer->viewport.y;
|
2011-02-15 13:59:59 -08:00
|
|
|
|
|
|
|
for (i = 0; i < count; ++i) {
|
2012-10-01 20:59:33 -07:00
|
|
|
final_points[i].x = (int)(x + points[i].x);
|
|
|
|
final_points[i].y = (int)(y + points[i].y);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for (i = 0; i < count; ++i) {
|
|
|
|
final_points[i].x = (int)points[i].x;
|
|
|
|
final_points[i].y = (int)points[i].y;
|
2011-02-15 13:59:59 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-02-03 15:49:37 -08:00
|
|
|
/* Draw the lines! */
|
2011-01-31 23:23:57 -08:00
|
|
|
if (renderer->blendMode == SDL_BLENDMODE_NONE) {
|
2011-02-03 15:49:37 -08:00
|
|
|
Uint32 color = SDL_MapRGBA(surface->format,
|
2009-12-09 15:56:56 +00:00
|
|
|
renderer->r, renderer->g, renderer->b,
|
|
|
|
renderer->a);
|
|
|
|
|
2012-10-01 20:59:33 -07:00
|
|
|
status = SDL_DrawLines(surface, final_points, count, color);
|
2008-12-20 13:14:28 +00:00
|
|
|
} else {
|
2012-10-01 20:59:33 -07:00
|
|
|
status = SDL_BlendLines(surface, final_points, count,
|
2011-02-15 13:59:59 -08:00
|
|
|
renderer->blendMode,
|
|
|
|
renderer->r, renderer->g, renderer->b,
|
|
|
|
renderer->a);
|
|
|
|
}
|
2012-10-01 20:59:33 -07:00
|
|
|
SDL_stack_free(final_points);
|
2011-02-15 13:59:59 -08:00
|
|
|
|
|
|
|
return status;
|
2008-12-20 13:14:28 +00:00
|
|
|
}
|
|
|
|
|
2009-12-23 01:55:00 +00:00
|
|
|
static int
|
2012-10-01 20:59:33 -07:00
|
|
|
SW_RenderFillRects(SDL_Renderer * renderer, const SDL_FRect * rects, int count)
|
2009-12-23 01:55:00 +00:00
|
|
|
{
|
2011-02-03 15:49:37 -08:00
|
|
|
SDL_Surface *surface = SW_ActivateRenderer(renderer);
|
2012-10-01 20:59:33 -07:00
|
|
|
SDL_Rect *final_rects;
|
|
|
|
int i, status;
|
2009-12-23 01:55:00 +00:00
|
|
|
|
2011-02-03 15:49:37 -08:00
|
|
|
if (!surface) {
|
2011-02-01 19:19:43 -08:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2012-10-01 20:59:33 -07:00
|
|
|
final_rects = SDL_stack_alloc(SDL_Rect, count);
|
|
|
|
if (!final_rects) {
|
2013-03-31 12:48:50 -04:00
|
|
|
return SDL_OutOfMemory();
|
2012-10-01 20:59:33 -07:00
|
|
|
}
|
2011-02-15 13:59:59 -08:00
|
|
|
if (renderer->viewport.x || renderer->viewport.y) {
|
2012-10-01 21:57:09 -07:00
|
|
|
int x = renderer->viewport.x;
|
|
|
|
int y = renderer->viewport.y;
|
2011-02-15 13:59:59 -08:00
|
|
|
|
|
|
|
for (i = 0; i < count; ++i) {
|
2012-10-01 20:59:33 -07:00
|
|
|
final_rects[i].x = (int)(x + rects[i].x);
|
|
|
|
final_rects[i].y = (int)(y + rects[i].y);
|
|
|
|
final_rects[i].w = SDL_max((int)rects[i].w, 1);
|
|
|
|
final_rects[i].h = SDL_max((int)rects[i].h, 1);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for (i = 0; i < count; ++i) {
|
|
|
|
final_rects[i].x = (int)rects[i].x;
|
|
|
|
final_rects[i].y = (int)rects[i].y;
|
|
|
|
final_rects[i].w = SDL_max((int)rects[i].w, 1);
|
|
|
|
final_rects[i].h = SDL_max((int)rects[i].h, 1);
|
2011-02-15 13:59:59 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-01-31 23:23:57 -08:00
|
|
|
if (renderer->blendMode == SDL_BLENDMODE_NONE) {
|
2011-02-03 15:49:37 -08:00
|
|
|
Uint32 color = SDL_MapRGBA(surface->format,
|
|
|
|
renderer->r, renderer->g, renderer->b,
|
|
|
|
renderer->a);
|
2012-10-01 20:59:33 -07:00
|
|
|
status = SDL_FillRects(surface, final_rects, count, color);
|
2011-02-03 15:49:37 -08:00
|
|
|
} else {
|
2012-10-01 20:59:33 -07:00
|
|
|
status = SDL_BlendFillRects(surface, final_rects, count,
|
2011-02-15 13:59:59 -08:00
|
|
|
renderer->blendMode,
|
|
|
|
renderer->r, renderer->g, renderer->b,
|
|
|
|
renderer->a);
|
2009-12-23 01:55:00 +00:00
|
|
|
}
|
2012-10-01 20:59:33 -07:00
|
|
|
SDL_stack_free(final_rects);
|
2011-02-15 13:59:59 -08:00
|
|
|
|
|
|
|
return status;
|
2009-12-23 01:55:00 +00:00
|
|
|
}
|
|
|
|
|
2006-07-10 21:04:37 +00:00
|
|
|
static int
|
2006-07-19 07:18:45 +00:00
|
|
|
SW_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
|
2012-10-01 20:59:33 -07:00
|
|
|
const SDL_Rect * srcrect, const SDL_FRect * dstrect)
|
2006-07-10 21:04:37 +00:00
|
|
|
{
|
2011-02-03 15:49:37 -08:00
|
|
|
SDL_Surface *surface = SW_ActivateRenderer(renderer);
|
|
|
|
SDL_Surface *src = (SDL_Surface *) texture->driverdata;
|
2012-10-01 20:59:33 -07:00
|
|
|
SDL_Rect final_rect;
|
2006-07-10 21:04:37 +00:00
|
|
|
|
2011-02-03 15:49:37 -08:00
|
|
|
if (!surface) {
|
2011-02-01 19:19:43 -08:00
|
|
|
return -1;
|
|
|
|
}
|
2011-02-14 11:50:18 -06:00
|
|
|
|
2011-02-15 13:59:59 -08:00
|
|
|
if (renderer->viewport.x || renderer->viewport.y) {
|
2012-10-01 21:57:09 -07:00
|
|
|
final_rect.x = (int)(renderer->viewport.x + dstrect->x);
|
|
|
|
final_rect.y = (int)(renderer->viewport.y + dstrect->y);
|
2012-10-01 20:59:33 -07:00
|
|
|
} else {
|
|
|
|
final_rect.x = (int)dstrect->x;
|
|
|
|
final_rect.y = (int)dstrect->y;
|
2011-02-15 13:59:59 -08:00
|
|
|
}
|
2012-10-01 20:59:33 -07:00
|
|
|
final_rect.w = (int)dstrect->w;
|
|
|
|
final_rect.h = (int)dstrect->h;
|
|
|
|
|
2011-02-14 11:50:18 -06:00
|
|
|
if ( srcrect->w == final_rect.w && srcrect->h == final_rect.h ) {
|
|
|
|
return SDL_BlitSurface(src, srcrect, surface, &final_rect);
|
|
|
|
} else {
|
2015-06-19 22:12:47 -07:00
|
|
|
/* If scaling is ever done, permanently disable RLE (which doesn't support scaling)
|
|
|
|
* to avoid potentially frequent RLE encoding/decoding.
|
|
|
|
*/
|
|
|
|
SDL_SetSurfaceRLE(surface, 0);
|
2011-02-14 11:50:18 -06:00
|
|
|
return SDL_BlitScaled(src, srcrect, surface, &final_rect);
|
|
|
|
}
|
2006-07-10 21:04:37 +00:00
|
|
|
}
|
|
|
|
|
2012-06-01 19:51:08 -03:00
|
|
|
static int
|
|
|
|
GetScaleQuality(void)
|
|
|
|
{
|
|
|
|
const char *hint = SDL_GetHint(SDL_HINT_RENDER_SCALE_QUALITY);
|
|
|
|
|
|
|
|
if (!hint || *hint == '0' || SDL_strcasecmp(hint, "nearest") == 0) {
|
|
|
|
return 0;
|
|
|
|
} else {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
SW_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
|
2012-10-01 20:59:33 -07:00
|
|
|
const SDL_Rect * srcrect, const SDL_FRect * dstrect,
|
|
|
|
const double angle, const SDL_FPoint * center, const SDL_RendererFlip flip)
|
2012-06-01 19:51:08 -03:00
|
|
|
{
|
|
|
|
SDL_Surface *surface = SW_ActivateRenderer(renderer);
|
|
|
|
SDL_Surface *src = (SDL_Surface *) texture->driverdata;
|
2012-10-01 20:59:33 -07:00
|
|
|
SDL_Rect final_rect, tmp_rect;
|
Fixed bug 3359 - Software renderer does incorrect blending with SDL_RenderCopyEx
Simon Hug
The software renderer produces incorrect results when blending textures at an angle with certain blend modes. It seems that there were some edge cases that weren't considered when the SW_RenderCopyEx function was last changed. Or another bug possibly covered up the problem. (More on that in another bug report.)
Most of the issues come from the fact that the rotating function sets a black colorkey. This is problematic because black is most likely appearing in the surface and the final blit will ignore these pixels. Unless a colorkey is already set (the software renderer currently never sets one), it's very hard to find a free color. Of course it could scan over the whole image until one is found, but that seems inefficient.
The following blend modes have issues when drawn at an angle.
NONE: The black pixels get ignored, making them essentially transparent. This breaks the 'dstRGBA = srcRGBA' definition of the NONE blend mode.
MOD: Again, the black pixels get ignored. This also breaks the 'dstRGB = dstRGB * srcRGB' definition of the MOD blend mode, where black pixels would make the destination black as well. A white colorkey will work though, with some preparations.
BLEND: There are some issues when blending a texture with a translucent RGBA target texture. I - uh - forgot what the problem here exactly is.
This patch fixes the issues mentioned above. It mainly changes the code so it tries to do things without the colorkey and removes the automatic format conversion part from the SDLgfx_rotateSurface function. Getting the format right is something the caller has to do now and the required code has been added to the SW_RenderCopyEx function.
There's a small change to the SW_CreateTexture function. RLE encoding a surface with an alpha mask can be a lossy process. Depending on how the user uses the RGBA channels, this may be undesired. The change that surfaces with an alpha mask don't get encoded makes the software renderer consistent with the other renderers.
The SW_RenderCopyEx function now does these steps: Lock the source surface if necessary. Create a clone of the source by using the pixel buffer directly. Check the format and set a flag if a conversion is necessary. Check if scaling or cropping is necessary and set the flag for that as well. Check if color and alpha modulation has to be done before the rotate. Check if the source is an opaque surface. If not, it creates a mask surface that is necessary for the NONE blend mode. If any of the flags were set, a new surface is created and the source will be converted, scaled, cropped, and modulated. The rest of the function stays somewhat the same. The mask also needs to be rotated of course and then there is the NONE blend mode...
It's surprisingly hard to get the pixel from a rotated surface to the destination buffer without affecting the pixel outside the rotated area. I found a way to do this with three blits which is pretty hard on the performance. Perhaps someone has an idea how to do this faster?
As mentioned above, the SDLgfx_rotateSurface now only takes 8-bit paletted or 32-bit with alpha mask surfaces. It additionally sets the new surfaces up for the MOD blend mode.
I shortly tested the 8-bit path of SDLgfx_rotateSurface and it seemed to work so far. This path is not used by the software renderer anyway.
2016-11-15 01:12:27 -08:00
|
|
|
SDL_Surface *src_clone, *src_rotated, *src_scaled;
|
|
|
|
SDL_Surface *mask = NULL, *mask_rotated = NULL;
|
|
|
|
int retval = 0, dstwidth, dstheight, abscenterx, abscentery;
|
2012-06-01 19:51:08 -03:00
|
|
|
double cangle, sangle, px, py, p1x, p1y, p2x, p2y, p3x, p3y, p4x, p4y;
|
Fixed bug 3359 - Software renderer does incorrect blending with SDL_RenderCopyEx
Simon Hug
The software renderer produces incorrect results when blending textures at an angle with certain blend modes. It seems that there were some edge cases that weren't considered when the SW_RenderCopyEx function was last changed. Or another bug possibly covered up the problem. (More on that in another bug report.)
Most of the issues come from the fact that the rotating function sets a black colorkey. This is problematic because black is most likely appearing in the surface and the final blit will ignore these pixels. Unless a colorkey is already set (the software renderer currently never sets one), it's very hard to find a free color. Of course it could scan over the whole image until one is found, but that seems inefficient.
The following blend modes have issues when drawn at an angle.
NONE: The black pixels get ignored, making them essentially transparent. This breaks the 'dstRGBA = srcRGBA' definition of the NONE blend mode.
MOD: Again, the black pixels get ignored. This also breaks the 'dstRGB = dstRGB * srcRGB' definition of the MOD blend mode, where black pixels would make the destination black as well. A white colorkey will work though, with some preparations.
BLEND: There are some issues when blending a texture with a translucent RGBA target texture. I - uh - forgot what the problem here exactly is.
This patch fixes the issues mentioned above. It mainly changes the code so it tries to do things without the colorkey and removes the automatic format conversion part from the SDLgfx_rotateSurface function. Getting the format right is something the caller has to do now and the required code has been added to the SW_RenderCopyEx function.
There's a small change to the SW_CreateTexture function. RLE encoding a surface with an alpha mask can be a lossy process. Depending on how the user uses the RGBA channels, this may be undesired. The change that surfaces with an alpha mask don't get encoded makes the software renderer consistent with the other renderers.
The SW_RenderCopyEx function now does these steps: Lock the source surface if necessary. Create a clone of the source by using the pixel buffer directly. Check the format and set a flag if a conversion is necessary. Check if scaling or cropping is necessary and set the flag for that as well. Check if color and alpha modulation has to be done before the rotate. Check if the source is an opaque surface. If not, it creates a mask surface that is necessary for the NONE blend mode. If any of the flags were set, a new surface is created and the source will be converted, scaled, cropped, and modulated. The rest of the function stays somewhat the same. The mask also needs to be rotated of course and then there is the NONE blend mode...
It's surprisingly hard to get the pixel from a rotated surface to the destination buffer without affecting the pixel outside the rotated area. I found a way to do this with three blits which is pretty hard on the performance. Perhaps someone has an idea how to do this faster?
As mentioned above, the SDLgfx_rotateSurface now only takes 8-bit paletted or 32-bit with alpha mask surfaces. It additionally sets the new surfaces up for the MOD blend mode.
I shortly tested the 8-bit path of SDLgfx_rotateSurface and it seemed to work so far. This path is not used by the software renderer anyway.
2016-11-15 01:12:27 -08:00
|
|
|
SDL_BlendMode blendmode;
|
|
|
|
Uint8 alphaMod, rMod, gMod, bMod;
|
|
|
|
int applyModulation = SDL_FALSE;
|
|
|
|
int blitRequired = SDL_FALSE;
|
|
|
|
int isOpaque = SDL_FALSE;
|
2012-06-01 19:51:08 -03:00
|
|
|
|
|
|
|
if (!surface) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (renderer->viewport.x || renderer->viewport.y) {
|
2012-10-01 21:57:09 -07:00
|
|
|
final_rect.x = (int)(renderer->viewport.x + dstrect->x);
|
|
|
|
final_rect.y = (int)(renderer->viewport.y + dstrect->y);
|
2012-10-01 20:59:33 -07:00
|
|
|
} else {
|
|
|
|
final_rect.x = (int)dstrect->x;
|
|
|
|
final_rect.y = (int)dstrect->y;
|
2012-06-01 19:51:08 -03:00
|
|
|
}
|
2012-10-01 20:59:33 -07:00
|
|
|
final_rect.w = (int)dstrect->w;
|
|
|
|
final_rect.h = (int)dstrect->h;
|
2012-06-01 19:51:08 -03:00
|
|
|
|
Fixed bug 1550 - SDL_RenderCopy/CopyEx in software should optionally render 8bit alpha
Adam M.
There are three problems in the code that I see.
1. SW_RenderCopyEx enables a color key on surface_scaled even if the source surface didn't have a color key.
2. SW_RenderCopyEx doesn't copy blend mode, color mod, or alpha mod from src to surface_scaled.
3. When SDL_BlitScaled(src, srcrect, surface_scaled, &tmp_rect) is called, it blends the src pixels into surface_scaled instead of overwriting them (if src has blending, etc. enabled).
I've attached a patch that 1) fixes the three problems that I mentioned, 2) adds the requested performance improvement of using the regular blit function if no rotation or flipping is needed, 3) avoids cloning the source surface if no stretching is required, and simplifies the rotation code slightly.
2015-06-19 23:20:43 -07:00
|
|
|
tmp_rect = final_rect;
|
|
|
|
tmp_rect.x = 0;
|
|
|
|
tmp_rect.y = 0;
|
|
|
|
|
Fixed bug 3359 - Software renderer does incorrect blending with SDL_RenderCopyEx
Simon Hug
The software renderer produces incorrect results when blending textures at an angle with certain blend modes. It seems that there were some edge cases that weren't considered when the SW_RenderCopyEx function was last changed. Or another bug possibly covered up the problem. (More on that in another bug report.)
Most of the issues come from the fact that the rotating function sets a black colorkey. This is problematic because black is most likely appearing in the surface and the final blit will ignore these pixels. Unless a colorkey is already set (the software renderer currently never sets one), it's very hard to find a free color. Of course it could scan over the whole image until one is found, but that seems inefficient.
The following blend modes have issues when drawn at an angle.
NONE: The black pixels get ignored, making them essentially transparent. This breaks the 'dstRGBA = srcRGBA' definition of the NONE blend mode.
MOD: Again, the black pixels get ignored. This also breaks the 'dstRGB = dstRGB * srcRGB' definition of the MOD blend mode, where black pixels would make the destination black as well. A white colorkey will work though, with some preparations.
BLEND: There are some issues when blending a texture with a translucent RGBA target texture. I - uh - forgot what the problem here exactly is.
This patch fixes the issues mentioned above. It mainly changes the code so it tries to do things without the colorkey and removes the automatic format conversion part from the SDLgfx_rotateSurface function. Getting the format right is something the caller has to do now and the required code has been added to the SW_RenderCopyEx function.
There's a small change to the SW_CreateTexture function. RLE encoding a surface with an alpha mask can be a lossy process. Depending on how the user uses the RGBA channels, this may be undesired. The change that surfaces with an alpha mask don't get encoded makes the software renderer consistent with the other renderers.
The SW_RenderCopyEx function now does these steps: Lock the source surface if necessary. Create a clone of the source by using the pixel buffer directly. Check the format and set a flag if a conversion is necessary. Check if scaling or cropping is necessary and set the flag for that as well. Check if color and alpha modulation has to be done before the rotate. Check if the source is an opaque surface. If not, it creates a mask surface that is necessary for the NONE blend mode. If any of the flags were set, a new surface is created and the source will be converted, scaled, cropped, and modulated. The rest of the function stays somewhat the same. The mask also needs to be rotated of course and then there is the NONE blend mode...
It's surprisingly hard to get the pixel from a rotated surface to the destination buffer without affecting the pixel outside the rotated area. I found a way to do this with three blits which is pretty hard on the performance. Perhaps someone has an idea how to do this faster?
As mentioned above, the SDLgfx_rotateSurface now only takes 8-bit paletted or 32-bit with alpha mask surfaces. It additionally sets the new surfaces up for the MOD blend mode.
I shortly tested the 8-bit path of SDLgfx_rotateSurface and it seemed to work so far. This path is not used by the software renderer anyway.
2016-11-15 01:12:27 -08:00
|
|
|
/* It is possible to encounter an RLE encoded surface here and locking it is
|
|
|
|
* necessary because this code is going to access the pixel buffer directly.
|
|
|
|
*/
|
|
|
|
if (SDL_MUSTLOCK(src)) {
|
|
|
|
SDL_LockSurface(src);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Clone the source surface but use its pixel buffer directly.
|
|
|
|
* The original source surface must be treated as read-only.
|
|
|
|
*/
|
|
|
|
src_clone = SDL_CreateRGBSurfaceFrom(src->pixels, src->w, src->h, src->format->BitsPerPixel, src->pitch,
|
|
|
|
src->format->Rmask, src->format->Gmask,
|
|
|
|
src->format->Bmask, src->format->Amask);
|
|
|
|
if (src_clone == NULL) {
|
|
|
|
if (SDL_MUSTLOCK(src)) {
|
|
|
|
SDL_UnlockSurface(src);
|
Fixed bug 1550 - SDL_RenderCopy/CopyEx in software should optionally render 8bit alpha
Adam M.
There are three problems in the code that I see.
1. SW_RenderCopyEx enables a color key on surface_scaled even if the source surface didn't have a color key.
2. SW_RenderCopyEx doesn't copy blend mode, color mod, or alpha mod from src to surface_scaled.
3. When SDL_BlitScaled(src, srcrect, surface_scaled, &tmp_rect) is called, it blends the src pixels into surface_scaled instead of overwriting them (if src has blending, etc. enabled).
I've attached a patch that 1) fixes the three problems that I mentioned, 2) adds the requested performance improvement of using the regular blit function if no rotation or flipping is needed, 3) avoids cloning the source surface if no stretching is required, and simplifies the rotation code slightly.
2015-06-19 23:20:43 -07:00
|
|
|
}
|
Fixed bug 3359 - Software renderer does incorrect blending with SDL_RenderCopyEx
Simon Hug
The software renderer produces incorrect results when blending textures at an angle with certain blend modes. It seems that there were some edge cases that weren't considered when the SW_RenderCopyEx function was last changed. Or another bug possibly covered up the problem. (More on that in another bug report.)
Most of the issues come from the fact that the rotating function sets a black colorkey. This is problematic because black is most likely appearing in the surface and the final blit will ignore these pixels. Unless a colorkey is already set (the software renderer currently never sets one), it's very hard to find a free color. Of course it could scan over the whole image until one is found, but that seems inefficient.
The following blend modes have issues when drawn at an angle.
NONE: The black pixels get ignored, making them essentially transparent. This breaks the 'dstRGBA = srcRGBA' definition of the NONE blend mode.
MOD: Again, the black pixels get ignored. This also breaks the 'dstRGB = dstRGB * srcRGB' definition of the MOD blend mode, where black pixels would make the destination black as well. A white colorkey will work though, with some preparations.
BLEND: There are some issues when blending a texture with a translucent RGBA target texture. I - uh - forgot what the problem here exactly is.
This patch fixes the issues mentioned above. It mainly changes the code so it tries to do things without the colorkey and removes the automatic format conversion part from the SDLgfx_rotateSurface function. Getting the format right is something the caller has to do now and the required code has been added to the SW_RenderCopyEx function.
There's a small change to the SW_CreateTexture function. RLE encoding a surface with an alpha mask can be a lossy process. Depending on how the user uses the RGBA channels, this may be undesired. The change that surfaces with an alpha mask don't get encoded makes the software renderer consistent with the other renderers.
The SW_RenderCopyEx function now does these steps: Lock the source surface if necessary. Create a clone of the source by using the pixel buffer directly. Check the format and set a flag if a conversion is necessary. Check if scaling or cropping is necessary and set the flag for that as well. Check if color and alpha modulation has to be done before the rotate. Check if the source is an opaque surface. If not, it creates a mask surface that is necessary for the NONE blend mode. If any of the flags were set, a new surface is created and the source will be converted, scaled, cropped, and modulated. The rest of the function stays somewhat the same. The mask also needs to be rotated of course and then there is the NONE blend mode...
It's surprisingly hard to get the pixel from a rotated surface to the destination buffer without affecting the pixel outside the rotated area. I found a way to do this with three blits which is pretty hard on the performance. Perhaps someone has an idea how to do this faster?
As mentioned above, the SDLgfx_rotateSurface now only takes 8-bit paletted or 32-bit with alpha mask surfaces. It additionally sets the new surfaces up for the MOD blend mode.
I shortly tested the 8-bit path of SDLgfx_rotateSurface and it seemed to work so far. This path is not used by the software renderer anyway.
2016-11-15 01:12:27 -08:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
SDL_GetSurfaceBlendMode(src, &blendmode);
|
|
|
|
SDL_GetSurfaceAlphaMod(src, &alphaMod);
|
|
|
|
SDL_GetSurfaceColorMod(src, &rMod, &gMod, &bMod);
|
|
|
|
|
|
|
|
/* SDLgfx_rotateSurface only accepts 32-bit surfaces with a 8888 layout. Everything else has to be converted. */
|
|
|
|
if (src->format->BitsPerPixel != 32 || SDL_PIXELLAYOUT(src->format->format) != SDL_PACKEDLAYOUT_8888 || !src->format->Amask) {
|
|
|
|
blitRequired = SDL_TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If scaling and cropping is necessary, it has to be taken care of before the rotation. */
|
|
|
|
if (!(srcrect->w == final_rect.w && srcrect->h == final_rect.h && srcrect->x == 0 && srcrect->y == 0)) {
|
|
|
|
blitRequired = SDL_TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The color and alpha modulation has to be applied before the rotation when using the NONE and MOD blend modes. */
|
|
|
|
if ((blendmode == SDL_BLENDMODE_NONE || blendmode == SDL_BLENDMODE_MOD) && (alphaMod & rMod & gMod & bMod) != 255) {
|
|
|
|
applyModulation = SDL_TRUE;
|
|
|
|
SDL_SetSurfaceAlphaMod(src_clone, alphaMod);
|
|
|
|
SDL_SetSurfaceColorMod(src_clone, rMod, gMod, bMod);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Opaque surfaces are much easier to handle with the NONE blend mode. */
|
|
|
|
if (blendmode == SDL_BLENDMODE_NONE && !src->format->Amask && alphaMod == 255) {
|
|
|
|
isOpaque = SDL_TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The NONE blend mode requires a mask for non-opaque surfaces. This mask will be used
|
|
|
|
* to clear the pixels in the destination surface. The other steps are explained below.
|
|
|
|
*/
|
|
|
|
if (blendmode == SDL_BLENDMODE_NONE && !isOpaque) {
|
|
|
|
mask = SDL_CreateRGBSurface(0, final_rect.w, final_rect.h, 32,
|
|
|
|
0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000);
|
|
|
|
if (mask == NULL) {
|
|
|
|
retval = -1;
|
|
|
|
} else {
|
|
|
|
SDL_SetSurfaceBlendMode(mask, SDL_BLENDMODE_MOD);
|
Fixed bug 1550 - SDL_RenderCopy/CopyEx in software should optionally render 8bit alpha
Adam M.
There are three problems in the code that I see.
1. SW_RenderCopyEx enables a color key on surface_scaled even if the source surface didn't have a color key.
2. SW_RenderCopyEx doesn't copy blend mode, color mod, or alpha mod from src to surface_scaled.
3. When SDL_BlitScaled(src, srcrect, surface_scaled, &tmp_rect) is called, it blends the src pixels into surface_scaled instead of overwriting them (if src has blending, etc. enabled).
I've attached a patch that 1) fixes the three problems that I mentioned, 2) adds the requested performance improvement of using the regular blit function if no rotation or flipping is needed, 3) avoids cloning the source surface if no stretching is required, and simplifies the rotation code slightly.
2015-06-19 23:20:43 -07:00
|
|
|
}
|
Fixed bug 3359 - Software renderer does incorrect blending with SDL_RenderCopyEx
Simon Hug
The software renderer produces incorrect results when blending textures at an angle with certain blend modes. It seems that there were some edge cases that weren't considered when the SW_RenderCopyEx function was last changed. Or another bug possibly covered up the problem. (More on that in another bug report.)
Most of the issues come from the fact that the rotating function sets a black colorkey. This is problematic because black is most likely appearing in the surface and the final blit will ignore these pixels. Unless a colorkey is already set (the software renderer currently never sets one), it's very hard to find a free color. Of course it could scan over the whole image until one is found, but that seems inefficient.
The following blend modes have issues when drawn at an angle.
NONE: The black pixels get ignored, making them essentially transparent. This breaks the 'dstRGBA = srcRGBA' definition of the NONE blend mode.
MOD: Again, the black pixels get ignored. This also breaks the 'dstRGB = dstRGB * srcRGB' definition of the MOD blend mode, where black pixels would make the destination black as well. A white colorkey will work though, with some preparations.
BLEND: There are some issues when blending a texture with a translucent RGBA target texture. I - uh - forgot what the problem here exactly is.
This patch fixes the issues mentioned above. It mainly changes the code so it tries to do things without the colorkey and removes the automatic format conversion part from the SDLgfx_rotateSurface function. Getting the format right is something the caller has to do now and the required code has been added to the SW_RenderCopyEx function.
There's a small change to the SW_CreateTexture function. RLE encoding a surface with an alpha mask can be a lossy process. Depending on how the user uses the RGBA channels, this may be undesired. The change that surfaces with an alpha mask don't get encoded makes the software renderer consistent with the other renderers.
The SW_RenderCopyEx function now does these steps: Lock the source surface if necessary. Create a clone of the source by using the pixel buffer directly. Check the format and set a flag if a conversion is necessary. Check if scaling or cropping is necessary and set the flag for that as well. Check if color and alpha modulation has to be done before the rotate. Check if the source is an opaque surface. If not, it creates a mask surface that is necessary for the NONE blend mode. If any of the flags were set, a new surface is created and the source will be converted, scaled, cropped, and modulated. The rest of the function stays somewhat the same. The mask also needs to be rotated of course and then there is the NONE blend mode...
It's surprisingly hard to get the pixel from a rotated surface to the destination buffer without affecting the pixel outside the rotated area. I found a way to do this with three blits which is pretty hard on the performance. Perhaps someone has an idea how to do this faster?
As mentioned above, the SDLgfx_rotateSurface now only takes 8-bit paletted or 32-bit with alpha mask surfaces. It additionally sets the new surfaces up for the MOD blend mode.
I shortly tested the 8-bit path of SDLgfx_rotateSurface and it seemed to work so far. This path is not used by the software renderer anyway.
2016-11-15 01:12:27 -08:00
|
|
|
}
|
Fixed bug 1550 - SDL_RenderCopy/CopyEx in software should optionally render 8bit alpha
Adam M.
There are three problems in the code that I see.
1. SW_RenderCopyEx enables a color key on surface_scaled even if the source surface didn't have a color key.
2. SW_RenderCopyEx doesn't copy blend mode, color mod, or alpha mod from src to surface_scaled.
3. When SDL_BlitScaled(src, srcrect, surface_scaled, &tmp_rect) is called, it blends the src pixels into surface_scaled instead of overwriting them (if src has blending, etc. enabled).
I've attached a patch that 1) fixes the three problems that I mentioned, 2) adds the requested performance improvement of using the regular blit function if no rotation or flipping is needed, 3) avoids cloning the source surface if no stretching is required, and simplifies the rotation code slightly.
2015-06-19 23:20:43 -07:00
|
|
|
|
Fixed bug 3359 - Software renderer does incorrect blending with SDL_RenderCopyEx
Simon Hug
The software renderer produces incorrect results when blending textures at an angle with certain blend modes. It seems that there were some edge cases that weren't considered when the SW_RenderCopyEx function was last changed. Or another bug possibly covered up the problem. (More on that in another bug report.)
Most of the issues come from the fact that the rotating function sets a black colorkey. This is problematic because black is most likely appearing in the surface and the final blit will ignore these pixels. Unless a colorkey is already set (the software renderer currently never sets one), it's very hard to find a free color. Of course it could scan over the whole image until one is found, but that seems inefficient.
The following blend modes have issues when drawn at an angle.
NONE: The black pixels get ignored, making them essentially transparent. This breaks the 'dstRGBA = srcRGBA' definition of the NONE blend mode.
MOD: Again, the black pixels get ignored. This also breaks the 'dstRGB = dstRGB * srcRGB' definition of the MOD blend mode, where black pixels would make the destination black as well. A white colorkey will work though, with some preparations.
BLEND: There are some issues when blending a texture with a translucent RGBA target texture. I - uh - forgot what the problem here exactly is.
This patch fixes the issues mentioned above. It mainly changes the code so it tries to do things without the colorkey and removes the automatic format conversion part from the SDLgfx_rotateSurface function. Getting the format right is something the caller has to do now and the required code has been added to the SW_RenderCopyEx function.
There's a small change to the SW_CreateTexture function. RLE encoding a surface with an alpha mask can be a lossy process. Depending on how the user uses the RGBA channels, this may be undesired. The change that surfaces with an alpha mask don't get encoded makes the software renderer consistent with the other renderers.
The SW_RenderCopyEx function now does these steps: Lock the source surface if necessary. Create a clone of the source by using the pixel buffer directly. Check the format and set a flag if a conversion is necessary. Check if scaling or cropping is necessary and set the flag for that as well. Check if color and alpha modulation has to be done before the rotate. Check if the source is an opaque surface. If not, it creates a mask surface that is necessary for the NONE blend mode. If any of the flags were set, a new surface is created and the source will be converted, scaled, cropped, and modulated. The rest of the function stays somewhat the same. The mask also needs to be rotated of course and then there is the NONE blend mode...
It's surprisingly hard to get the pixel from a rotated surface to the destination buffer without affecting the pixel outside the rotated area. I found a way to do this with three blits which is pretty hard on the performance. Perhaps someone has an idea how to do this faster?
As mentioned above, the SDLgfx_rotateSurface now only takes 8-bit paletted or 32-bit with alpha mask surfaces. It additionally sets the new surfaces up for the MOD blend mode.
I shortly tested the 8-bit path of SDLgfx_rotateSurface and it seemed to work so far. This path is not used by the software renderer anyway.
2016-11-15 01:12:27 -08:00
|
|
|
/* Create a new surface should there be a format mismatch or if scaling, cropping,
|
|
|
|
* or modulation is required. It's possible to use the source surface directly otherwise.
|
|
|
|
*/
|
|
|
|
if (!retval && (blitRequired || applyModulation)) {
|
|
|
|
SDL_Rect scale_rect = tmp_rect;
|
|
|
|
src_scaled = SDL_CreateRGBSurface(0, final_rect.w, final_rect.h, 32,
|
|
|
|
0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000);
|
|
|
|
if (src_scaled == NULL) {
|
|
|
|
retval = -1;
|
|
|
|
} else {
|
|
|
|
SDL_SetSurfaceBlendMode(src_clone, SDL_BLENDMODE_NONE);
|
|
|
|
retval = SDL_BlitScaled(src_clone, srcrect, src_scaled, &scale_rect);
|
|
|
|
SDL_FreeSurface(src_clone);
|
|
|
|
src_clone = src_scaled;
|
|
|
|
src_scaled = NULL;
|
2012-06-01 19:51:08 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Fixed bug 3359 - Software renderer does incorrect blending with SDL_RenderCopyEx
Simon Hug
The software renderer produces incorrect results when blending textures at an angle with certain blend modes. It seems that there were some edge cases that weren't considered when the SW_RenderCopyEx function was last changed. Or another bug possibly covered up the problem. (More on that in another bug report.)
Most of the issues come from the fact that the rotating function sets a black colorkey. This is problematic because black is most likely appearing in the surface and the final blit will ignore these pixels. Unless a colorkey is already set (the software renderer currently never sets one), it's very hard to find a free color. Of course it could scan over the whole image until one is found, but that seems inefficient.
The following blend modes have issues when drawn at an angle.
NONE: The black pixels get ignored, making them essentially transparent. This breaks the 'dstRGBA = srcRGBA' definition of the NONE blend mode.
MOD: Again, the black pixels get ignored. This also breaks the 'dstRGB = dstRGB * srcRGB' definition of the MOD blend mode, where black pixels would make the destination black as well. A white colorkey will work though, with some preparations.
BLEND: There are some issues when blending a texture with a translucent RGBA target texture. I - uh - forgot what the problem here exactly is.
This patch fixes the issues mentioned above. It mainly changes the code so it tries to do things without the colorkey and removes the automatic format conversion part from the SDLgfx_rotateSurface function. Getting the format right is something the caller has to do now and the required code has been added to the SW_RenderCopyEx function.
There's a small change to the SW_CreateTexture function. RLE encoding a surface with an alpha mask can be a lossy process. Depending on how the user uses the RGBA channels, this may be undesired. The change that surfaces with an alpha mask don't get encoded makes the software renderer consistent with the other renderers.
The SW_RenderCopyEx function now does these steps: Lock the source surface if necessary. Create a clone of the source by using the pixel buffer directly. Check the format and set a flag if a conversion is necessary. Check if scaling or cropping is necessary and set the flag for that as well. Check if color and alpha modulation has to be done before the rotate. Check if the source is an opaque surface. If not, it creates a mask surface that is necessary for the NONE blend mode. If any of the flags were set, a new surface is created and the source will be converted, scaled, cropped, and modulated. The rest of the function stays somewhat the same. The mask also needs to be rotated of course and then there is the NONE blend mode...
It's surprisingly hard to get the pixel from a rotated surface to the destination buffer without affecting the pixel outside the rotated area. I found a way to do this with three blits which is pretty hard on the performance. Perhaps someone has an idea how to do this faster?
As mentioned above, the SDLgfx_rotateSurface now only takes 8-bit paletted or 32-bit with alpha mask surfaces. It additionally sets the new surfaces up for the MOD blend mode.
I shortly tested the 8-bit path of SDLgfx_rotateSurface and it seemed to work so far. This path is not used by the software renderer anyway.
2016-11-15 01:12:27 -08:00
|
|
|
/* SDLgfx_rotateSurface is going to make decisions depending on the blend mode. */
|
|
|
|
SDL_SetSurfaceBlendMode(src_clone, blendmode);
|
|
|
|
|
Fixed bug 1550 - SDL_RenderCopy/CopyEx in software should optionally render 8bit alpha
Adam M.
There are three problems in the code that I see.
1. SW_RenderCopyEx enables a color key on surface_scaled even if the source surface didn't have a color key.
2. SW_RenderCopyEx doesn't copy blend mode, color mod, or alpha mod from src to surface_scaled.
3. When SDL_BlitScaled(src, srcrect, surface_scaled, &tmp_rect) is called, it blends the src pixels into surface_scaled instead of overwriting them (if src has blending, etc. enabled).
I've attached a patch that 1) fixes the three problems that I mentioned, 2) adds the requested performance improvement of using the regular blit function if no rotation or flipping is needed, 3) avoids cloning the source surface if no stretching is required, and simplifies the rotation code slightly.
2015-06-19 23:20:43 -07:00
|
|
|
if (!retval) {
|
2016-10-07 18:00:30 -07:00
|
|
|
SDLgfx_rotozoomSurfaceSizeTrig(tmp_rect.w, tmp_rect.h, angle, &dstwidth, &dstheight, &cangle, &sangle);
|
Fixed bug 3359 - Software renderer does incorrect blending with SDL_RenderCopyEx
Simon Hug
The software renderer produces incorrect results when blending textures at an angle with certain blend modes. It seems that there were some edge cases that weren't considered when the SW_RenderCopyEx function was last changed. Or another bug possibly covered up the problem. (More on that in another bug report.)
Most of the issues come from the fact that the rotating function sets a black colorkey. This is problematic because black is most likely appearing in the surface and the final blit will ignore these pixels. Unless a colorkey is already set (the software renderer currently never sets one), it's very hard to find a free color. Of course it could scan over the whole image until one is found, but that seems inefficient.
The following blend modes have issues when drawn at an angle.
NONE: The black pixels get ignored, making them essentially transparent. This breaks the 'dstRGBA = srcRGBA' definition of the NONE blend mode.
MOD: Again, the black pixels get ignored. This also breaks the 'dstRGB = dstRGB * srcRGB' definition of the MOD blend mode, where black pixels would make the destination black as well. A white colorkey will work though, with some preparations.
BLEND: There are some issues when blending a texture with a translucent RGBA target texture. I - uh - forgot what the problem here exactly is.
This patch fixes the issues mentioned above. It mainly changes the code so it tries to do things without the colorkey and removes the automatic format conversion part from the SDLgfx_rotateSurface function. Getting the format right is something the caller has to do now and the required code has been added to the SW_RenderCopyEx function.
There's a small change to the SW_CreateTexture function. RLE encoding a surface with an alpha mask can be a lossy process. Depending on how the user uses the RGBA channels, this may be undesired. The change that surfaces with an alpha mask don't get encoded makes the software renderer consistent with the other renderers.
The SW_RenderCopyEx function now does these steps: Lock the source surface if necessary. Create a clone of the source by using the pixel buffer directly. Check the format and set a flag if a conversion is necessary. Check if scaling or cropping is necessary and set the flag for that as well. Check if color and alpha modulation has to be done before the rotate. Check if the source is an opaque surface. If not, it creates a mask surface that is necessary for the NONE blend mode. If any of the flags were set, a new surface is created and the source will be converted, scaled, cropped, and modulated. The rest of the function stays somewhat the same. The mask also needs to be rotated of course and then there is the NONE blend mode...
It's surprisingly hard to get the pixel from a rotated surface to the destination buffer without affecting the pixel outside the rotated area. I found a way to do this with three blits which is pretty hard on the performance. Perhaps someone has an idea how to do this faster?
As mentioned above, the SDLgfx_rotateSurface now only takes 8-bit paletted or 32-bit with alpha mask surfaces. It additionally sets the new surfaces up for the MOD blend mode.
I shortly tested the 8-bit path of SDLgfx_rotateSurface and it seemed to work so far. This path is not used by the software renderer anyway.
2016-11-15 01:12:27 -08:00
|
|
|
src_rotated = SDLgfx_rotateSurface(src_clone, angle, dstwidth/2, dstheight/2, GetScaleQuality(), flip & SDL_FLIP_HORIZONTAL, flip & SDL_FLIP_VERTICAL, dstwidth, dstheight, cangle, sangle);
|
|
|
|
if (src_rotated == NULL) {
|
|
|
|
retval = -1;
|
|
|
|
}
|
|
|
|
if (!retval && mask != NULL) {
|
|
|
|
/* The mask needed for the NONE blend mode gets rotated with the same parameters. */
|
|
|
|
mask_rotated = SDLgfx_rotateSurface(mask, angle, dstwidth/2, dstheight/2, SDL_FALSE, 0, 0, dstwidth, dstheight, cangle, sangle);
|
|
|
|
if (mask_rotated == NULL) {
|
|
|
|
retval = -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!retval) {
|
Fixed bug 1550 - SDL_RenderCopy/CopyEx in software should optionally render 8bit alpha
Adam M.
There are three problems in the code that I see.
1. SW_RenderCopyEx enables a color key on surface_scaled even if the source surface didn't have a color key.
2. SW_RenderCopyEx doesn't copy blend mode, color mod, or alpha mod from src to surface_scaled.
3. When SDL_BlitScaled(src, srcrect, surface_scaled, &tmp_rect) is called, it blends the src pixels into surface_scaled instead of overwriting them (if src has blending, etc. enabled).
I've attached a patch that 1) fixes the three problems that I mentioned, 2) adds the requested performance improvement of using the regular blit function if no rotation or flipping is needed, 3) avoids cloning the source surface if no stretching is required, and simplifies the rotation code slightly.
2015-06-19 23:20:43 -07:00
|
|
|
/* Find out where the new origin is by rotating the four final_rect points around the center and then taking the extremes */
|
|
|
|
abscenterx = final_rect.x + (int)center->x;
|
|
|
|
abscentery = final_rect.y + (int)center->y;
|
|
|
|
/* Compensate the angle inversion to match the behaviour of the other backends */
|
|
|
|
sangle = -sangle;
|
|
|
|
|
|
|
|
/* Top Left */
|
|
|
|
px = final_rect.x - abscenterx;
|
|
|
|
py = final_rect.y - abscentery;
|
|
|
|
p1x = px * cangle - py * sangle + abscenterx;
|
|
|
|
p1y = px * sangle + py * cangle + abscentery;
|
|
|
|
|
|
|
|
/* Top Right */
|
|
|
|
px = final_rect.x + final_rect.w - abscenterx;
|
|
|
|
py = final_rect.y - abscentery;
|
|
|
|
p2x = px * cangle - py * sangle + abscenterx;
|
|
|
|
p2y = px * sangle + py * cangle + abscentery;
|
|
|
|
|
|
|
|
/* Bottom Left */
|
|
|
|
px = final_rect.x - abscenterx;
|
|
|
|
py = final_rect.y + final_rect.h - abscentery;
|
|
|
|
p3x = px * cangle - py * sangle + abscenterx;
|
|
|
|
p3y = px * sangle + py * cangle + abscentery;
|
|
|
|
|
|
|
|
/* Bottom Right */
|
|
|
|
px = final_rect.x + final_rect.w - abscenterx;
|
|
|
|
py = final_rect.y + final_rect.h - abscentery;
|
|
|
|
p4x = px * cangle - py * sangle + abscenterx;
|
|
|
|
p4y = px * sangle + py * cangle + abscentery;
|
|
|
|
|
|
|
|
tmp_rect.x = (int)MIN(MIN(p1x, p2x), MIN(p3x, p4x));
|
|
|
|
tmp_rect.y = (int)MIN(MIN(p1y, p2y), MIN(p3y, p4y));
|
|
|
|
tmp_rect.w = dstwidth;
|
|
|
|
tmp_rect.h = dstheight;
|
|
|
|
|
Fixed bug 3359 - Software renderer does incorrect blending with SDL_RenderCopyEx
Simon Hug
The software renderer produces incorrect results when blending textures at an angle with certain blend modes. It seems that there were some edge cases that weren't considered when the SW_RenderCopyEx function was last changed. Or another bug possibly covered up the problem. (More on that in another bug report.)
Most of the issues come from the fact that the rotating function sets a black colorkey. This is problematic because black is most likely appearing in the surface and the final blit will ignore these pixels. Unless a colorkey is already set (the software renderer currently never sets one), it's very hard to find a free color. Of course it could scan over the whole image until one is found, but that seems inefficient.
The following blend modes have issues when drawn at an angle.
NONE: The black pixels get ignored, making them essentially transparent. This breaks the 'dstRGBA = srcRGBA' definition of the NONE blend mode.
MOD: Again, the black pixels get ignored. This also breaks the 'dstRGB = dstRGB * srcRGB' definition of the MOD blend mode, where black pixels would make the destination black as well. A white colorkey will work though, with some preparations.
BLEND: There are some issues when blending a texture with a translucent RGBA target texture. I - uh - forgot what the problem here exactly is.
This patch fixes the issues mentioned above. It mainly changes the code so it tries to do things without the colorkey and removes the automatic format conversion part from the SDLgfx_rotateSurface function. Getting the format right is something the caller has to do now and the required code has been added to the SW_RenderCopyEx function.
There's a small change to the SW_CreateTexture function. RLE encoding a surface with an alpha mask can be a lossy process. Depending on how the user uses the RGBA channels, this may be undesired. The change that surfaces with an alpha mask don't get encoded makes the software renderer consistent with the other renderers.
The SW_RenderCopyEx function now does these steps: Lock the source surface if necessary. Create a clone of the source by using the pixel buffer directly. Check the format and set a flag if a conversion is necessary. Check if scaling or cropping is necessary and set the flag for that as well. Check if color and alpha modulation has to be done before the rotate. Check if the source is an opaque surface. If not, it creates a mask surface that is necessary for the NONE blend mode. If any of the flags were set, a new surface is created and the source will be converted, scaled, cropped, and modulated. The rest of the function stays somewhat the same. The mask also needs to be rotated of course and then there is the NONE blend mode...
It's surprisingly hard to get the pixel from a rotated surface to the destination buffer without affecting the pixel outside the rotated area. I found a way to do this with three blits which is pretty hard on the performance. Perhaps someone has an idea how to do this faster?
As mentioned above, the SDLgfx_rotateSurface now only takes 8-bit paletted or 32-bit with alpha mask surfaces. It additionally sets the new surfaces up for the MOD blend mode.
I shortly tested the 8-bit path of SDLgfx_rotateSurface and it seemed to work so far. This path is not used by the software renderer anyway.
2016-11-15 01:12:27 -08:00
|
|
|
/* The NONE blend mode needs some special care with non-opaque surfaces.
|
|
|
|
* Other blend modes or opaque surfaces can be blitted directly.
|
|
|
|
*/
|
|
|
|
if (blendmode != SDL_BLENDMODE_NONE || isOpaque) {
|
|
|
|
if (applyModulation == SDL_FALSE) {
|
|
|
|
/* If the modulation wasn't already applied, make it happen now. */
|
|
|
|
SDL_SetSurfaceAlphaMod(src_rotated, alphaMod);
|
|
|
|
SDL_SetSurfaceColorMod(src_rotated, rMod, gMod, bMod);
|
|
|
|
}
|
|
|
|
retval = SDL_BlitSurface(src_rotated, NULL, surface, &tmp_rect);
|
|
|
|
} else {
|
|
|
|
/* The NONE blend mode requires three steps to get the pixels onto the destination surface.
|
|
|
|
* First, the area where the rotated pixels will be blitted to get set to zero.
|
|
|
|
* This is accomplished by simply blitting a mask with the NONE blend mode.
|
|
|
|
* The colorkey set by the rotate function will discard the correct pixels.
|
|
|
|
*/
|
|
|
|
SDL_Rect mask_rect = tmp_rect;
|
|
|
|
SDL_SetSurfaceBlendMode(mask_rotated, SDL_BLENDMODE_NONE);
|
|
|
|
retval = SDL_BlitSurface(mask_rotated, NULL, surface, &mask_rect);
|
|
|
|
if (!retval) {
|
|
|
|
/* The next step copies the alpha value. This is done with the BLEND blend mode and
|
|
|
|
* by modulating the source colors with 0. Since the destination is all zeros, this
|
|
|
|
* will effectively set the destination alpha to the source alpha.
|
|
|
|
*/
|
|
|
|
SDL_SetSurfaceColorMod(src_rotated, 0, 0, 0);
|
|
|
|
mask_rect = tmp_rect;
|
|
|
|
retval = SDL_BlitSurface(src_rotated, NULL, surface, &mask_rect);
|
|
|
|
if (!retval) {
|
|
|
|
/* The last step gets the color values in place. The ADD blend mode simply adds them to
|
|
|
|
* the destination (where the color values are all zero). However, because the ADD blend
|
|
|
|
* mode modulates the colors with the alpha channel, a surface without an alpha mask needs
|
|
|
|
* to be created. This makes all source pixels opaque and the colors get copied correctly.
|
|
|
|
*/
|
|
|
|
SDL_Surface *src_rotated_rgb;
|
|
|
|
src_rotated_rgb = SDL_CreateRGBSurfaceFrom(src_rotated->pixels, src_rotated->w, src_rotated->h,
|
|
|
|
src_rotated->format->BitsPerPixel, src_rotated->pitch,
|
|
|
|
src_rotated->format->Rmask, src_rotated->format->Gmask,
|
|
|
|
src_rotated->format->Bmask, 0);
|
|
|
|
if (src_rotated_rgb == NULL) {
|
|
|
|
retval = -1;
|
|
|
|
} else {
|
|
|
|
SDL_SetSurfaceBlendMode(src_rotated_rgb, SDL_BLENDMODE_ADD);
|
|
|
|
retval = SDL_BlitSurface(src_rotated_rgb, NULL, surface, &tmp_rect);
|
|
|
|
SDL_FreeSurface(src_rotated_rgb);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
SDL_FreeSurface(mask_rotated);
|
|
|
|
}
|
|
|
|
if (src_rotated != NULL) {
|
|
|
|
SDL_FreeSurface(src_rotated);
|
|
|
|
}
|
Fixed bug 1550 - SDL_RenderCopy/CopyEx in software should optionally render 8bit alpha
Adam M.
There are three problems in the code that I see.
1. SW_RenderCopyEx enables a color key on surface_scaled even if the source surface didn't have a color key.
2. SW_RenderCopyEx doesn't copy blend mode, color mod, or alpha mod from src to surface_scaled.
3. When SDL_BlitScaled(src, srcrect, surface_scaled, &tmp_rect) is called, it blends the src pixels into surface_scaled instead of overwriting them (if src has blending, etc. enabled).
I've attached a patch that 1) fixes the three problems that I mentioned, 2) adds the requested performance improvement of using the regular blit function if no rotation or flipping is needed, 3) avoids cloning the source surface if no stretching is required, and simplifies the rotation code slightly.
2015-06-19 23:20:43 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Fixed bug 3359 - Software renderer does incorrect blending with SDL_RenderCopyEx
Simon Hug
The software renderer produces incorrect results when blending textures at an angle with certain blend modes. It seems that there were some edge cases that weren't considered when the SW_RenderCopyEx function was last changed. Or another bug possibly covered up the problem. (More on that in another bug report.)
Most of the issues come from the fact that the rotating function sets a black colorkey. This is problematic because black is most likely appearing in the surface and the final blit will ignore these pixels. Unless a colorkey is already set (the software renderer currently never sets one), it's very hard to find a free color. Of course it could scan over the whole image until one is found, but that seems inefficient.
The following blend modes have issues when drawn at an angle.
NONE: The black pixels get ignored, making them essentially transparent. This breaks the 'dstRGBA = srcRGBA' definition of the NONE blend mode.
MOD: Again, the black pixels get ignored. This also breaks the 'dstRGB = dstRGB * srcRGB' definition of the MOD blend mode, where black pixels would make the destination black as well. A white colorkey will work though, with some preparations.
BLEND: There are some issues when blending a texture with a translucent RGBA target texture. I - uh - forgot what the problem here exactly is.
This patch fixes the issues mentioned above. It mainly changes the code so it tries to do things without the colorkey and removes the automatic format conversion part from the SDLgfx_rotateSurface function. Getting the format right is something the caller has to do now and the required code has been added to the SW_RenderCopyEx function.
There's a small change to the SW_CreateTexture function. RLE encoding a surface with an alpha mask can be a lossy process. Depending on how the user uses the RGBA channels, this may be undesired. The change that surfaces with an alpha mask don't get encoded makes the software renderer consistent with the other renderers.
The SW_RenderCopyEx function now does these steps: Lock the source surface if necessary. Create a clone of the source by using the pixel buffer directly. Check the format and set a flag if a conversion is necessary. Check if scaling or cropping is necessary and set the flag for that as well. Check if color and alpha modulation has to be done before the rotate. Check if the source is an opaque surface. If not, it creates a mask surface that is necessary for the NONE blend mode. If any of the flags were set, a new surface is created and the source will be converted, scaled, cropped, and modulated. The rest of the function stays somewhat the same. The mask also needs to be rotated of course and then there is the NONE blend mode...
It's surprisingly hard to get the pixel from a rotated surface to the destination buffer without affecting the pixel outside the rotated area. I found a way to do this with three blits which is pretty hard on the performance. Perhaps someone has an idea how to do this faster?
As mentioned above, the SDLgfx_rotateSurface now only takes 8-bit paletted or 32-bit with alpha mask surfaces. It additionally sets the new surfaces up for the MOD blend mode.
I shortly tested the 8-bit path of SDLgfx_rotateSurface and it seemed to work so far. This path is not used by the software renderer anyway.
2016-11-15 01:12:27 -08:00
|
|
|
if (SDL_MUSTLOCK(src)) {
|
|
|
|
SDL_UnlockSurface(src);
|
|
|
|
}
|
|
|
|
if (mask != NULL) {
|
|
|
|
SDL_FreeSurface(mask);
|
|
|
|
}
|
|
|
|
if (src_clone != NULL) {
|
|
|
|
SDL_FreeSurface(src_clone);
|
Fixed bug 1550 - SDL_RenderCopy/CopyEx in software should optionally render 8bit alpha
Adam M.
There are three problems in the code that I see.
1. SW_RenderCopyEx enables a color key on surface_scaled even if the source surface didn't have a color key.
2. SW_RenderCopyEx doesn't copy blend mode, color mod, or alpha mod from src to surface_scaled.
3. When SDL_BlitScaled(src, srcrect, surface_scaled, &tmp_rect) is called, it blends the src pixels into surface_scaled instead of overwriting them (if src has blending, etc. enabled).
I've attached a patch that 1) fixes the three problems that I mentioned, 2) adds the requested performance improvement of using the regular blit function if no rotation or flipping is needed, 3) avoids cloning the source surface if no stretching is required, and simplifies the rotation code slightly.
2015-06-19 23:20:43 -07:00
|
|
|
}
|
|
|
|
return retval;
|
2012-06-01 19:51:08 -03:00
|
|
|
}
|
|
|
|
|
2009-11-09 05:20:11 +00:00
|
|
|
static int
|
|
|
|
SW_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
|
2009-11-16 07:13:07 +00:00
|
|
|
Uint32 format, void * pixels, int pitch)
|
2009-11-09 05:20:11 +00:00
|
|
|
{
|
2011-02-03 15:49:37 -08:00
|
|
|
SDL_Surface *surface = SW_ActivateRenderer(renderer);
|
|
|
|
Uint32 src_format;
|
|
|
|
void *src_pixels;
|
2011-02-15 13:59:59 -08:00
|
|
|
SDL_Rect final_rect;
|
2009-11-09 05:20:11 +00:00
|
|
|
|
2011-02-03 15:49:37 -08:00
|
|
|
if (!surface) {
|
2011-02-01 19:19:43 -08:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2011-02-15 13:59:59 -08:00
|
|
|
if (renderer->viewport.x || renderer->viewport.y) {
|
|
|
|
final_rect.x = renderer->viewport.x + rect->x;
|
|
|
|
final_rect.y = renderer->viewport.y + rect->y;
|
|
|
|
final_rect.w = rect->w;
|
|
|
|
final_rect.h = rect->h;
|
|
|
|
rect = &final_rect;
|
|
|
|
}
|
|
|
|
|
2011-02-03 15:49:37 -08:00
|
|
|
if (rect->x < 0 || rect->x+rect->w > surface->w ||
|
|
|
|
rect->y < 0 || rect->y+rect->h > surface->h) {
|
2013-03-31 12:48:50 -04:00
|
|
|
return SDL_SetError("Tried to read outside of surface bounds");
|
2009-11-09 05:20:11 +00:00
|
|
|
}
|
|
|
|
|
2011-02-15 13:59:59 -08:00
|
|
|
src_format = surface->format->format;
|
2011-02-03 15:49:37 -08:00
|
|
|
src_pixels = (void*)((Uint8 *) surface->pixels +
|
|
|
|
rect->y * surface->pitch +
|
|
|
|
rect->x * surface->format->BytesPerPixel);
|
|
|
|
|
|
|
|
return SDL_ConvertPixels(rect->w, rect->h,
|
|
|
|
src_format, src_pixels, surface->pitch,
|
|
|
|
format, pixels, pitch);
|
2009-11-09 05:20:11 +00:00
|
|
|
}
|
|
|
|
|
2006-07-10 21:04:37 +00:00
|
|
|
static void
|
2006-07-19 07:18:45 +00:00
|
|
|
SW_RenderPresent(SDL_Renderer * renderer)
|
2006-07-10 21:04:37 +00:00
|
|
|
{
|
2011-02-03 15:49:37 -08:00
|
|
|
SDL_Window *window = renderer->window;
|
2006-07-10 21:04:37 +00:00
|
|
|
|
2011-02-03 15:49:37 -08:00
|
|
|
if (window) {
|
|
|
|
SDL_UpdateWindowSurface(window);
|
2011-02-01 19:19:43 -08:00
|
|
|
}
|
2006-07-10 21:04:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2006-07-19 07:18:45 +00:00
|
|
|
SW_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture)
|
2006-07-10 21:04:37 +00:00
|
|
|
{
|
2011-02-03 00:19:40 -08:00
|
|
|
SDL_Surface *surface = (SDL_Surface *) texture->driverdata;
|
2006-07-10 21:04:37 +00:00
|
|
|
|
2011-02-03 00:19:40 -08:00
|
|
|
SDL_FreeSurface(surface);
|
2006-07-10 21:04:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2006-07-19 07:18:45 +00:00
|
|
|
SW_DestroyRenderer(SDL_Renderer * renderer)
|
2006-07-10 21:04:37 +00:00
|
|
|
{
|
2006-07-19 07:18:45 +00:00
|
|
|
SW_RenderData *data = (SW_RenderData *) renderer->driverdata;
|
2006-07-10 21:04:37 +00:00
|
|
|
|
2013-08-29 08:29:21 -07:00
|
|
|
SDL_free(data);
|
2006-07-10 21:04:37 +00:00
|
|
|
SDL_free(renderer);
|
|
|
|
}
|
|
|
|
|
2011-02-08 10:04:09 -08:00
|
|
|
#endif /* !SDL_RENDER_DISABLED */
|
|
|
|
|
2006-07-10 21:04:37 +00:00
|
|
|
/* vi: set ts=4 sw=4 expandtab: */
|