diff --git a/Makefile.ps3 b/Makefile.ps3 index d140fc5302..87d2852557 100644 --- a/Makefile.ps3 +++ b/Makefile.ps3 @@ -116,7 +116,7 @@ PPU_LDLIBS = $(FONT_LIBS) $(GL_LIBS) $(WHOLE_START) -lretro_ps3 $(WHOLE_END) -l PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe -DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_HEADSET -DHAVE_VID_CONTEXT -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FILEBROWSER -DHAVE_FBO -DHAVE_RARCH_MAIN_WRAP -DHAVE_RARCH_MAIN_IMPLEMENTATION -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -DWANT_MINIZ -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_OSKUTIL -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) +DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_VID_CONTEXT -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FILEBROWSER -DHAVE_FBO -DHAVE_RARCH_MAIN_WRAP -DHAVE_RARCH_MAIN_IMPLEMENTATION -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -DWANT_MINIZ -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_OSKUTIL -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) ifeq ($(DEBUG), 1) PPU_OPTIMIZE_LV := -O0 -g diff --git a/gfx/gl.c b/gfx/gl.c index cde5abcf36..5cdebcc028 100644 --- a/gfx/gl.c +++ b/gfx/gl.c @@ -2159,7 +2159,9 @@ static bool gl_overlay_load(void *data, const uint32_t *image, unsigned width, u glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); +#ifndef HAVE_PSGL glPixelStorei(GL_UNPACK_ALIGNMENT, get_alignment(width * sizeof(uint32_t))); +#endif glTexImage2D(GL_TEXTURE_2D, 0, driver.gfx_use_rgba ? GL_RGBA : RARCH_GL_INTERNAL_FORMAT32, width, height, 0, driver.gfx_use_rgba ? GL_RGBA : RARCH_GL_TEXTURE_TYPE32, RARCH_GL_FORMAT32, image); diff --git a/input/input_common.c b/input/input_common.c index b8a87352d0..a926294a43 100644 --- a/input/input_common.c +++ b/input/input_common.c @@ -489,80 +489,3 @@ unsigned input_translate_rk_to_keysym(enum retro_key key) { return rarch_keysym_lut[key]; } - -struct str_to_bind_map -{ - const char *str; - unsigned bind; -}; - -static const struct str_to_bind_map str_to_bind[] = { - { "b", RETRO_DEVICE_ID_JOYPAD_B }, - { "y", RETRO_DEVICE_ID_JOYPAD_Y }, - { "select", RETRO_DEVICE_ID_JOYPAD_SELECT }, - { "start", RETRO_DEVICE_ID_JOYPAD_START }, - { "up", RETRO_DEVICE_ID_JOYPAD_UP }, - { "down", RETRO_DEVICE_ID_JOYPAD_DOWN }, - { "left", RETRO_DEVICE_ID_JOYPAD_LEFT }, - { "right", RETRO_DEVICE_ID_JOYPAD_RIGHT }, - { "a", RETRO_DEVICE_ID_JOYPAD_A }, - { "x", RETRO_DEVICE_ID_JOYPAD_X }, - { "l", RETRO_DEVICE_ID_JOYPAD_L }, - { "r", RETRO_DEVICE_ID_JOYPAD_R }, - { "l2", RETRO_DEVICE_ID_JOYPAD_L2 }, - { "r2", RETRO_DEVICE_ID_JOYPAD_R2 }, - { "l3", RETRO_DEVICE_ID_JOYPAD_L3 }, - { "r3", RETRO_DEVICE_ID_JOYPAD_R3 }, - { "turbo", RARCH_TURBO_ENABLE }, - { "l_x_plus", RARCH_ANALOG_LEFT_X_PLUS }, - { "l_x_minus", RARCH_ANALOG_LEFT_X_MINUS }, - { "l_y_plus", RARCH_ANALOG_LEFT_Y_PLUS }, - { "l_y_minus", RARCH_ANALOG_LEFT_Y_MINUS }, - { "r_x_plus", RARCH_ANALOG_RIGHT_X_PLUS }, - { "r_x_minus", RARCH_ANALOG_RIGHT_X_MINUS }, - { "r_y_plus", RARCH_ANALOG_RIGHT_Y_PLUS }, - { "r_y_minus", RARCH_ANALOG_RIGHT_Y_MINUS }, - { "toggle_fast_forward", RARCH_FAST_FORWARD_KEY }, - { "hold_fast_forward", RARCH_FAST_FORWARD_HOLD_KEY }, - { "load_state", RARCH_LOAD_STATE_KEY }, - { "save_state", RARCH_SAVE_STATE_KEY }, - { "toggle_fullscreen", RARCH_FULLSCREEN_TOGGLE_KEY }, - { "exit_emulator", RARCH_QUIT_KEY }, - { "state_slot_increase", RARCH_STATE_SLOT_PLUS }, - { "state_slot_decrease", RARCH_STATE_SLOT_MINUS }, - { "rewind", RARCH_REWIND }, - { "movie_record_toggle", RARCH_MOVIE_RECORD_TOGGLE }, - { "pause_toggle", RARCH_PAUSE_TOGGLE }, - { "frame_advance", RARCH_FRAMEADVANCE }, - { "reset", RARCH_RESET }, - { "shader_next", RARCH_SHADER_NEXT }, - { "shader_prev", RARCH_SHADER_PREV }, - { "cheat_index_plus", RARCH_CHEAT_INDEX_PLUS }, - { "cheat_index_minus", RARCH_CHEAT_INDEX_MINUS }, - { "cheat_toggle", RARCH_CHEAT_TOGGLE }, - { "screenshot", RARCH_SCREENSHOT }, - { "dsp_config", RARCH_DSP_CONFIG }, - { "audio_mute", RARCH_MUTE }, - { "netplay_flip_players", RARCH_NETPLAY_FLIP }, - { "slowmotion", RARCH_SLOWMOTION }, - { "enable_hotkey", RARCH_ENABLE_HOTKEY }, - { "volume_up", RARCH_VOLUME_UP }, - { "volume_down", RARCH_VOLUME_DOWN }, - { "overlay_next", RARCH_OVERLAY_NEXT }, - { "disk_eject_toggle", RARCH_DISK_EJECT_TOGGLE }, - { "disk_next", RARCH_DISK_NEXT }, - { "grab_mouse_toggle", RARCH_GRAB_MOUSE_TOGGLE }, - { "menu_toggle", RARCH_MENU_TOGGLE }, -}; - -unsigned input_str_to_bind(const char *str) -{ - for (unsigned i = 0; i < ARRAY_SIZE(str_to_bind); i++) - { - if (!strcmp(str_to_bind[i].str, str)) - return str_to_bind[i].bind; - } - - return RARCH_BIND_LIST_END; -} - diff --git a/input/input_common.h b/input/input_common.h index 84e9dfbcfa..68ac10c561 100644 --- a/input/input_common.h +++ b/input/input_common.h @@ -106,7 +106,5 @@ void input_init_keyboard_lut(const struct rarch_key_map *map); enum retro_key input_translate_keysym_to_rk(unsigned sym); unsigned input_translate_rk_to_keysym(enum retro_key key); -unsigned input_str_to_bind(const char *str); - #endif diff --git a/input/overlay.c b/input/overlay.c index e3575fed95..5fcb618501 100644 --- a/input/overlay.c +++ b/input/overlay.c @@ -81,6 +81,82 @@ struct input_overlay unsigned next_index; }; +struct str_to_bind_map +{ + const char *str; + unsigned bind; +}; + +static const struct str_to_bind_map str_to_bind[] = { + { "b", RETRO_DEVICE_ID_JOYPAD_B }, + { "y", RETRO_DEVICE_ID_JOYPAD_Y }, + { "select", RETRO_DEVICE_ID_JOYPAD_SELECT }, + { "start", RETRO_DEVICE_ID_JOYPAD_START }, + { "up", RETRO_DEVICE_ID_JOYPAD_UP }, + { "down", RETRO_DEVICE_ID_JOYPAD_DOWN }, + { "left", RETRO_DEVICE_ID_JOYPAD_LEFT }, + { "right", RETRO_DEVICE_ID_JOYPAD_RIGHT }, + { "a", RETRO_DEVICE_ID_JOYPAD_A }, + { "x", RETRO_DEVICE_ID_JOYPAD_X }, + { "l", RETRO_DEVICE_ID_JOYPAD_L }, + { "r", RETRO_DEVICE_ID_JOYPAD_R }, + { "l2", RETRO_DEVICE_ID_JOYPAD_L2 }, + { "r2", RETRO_DEVICE_ID_JOYPAD_R2 }, + { "l3", RETRO_DEVICE_ID_JOYPAD_L3 }, + { "r3", RETRO_DEVICE_ID_JOYPAD_R3 }, + { "turbo", RARCH_TURBO_ENABLE }, + { "l_x_plus", RARCH_ANALOG_LEFT_X_PLUS }, + { "l_x_minus", RARCH_ANALOG_LEFT_X_MINUS }, + { "l_y_plus", RARCH_ANALOG_LEFT_Y_PLUS }, + { "l_y_minus", RARCH_ANALOG_LEFT_Y_MINUS }, + { "r_x_plus", RARCH_ANALOG_RIGHT_X_PLUS }, + { "r_x_minus", RARCH_ANALOG_RIGHT_X_MINUS }, + { "r_y_plus", RARCH_ANALOG_RIGHT_Y_PLUS }, + { "r_y_minus", RARCH_ANALOG_RIGHT_Y_MINUS }, + { "toggle_fast_forward", RARCH_FAST_FORWARD_KEY }, + { "hold_fast_forward", RARCH_FAST_FORWARD_HOLD_KEY }, + { "load_state", RARCH_LOAD_STATE_KEY }, + { "save_state", RARCH_SAVE_STATE_KEY }, + { "toggle_fullscreen", RARCH_FULLSCREEN_TOGGLE_KEY }, + { "exit_emulator", RARCH_QUIT_KEY }, + { "state_slot_increase", RARCH_STATE_SLOT_PLUS }, + { "state_slot_decrease", RARCH_STATE_SLOT_MINUS }, + { "rewind", RARCH_REWIND }, + { "movie_record_toggle", RARCH_MOVIE_RECORD_TOGGLE }, + { "pause_toggle", RARCH_PAUSE_TOGGLE }, + { "frame_advance", RARCH_FRAMEADVANCE }, + { "reset", RARCH_RESET }, + { "shader_next", RARCH_SHADER_NEXT }, + { "shader_prev", RARCH_SHADER_PREV }, + { "cheat_index_plus", RARCH_CHEAT_INDEX_PLUS }, + { "cheat_index_minus", RARCH_CHEAT_INDEX_MINUS }, + { "cheat_toggle", RARCH_CHEAT_TOGGLE }, + { "screenshot", RARCH_SCREENSHOT }, + { "dsp_config", RARCH_DSP_CONFIG }, + { "audio_mute", RARCH_MUTE }, + { "netplay_flip_players", RARCH_NETPLAY_FLIP }, + { "slowmotion", RARCH_SLOWMOTION }, + { "enable_hotkey", RARCH_ENABLE_HOTKEY }, + { "volume_up", RARCH_VOLUME_UP }, + { "volume_down", RARCH_VOLUME_DOWN }, + { "overlay_next", RARCH_OVERLAY_NEXT }, + { "disk_eject_toggle", RARCH_DISK_EJECT_TOGGLE }, + { "disk_next", RARCH_DISK_NEXT }, + { "grab_mouse_toggle", RARCH_GRAB_MOUSE_TOGGLE }, + { "menu_toggle", RARCH_MENU_TOGGLE }, +}; + +static unsigned input_str_to_bind(const char *str) +{ + for (unsigned i = 0; i < ARRAY_SIZE(str_to_bind); i++) + { + if (!strcmp(str_to_bind[i].str, str)) + return str_to_bind[i].bind; + } + + return RARCH_BIND_LIST_END; +} + static void input_overlay_scale(struct overlay *overlay, float scale) { if (overlay->block_scale)