mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Seems to work :)

Browse Source
This commit is contained in:
Themaister 2011-03-27 20:54:14 +02:00
parent 142411c08c
commit a01e3347f7
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gfx/gl.c
View File

@ -344,13 +344,10 @@ static void gl_init_fbo(gl_t *gl, unsigned width, unsigned height)
scale.type_x = scale.type_y = SSNES_SCALE_INPUT; scale.type_x = scale.type_y = SSNES_SCALE_INPUT;
} }
float accum_scale_x = 1.0, accum_scale_y = 1.0; switch (scale.type_x)
switch (gl->fbo_scale[0].type_x)
{ {
case SSNES_SCALE_INPUT: case SSNES_SCALE_INPUT:
accum_scale_x *= scale.scale_x; gl->fbo_rect[0].width = width * next_pow2(ceil(scale.scale_x));
gl->fbo_rect[0].width = width * next_pow2(ceil(accum_scale_x));
break; break;
case SSNES_SCALE_ABSOLUTE: case SSNES_SCALE_ABSOLUTE:
@ -365,11 +362,10 @@ static void gl_init_fbo(gl_t *gl, unsigned width, unsigned height)
break; break;
} }
switch (gl->fbo_scale[0].type_y) switch (scale.type_y)
{ {
case SSNES_SCALE_INPUT: case SSNES_SCALE_INPUT:
accum_scale_y *= scale.scale_y; gl->fbo_rect[0].height = height * next_pow2(ceil(scale.scale_y));
gl->fbo_rect[0].height = height * next_pow2(ceil(accum_scale_y));
break; break;
case SSNES_SCALE_ABSOLUTE: case SSNES_SCALE_ABSOLUTE:
@ -384,6 +380,7 @@ static void gl_init_fbo(gl_t *gl, unsigned width, unsigned height)
break; break;
} }
unsigned last_width = gl->fbo_rect[0].width, last_height = gl->fbo_rect[0].height;
gl->fbo_scale[0] = scale; gl->fbo_scale[0] = scale;
SSNES_LOG("Creating FBO 0 @ %ux%u\n", gl->fbo_rect[0].width, gl->fbo_rect[0].height); SSNES_LOG("Creating FBO 0 @ %ux%u\n", gl->fbo_rect[0].width, gl->fbo_rect[0].height);
@ -399,8 +396,7 @@ static void gl_init_fbo(gl_t *gl, unsigned width, unsigned height)
switch (gl->fbo_scale[i].type_x) switch (gl->fbo_scale[i].type_x)
{ {
case SSNES_SCALE_INPUT: case SSNES_SCALE_INPUT:
accum_scale_x *= gl->fbo_scale[i].scale_x; gl->fbo_rect[i].width = last_width * next_pow2(ceil(gl->fbo_scale[i].scale_x));
gl->fbo_rect[i].width = width * next_pow2(ceil(accum_scale_x));
break; break;
case SSNES_SCALE_ABSOLUTE: case SSNES_SCALE_ABSOLUTE:
@ -418,8 +414,7 @@ static void gl_init_fbo(gl_t *gl, unsigned width, unsigned height)
switch (gl->fbo_scale[i].type_y) switch (gl->fbo_scale[i].type_y)
{ {
case SSNES_SCALE_INPUT: case SSNES_SCALE_INPUT:
accum_scale_y *= gl->fbo_scale[i].scale_y; gl->fbo_rect[i].height = last_height * next_pow2(ceil(gl->fbo_scale[i].scale_y));
gl->fbo_rect[i].height = height * next_pow2(ceil(accum_scale_y));
break; break;
case SSNES_SCALE_ABSOLUTE: case SSNES_SCALE_ABSOLUTE:
@ -433,6 +428,9 @@ static void gl_init_fbo(gl_t *gl, unsigned width, unsigned height)
default: default:
break; break;
} }
last_width = gl->fbo_rect[i].width;
last_height = gl->fbo_rect[i].height;
} }
else else
{ {
@ -725,6 +723,8 @@ static bool gl_frame(void *data, const void* frame, unsigned width, unsigned hei
GLenum status = pglCheckFramebufferStatus(GL_FRAMEBUFFER); GLenum status = pglCheckFramebufferStatus(GL_FRAMEBUFFER);
if (status != GL_FRAMEBUFFER_COMPLETE) if (status != GL_FRAMEBUFFER_COMPLETE)
SSNES_WARN("Failed to reinit FBO texture!\n"); SSNES_WARN("Failed to reinit FBO texture!\n");
SSNES_LOG("Recreating FBO texture #%d: %ux%u\n", i, gl->fbo_rect[i].width, gl->fbo_rect[i].height);
} }
} }