summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/sdl/window.cpp
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2016-02-21 14:50:24 +0100
committer ImJezze <jezze@gmx.net>2016-02-21 14:50:24 +0100
commitbf4640c309c655c6cb7bc5b9bbab5c03029ccd86 (patch)
treec50f6f204d34c7a1888ab41cdf6c5250ffe7b8af /src/osd/sdl/window.cpp
parentcc24a339d8c0517259084b5c178d784626ba965c (diff)
parenta0ba40749d98488dafb84d365e4a6e44a4c01f84 (diff)
Merge remote-tracking branch 'refs/remotes/mamedev/master'
Resolved Conflicts: - src/osd/modules/render/d3d/d3dhlsl.cpp - src/osd/modules/render/d3d/d3dhlsl.h - src/osd/modules/render/drawd3d.cpp - src/osd/modules/render/drawd3d.h - src/osd/windows/winmain.cpp
Diffstat (limited to 'src/osd/sdl/window.cpp')
-rw-r--r--src/osd/sdl/window.cpp107
1 files changed, 59 insertions, 48 deletions
diff --git a/src/osd/sdl/window.cpp b/src/osd/sdl/window.cpp
index 113a00b47bf..49e8ed48477 100644
--- a/src/osd/sdl/window.cpp
+++ b/src/osd/sdl/window.cpp
@@ -36,6 +36,12 @@
#include "window.h"
#include "input.h"
#include "osdsdl.h"
+#include "modules/render/drawbgfx.h"
+#include "modules/render/drawsdl.h"
+#include "modules/render/draw13.h"
+#if (USE_OPENGL)
+#include "modules/render/drawogl.h"
+#endif
//============================================================
// PARAMETERS
@@ -94,11 +100,9 @@ static SDL_threadID window_threadid;
// debugger
//static int in_background;
-static osd_draw_callbacks draw;
-
struct worker_param {
worker_param()
- : m_window(NULL), m_list(NULL), m_resize_new_width(0), m_resize_new_height(0)
+ : m_window(nullptr), m_list(nullptr), m_resize_new_width(0), m_resize_new_height(0)
{
}
worker_param(sdl_window_info *awindow, render_primitive_list &alist)
@@ -106,14 +110,14 @@ struct worker_param {
{
}
worker_param(sdl_window_info *awindow, int anew_width, int anew_height)
- : m_window(awindow), m_list(NULL), m_resize_new_width(anew_width), m_resize_new_height(anew_height)
+ : m_window(awindow), m_list(nullptr), m_resize_new_width(anew_width), m_resize_new_height(anew_height)
{
}
worker_param(sdl_window_info *awindow)
- : m_window(awindow), m_list(NULL), m_resize_new_width(0), m_resize_new_height(0)
+ : m_window(awindow), m_list(nullptr), m_resize_new_width(0), m_resize_new_height(0)
{
}
- sdl_window_info *window() const { assert(m_window != NULL); return m_window; }
+ sdl_window_info *window() const { assert(m_window != nullptr); return m_window; }
render_primitive_list *list() const { return m_list; }
int new_width() const { return m_resize_new_width; }
int new_height() const { return m_resize_new_height; }
@@ -187,7 +191,7 @@ static OSDWORK_CALLBACK(sdlwindow_thread_id)
exit(-1);
}
}
- return NULL;
+ return nullptr;
}
@@ -210,40 +214,50 @@ bool sdl_osd_interface::window_init()
{
// create a thread to run the windows from
work_queue = osd_work_queue_alloc(WORK_QUEUE_FLAG_IO);
- if (work_queue == NULL)
+ if (work_queue == nullptr)
return false;
- osd_work_item_queue(work_queue, &sdlwindow_thread_id, NULL, WORK_ITEM_FLAG_AUTO_RELEASE);
+ osd_work_item_queue(work_queue, &sdlwindow_thread_id, nullptr, WORK_ITEM_FLAG_AUTO_RELEASE);
sdlwindow_sync();
}
else
{
// otherwise, treat the window thread as the main thread
//window_threadid = main_threadid;
- sdlwindow_thread_id(NULL, 0);
+ sdlwindow_thread_id(nullptr, 0);
}
// initialize the drawers
-#if USE_OPENGL
- if (video_config.mode == VIDEO_MODE_OPENGL)
+ if (video_config.mode == VIDEO_MODE_BGFX)
{
- if (drawogl_init(machine(), &draw))
- video_config.mode = VIDEO_MODE_SOFT;
+ if (renderer_bgfx::init(machine()))
+ {
+#if (USE_OPENGL)
+ video_config.mode = VIDEO_MODE_OPENGL;
+ }
}
-#endif
- if (video_config.mode == VIDEO_MODE_SDL2ACCEL)
+ if (video_config.mode == VIDEO_MODE_OPENGL)
{
- if (drawsdl2_init(machine(), &draw))
+ if (renderer_ogl::init(machine()))
+ {
+ video_config.mode = VIDEO_MODE_SOFT;
+#else
video_config.mode = VIDEO_MODE_SOFT;
+#endif
+ }
}
- if (video_config.mode == VIDEO_MODE_BGFX)
+ if (video_config.mode == VIDEO_MODE_SDL2ACCEL)
{
- if (drawbgfx_init(machine(), &draw))
+ if (renderer_sdl2::init(machine()))
+ {
video_config.mode = VIDEO_MODE_SOFT;
+ }
}
if (video_config.mode == VIDEO_MODE_SOFT)
{
- if (drawsdl_init(&draw))
+ if (renderer_sdl1::init(machine()))
+ {
return false;
+ }
}
/* We may want to set a number of the hints SDL2 provides.
@@ -271,11 +285,11 @@ bool sdl_osd_interface::window_init()
SDL_HINT_WINRT_PRIVACY_POLICY_URL, SDL_HINT_WINRT_PRIVACY_POLICY_LABEL,
SDL_HINT_WINRT_HANDLE_BACK_BUTTON,
#endif
- NULL
+ nullptr
};
osd_printf_verbose("\nHints:\n");
- for (int i = 0; hints[i] != NULL; i++)
+ for (int i = 0; hints[i] != nullptr; i++)
osd_printf_verbose("\t%-40s %s\n", hints[i], SDL_GetHint(hints[i]));
// set up the window list
@@ -315,7 +329,7 @@ static OSDWORK_CALLBACK( sdlwindow_exit_wt )
if (param)
osd_free(param);
- return NULL;
+ return nullptr;
}
@@ -328,7 +342,7 @@ void sdl_osd_interface::window_exit()
osd_printf_verbose("Enter sdlwindow_exit\n");
// free all the windows
- while (sdl_window_list != NULL)
+ while (sdl_window_list != nullptr)
{
sdl_window_info *temp = sdl_window_list;
sdl_window_list = temp->m_next;
@@ -343,9 +357,6 @@ void sdl_osd_interface::window_exit()
sdlwindow_sync();
}
- // kill the drawers
- (*draw.exit)();
-
execute_async_wait(&sdlwindow_exit_wt, wp_dummy);
if (multithreading_enabled)
@@ -464,7 +475,7 @@ OSDWORK_CALLBACK( sdl_window_info::sdlwindow_resize_wt )
window->renderer().notify_changed();
osd_free(wp);
- return NULL;
+ return nullptr;
}
void sdl_window_info::resize(INT32 width, INT32 height)
@@ -492,7 +503,7 @@ OSDWORK_CALLBACK( sdl_window_info::notify_changed_wt )
window->renderer().notify_changed();
osd_free(wp);
- return NULL;
+ return nullptr;
}
void sdl_window_info::notify_changed()
@@ -522,7 +533,7 @@ OSDWORK_CALLBACK( sdl_window_info::sdlwindow_toggle_full_screen_wt )
// if we are in debug mode, never go full screen
if (window->machine().debug_flags & DEBUG_FLAG_OSD_ENABLED)
- return NULL;
+ return nullptr;
// If we are going fullscreen (leaving windowed) remember our windowed size
if (!window->fullscreen())
@@ -530,9 +541,8 @@ OSDWORK_CALLBACK( sdl_window_info::sdlwindow_toggle_full_screen_wt )
window->m_windowed_dim = window->get_size();
}
- window->renderer().destroy();
- global_free(window->m_renderer);
- window->m_renderer = NULL;
+ delete window->m_renderer;
+ window->m_renderer = nullptr;
bool is_osx = false;
#ifdef SDLMAME_MACOSX
@@ -548,14 +558,14 @@ OSDWORK_CALLBACK( sdl_window_info::sdlwindow_toggle_full_screen_wt )
SDL_DestroyWindow(window->sdl_window());
sdlinput_release_keys();
- window->set_renderer(draw.create(window));
+ window->set_renderer(osd_renderer::make_for_type(video_config.mode, reinterpret_cast<osd_window *>(window)));
// toggle the window mode
window->set_fullscreen(!window->fullscreen());
complete_create_wt(param, 0);
- return NULL;
+ return nullptr;
}
void sdl_window_info::toggle_full_screen()
@@ -632,7 +642,7 @@ void sdl_window_info::update_cursor_state()
SDL_SetWindowGrab(sdl_window(), SDL_TRUE);
SDL_SetRelativeMouseMode(SDL_TRUE);
}
- SDL_SetCursor(NULL); // Force an update in case the underlying driver has changed visibility
+ SDL_SetCursor(nullptr); // Force an update in case the underlying driver has changed visibility
}
#endif
}
@@ -645,7 +655,7 @@ OSDWORK_CALLBACK( sdl_window_info::update_cursor_state_wt )
window->update_cursor_state();
osd_free(wp);
- return NULL;
+ return nullptr;
}
int sdl_window_info::xy_to_render_target(int x, int y, int *xt, int *yt)
@@ -674,7 +684,7 @@ int sdl_window_info::window_init()
*last_window_ptr = this;
last_window_ptr = &this->m_next;
- set_renderer(draw.create(this));
+ set_renderer(osd_renderer::make_for_type(video_config.mode, reinterpret_cast<osd_window *>(this)));
// create an event that we can use to skip blitting
m_rendered_event = osd_event_alloc(FALSE, TRUE);
@@ -731,7 +741,8 @@ OSDWORK_CALLBACK( sdl_window_info::sdlwindow_video_window_destroy_wt )
ASSERT_WINDOW_THREAD();
// free the textures etc
- window->renderer().destroy();
+ global_free(window->m_renderer);
+ window->m_renderer = nullptr;
if (window->fullscreen() && video_config.switchres)
{
@@ -745,7 +756,7 @@ OSDWORK_CALLBACK( sdl_window_info::sdlwindow_video_window_destroy_wt )
osd_free(wp);
- return NULL;
+ return nullptr;
}
void sdl_window_info::destroy()
@@ -761,7 +772,7 @@ void sdl_window_info::destroy()
//osd_event_wait(window->rendered_event, osd_ticks_per_second()*10);
// remove us from the list
- for (prevptr = &sdl_window_list; *prevptr != NULL; prevptr = &(*prevptr)->m_next)
+ for (prevptr = &sdl_window_list; *prevptr != nullptr; prevptr = &(*prevptr)->m_next)
if (*prevptr == this)
{
*prevptr = this->m_next;
@@ -869,7 +880,7 @@ void sdl_window_info::update()
execute_async(&update_cursor_state_wt, worker_param(this));
// if we're visible and running and not in the middle of a resize, draw
- if (m_target != NULL)
+ if (m_target != nullptr)
{
int tempwidth, tempheight;
@@ -1033,7 +1044,7 @@ OSDWORK_CALLBACK( sdl_window_info::complete_create_wt )
//window().sdl_window() = SDL_CreateWindow(window().m_title, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
// width, height, m_extra_flags);
- if ( window->m_sdl_window == NULL )
+ if ( window->m_sdl_window == nullptr )
{
if (window->renderer().has_flags(osd_renderer::FLAG_NEEDS_OPENGL))
osd_printf_error("OpenGL not supported on this driver: %s\n", SDL_GetError());
@@ -1064,7 +1075,7 @@ OSDWORK_CALLBACK( sdl_window_info::complete_create_wt )
}
else
{
- //SDL_SetWindowDisplayMode(window().sdl_window(), NULL); // Use desktop
+ //SDL_SetWindowDisplayMode(window().sdl_window(), nullptr); // Use desktop
}
// show window
@@ -1082,7 +1093,7 @@ OSDWORK_CALLBACK( sdl_window_info::complete_create_wt )
// set main window
if (window->m_index > 0)
{
- for (auto w = sdl_window_list; w != NULL; w = w->m_next)
+ for (auto w = sdl_window_list; w != nullptr; w = w->m_next)
{
if (w->m_index == 0)
{
@@ -1169,7 +1180,7 @@ OSDWORK_CALLBACK( sdl_window_info::draw_video_contents_wt )
int scrnum = 0;
int is_vector = 0;
screen_device_iterator iter(window->machine().root_device());
- for (const screen_device *screen = iter.first(); screen != NULL; screen = iter.next())
+ for (const screen_device *screen = iter.first(); screen != nullptr; screen = iter.next())
{
if (scrnum == window->m_index)
{
@@ -1192,7 +1203,7 @@ OSDWORK_CALLBACK( sdl_window_info::draw_video_contents_wt )
window->m_primlist = wp->list();
// if no bitmap, just fill
- if (window->m_primlist == NULL)
+ if (window->m_primlist == nullptr)
{
}
// otherwise, render with our drawing system
@@ -1208,7 +1219,7 @@ OSDWORK_CALLBACK( sdl_window_info::draw_video_contents_wt )
osd_event_set(window->m_rendered_event);
osd_free(wp);
- return NULL;
+ return nullptr;
}
int sdl_window_info::wnd_extra_width()