diff options
author | 2015-12-13 11:23:55 +0100 | |
---|---|---|
committer | 2015-12-13 11:23:55 +0100 | |
commit | 4e580a77b9da9b78aba1fec8e44b1de5a4a14aaf (patch) | |
tree | df0e1d28daa79b9151088498a933cd1fc37c9c07 /src/osd/modules/render/drawogl.cpp | |
parent | 1cda42b22e591965ee69561fcf52272bd991b3b2 (diff) | |
parent | 14d5966a379e9783ba724750a5f84a72af62cadc (diff) |
Merge pull request #9 from mamedev/master
Sync to base master
Diffstat (limited to 'src/osd/modules/render/drawogl.cpp')
-rw-r--r-- | src/osd/modules/render/drawogl.cpp | 60 |
1 files changed, 32 insertions, 28 deletions
diff --git a/src/osd/modules/render/drawogl.cpp b/src/osd/modules/render/drawogl.cpp index de04e04a580..4a2744e4068 100644 --- a/src/osd/modules/render/drawogl.cpp +++ b/src/osd/modules/render/drawogl.cpp @@ -233,12 +233,12 @@ public: ReleaseDC(m_window, m_hdc); } - virtual void MakeCurrent() + virtual void MakeCurrent() override { this->pfn_wglMakeCurrent(m_hdc, m_context); } - virtual const char *LastErrorMsg() + virtual const char *LastErrorMsg() override { if (m_error[0] == 0) return NULL; @@ -246,7 +246,7 @@ public: return m_error; } - virtual void *getProcAddress(const char *proc) + virtual void *getProcAddress(const char *proc) override { void *ret = (void *) GetProcAddress(m_module, proc); if (ret == NULL) @@ -254,7 +254,7 @@ public: return ret; } - virtual int SetSwapInterval(const int swap) + virtual int SetSwapInterval(const int swap) override { if (this->pfn_wglSwapIntervalEXT != NULL) { @@ -263,7 +263,7 @@ public: return 0; } - virtual void SwapBuffer() + virtual void SwapBuffer() override { SwapBuffers(m_hdc); //wglSwapLayerBuffers(GetDC(window().m_hwnd), WGL_SWAP_MAIN_PLANE); @@ -362,29 +362,29 @@ public: { SDL_GL_DeleteContext(m_context); } - virtual void MakeCurrent() + virtual void MakeCurrent() override { SDL_GL_MakeCurrent(m_window, m_context); } - virtual int SetSwapInterval(const int swap) + virtual int SetSwapInterval(const int swap) override { return SDL_GL_SetSwapInterval(swap); } - virtual const char *LastErrorMsg() + virtual const char *LastErrorMsg() override { if (m_error[0] == 0) return NULL; else return m_error; } - virtual void *getProcAddress(const char *proc) + virtual void *getProcAddress(const char *proc) override { return SDL_GL_GetProcAddress(proc); } - virtual void SwapBuffer() + virtual void SwapBuffer() override { SDL_GL_SwapWindow(m_window); } @@ -535,12 +535,14 @@ public: m_texVerticex[i] = 0.0f; } - /* virtual */ int create(); - /* virtual */ int draw(const int update); + virtual int create() override; + virtual int draw(const int update) override; - /* virtual */ int xy_to_render_target(const int x, const int y, int *xt, int *yt); - /* virtual */ void destroy(); - /* virtual */ render_primitive_list *get_primitives() +#ifndef OSD_WINDOWS + virtual int xy_to_render_target(const int x, const int y, int *xt, int *yt) override; +#endif + virtual void destroy() override; + virtual render_primitive_list *get_primitives() override { #ifdef OSD_WINDOWS osd_dim nd = window().get_size(); @@ -556,9 +558,11 @@ public: return &window().target()->get_primitives(); } - /* virtual */ void save() { } - /* virtual */ void record() { } - /* virtual */ void toggle_fsfx() { } +#ifdef OSD_WINDOWS + virtual void save() override { } + virtual void record() override { } + virtual void toggle_fsfx() override { } +#endif private: void destroy_all_textures(); @@ -651,7 +655,7 @@ static const line_aa_step line_aa_4step[] = // INLINES //============================================================ -INLINE HashT texture_compute_hash(const render_texinfo *texture, UINT32 flags) +static inline HashT texture_compute_hash(const render_texinfo *texture, UINT32 flags) { HashT h = (HashT)texture->base ^ (flags & (PRIMFLAG_BLENDMODE_MASK | PRIMFLAG_TEXFORMAT_MASK)); //printf("hash %d\n", (int) h % HASH_SIZE); @@ -1087,7 +1091,7 @@ void sdl_info_ogl::destroy() //============================================================ // drawsdl_xy_to_render_target //============================================================ - +#ifndef OSD_WINDOWS int sdl_info_ogl::xy_to_render_target(int x, int y, int *xt, int *yt) { *xt = x - m_last_hofs; @@ -1098,7 +1102,7 @@ int sdl_info_ogl::xy_to_render_target(int x, int y, int *xt, int *yt) return 0; return 1; } - +#endif //============================================================ // drawsdl_destroy_all_textures //============================================================ @@ -1994,7 +1998,7 @@ void sdl_info_ogl::texture_compute_type_subroutine(const render_texinfo *texsour } } -INLINE int get_valid_pow2_value(int v, int needPow2) +static inline int get_valid_pow2_value(int v, int needPow2) { return (needPow2)?gl_round_to_pow2(v):v; } @@ -2565,7 +2569,7 @@ ogl_texture_info *sdl_info_ogl::texture_create(const render_texinfo *texsource, // copyline_palette16 //============================================================ -INLINE void copyline_palette16(UINT32 *dst, const UINT16 *src, int width, const rgb_t *palette, int xborderpix, int xprescale) +static inline void copyline_palette16(UINT32 *dst, const UINT16 *src, int width, const rgb_t *palette, int xborderpix, int xprescale) { int x; @@ -2588,7 +2592,7 @@ INLINE void copyline_palette16(UINT32 *dst, const UINT16 *src, int width, const // copyline_palettea16 //============================================================ -INLINE void copyline_palettea16(UINT32 *dst, const UINT16 *src, int width, const rgb_t *palette, int xborderpix, int xprescale) +static inline void copyline_palettea16(UINT32 *dst, const UINT16 *src, int width, const rgb_t *palette, int xborderpix, int xprescale) { int x; @@ -2611,7 +2615,7 @@ INLINE void copyline_palettea16(UINT32 *dst, const UINT16 *src, int width, const // copyline_rgb32 //============================================================ -INLINE void copyline_rgb32(UINT32 *dst, const UINT32 *src, int width, const rgb_t *palette, int xborderpix, int xprescale) +static inline void copyline_rgb32(UINT32 *dst, const UINT32 *src, int width, const rgb_t *palette, int xborderpix, int xprescale) { int x; @@ -2663,7 +2667,7 @@ INLINE void copyline_rgb32(UINT32 *dst, const UINT32 *src, int width, const rgb_ // copyline_argb32 //============================================================ -INLINE void copyline_argb32(UINT32 *dst, const UINT32 *src, int width, const rgb_t *palette, int xborderpix, int xprescale) +static inline void copyline_argb32(UINT32 *dst, const UINT32 *src, int width, const rgb_t *palette, int xborderpix, int xprescale) { int x; @@ -2706,7 +2710,7 @@ INLINE void copyline_argb32(UINT32 *dst, const UINT32 *src, int width, const rgb } } -INLINE UINT32 ycc_to_rgb(UINT8 y, UINT8 cb, UINT8 cr) +static inline UINT32 ycc_to_rgb(UINT8 y, UINT8 cb, UINT8 cr) { /* original equations: @@ -2751,7 +2755,7 @@ INLINE UINT32 ycc_to_rgb(UINT8 y, UINT8 cb, UINT8 cr) // copyline_yuy16_to_argb //============================================================ -INLINE void copyline_yuy16_to_argb(UINT32 *dst, const UINT16 *src, int width, const rgb_t *palette, int xborderpix, int xprescale) +static inline void copyline_yuy16_to_argb(UINT32 *dst, const UINT16 *src, int width, const rgb_t *palette, int xborderpix, int xprescale) { int x; |