--- a/src/video/dummy/SDL_nullrender.c Sat Jul 15 09:46:36 2006 +0000
+++ b/src/video/dummy/SDL_nullrender.c Sat Jul 15 19:29:42 2006 +0000
@@ -23,15 +23,52 @@
#include "SDL_video.h"
#include "../SDL_sysvideo.h"
+#include "../SDL_yuv_sw_c.h"
/* SDL surface based renderer implementation */
-static SDL_Renderer *SDL_DUMMY_CreateRenderer(SDL_Window * window,
- Uint32 flags);
+static SDL_Renderer *SDL_DUMMY_CreateRenderer(SDL_Window * window, Uint32 flags);
static int SDL_DUMMY_CreateTexture(SDL_Renderer * renderer,
- SDL_Texture * texture);
+ SDL_Texture * texture);
+static int SDL_DUMMY_QueryTexturePixels(SDL_Renderer * renderer,
+ SDL_Texture * texture, void **pixels,
+ int *pitch);
+static int SDL_DUMMY_SetTexturePalette(SDL_Renderer * renderer,
+ SDL_Texture * texture,
+ const SDL_Color * colors, int firstcolor,
+ int ncolors);
+static int SDL_DUMMY_GetTexturePalette(SDL_Renderer * renderer,
+ SDL_Texture * texture, SDL_Color * colors,
+ int firstcolor, int ncolors);
+static int SDL_DUMMY_UpdateTexture(SDL_Renderer * renderer,
+ SDL_Texture * texture, const SDL_Rect * rect,
+ const void *pixels, int pitch);
+static int SDL_DUMMY_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+ const SDL_Rect * rect, int markDirty,
+ void **pixels, int *pitch);
+static void SDL_DUMMY_UnlockTexture(SDL_Renderer * renderer,
+ SDL_Texture * texture);
+static void SDL_DUMMY_DirtyTexture(SDL_Renderer * renderer,
+ SDL_Texture * texture, int numrects,
+ const SDL_Rect * rects);
+static void SDL_DUMMY_SelectRenderTexture(SDL_Renderer * renderer,
+ SDL_Texture * texture);
+static int SDL_DUMMY_RenderFill(SDL_Renderer * renderer, const SDL_Rect * rect,
+ Uint32 color);
+static int SDL_DUMMY_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
+ const SDL_Rect * srcrect,
+ const SDL_Rect * dstrect, int blendMode,
+ int scaleMode);
+static int SDL_DUMMY_RenderReadPixels(SDL_Renderer * renderer,
+ const SDL_Rect * rect, void *pixels,
+ int pitch);
+static int SDL_DUMMY_RenderWritePixels(SDL_Renderer * renderer,
+ const SDL_Rect * rect, const void *pixels,
+ int pitch);
static void SDL_DUMMY_RenderPresent(SDL_Renderer * renderer);
+static void SDL_DUMMY_DestroyTexture(SDL_Renderer * renderer,
+ SDL_Texture * texture);
static void SDL_DUMMY_DestroyRenderer(SDL_Renderer * renderer);
@@ -39,18 +76,33 @@
SDL_DUMMY_CreateRenderer,
{
"dummy",
- (SDL_Renderer_PresentDiscard | SDL_Renderer_PresentCopy),
- SDL_TextureBlendMode_None,
- SDL_TextureScaleMode_None,
- 0,
- {0},
+ (SDL_Renderer_SingleBuffer | SDL_Renderer_PresentCopy |
+ SDL_Renderer_PresentFlip2 | SDL_Renderer_PresentFlip3 |
+ SDL_Renderer_PresentDiscard),
+ (SDL_TextureBlendMode_None | SDL_TextureBlendMode_Mask |
+ SDL_TextureBlendMode_Blend),
+ (SDL_TextureScaleMode_None | SDL_TextureScaleMode_Fast),
+ 11,
+ {
+ SDL_PixelFormat_Index8,
+ SDL_PixelFormat_RGB555,
+ SDL_PixelFormat_RGB565,
+ SDL_PixelFormat_RGB888,
+ SDL_PixelFormat_BGR888,
+ SDL_PixelFormat_ARGB8888,
+ SDL_PixelFormat_RGBA8888,
+ SDL_PixelFormat_ABGR8888,
+ SDL_PixelFormat_BGRA8888,
+ SDL_PixelFormat_YUY2,
+ SDL_PixelFormat_UYVY},
0,
0}
};
typedef struct
{
- SDL_Surface *surface;
+ int current_screen;
+ SDL_Surface *screens[3];
} SDL_DUMMY_RenderData;
SDL_Renderer *
@@ -60,6 +112,7 @@
SDL_DisplayMode *displayMode = &display->current_mode;
SDL_Renderer *renderer;
SDL_DUMMY_RenderData *data;
+ int i, n;
int bpp;
Uint32 Rmask, Gmask, Bmask, Amask;
@@ -69,12 +122,11 @@
return NULL;
}
- renderer = (SDL_Renderer *) SDL_malloc(sizeof(*renderer));
+ renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));
if (!renderer) {
SDL_OutOfMemory();
return NULL;
}
- SDL_zerop(renderer);
data = (SDL_DUMMY_RenderData *) SDL_malloc(sizeof(*data));
if (!data) {
@@ -84,50 +136,284 @@
}
SDL_zerop(data);
+ renderer->CreateTexture = SDL_DUMMY_CreateTexture;
+ renderer->QueryTexturePixels = SDL_DUMMY_QueryTexturePixels;
+ renderer->SetTexturePalette = SDL_DUMMY_SetTexturePalette;
+ renderer->GetTexturePalette = SDL_DUMMY_GetTexturePalette;
+ renderer->UpdateTexture = SDL_DUMMY_UpdateTexture;
+ renderer->LockTexture = SDL_DUMMY_LockTexture;
+ renderer->UnlockTexture = SDL_DUMMY_UnlockTexture;
+ renderer->DirtyTexture = SDL_DUMMY_DirtyTexture;
+ renderer->RenderFill = SDL_DUMMY_RenderFill;
+ renderer->RenderCopy = SDL_DUMMY_RenderCopy;
renderer->RenderPresent = SDL_DUMMY_RenderPresent;
+ renderer->DestroyTexture = SDL_DUMMY_DestroyTexture;
renderer->DestroyRenderer = SDL_DUMMY_DestroyRenderer;
renderer->info = SDL_DUMMY_RenderDriver.info;
renderer->window = window->id;
renderer->driverdata = data;
- data->surface =
- SDL_CreateRGBSurface(0, window->w, window->h, bpp, Rmask, Gmask,
- Bmask, Amask);
- if (!data->surface) {
- SDL_DUMMY_DestroyRenderer(renderer);
- return NULL;
+ renderer->info.flags = 0;
+
+ if (flags & SDL_Renderer_PresentFlip2) {
+ renderer->info.flags |= SDL_Renderer_PresentFlip2;
+ n = 2;
+ } else if (flags & SDL_Renderer_PresentFlip3) {
+ renderer->info.flags |= SDL_Renderer_PresentFlip3;
+ n = 3;
+ } else {
+ renderer->info.flags |= SDL_Renderer_PresentCopy;
+ n = 1;
}
- SDL_SetSurfacePalette(data->surface, display->palette);
+ for (i = 0; i < n; ++i) {
+ data->screens[i] =
+ SDL_CreateRGBSurface(0, window->w, window->h, bpp, Rmask, Gmask,
+ Bmask, Amask);
+ if (!data->screens[i]) {
+ SDL_DUMMY_DestroyRenderer(renderer);
+ return NULL;
+ }
+ SDL_SetSurfacePalette(data->screens[i], display->palette);
+ }
+ data->current_screen = 0;
return renderer;
}
-void
+static int
+SDL_DUMMY_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+ if (SDL_ISPIXELFORMAT_FOURCC(texture->format)) {
+ texture->driverdata = SDL_SW_CreateYUVTexture(texture);
+ } else {
+ int bpp;
+ Uint32 Rmask, Gmask, Bmask, Amask;
+
+ if (!SDL_PixelFormatEnumToMasks
+ (texture->format, &bpp, &Rmask, &Gmask, &Bmask, &Amask)) {
+ SDL_SetError("Unknown texture format");
+ return -1;
+ }
+
+ texture->driverdata = SDL_CreateRGBSurface(0, texture->w, texture->h, bpp, Rmask, Gmask, Bmask, Amask);
+ }
+
+ if (!texture->driverdata) {
+ return -1;
+ }
+ return 0;
+}
+
+static int
+SDL_DUMMY_QueryTexturePixels(SDL_Renderer * renderer, SDL_Texture * texture,
+ void **pixels, int *pitch)
+{
+ if (SDL_ISPIXELFORMAT_FOURCC(texture->format)) {
+ return SDL_SW_QueryYUVTexturePixels((SDL_SW_YUVTexture *) texture->driverdata, pixels, pitch);
+ } else {
+ SDL_Surface *surface = (SDL_Surface *) texture->driverdata;
+
+ *pixels = surface->pixels;
+ *pitch = surface->pitch;
+ return 0;
+ }
+}
+
+static int
+SDL_DUMMY_SetTexturePalette(SDL_Renderer * renderer, SDL_Texture * texture,
+ const SDL_Color * colors, int firstcolor,
+ int ncolors)
+{
+ if (SDL_ISPIXELFORMAT_FOURCC(texture->format)) {
+ SDL_SetError("YUV textures don't have a palette");
+ return -1;
+ } else {
+ SDL_Surface *surface = (SDL_Surface *) texture->driverdata;
+
+ return SDL_SetPaletteColors(surface->format->palette, colors,
+ firstcolor, ncolors);
+ }
+}
+
+static int
+SDL_DUMMY_GetTexturePalette(SDL_Renderer * renderer, SDL_Texture * texture,
+ SDL_Color * colors, int firstcolor, int ncolors)
+{
+ if (SDL_ISPIXELFORMAT_FOURCC(texture->format)) {
+ SDL_SetError("YUV textures don't have a palette");
+ return -1;
+ } else {
+ SDL_Surface *surface = (SDL_Surface *) texture->driverdata;
+
+ SDL_memcpy(colors, &surface->format->palette->colors[firstcolor],
+ ncolors * sizeof(*colors));
+ return 0;
+ }
+}
+
+static int
+SDL_DUMMY_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+ const SDL_Rect * rect, const void *pixels, int pitch)
+{
+ if (SDL_ISPIXELFORMAT_FOURCC(texture->format)) {
+ return SDL_SW_UpdateYUVTexture((SDL_SW_YUVTexture *) texture->
+ driverdata, rect, pixels, pitch);
+ } else {
+ SDL_Surface *surface = (SDL_Surface *) texture->driverdata;
+ Uint8 *src, *dst;
+ int row;
+ size_t length;
+
+ 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;
+ }
+ return 0;
+ }
+}
+
+static int
+SDL_DUMMY_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+ const SDL_Rect * rect, int markDirty, void **pixels,
+ int *pitch)
+{
+ if (SDL_ISPIXELFORMAT_FOURCC(texture->format)) {
+ return SDL_SW_LockYUVTexture((SDL_SW_YUVTexture *) texture->
+ driverdata, rect, markDirty, pixels,
+ pitch);
+ } else {
+ SDL_Surface *surface = (SDL_Surface *) texture->driverdata;
+
+ *pixels =
+ (void *) ((Uint8 *) surface->pixels + rect->y * surface->pitch +
+ rect->x * surface->format->BytesPerPixel);
+ *pitch = surface->pitch;
+ return 0;
+ }
+}
+
+static void
+SDL_DUMMY_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+ if (SDL_ISPIXELFORMAT_FOURCC(texture->format)) {
+ SDL_SW_UnlockYUVTexture((SDL_SW_YUVTexture *) texture->driverdata);
+ }
+}
+
+static void
+SDL_DUMMY_DirtyTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+ int numrects, const SDL_Rect * rects)
+{
+}
+
+static int
+SDL_DUMMY_RenderFill(SDL_Renderer * renderer, const SDL_Rect * rect,
+ Uint32 color)
+{
+ SDL_DUMMY_RenderData *data = (SDL_DUMMY_RenderData *) renderer->driverdata;
+ SDL_Surface *target = data->screens[data->current_screen];
+ SDL_Rect real_rect = *rect;
+ Uint8 r, g, b, a;
+
+ a = (Uint8) ((color >> 24) & 0xFF);
+ r = (Uint8) ((color >> 16) & 0xFF);
+ g = (Uint8) ((color >> 8) & 0xFF);
+ b = (Uint8) (color & 0xFF);
+ color = SDL_MapRGBA(target->format, r, g, b, a);
+
+ return SDL_FillRect(target, &real_rect, color);
+}
+
+static int
+SDL_DUMMY_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
+ const SDL_Rect * srcrect, const SDL_Rect * dstrect,
+ int blendMode, int scaleMode)
+{
+ SDL_DUMMY_RenderData *data = (SDL_DUMMY_RenderData *) renderer->driverdata;
+ SDL_Window *window = SDL_GetWindowFromID(renderer->window);
+ SDL_VideoDisplay *display = SDL_GetDisplayFromWindow(window);
+
+ if (SDL_ISPIXELFORMAT_FOURCC(texture->format)) {
+ SDL_Surface *target = data->screens[data->current_screen];
+ void *pixels =
+ (Uint8 *) target->pixels + dstrect->y * target->pitch +
+ dstrect->x * target->format->BytesPerPixel;
+ return SDL_SW_CopyYUVToRGB((SDL_SW_YUVTexture *) texture->driverdata,
+ srcrect, display->current_mode.format,
+ dstrect->w, dstrect->h, pixels,
+ target->pitch);
+ } else {
+ SDL_Surface *surface = (SDL_Surface *) texture->driverdata;
+ SDL_Surface *target = data->screens[data->current_screen];
+ SDL_Rect real_srcrect = *srcrect;
+ SDL_Rect real_dstrect = *dstrect;
+
+ if (blendMode &
+ (SDL_TextureBlendMode_Mask | SDL_TextureBlendMode_Blend)) {
+ SDL_SetAlpha(surface, SDL_SRCALPHA, 0);
+ } else {
+ SDL_SetAlpha(surface, 0, 0);
+ }
+ if (scaleMode != SDL_TextureScaleMode_None &&
+ (srcrect->w != dstrect->w || srcrect->h != dstrect->h)) {
+ return SDL_SoftStretch(surface, &real_srcrect, target, &real_dstrect);
+ } else {
+ return SDL_LowerBlit(surface, &real_srcrect, target, &real_dstrect);
+ }
+ }
+}
+
+static void
SDL_DUMMY_RenderPresent(SDL_Renderer * renderer)
{
static int frame_number;
- SDL_DUMMY_RenderData *data =
- (SDL_DUMMY_RenderData *) renderer->driverdata;
- SDL_Surface *surface = data->surface;
+ SDL_DUMMY_RenderData *data = (SDL_DUMMY_RenderData *) renderer->driverdata;
+ /* Send the data to the display */
if (SDL_getenv("SDL_VIDEO_DUMMY_SAVE_FRAMES")) {
char file[128];
SDL_snprintf(file, sizeof(file), "SDL_window%d-%8.8d.bmp",
renderer->window, ++frame_number);
- SDL_SaveBMP(surface, file);
+ SDL_SaveBMP(data->screens[data->current_screen], file);
+ }
+
+ /* Update the flipping chain, if any */
+ if (renderer->info.flags & SDL_Renderer_PresentFlip2) {
+ data->current_screen = (data->current_screen + 1) % 2;
+ } else if (renderer->info.flags & SDL_Renderer_PresentFlip3) {
+ data->current_screen = (data->current_screen + 1) % 3;
}
}
-void
+static void
+SDL_DUMMY_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+ if (SDL_ISPIXELFORMAT_FOURCC(texture->format)) {
+ SDL_SW_DestroyYUVTexture((SDL_SW_YUVTexture *) texture->driverdata);
+ } else {
+ SDL_Surface *surface = (SDL_Surface *) texture->driverdata;
+
+ SDL_FreeSurface(surface);
+ }
+}
+
+static void
SDL_DUMMY_DestroyRenderer(SDL_Renderer * renderer)
{
- SDL_DUMMY_RenderData *data =
- (SDL_DUMMY_RenderData *) renderer->driverdata;
+ SDL_DUMMY_RenderData *data = (SDL_DUMMY_RenderData *) renderer->driverdata;
+ int i;
if (data) {
- if (data->surface) {
- data->surface->format->palette = NULL;
- SDL_FreeSurface(data->surface);
+ for (i = 0; i < SDL_arraysize(data->screens); ++i) {
+ if (data->screens[i]) {
+ SDL_FreeSurface(data->screens[i]);
+ }
}
SDL_free(data);
}