mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-04 03:40:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "(360) Quick fix to gfx_frame"

Browse Source 
This reverts commit 9d5da1e9e0b224500ce3d3ec0c5d4ba8fc38335e.
This commit is contained in:
Twinaphex 2012-04-19 15:59:38 +02:00
parent c09fdcc14a
commit 3851664399
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
360/main.c
View File

@ -134,7 +134,7 @@ static void set_default_settings (void)
strlcpy(g_settings.video.cg_shader_path, DEFAULT_SHADER_FILE, sizeof(g_settings.video.cg_shader_path));
g_settings.video.fbo_scale_x = 2.0f;
g_settings.video.fbo_scale_y = 2.0f;
g_settings.video.render_to_texture = false;
g_settings.video.render_to_texture = true;
strlcpy(g_settings.video.second_pass_shader, DEFAULT_SHADER_FILE, sizeof(g_settings.video.second_pass_shader));
g_settings.video.second_pass_smooth = true;
g_settings.video.smooth = true;

14
360/xdk360_video.cpp
View File

@ -395,8 +395,6 @@ static bool xdk360_init_fbo(xdk360_video_t * vid, unsigned width, unsigned heigh
vid->d3d_render_device->CreateRenderTarget(height * g_settings.video.fbo_scale_x, height * g_settings.video.fbo_scale_y, ( D3DFORMAT )MAKESRGBFMT( D3DFMT_A8R8G8B8 ),
D3DMULTISAMPLE_NONE, 0, 0, &vid->fbo, NULL );
vid->fbo_inited = true;
return true;
}
@ -519,16 +517,8 @@ static bool xdk360_gfx_frame(void *data, const void *frame,
memset(d3dlr.pBits, 0, 512 * d3dlr.Pitch);
vid->lpTexture->UnlockRect(0);
ifdef(vid->fbo_inited)
{
float tex_w = width / (512.0f * g_settings.video.fbo_scale_x);
float tex_h = height / (512.0f * g_settings.video.fbo_scale_y);
}
else
{
float tex_w = width / (512.0f);
float tex_h = height / (512.0f);
}
float tex_w = width / (512.0f * g_settings.video.fbo_scale_x);
float tex_h = height / (512.0f * g_settings.video.fbo_scale_y);
const DrawVerticeFormats verts[] = {
{ -1.0f, -1.0f, 0.0f, tex_h },