mirror of
https://github.com/holub/mame
synced 2025-04-19 23:12:11 +03:00
fix SDL on Windows compile
This commit is contained in:
parent
d47f8d623f
commit
418d057e97
@ -174,11 +174,11 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
/* virtual */ int create();
|
||||
/* virtual */ int draw(const int update);
|
||||
/* 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()
|
||||
/* 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) override;
|
||||
/* virtual */ void destroy() override;
|
||||
/* virtual */ render_primitive_list *get_primitives() override
|
||||
{
|
||||
osd_dim nd = window().blit_surface_size();
|
||||
if (nd != m_blit_dim)
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -57,13 +57,13 @@ public:
|
||||
}
|
||||
virtual ~sound_sdl() { }
|
||||
|
||||
virtual int init(const osd_options &options);
|
||||
virtual void exit();
|
||||
virtual int init(const osd_options &options) override;
|
||||
virtual void exit() override;
|
||||
|
||||
// sound_module
|
||||
|
||||
virtual void update_audio_stream(bool is_throttled, const INT16 *buffer, int samples_this_frame);
|
||||
virtual void set_mastervolume(int attenuation);
|
||||
virtual void update_audio_stream(bool is_throttled, const INT16 *buffer, int samples_this_frame) override;
|
||||
virtual void set_mastervolume(int attenuation) override;
|
||||
|
||||
private:
|
||||
int lock_buffer(bool is_throttled, long offset, long size, void **buffer1, long *length1, void **buffer2, long *length2);
|
||||
|
@ -147,32 +147,32 @@ public:
|
||||
virtual ~sdl_osd_interface();
|
||||
|
||||
// general overridables
|
||||
virtual void init(running_machine &machine);
|
||||
virtual void update(bool skip_redraw);
|
||||
virtual void init(running_machine &machine) override;
|
||||
virtual void update(bool skip_redraw) override;
|
||||
|
||||
// input overridables
|
||||
virtual void customize_input_type_list(simple_list<input_type_entry> &typelist);
|
||||
virtual void customize_input_type_list(simple_list<input_type_entry> &typelist) override;
|
||||
|
||||
virtual void video_register();
|
||||
virtual void video_register() override;
|
||||
|
||||
virtual bool video_init();
|
||||
virtual bool window_init();
|
||||
virtual bool input_init();
|
||||
virtual void input_pause();
|
||||
virtual void input_resume();
|
||||
virtual bool output_init();
|
||||
virtual bool video_init() override;
|
||||
virtual bool window_init() override;
|
||||
virtual bool input_init() override;
|
||||
virtual void input_pause() override;
|
||||
virtual void input_resume() override;
|
||||
virtual bool output_init() override;
|
||||
//virtual bool midi_init();
|
||||
|
||||
virtual void video_exit();
|
||||
virtual void window_exit();
|
||||
virtual void input_exit();
|
||||
virtual void output_exit();
|
||||
virtual void video_exit() override;
|
||||
virtual void window_exit() override;
|
||||
virtual void input_exit() override;
|
||||
virtual void output_exit() override;
|
||||
//virtual void midi_exit();
|
||||
|
||||
sdl_options &options() { return m_options; }
|
||||
|
||||
private:
|
||||
virtual void osd_exit();
|
||||
virtual void osd_exit() override;
|
||||
|
||||
void extract_video_config();
|
||||
|
||||
|
@ -171,7 +171,7 @@ public:
|
||||
static BOOL CALLBACK monitor_enum_callback(HMONITOR handle, HDC dc, LPRECT rect, LPARAM data);
|
||||
#endif
|
||||
private:
|
||||
void virtual refresh();
|
||||
void virtual refresh() override;
|
||||
|
||||
UINT64 m_handle; // handle to the monitor
|
||||
};
|
||||
|
@ -79,7 +79,7 @@ public:
|
||||
|
||||
void notify_changed();
|
||||
|
||||
osd_dim get_size()
|
||||
osd_dim get_size() override
|
||||
{
|
||||
#if (SDLMAME_SDL2)
|
||||
int w=0; int h=0;
|
||||
@ -92,18 +92,18 @@ public:
|
||||
|
||||
int xy_to_render_target(int x, int y, int *xt, int *yt);
|
||||
|
||||
running_machine &machine() const { return m_machine; }
|
||||
osd_monitor_info *monitor() const { return m_monitor; }
|
||||
int fullscreen() const { return m_fullscreen; }
|
||||
running_machine &machine() const override { return m_machine; }
|
||||
osd_monitor_info *monitor() const override { return m_monitor; }
|
||||
int fullscreen() const override { return m_fullscreen; }
|
||||
|
||||
render_target *target() { return m_target; }
|
||||
render_target *target() override { return m_target; }
|
||||
#if (SDLMAME_SDL2)
|
||||
SDL_Window *sdl_window() { return m_sdl_window; }
|
||||
SDL_Window *sdl_window() override { return m_sdl_window; }
|
||||
#else
|
||||
SDL_Surface *sdl_surface() { return m_sdlsurf; }
|
||||
#endif
|
||||
|
||||
osd_dim blit_surface_size();
|
||||
osd_dim blit_surface_size() override;
|
||||
int prescale() const { return m_prescale; }
|
||||
|
||||
// Pointer to next window
|
||||
|
Loading…
Reference in New Issue
Block a user