summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/sdl/video.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/osd/sdl/video.cpp')
-rw-r--r--src/osd/sdl/video.cpp217
1 files changed, 21 insertions, 196 deletions
diff --git a/src/osd/sdl/video.cpp b/src/osd/sdl/video.cpp
index 88bc1b51ce4..8fe836aabf2 100644
--- a/src/osd/sdl/video.cpp
+++ b/src/osd/sdl/video.cpp
@@ -2,30 +2,28 @@
// copyright-holders:Olivier Galibert, R. Belmont
//============================================================
//
-// video.c - SDL video handling
+// video.cpp - SDL video handling
//
// SDLMAME by Olivier Galibert and R. Belmont
//
//============================================================
-#include <SDL2/SDL.h>
-
-// MAME headers
-#include "emu.h"
-#include "rendutil.h"
-#include "ui/uimain.h"
-#include "emuopts.h"
-#include "uiinput.h"
+#include "window.h"
// MAMEOS headers
-#include "video.h"
-#include "window.h"
#include "osdsdl.h"
#include "modules/lib/osdlib.h"
+#include "modules/monitor/monitor_module.h"
+#include "modules/render/render_module.h"
-//============================================================
-// CONSTANTS
-//============================================================
+// MAME headers
+#include "emu.h"
+#include "emuopts.h"
+#include "main.h"
+#include "rendutil.h"
+#include "uiinput.h"
+
+#include <SDL2/SDL.h>
//============================================================
@@ -34,17 +32,11 @@
osd_video_config video_config;
-//============================================================
-// LOCAL VARIABLES
-//============================================================
-
//============================================================
// PROTOTYPES
//============================================================
-static void check_osd_inputs(running_machine &machine);
-
static void get_resolution(const char *defdata, const char *data, osd_window_config *config, int report_error);
@@ -70,16 +62,19 @@ bool sdl_osd_interface::video_init()
for (index = 0; index < video_config.numscreens; index++)
{
osd_window_config conf;
- memset(&conf, 0, sizeof(conf));
get_resolution(options().resolution(), options().resolution(index), &conf, true);
// create window ...
- std::shared_ptr<sdl_window_info> win = std::make_shared<sdl_window_info>(machine(), index, m_monitor_module->pick_monitor(reinterpret_cast<osd_options &>(options()), index), &conf);
-
+ auto win = std::make_unique<sdl_window_info>(machine(), *m_render, index, m_monitor_module->pick_monitor(reinterpret_cast<osd_options &>(options()), index), &conf);
if (win->window_init())
return false;
+
+ s_window_list.emplace_back(std::move(win));
}
+ if (m_render->is_interactive())
+ SDL_RaiseWindow(dynamic_cast<sdl_window_info &>(*osd_common_t::s_window_list.front()).platform_window());
+
return true;
}
@@ -104,86 +99,29 @@ void sdl_osd_interface::update(bool skip_redraw)
if (!skip_redraw)
{
// profiler_mark(PROFILER_BLIT);
- for (auto window : osd_common_t::s_window_list)
+ for (auto const &window : osd_common_t::window_list())
window->update();
// profiler_mark(PROFILER_END);
}
- // poll the joystick values here
- downcast<sdl_osd_interface&>(machine().osd()).poll_inputs(machine());
-
- check_osd_inputs(machine());
// if we're running, disable some parts of the debugger
if ((machine().debug_flags & DEBUG_FLAG_OSD_ENABLED) != 0)
debugger_update();
}
//============================================================
-// check_osd_inputs
-//============================================================
-
-static void check_osd_inputs(running_machine &machine)
-{
- // check for toggling fullscreen mode
- if (machine.ui_input().pressed(IPT_OSD_1))
- {
- for (auto curwin : osd_common_t::s_window_list)
- std::static_pointer_cast<sdl_window_info>(curwin)->toggle_full_screen();
- }
-
- auto window = osd_common_t::s_window_list.front();
- if (machine.ui_input().pressed(IPT_OSD_2))
- {
- //FIXME: on a per window basis
- video_config.fullstretch = !video_config.fullstretch;
- window->target()->set_scale_mode(video_config.fullstretch? SCALE_FRACTIONAL : SCALE_INTEGER);
- machine.ui().popup_time(1, "Uneven stretch %s", video_config.fullstretch? "enabled":"disabled");
- }
-
- if (machine.ui_input().pressed(IPT_OSD_4))
- {
- //FIXME: on a per window basis
- video_config.keepaspect = !video_config.keepaspect;
- window->target()->set_keepaspect(video_config.keepaspect);
- machine.ui().popup_time(1, "Keepaspect %s", video_config.keepaspect? "enabled":"disabled");
- }
-
- #if (USE_OPENGL)
- //FIXME: on a per window basis
- if (machine.ui_input().pressed(IPT_OSD_5))
- {
- video_config.filter = !video_config.filter;
- machine.ui().popup_time(1, "Filter %s", video_config.filter? "enabled":"disabled");
- }
- #endif
-
- if (machine.ui_input().pressed(IPT_OSD_6))
- std::static_pointer_cast<sdl_window_info>(window)->modify_prescale(-1);
-
- if (machine.ui_input().pressed(IPT_OSD_7))
- std::static_pointer_cast<sdl_window_info>(window)->modify_prescale(1);
-
- if (machine.ui_input().pressed(IPT_OSD_8))
- window->renderer().record();
-}
-
-//============================================================
// extract_video_config
//============================================================
void sdl_osd_interface::extract_video_config()
{
- const char *stemp;
-
video_config.perftest = options().video_fps();
// global options: extract the data
video_config.windowed = options().window();
video_config.prescale = options().prescale();
video_config.filter = options().filter();
- video_config.keepaspect = options().keep_aspect();
video_config.numscreens = options().numscreens();
- video_config.fullstretch = options().uneven_stretch();
#ifdef SDLMAME_X11
video_config.restrictonemonitor = !options().use_all_heads();
#endif
@@ -192,49 +130,6 @@ void sdl_osd_interface::extract_video_config()
if (machine().debug_flags & DEBUG_FLAG_OSD_ENABLED)
video_config.windowed = true;
- // default to working video please
- video_config.novideo = 0;
-
- // d3d options: extract the data
- stemp = options().video();
- if (strcmp(stemp, "auto") == 0)
- {
-#if (defined SDLMAME_MACOSX || defined SDLMAME_WIN32)
- stemp = "opengl";
-#elif (defined __STEAMLINK__)
- stemp = "bgfx";
-#else
- stemp = "soft";
-#endif
- }
- if (strcmp(stemp, SDLOPTVAL_SOFT) == 0)
- video_config.mode = VIDEO_MODE_SOFT;
- else if (strcmp(stemp, OSDOPTVAL_NONE) == 0)
- {
- video_config.mode = VIDEO_MODE_SOFT;
- video_config.novideo = 1;
-
- if (!emulator_info::standalone() && options().seconds_to_run() == 0)
- osd_printf_warning("Warning: -video none doesn't make much sense without -seconds_to_run\n");
- }
-#if (USE_OPENGL)
- else if (strcmp(stemp, SDLOPTVAL_OPENGL) == 0)
- video_config.mode = VIDEO_MODE_OPENGL;
-#endif
- else if ((strcmp(stemp, SDLOPTVAL_SDL2ACCEL) == 0))
- {
- video_config.mode = VIDEO_MODE_SDL2ACCEL;
- }
- else if (strcmp(stemp, SDLOPTVAL_BGFX) == 0)
- {
- video_config.mode = VIDEO_MODE_BGFX;
- }
- else
- {
- osd_printf_warning("Invalid video value %s; reverting to software\n", stemp);
- video_config.mode = VIDEO_MODE_SOFT;
- }
-
video_config.switchres = options().switch_res();
video_config.centerh = options().centerh();
video_config.centerv = options().centerv();
@@ -246,69 +141,12 @@ void sdl_osd_interface::extract_video_config()
video_config.syncrefresh = 0;
}
- if (video_config.prescale < 1 || video_config.prescale > 3)
+ if (video_config.prescale < 1 || video_config.prescale > 20)
{
osd_printf_warning("Invalid prescale option, reverting to '1'\n");
video_config.prescale = 1;
}
- #if (USE_OPENGL)
- // default to working video please
- video_config.forcepow2texture = options().gl_force_pow2_texture();
- video_config.allowtexturerect = !(options().gl_no_texture_rect());
- video_config.vbo = options().gl_vbo();
- video_config.pbo = options().gl_pbo();
- video_config.glsl = options().gl_glsl();
- if ( video_config.glsl )
- {
- int i;
-
- video_config.glsl_filter = options().glsl_filter();
-
- video_config.glsl_shader_mamebm_num=0;
-
- for(i=0; i<GLSL_SHADER_MAX; i++)
- {
- stemp = options().shader_mame(i);
- if (stemp && strcmp(stemp, OSDOPTVAL_NONE) != 0 && strlen(stemp)>0)
- {
- video_config.glsl_shader_mamebm[i] = (char *) malloc(strlen(stemp)+1);
- strcpy(video_config.glsl_shader_mamebm[i], stemp);
- video_config.glsl_shader_mamebm_num++;
- } else {
- video_config.glsl_shader_mamebm[i] = nullptr;
- }
- }
-
- video_config.glsl_shader_scrn_num=0;
-
- for(i=0; i<GLSL_SHADER_MAX; i++)
- {
- stemp = options().shader_screen(i);
- if (stemp && strcmp(stemp, OSDOPTVAL_NONE) != 0 && strlen(stemp)>0)
- {
- video_config.glsl_shader_scrn[i] = (char *) malloc(strlen(stemp)+1);
- strcpy(video_config.glsl_shader_scrn[i], stemp);
- video_config.glsl_shader_scrn_num++;
- } else {
- video_config.glsl_shader_scrn[i] = nullptr;
- }
- }
- } else {
- int i;
- video_config.glsl_filter = 0;
- video_config.glsl_shader_mamebm_num=0;
- for(i=0; i<GLSL_SHADER_MAX; i++)
- {
- video_config.glsl_shader_mamebm[i] = nullptr;
- }
- video_config.glsl_shader_scrn_num=0;
- for(i=0; i<GLSL_SHADER_MAX; i++)
- {
- video_config.glsl_shader_scrn[i] = nullptr;
- }
- }
-
- #endif /* USE_OPENGL */
+
// misc options: sanity check values
// global options: sanity check values
@@ -317,19 +155,6 @@ void sdl_osd_interface::extract_video_config()
osd_printf_warning("Invalid numscreens value %d; reverting to 1\n", video_config.numscreens);
video_config.numscreens = 1;
}
- // yuv settings ...
- stemp = options().scale_mode();
- video_config.scale_mode = drawsdl_scale_mode(stemp);
- if (video_config.scale_mode < 0)
- {
- osd_printf_warning("Invalid yuvmode value %s; reverting to none\n", stemp);
- video_config.scale_mode = VIDEO_SCALE_MODE_NONE;
- }
- if ( (video_config.mode != VIDEO_MODE_SOFT) && (video_config.scale_mode != VIDEO_SCALE_MODE_NONE) )
- {
- osd_printf_warning("scalemode is only for -video soft, overriding\n");
- video_config.scale_mode = VIDEO_SCALE_MODE_NONE;
- }
}