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

Fix Win32 build.

Browse Source
This commit is contained in:
Themaister 2013-04-06 00:06:51 +02:00
parent 160bbf0218
commit cf655355d7
2 changed files with 4 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gfx/d3d9/d3d9.cpp
View File

@ -653,31 +653,10 @@ void D3DVideo::init_chain_singlepass(const video_info_t &video_info)
info.shader_path = cg_shader; info.shader_path = cg_shader;
#endif #endif
bool second_pass = g_settings.video.render_to_texture; info.scale_x = info.scale_y = 1.0f;
info.filter_linear = video_info.smooth;
if (second_pass) info.tex_w = info.tex_h = RARCH_SCALE_BASE * video_info.input_scale;
{ info.scale_type_x = info.scale_type_y = LinkInfo::Viewport;
info.scale_x = g_settings.video.fbo.scale_x;
info.scale_y = g_settings.video.fbo.scale_y;
info.filter_linear = video_info.smooth;
info.tex_w = next_pow2(RARCH_SCALE_BASE * video_info.input_scale);
info.tex_h = next_pow2(RARCH_SCALE_BASE * video_info.input_scale);
info.scale_type_x = info.scale_type_y = LinkInfo::Relative;
info_second.scale_x = info_second.scale_y = 1.0f;
info_second.scale_type_x = info_second.scale_type_y = LinkInfo::Viewport;
info_second.filter_linear = g_settings.video.second_pass_smooth;
info_second.tex_w = next_pow2(info.tex_w * info.scale_x);
info_second.tex_h = next_pow2(info.tex_h * info.scale_y);
info_second.shader_path = g_settings.video.second_pass_shader;
}
else
{
info.scale_x = info.scale_y = 1.0f;
info.filter_linear = video_info.smooth;
info.tex_w = info.tex_h = RARCH_SCALE_BASE * video_info.input_scale;
info.scale_type_x = info.scale_type_y = LinkInfo::Viewport;
}
chain = std::unique_ptr<RenderChain>(new RenderChain( chain = std::unique_ptr<RenderChain>(new RenderChain(
video_info, video_info,
@ -685,9 +664,6 @@ void D3DVideo::init_chain_singlepass(const video_info_t &video_info)
info, info,
video_info.rgb32 ? RenderChain::ARGB : RenderChain::RGB565, video_info.rgb32 ? RenderChain::ARGB : RenderChain::RGB565,
final_viewport)); final_viewport));
if (second_pass)
chain->add_pass(info_second);
} }
static std::vector<std::string> tokenize(const std::string &str) static std::vector<std::string> tokenize(const std::string &str)

5
gfx/gl.c
View File

@ -2255,11 +2255,6 @@ static void gl_start(void)
// Comes too early for console - moved to gl_start // Comes too early for console - moved to gl_start
gl->font_ctx = gl_font_init_first(gl, g_settings.video.font_path, g_settings.video.font_size); gl->font_ctx = gl_font_init_first(gl, g_settings.video.font_path, g_settings.video.font_size);
#ifdef HAVE_FBO
if (!g_settings.video.render_to_texture)
gl_deinit_fbo(gl);
#endif
#ifdef HAVE_RMENU #ifdef HAVE_RMENU
context_get_available_resolutions_func(); context_get_available_resolutions_func();