libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-04-13 19:30:26 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

Move FBO enums to gl_common.h

Browse Source
This commit is contained in:
twinaphex 2013-03-06 01:57:30 +01:00
parent eb3975c81d
commit 566a5ebb9c
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/native/jni/input_autodetect.c
View File

@ -225,6 +225,7 @@ void input_autodetect_setup (void *data, char *msg, size_t sizeof_msg, unsigned
keycode_lut[AKEYCODE_BUTTON_10] |= ((RETRO_DEVICE_ID_JOYPAD_START+1) << shift); keycode_lut[AKEYCODE_BUTTON_10] |= ((RETRO_DEVICE_ID_JOYPAD_START+1) << shift);
/* TODO - unsure about pad 2 still */ /* TODO - unsure about pad 2 still */
#if 0
keycode_lut[AKEYCODE_BUTTON_Z] |= ((RETRO_DEVICE_ID_JOYPAD_UP+1) << shift); keycode_lut[AKEYCODE_BUTTON_Z] |= ((RETRO_DEVICE_ID_JOYPAD_UP+1) << shift);
keycode_lut[AKEYCODE_BUTTON_Y] |= ((RETRO_DEVICE_ID_JOYPAD_DOWN+1) << shift); keycode_lut[AKEYCODE_BUTTON_Y] |= ((RETRO_DEVICE_ID_JOYPAD_DOWN+1) << shift);
keycode_lut[AKEYCODE_BUTTON_C] |= ((RETRO_DEVICE_ID_JOYPAD_LEFT+1) << shift); keycode_lut[AKEYCODE_BUTTON_C] |= ((RETRO_DEVICE_ID_JOYPAD_LEFT+1) << shift);
@ -240,6 +241,7 @@ void input_autodetect_setup (void *data, char *msg, size_t sizeof_msg, unsigned
keycode_lut[AKEYCODE_BUTTON_B] |= ((RETRO_DEVICE_ID_JOYPAD_R2+1) << shift); keycode_lut[AKEYCODE_BUTTON_B] |= ((RETRO_DEVICE_ID_JOYPAD_R2+1) << shift);
keycode_lut[AKEYCODE_BUTTON_C] |= ((RETRO_DEVICE_ID_JOYPAD_SELECT+1) << shift); keycode_lut[AKEYCODE_BUTTON_C] |= ((RETRO_DEVICE_ID_JOYPAD_SELECT+1) << shift);
keycode_lut[AKEYCODE_BUTTON_X] |= ((RETRO_DEVICE_ID_JOYPAD_START+1) << shift); keycode_lut[AKEYCODE_BUTTON_X] |= ((RETRO_DEVICE_ID_JOYPAD_START+1) << shift);
#endif
} }
else if (strstr(name_buf, "TOMMO NEOGEOX Arcade Stick")) else if (strstr(name_buf, "TOMMO NEOGEOX Arcade Stick"))
{ {

6
console/rarch_console_video.h
View File

@ -25,12 +25,6 @@
#define MAX_SCALING_FACTOR (2.0f) #define MAX_SCALING_FACTOR (2.0f)
#endif #endif
enum
{
FBO_DEINIT = 0,
FBO_INIT,
FBO_REINIT
};
enum aspect_ratio enum aspect_ratio
{ {

10
gfx/gl_common.h
View File

@ -56,6 +56,7 @@
#include <GL/glext.h> #include <GL/glext.h>
#endif #endif
#if defined(ANDROID) && defined(HAVE_GRIFFIN) #if defined(ANDROID) && defined(HAVE_GRIFFIN)
#include "../console/griffin/hook_context.h" #include "../console/griffin/hook_context.h"
#else #else
@ -163,6 +164,15 @@ enum gl_scale_type
RARCH_SCALE_VIEWPORT RARCH_SCALE_VIEWPORT
}; };
#ifdef HAVE_FBO
enum fbo_option
{
FBO_DEINIT = 0,
FBO_INIT,
FBO_REINIT
};
#endif
struct gl_fbo_scale struct gl_fbo_scale
{ {
enum gl_scale_type type_x; enum gl_scale_type type_x;