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/drawdd.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/drawdd.cpp')
-rw-r--r-- | src/osd/modules/render/drawdd.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/osd/modules/render/drawdd.cpp b/src/osd/modules/render/drawdd.cpp index 0240b8fc26e..fb82dff3c1f 100644 --- a/src/osd/modules/render/drawdd.cpp +++ b/src/osd/modules/render/drawdd.cpp @@ -38,9 +38,9 @@ class renderer_dd : public osd_renderer { public: renderer_dd(osd_window *window) - : osd_renderer(window, FLAG_NONE), - width(0), - height(0), + : osd_renderer(window, FLAG_NONE), + width(0), + height(0), refresh(0), //adapter(0), adapter_ptr(NULL), @@ -64,13 +64,13 @@ public: virtual ~renderer_dd() { } - virtual int create(); - virtual render_primitive_list *get_primitives(); - virtual int draw(const int update); - virtual void save() {}; - virtual void record() {}; - virtual void toggle_fsfx() {}; - virtual void destroy(); + virtual int create() override; + virtual render_primitive_list *get_primitives() override; + virtual int draw(const int update) override; + virtual void save() override {}; + virtual void record() override {}; + virtual void toggle_fsfx() override {}; + virtual void destroy() override; int width, height; // current width, height int refresh; // current refresh rate @@ -171,7 +171,7 @@ inline void renderer_dd::update_outer_rects() } -INLINE int better_mode(int width0, int height0, int width1, int height1, float desired_aspect) +static inline int better_mode(int width0, int height0, int width1, int height1, float desired_aspect) { float aspect0 = (float)width0 / (float)height0; float aspect1 = (float)width1 / (float)height1; |