Commit 296ed893 authored by Sam Lantinga's avatar Sam Lantinga

Fixed bug recreating OpenGL textures on window resize

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402019
parent c018c144
...@@ -95,6 +95,7 @@ SDL_RenderDriver SW_RenderDriver = { ...@@ -95,6 +95,7 @@ SDL_RenderDriver SW_RenderDriver = {
typedef struct typedef struct
{ {
Uint32 format; Uint32 format;
SDL_bool updateSize;
int current_texture; int current_texture;
SDL_Texture *texture[3]; SDL_Texture *texture[3];
SDL_Surface surface; SDL_Surface surface;
...@@ -276,12 +277,39 @@ static int ...@@ -276,12 +277,39 @@ static int
SW_ActivateRenderer(SDL_Renderer * renderer) SW_ActivateRenderer(SDL_Renderer * renderer)
{ {
SW_RenderData *data = (SW_RenderData *) renderer->driverdata; SW_RenderData *data = (SW_RenderData *) renderer->driverdata;
SDL_Window *window = SDL_GetWindowFromID(renderer->window);
int i, n;
if (data->renderer && data->renderer->ActivateRenderer) { if (data->renderer && data->renderer->ActivateRenderer) {
if (data->renderer->ActivateRenderer(data->renderer) < 0) { if (data->renderer->ActivateRenderer(data->renderer) < 0) {
return -1; return -1;
} }
} }
if (data->updateSize) {
/* Recreate the textures for the new window size */
if (renderer->info.flags & SDL_RENDERER_PRESENTFLIP2) {
n = 2;
} else if (renderer->info.flags & SDL_RENDERER_PRESENTFLIP3) {
n = 3;
} else {
n = 1;
}
for (i = 0; i < n; ++i) {
if (data->texture[i]) {
DestroyTexture(data->renderer, data->texture[i]);
data->texture[i] = 0;
}
}
for (i = 0; i < n; ++i) {
data->texture[i] =
CreateTexture(data->renderer, data->format, window->w,
window->h);
if (!data->texture[i]) {
return -1;
}
}
data->updateSize = SDL_FALSE;
}
return 0; return 0;
} }
...@@ -289,30 +317,13 @@ static int ...@@ -289,30 +317,13 @@ static int
SW_DisplayModeChanged(SDL_Renderer * renderer) SW_DisplayModeChanged(SDL_Renderer * renderer)
{ {
SW_RenderData *data = (SW_RenderData *) renderer->driverdata; SW_RenderData *data = (SW_RenderData *) renderer->driverdata;
SDL_Window *window = SDL_GetWindowFromID(renderer->window);
int i, n;
if (data->renderer && data->renderer->DisplayModeChanged) { if (data->renderer && data->renderer->DisplayModeChanged) {
if (data->renderer->DisplayModeChanged(data->renderer) < 0) { if (data->renderer->DisplayModeChanged(data->renderer) < 0) {
return -1; return -1;
} }
} }
data->updateSize = SDL_TRUE;
/* Recreate the textures for the new window size */
if (renderer->info.flags & SDL_RENDERER_PRESENTFLIP2) {
n = 2;
} else if (renderer->info.flags & SDL_RENDERER_PRESENTFLIP3) {
n = 3;
} else {
n = 1;
}
for (i = 0; i < n; ++i) {
if (data->texture[i]) {
DestroyTexture(data->renderer, data->texture[i]);
}
data->texture[i] =
CreateTexture(data->renderer, data->format, window->w, window->h);
}
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment