libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-03 15:54:39 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

(PS3) Build fix

Browse Source 
(RMenu) Get rid of (now) unnecessary includes
This commit is contained in:
twinaphex 2012-10-01 04:04:50 +02:00
parent 6c5d6515ce
commit 666ed41234
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
console/rmenu/rmenu.c
View File

@ -43,16 +43,8 @@
#include "../../console/rarch_console_rzlib.h"
#endif
#if defined(HAVE_OPENGL)
#include "../../gfx/gl_common.h"
#include "../../gfx/gl_font.h"
#endif
#include "../../gfx/gfx_context.h"
#if defined(HAVE_CG)
#include "../../gfx/shader_cg.h"
#endif
#include "../../file.h"
#include "../../general.h"

13
gfx/gl.c
View File

@ -1052,11 +1052,17 @@ static inline void gl_next_texture_index(gl_t *gl, const struct gl_tex_info *tex
gl->tex_index = (gl->tex_index + 1) & TEXTURES_MASK;
}
static void gl_set_shader_viewport(gl_t *gl, unsigned shader)
{
gl_shader_use(shader);
gl_set_viewport(gl, gl->win_width, gl->win_height, false, true);
}
#ifdef HAVE_CG_MENU
static void gl_render_menu(gl_t *gl)
{
gl_shader_use(RARCH_CG_MENU_SHADER_INDEX);
gl_set_shader_viewport(RARCH_CG_MENU_SHADER_INDEX);
gl_set_shader_viewport(gl, RARCH_CG_MENU_SHADER_INDEX);
gl_shader_set_params(gl->win_width, gl->win_height, gl->win_width,
gl->win_height, gl->win_width, gl->win_height, gl->frame_count,
@ -1253,11 +1259,6 @@ static bool resolve_extensions(gl_t *gl)
return true;
}
static void gl_set_shader_viewport(gl_t *gl, unsigned shader)
{
gl_shader_use(shader);
gl_set_viewport(gl, gl->win_width, gl->win_height, false, true);
}
static void *gl_init(const video_info_t *video, const input_driver_t **input, void **input_data)
{