summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author couriersud <couriersud@arcor.de>2015-02-12 08:26:07 +0100
committer couriersud <couriersud@arcor.de>2015-02-12 08:26:07 +0100
commita3b8fa8a7919c210789cc825462b6da772a54b68 (patch)
treeccf9fa57aa77fcb8d05d117f10d2b0b422cd3c7d
parenteebdafacd491bc63df7ec9be8419b17e2b7e99be (diff)
Remove start_viewscreen, fix sdl.mak. (nw)
-rw-r--r--src/osd/sdl/drawogl.c1
-rw-r--r--src/osd/sdl/sdl.mak2
-rw-r--r--src/osd/sdl/window.c1
-rw-r--r--src/osd/sdl/window.h16
-rw-r--r--src/osd/windows/window.h3
5 files changed, 14 insertions, 9 deletions
diff --git a/src/osd/sdl/drawogl.c b/src/osd/sdl/drawogl.c
index 3315c9cd9cf..aae9d8c3a1a 100644
--- a/src/osd/sdl/drawogl.c
+++ b/src/osd/sdl/drawogl.c
@@ -2729,6 +2729,7 @@ void sdl_info_ogl::texture_coord_update(texture_info *texture, const render_prim
ustop = (float)(m_width) / (float)surf_w_pow2;
vstop = (float)(m_height) / (float)surf_h_pow2;
+
}
else
{
diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak
index a8150aa2e54..8d8e189129c 100644
--- a/src/osd/sdl/sdl.mak
+++ b/src/osd/sdl/sdl.mak
@@ -82,7 +82,7 @@ SDL_FRAMEWORK_PATH = /Library/Frameworks/
# uncomment to use BGFX
-USE_BGFX = 1
+# USE_BGFX = 1
###########################################################################
################## END USER-CONFIGURABLE OPTIONS ######################
diff --git a/src/osd/sdl/window.c b/src/osd/sdl/window.c
index f89389adff0..13cc5f84e1f 100644
--- a/src/osd/sdl/window.c
+++ b/src/osd/sdl/window.c
@@ -1072,7 +1072,6 @@ void sdl_window_info::set_starting_view(running_machine &machine, int index, con
// set the view
target()->set_view(viewindex);
- m_start_viewscreen=viewindex;
}
diff --git a/src/osd/sdl/window.h b/src/osd/sdl/window.h
index c582d09cf7d..57ac325a377 100644
--- a/src/osd/sdl/window.h
+++ b/src/osd/sdl/window.h
@@ -32,13 +32,22 @@ typedef UINT32 HashT;
// TYPE DEFINITIONS
//============================================================
+/* ------------------------------------------------------
+ *
+ * All types named osd_* will ultimately be located in
+ * the modules tree. They are temporarily maintained in
+ * window.h until basic code simplification is finished.
+ *
+ */
+
+class win_window_info;
+
class osd_window
{
public:
osd_window()
:
#ifdef OSD_SDL
- m_start_viewscreen(0),
#else
m_hwnd(0), m_focus_hwnd(0), m_monitor(NULL), m_resize_state(0),
m_maxwidth(0), m_maxheight(0),
@@ -64,15 +73,14 @@ public:
#else
virtual SDL_Surface *sdl_surface() = 0;
#endif
-
- int m_start_viewscreen;
-
#else
virtual bool win_has_menu() = 0;
virtual win_monitor_info *winwindow_video_window_monitor(const RECT *proposed) = 0;
// window handle and info
HWND m_hwnd;
+ // FIXME: this is the same as win_window_list->m_hwnd, i.e. first window.
+ // During modularization, this should be passed in differently
HWND m_focus_hwnd;
// monitor info
diff --git a/src/osd/windows/window.h b/src/osd/windows/window.h
index 9cdec018420..608275d3eca 100644
--- a/src/osd/windows/window.h
+++ b/src/osd/windows/window.h
@@ -74,9 +74,6 @@ public:
#else
virtual SDL_Surface *sdl_surface() = 0;
#endif
-
- int m_start_viewscreen;
-
#else
virtual bool win_has_menu() = 0;
virtual win_monitor_info *winwindow_video_window_monitor(const RECT *proposed) = 0;