pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reorganized the render target code, moving the viewport handling to the general code and adding software implementation.

Browse source
This commit is contained in:
Sam Lantinga 2012-01-21 22:22:30 -05:00
parent fb87e98b8a
commit da686e5bd4
7 changed files with 260 additions and 342 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/render/software/SDL_render_sw.c
View file

@ -51,6 +51,7 @@ static int SW_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
static int SW_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
const SDL_Rect * rect, void **pixels, int *pitch);
static void SW_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture);
static int SW_SetTargetTexture(SDL_Renderer * renderer, SDL_Texture * texture);
static int SW_UpdateViewport(SDL_Renderer * renderer);
static int SW_RenderClear(SDL_Renderer * renderer);
static int SW_RenderDrawPoints(SDL_Renderer * renderer,
@ -72,7 +73,7 @@ SDL_RenderDriver SW_RenderDriver = {
SW_CreateRenderer,
{
"software",
SDL_RENDERER_SOFTWARE,
SDL_RENDERER_SOFTWARE | SDL_RENDERER_TARGETTEXTURE,
8,
{
SDL_PIXELFORMAT_RGB555,
@ -91,6 +92,7 @@ SDL_RenderDriver SW_RenderDriver = {
typedef struct
{
SDL_Surface *surface;
SDL_Surface *window;
} SW_RenderData;
@ -100,7 +102,10 @@ SW_ActivateRenderer(SDL_Renderer * renderer)
SW_RenderData *data = (SW_RenderData *) renderer->driverdata;
if (!data->surface) {
data->surface = SDL_GetWindowSurface(renderer->window);
data->surface = data->window;
}
if (!data->surface) {
data->surface = data->window = SDL_GetWindowSurface(renderer->window);
SW_UpdateViewport(renderer);
}
@ -140,8 +145,8 @@ SW_CreateRendererForSurface(SDL_Surface * surface)
renderer->UpdateTexture = SW_UpdateTexture;
renderer->LockTexture = SW_LockTexture;
renderer->UnlockTexture = SW_UnlockTexture;
renderer->SetTargetTexture = SW_SetTargetTexture;
renderer->UpdateViewport = SW_UpdateViewport;
renderer->DestroyTexture = SW_DestroyTexture;
renderer->RenderClear = SW_RenderClear;
renderer->RenderDrawPoints = SW_RenderDrawPoints;
renderer->RenderDrawLines = SW_RenderDrawLines;
@ -149,6 +154,7 @@ SW_CreateRendererForSurface(SDL_Surface * surface)
renderer->RenderCopy = SW_RenderCopy;
renderer->RenderReadPixels = SW_RenderReadPixels;
renderer->RenderPresent = SW_RenderPresent;
renderer->DestroyTexture = SW_DestroyTexture;
renderer->DestroyRenderer = SW_DestroyRenderer;
renderer->info = SW_RenderDriver.info;
renderer->driverdata = data;
@ -276,6 +282,19 @@ SW_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture)
{
}
static int
SW_SetTargetTexture(SDL_Renderer * renderer, SDL_Texture * texture)
{
SW_RenderData *data = (SW_RenderData *) renderer->driverdata;
if (texture ) {
data->surface = (SDL_Surface *) texture->driverdata;
} else {
data->surface = data->window;
}
return 0;
}
static int
SW_UpdateViewport(SDL_Renderer * renderer)
{