summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author couriersud <couriersud@arcor.de>2016-04-18 21:28:07 +0200
committer couriersud <couriersud@arcor.de>2016-04-18 21:28:07 +0200
commit118658da9da7823ab4b13a77bf5f9aa0ea1387d2 (patch)
treeb0cd6dc5e135f1af3ef61c305ab461985589a0ad
parentaef55ded1f4cfba8a51ff9f600463e73763f77c4 (diff)
These init calls all returned false. No need for a return value in this
case. [Couriersud]
-rw-r--r--src/osd/modules/render/draw13.cpp4
-rw-r--r--src/osd/modules/render/draw13.h2
-rw-r--r--src/osd/modules/render/drawbgfx.h2
-rw-r--r--src/osd/modules/render/drawogl.cpp4
-rw-r--r--src/osd/modules/render/drawogl.h2
-rw-r--r--src/osd/modules/render/drawsdl.cpp3
-rw-r--r--src/osd/modules/render/drawsdl.h2
-rw-r--r--src/osd/sdl/window.cpp42
8 files changed, 21 insertions, 40 deletions
diff --git a/src/osd/modules/render/draw13.cpp b/src/osd/modules/render/draw13.cpp
index 39a607b024f..b4326ff2bdf 100644
--- a/src/osd/modules/render/draw13.cpp
+++ b/src/osd/modules/render/draw13.cpp
@@ -362,7 +362,7 @@ void renderer_sdl2::expand_copy_info(const copy_info_t *list)
}
// FIXME: machine only used to access options.
-bool renderer_sdl2::init(running_machine &machine)
+void renderer_sdl2::init(running_machine &machine)
{
osd_printf_verbose("Using SDL native texturing driver (SDL 2.0+)\n");
@@ -380,8 +380,6 @@ bool renderer_sdl2::init(running_machine &machine)
osd_printf_warning("Warning: Unable to load opengl library: %s\n", stemp ? stemp : "<default>");
else
osd_printf_verbose("Loaded opengl shared library: %s\n", stemp ? stemp : "<default>");
-
- return false;
}
diff --git a/src/osd/modules/render/draw13.h b/src/osd/modules/render/draw13.h
index 82653d998a1..634c1debf6f 100644
--- a/src/osd/modules/render/draw13.h
+++ b/src/osd/modules/render/draw13.h
@@ -158,7 +158,7 @@ public:
m_sdl_renderer = nullptr;
}
- static bool init(running_machine &machine);
+ static void init(running_machine &machine);
static void exit();
virtual int create() override;
diff --git a/src/osd/modules/render/drawbgfx.h b/src/osd/modules/render/drawbgfx.h
index f7da00fe787..a6f66a6eff3 100644
--- a/src/osd/modules/render/drawbgfx.h
+++ b/src/osd/modules/render/drawbgfx.h
@@ -33,7 +33,7 @@ public:
renderer_bgfx(osd_window *w);
virtual ~renderer_bgfx();
- static bool init(running_machine &machine) { return false; }
+ static void init(running_machine &machine) { }
static void exit();
virtual int create() override;
diff --git a/src/osd/modules/render/drawogl.cpp b/src/osd/modules/render/drawogl.cpp
index 6853602353b..a7ffe24a5df 100644
--- a/src/osd/modules/render/drawogl.cpp
+++ b/src/osd/modules/render/drawogl.cpp
@@ -277,7 +277,7 @@ static void texture_set_data(ogl_texture_info *texture, const render_texinfo *te
bool renderer_ogl::s_shown_video_info = false;
bool renderer_ogl::s_dll_loaded = false;
-bool renderer_ogl::init(running_machine &machine)
+void renderer_ogl::init(running_machine &machine)
{
s_dll_loaded = false;
@@ -287,8 +287,6 @@ bool renderer_ogl::init(running_machine &machine)
#else
osd_printf_verbose("Using SDL multi-window OpenGL driver (SDL 2.0+)\n");
#endif
-
- return false;
}
//============================================================
diff --git a/src/osd/modules/render/drawogl.h b/src/osd/modules/render/drawogl.h
index 69cd576c32d..7b89040e925 100644
--- a/src/osd/modules/render/drawogl.h
+++ b/src/osd/modules/render/drawogl.h
@@ -130,7 +130,7 @@ public:
}
virtual ~renderer_ogl();
- static bool init(running_machine &machine);
+ static void init(running_machine &machine);
static void exit();
virtual int create() override;
diff --git a/src/osd/modules/render/drawsdl.cpp b/src/osd/modules/render/drawsdl.cpp
index 83e304c48f3..af597516633 100644
--- a/src/osd/modules/render/drawsdl.cpp
+++ b/src/osd/modules/render/drawsdl.cpp
@@ -90,10 +90,9 @@ int drawsdl_scale_mode(const char *s)
// drawsdl_init
//============================================================
-bool renderer_sdl1::init(running_machine &machine)
+void renderer_sdl1::init(running_machine &machine)
{
osd_printf_verbose("Using SDL multi-window soft driver (SDL 2.0+)\n");
- return false;
}
//============================================================
diff --git a/src/osd/modules/render/drawsdl.h b/src/osd/modules/render/drawsdl.h
index 09cfc32944d..2958dbf265a 100644
--- a/src/osd/modules/render/drawsdl.h
+++ b/src/osd/modules/render/drawsdl.h
@@ -36,7 +36,7 @@ public:
}
virtual ~renderer_sdl1();
- static bool init(running_machine &machine);
+ static void init(running_machine &machine);
static void exit() { }
virtual int create() override;
diff --git a/src/osd/sdl/window.cpp b/src/osd/sdl/window.cpp
index a23ab3a7aae..f3e5b8e8b4c 100644
--- a/src/osd/sdl/window.cpp
+++ b/src/osd/sdl/window.cpp
@@ -211,37 +211,23 @@ bool sdl_osd_interface::window_init()
sdlwindow_thread_id(nullptr, 0);
// initialize the drawers
- if (video_config.mode == VIDEO_MODE_BGFX)
+
+ switch (video_config.mode)
{
- if (renderer_bgfx::init(machine()))
- {
+ case VIDEO_MODE_BGFX:
+ renderer_bgfx::init(machine());
+ break;
#if (USE_OPENGL)
- video_config.mode = VIDEO_MODE_OPENGL;
- }
- }
- if (video_config.mode == VIDEO_MODE_OPENGL)
- {
- if (renderer_ogl::init(machine()))
- {
- video_config.mode = VIDEO_MODE_SOFT;
-#else
- video_config.mode = VIDEO_MODE_SOFT;
+ case VIDEO_MODE_OPENGL:
+ renderer_ogl::init(machine());
+ break;
#endif
- }
- }
- if (video_config.mode == VIDEO_MODE_SDL2ACCEL)
- {
- if (renderer_sdl2::init(machine()))
- {
- video_config.mode = VIDEO_MODE_SOFT;
- }
- }
- if (video_config.mode == VIDEO_MODE_SOFT)
- {
- if (renderer_sdl1::init(machine()))
- {
- return false;
- }
+ case VIDEO_MODE_SDL2ACCEL:
+ renderer_sdl2::init(machine());
+ break;
+ case VIDEO_MODE_SOFT:
+ renderer_sdl1::init(machine());
+ break;
}
/* We may want to set a number of the hints SDL2 provides.