ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(GX) Move some GX-specific variables over to menu_settings.c (only place 

they are needed
This commit is contained in:
twinaphex 2013-10-02 19:15:11 +02:00
parent 994570be84
commit 8c7550bb90
3 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/menu/menu_common.h
View File

@ -318,11 +318,6 @@ typedef struct
extern rgui_handle_t *rgui; extern rgui_handle_t *rgui;
#ifdef GEKKO
extern unsigned rgui_gx_resolutions[GX_RESOLUTIONS_LAST][2];
extern unsigned rgui_current_gx_resolution;
#endif
void menu_init(void); void menu_init(void);
bool menu_iterate(void); bool menu_iterate(void);
void menu_free(void); void menu_free(void);

26
frontend/menu/menu_settings.c
View File

@ -22,6 +22,32 @@
#ifdef GEKKO #ifdef GEKKO
#define MAX_GAMMA_SETTING 2 #define MAX_GAMMA_SETTING 2
static unsigned rgui_gx_resolutions[GX_RESOLUTIONS_LAST][2] = {
{ 512, 192 },
{ 598, 200 },
{ 640, 200 },
{ 384, 224 },
{ 448, 224 },
{ 480, 224 },
{ 512, 224 },
{ 340, 232 },
{ 512, 232 },
{ 512, 236 },
{ 336, 240 },
{ 384, 240 },
{ 512, 240 },
{ 576, 224 },
{ 608, 224 },
{ 640, 224 },
{ 530, 240 },
{ 640, 240 },
{ 512, 448 },
{ 640, 448 },
{ 640, 480 },
};
static unsigned rgui_current_gx_resolution = GX_RESOLUTIONS_640_480;
#else #else
#define MAX_GAMMA_SETTING 1 #define MAX_GAMMA_SETTING 1
#endif #endif

28
frontend/menu/rgui.c
View File

@ -41,34 +41,6 @@
#include "../../screenshot.h" #include "../../screenshot.h"
#ifdef GEKKO
unsigned rgui_gx_resolutions[GX_RESOLUTIONS_LAST][2] = {
{ 512, 192 },
{ 598, 200 },
{ 640, 200 },
{ 384, 224 },
{ 448, 224 },
{ 480, 224 },
{ 512, 224 },
{ 340, 232 },
{ 512, 232 },
{ 512, 236 },
{ 336, 240 },
{ 384, 240 },
{ 512, 240 },
{ 576, 224 },
{ 608, 224 },
{ 640, 224 },
{ 530, 240 },
{ 640, 240 },
{ 512, 448 },
{ 640, 448 },
{ 640, 480 },
};
unsigned rgui_current_gx_resolution = GX_RESOLUTIONS_640_480;
#endif
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL) #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL)
#define HAVE_SHADER_MANAGER #define HAVE_SHADER_MANAGER
#endif #endif