Small cleanups.

This commit is contained in:
Themaister 2012-01-03 02:50:45 +01:00
parent 520878272c
commit 318d875981
2 changed files with 0 additions and 15 deletions

View File

@ -1401,13 +1401,6 @@ static bool gl_xml_shader(void *data, const char *path)
{ {
gl_t *gl = (gl_t*)data; gl_t *gl = (gl_t*)data;
//if (!gl_check_error())
// SSNES_WARN("Error happened before deinit!\n");
//if (!gl_check_error())
// SSNES_WARN("Error happened in deinit!\n");
#ifdef HAVE_FBO #ifdef HAVE_FBO
if (gl->fbo_inited) if (gl->fbo_inited)
{ {
@ -1425,9 +1418,6 @@ static bool gl_xml_shader(void *data, const char *path)
gl_shader_deinit(); gl_shader_deinit();
//if (!gl_check_error())
// SSNES_WARN("Failed to deinit rendering path properly!\n");
if (!gl_glsl_init(path)) if (!gl_glsl_init(path))
return false; return false;

View File

@ -263,9 +263,7 @@ static void *sdl_gfx_init(const video_info_t *video, const input_driver_t **inpu
unsigned full_y = video_info->current_h; unsigned full_y = video_info->current_h;
SSNES_LOG("Detecting desktop resolution %ux%u.\n", full_x, full_y); SSNES_LOG("Detecting desktop resolution %ux%u.\n", full_x, full_y);
#ifndef XENON
sdl_input_t *sdl_input = NULL; sdl_input_t *sdl_input = NULL;
#endif
const SDL_PixelFormat *fmt = NULL; const SDL_PixelFormat *fmt = NULL;
if (!video->fullscreen) if (!video->fullscreen)
@ -314,7 +312,6 @@ static void *sdl_gfx_init(const video_info_t *video, const input_driver_t **inpu
goto error; goto error;
} }
#ifndef XENON
sdl_input = (sdl_input_t*)input_sdl.init(); sdl_input = (sdl_input_t*)input_sdl.init();
if (sdl_input) if (sdl_input)
{ {
@ -322,12 +319,10 @@ static void *sdl_gfx_init(const video_info_t *video, const input_driver_t **inpu
*input_data = sdl_input; *input_data = sdl_input;
} }
else else
#else
{ {
*input = NULL; *input = NULL;
*input_data = NULL; *input_data = NULL;
} }
#endif
vid->rgb32 = video->rgb32; vid->rgb32 = video->rgb32;