summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-03-25 08:16:51 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2015-03-25 08:16:51 +0100
commit0147bb4cc82e642cf75151f039f240eb20989fbc (patch)
tree1da79e38b3eb810f9f5ab9f6f4853defad55792d /src/osd
parentfda60d87eb9228d923fd33130671b2c5de881683 (diff)
Cleanups and version bumpmame0160
Diffstat (limited to 'src/osd')
-rw-r--r--src/osd/modules/opengl/osd_opengl.h10
-rw-r--r--src/osd/modules/osdwindow.h6
-rw-r--r--src/osd/modules/render/draw13.c2
-rw-r--r--src/osd/modules/render/drawogl.c80
-rw-r--r--src/osd/sdl/sdl.mak4
-rw-r--r--src/osd/sdl/video.h8
-rw-r--r--src/osd/sdl/window.c4
-rw-r--r--src/osd/windows/video.h8
-rw-r--r--src/osd/windows/windows.mak4
9 files changed, 63 insertions, 63 deletions
diff --git a/src/osd/modules/opengl/osd_opengl.h b/src/osd/modules/opengl/osd_opengl.h
index 829cad43bf5..a0084ebdb6d 100644
--- a/src/osd/modules/opengl/osd_opengl.h
+++ b/src/osd/modules/opengl/osd_opengl.h
@@ -61,11 +61,11 @@
virtual const char *LastErrorMsg() = 0;
virtual void *getProcAddress(const char *proc) = 0;
/*
- * 0 for immediate updates,
- * 1 for updates synchronized with the vertical retrace,
- * -1 for late swap tearing
+ * 0 for immediate updates,
+ * 1 for updates synchronized with the vertical retrace,
+ * -1 for late swap tearing
*
- * returns -1 if swap interval is not supported
+ * returns -1 if swap interval is not supported
*
*/
virtual int SetSwapInterval(const int swap) = 0;
@@ -99,7 +99,7 @@
#undef GET_GLFUNC
};
#ifdef _MSC_VER
- }
+ }
#endif
#undef OSD_GL
diff --git a/src/osd/modules/osdwindow.h b/src/osd/modules/osdwindow.h
index 993866984a2..edafeb303ca 100644
--- a/src/osd/modules/osdwindow.h
+++ b/src/osd/modules/osdwindow.h
@@ -78,9 +78,9 @@ public:
#endif
render_primitive_list *m_primlist;
- osd_window_config m_win_config;
+ osd_window_config m_win_config;
protected:
- int m_prescale;
+ int m_prescale;
};
class osd_renderer
@@ -131,7 +131,7 @@ protected:
private:
osd_window *m_window;
- int m_flags;
+ int m_flags;
};
diff --git a/src/osd/modules/render/draw13.c b/src/osd/modules/render/draw13.c
index acc64a1f982..fb52a725562 100644
--- a/src/osd/modules/render/draw13.c
+++ b/src/osd/modules/render/draw13.c
@@ -118,7 +118,7 @@ public:
private:
Uint32 m_sdl_access;
- sdl_info13 * m_renderer;
+ sdl_info13 * m_renderer;
render_texinfo m_texinfo; // copy of the texture info
HashT m_hash; // hash value for the texture (must be >= pointer size)
UINT32 m_flags; // rendering flags
diff --git a/src/osd/modules/render/drawogl.c b/src/osd/modules/render/drawogl.c
index 328310ba9c6..4a3bf4d1e45 100644
--- a/src/osd/modules/render/drawogl.c
+++ b/src/osd/modules/render/drawogl.c
@@ -281,50 +281,50 @@ private:
int setupPixelFormat(HDC hDC)
{
- PIXELFORMATDESCRIPTOR pfd = {
- sizeof(PIXELFORMATDESCRIPTOR), /* size */
- 1, /* version */
- PFD_SUPPORT_OPENGL |
- PFD_DRAW_TO_WINDOW |
- PFD_DOUBLEBUFFER, /* support double-buffering */
- PFD_TYPE_RGBA, /* color type */
- 32, /* prefered color depth */
- 0, 0, 0, 0, 0, 0, /* color bits (ignored) */
- 0, /* no alpha buffer */
- 0, /* alpha bits (ignored) */
- 0, /* no accumulation buffer */
- 0, 0, 0, 0, /* accum bits (ignored) */
- 16, /* depth buffer */
- 0, /* no stencil buffer */
- 0, /* no auxiliary buffers */
- PFD_MAIN_PLANE, /* main layer */
- 0, /* reserved */
- 0, 0, 0, /* no layer, visible, damage masks */
- };
- int pixelFormat;
-
- pixelFormat = ChoosePixelFormat(hDC, &pfd);
- if (pixelFormat == 0) {
- strcpy(m_error, "ChoosePixelFormat failed");
- return 1;
- }
-
- if (SetPixelFormat(hDC, pixelFormat, &pfd) != TRUE) {
- strcpy(m_error, "SetPixelFormat failed.");
- return 1;
- }
- return 0;
+ PIXELFORMATDESCRIPTOR pfd = {
+ sizeof(PIXELFORMATDESCRIPTOR), /* size */
+ 1, /* version */
+ PFD_SUPPORT_OPENGL |
+ PFD_DRAW_TO_WINDOW |
+ PFD_DOUBLEBUFFER, /* support double-buffering */
+ PFD_TYPE_RGBA, /* color type */
+ 32, /* prefered color depth */
+ 0, 0, 0, 0, 0, 0, /* color bits (ignored) */
+ 0, /* no alpha buffer */
+ 0, /* alpha bits (ignored) */
+ 0, /* no accumulation buffer */
+ 0, 0, 0, 0, /* accum bits (ignored) */
+ 16, /* depth buffer */
+ 0, /* no stencil buffer */
+ 0, /* no auxiliary buffers */
+ PFD_MAIN_PLANE, /* main layer */
+ 0, /* reserved */
+ 0, 0, 0, /* no layer, visible, damage masks */
+ };
+ int pixelFormat;
+
+ pixelFormat = ChoosePixelFormat(hDC, &pfd);
+ if (pixelFormat == 0) {
+ strcpy(m_error, "ChoosePixelFormat failed");
+ return 1;
+ }
+
+ if (SetPixelFormat(hDC, pixelFormat, &pfd) != TRUE) {
+ strcpy(m_error, "SetPixelFormat failed.");
+ return 1;
+ }
+ return 0;
}
bool WGLExtensionSupported(const char *extension_name)
{
- //if (pfn_wglGetExtensionsStringEXT != NULL)
- // printf("%s\n", this->pfn_wglGetExtensionsStringEXT());
+ //if (pfn_wglGetExtensionsStringEXT != NULL)
+ // printf("%s\n", this->pfn_wglGetExtensionsStringEXT());
- if (pfn_wglGetExtensionsStringEXT != NULL && strstr(pfn_wglGetExtensionsStringEXT(), extension_name) != NULL)
- return true;
- else
- return false;
+ if (pfn_wglGetExtensionsStringEXT != NULL && strstr(pfn_wglGetExtensionsStringEXT(), extension_name) != NULL)
+ return true;
+ else
+ return false;
}
HGLRC m_context;
@@ -589,7 +589,7 @@ private:
int m_height;
osd_dim m_blit_dim;
- osd_gl_context *m_gl_context;
+ osd_gl_context *m_gl_context;
int m_initialized; // is everything well initialized, i.e. all GL stuff etc.
// 3D info (GL mode only)
diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak
index 2f188762da5..7f2de3c4300 100644
--- a/src/osd/sdl/sdl.mak
+++ b/src/osd/sdl/sdl.mak
@@ -429,7 +429,7 @@ OBJDIRS += $(SDLOBJ) \
$(OSDOBJ)/modules/netdev \
$(OSDOBJ)/modules/opengl \
$(OSDOBJ)/modules/render
-
+
#-------------------------------------------------
# OSD core library
#-------------------------------------------------
@@ -827,7 +827,7 @@ OSDOBJS += \
$(OSDOBJ)/modules/render/drawogl.o \
$(OSDOBJ)/modules/opengl/gl_shader_tool.o \
$(OSDOBJ)/modules/opengl/gl_shader_mgr.o
-
+
DEFS += -DUSE_OPENGL=1
ifeq ($(USE_DISPATCH_GL),1)
DEFS += -DUSE_DISPATCH_GL=1
diff --git a/src/osd/sdl/video.h b/src/osd/sdl/video.h
index 4a3d8b69f9d..913116f6b62 100644
--- a/src/osd/sdl/video.h
+++ b/src/osd/sdl/video.h
@@ -131,9 +131,9 @@ public:
osd_monitor_info *m_next; // pointer to next monitor in list
protected:
virtual void refresh() = 0;
- osd_rect m_pos_size;
- osd_rect m_usuable_pos_size;
- bool m_is_primary;
+ osd_rect m_pos_size;
+ osd_rect m_usuable_pos_size;
+ bool m_is_primary;
char m_name[64];
private:
@@ -185,7 +185,7 @@ struct osd_video_config
int syncrefresh; // sync only to refresh rate
int switchres; // switch resolutions
- int fullstretch; // FXIME: implement in windows!
+ int fullstretch; // FXIME: implement in windows!
// ddraw options
int hwstretch; // stretch using the hardware
diff --git a/src/osd/sdl/window.c b/src/osd/sdl/window.c
index 2f183ef447b..b41bf3bc7e5 100644
--- a/src/osd/sdl/window.c
+++ b/src/osd/sdl/window.c
@@ -1153,8 +1153,8 @@ OSDWORK_CALLBACK( sdl_window_info::complete_create_wt )
#ifdef SDLMAME_MACOSX
/* FIMXE: On OSX, SDL_WINDOW_FULLSCREEN_DESKTOP seems to be more reliable.
- * It however creates issues with white borders, i.e. the screen clear
- * does not work. This happens both with opengl and accel.
+ * It however creates issues with white borders, i.e. the screen clear
+ * does not work. This happens both with opengl and accel.
*/
#endif
diff --git a/src/osd/windows/video.h b/src/osd/windows/video.h
index ba00c6bf368..87ce0d8527c 100644
--- a/src/osd/windows/video.h
+++ b/src/osd/windows/video.h
@@ -131,9 +131,9 @@ public:
osd_monitor_info *m_next; // pointer to next monitor in list
protected:
virtual void refresh() = 0;
- osd_rect m_pos_size;
- osd_rect m_usuable_pos_size;
- bool m_is_primary;
+ osd_rect m_pos_size;
+ osd_rect m_usuable_pos_size;
+ bool m_is_primary;
char m_name[64];
private:
@@ -175,7 +175,7 @@ struct osd_video_config
int syncrefresh; // sync only to refresh rate
int switchres; // switch resolutions
- int fullstretch; // FXIME: implement in windows!
+ int fullstretch; // FXIME: implement in windows!
// ddraw options
int hwstretch; // stretch using the hardware
diff --git a/src/osd/windows/windows.mak b/src/osd/windows/windows.mak
index 53d8be9518a..633ae52b7b9 100644
--- a/src/osd/windows/windows.mak
+++ b/src/osd/windows/windows.mak
@@ -406,9 +406,9 @@ OSDOBJS += \
$(OSDOBJ)/modules/render/drawogl.o \
$(OSDOBJ)/modules/opengl/gl_shader_tool.o \
$(OSDOBJ)/modules/opengl/gl_shader_mgr.o
-
+
OBJDIRS += \
- $(OSDOBJ)/modules/opengl
+ $(OSDOBJ)/modules/opengl
DEFS += -DUSE_OPENGL=1