diff options
| author | 2015-11-25 08:22:24 +0100 | |
|---|---|---|
| committer | 2015-11-25 08:22:24 +0100 | |
| commit | 0825ce4f3b8eaab42e3682f7d01d97ce6ea0416d (patch) | |
| tree | 24de29ca8cbba68740ec8cd26f15209f19c2bf0b /src/osd/modules | |
| parent | d1d8a66ab196156ab22ba1059d714cd040b44ab6 (diff) | |
Cleanups and version bumpmame0168
Diffstat (limited to 'src/osd/modules')
| -rw-r--r-- | src/osd/modules/debugger/debugint.cpp | 8 | ||||
| -rw-r--r-- | src/osd/modules/font/font_windows.cpp | 2 | ||||
| -rw-r--r-- | src/osd/modules/midi/portmidi.cpp | 2 | ||||
| -rw-r--r-- | src/osd/modules/render/d3d/d3dhlsl.cpp | 9 | ||||
| -rw-r--r-- | src/osd/modules/render/d3d/d3dhlsl.h | 2 | ||||
| -rw-r--r-- | src/osd/modules/render/drawd3d.cpp | 4 | ||||
| -rw-r--r-- | src/osd/modules/render/drawdd.cpp | 6 |
7 files changed, 16 insertions, 17 deletions
diff --git a/src/osd/modules/debugger/debugint.cpp b/src/osd/modules/debugger/debugint.cpp index 181b5c149fa..2598f481ca6 100644 --- a/src/osd/modules/debugger/debugint.cpp +++ b/src/osd/modules/debugger/debugint.cpp @@ -1440,10 +1440,10 @@ void debug_internal::wait_for_debugger(device_t &device, bool firststop) DView *disassembly = dview_alloc(target, device.machine(), DVT_DISASSEMBLY, VIEW_STATE_FOLLOW_CPU); disassembly->editor.active = TRUE; disassembly->editor.container = &device.machine().render().ui_container(); - - dview_alloc(target, device.machine(), DVT_STATE, VIEW_STATE_FOLLOW_CPU); - - DView *console = dview_alloc(target, device.machine(), DVT_CONSOLE, VIEW_STATE_FOLLOW_CPU); + + dview_alloc(target, device.machine(), DVT_STATE, VIEW_STATE_FOLLOW_CPU); + + DView *console = dview_alloc(target, device.machine(), DVT_CONSOLE, VIEW_STATE_FOLLOW_CPU); dview_set_title(console, "Console"); console->editor.active = TRUE; console->editor.container = &device.machine().render().ui_container(); diff --git a/src/osd/modules/font/font_windows.cpp b/src/osd/modules/font/font_windows.cpp index e6ae37bdfc6..6192c965564 100644 --- a/src/osd/modules/font/font_windows.cpp +++ b/src/osd/modules/font/font_windows.cpp @@ -34,7 +34,7 @@ //------------------------------------------------- class osd_font_windows : public osd_font -{ +{ public: osd_font_windows(): m_font(NULL) { } virtual ~osd_font_windows() { } diff --git a/src/osd/modules/midi/portmidi.cpp b/src/osd/modules/midi/portmidi.cpp index df92b0b9a37..dd75d58ff17 100644 --- a/src/osd/modules/midi/portmidi.cpp +++ b/src/osd/modules/midi/portmidi.cpp @@ -44,7 +44,7 @@ static const int RX_EVENT_BUF_SIZE = 512; #define MIDI_EOX 0xf7 class osd_midi_device_pm : public osd_midi_device -{ +{ public: osd_midi_device_pm(): pmStream(NULL), xmit_cnt(0), last_status(0), rx_sysex(false) { } virtual ~osd_midi_device_pm() { } diff --git a/src/osd/modules/render/d3d/d3dhlsl.cpp b/src/osd/modules/render/d3d/d3dhlsl.cpp index 61e2a4b12b5..567426b3c27 100644 --- a/src/osd/modules/render/d3d/d3dhlsl.cpp +++ b/src/osd/modules/render/d3d/d3dhlsl.cpp @@ -52,7 +52,6 @@ static file_error open_next(d3d::renderer *d3d, emu_file &file, const char *temp namespace d3d { - //============================================================ // PROTOTYPES //============================================================ @@ -72,12 +71,12 @@ static direct3dx9_loadeffect_ptr g_load_effect = NULL; // shader manager constructor //============================================================ -shaders::shaders() : - d3dintf(NULL), machine(NULL), d3d(NULL), num_screens(0), curr_screen(0), curr_frame(0), write_ini(false), read_ini(false), hlsl_prescale_x(0), hlsl_prescale_y(0), bloom_count(0), +shaders::shaders() : + d3dintf(NULL), machine(NULL), d3d(NULL), num_screens(0), curr_screen(0), curr_frame(0), write_ini(false), read_ini(false), hlsl_prescale_x(0), hlsl_prescale_y(0), bloom_count(0), vecbuf_type(), vecbuf_index(0), vecbuf_count(0), avi_output_file(NULL), avi_frame(0), avi_copy_surface(NULL), avi_copy_texture(NULL), avi_final_target(NULL), avi_final_texture(NULL), - black_surface(NULL), black_texture(NULL), render_snap(false), snap_rendered(false), snap_copy_target(NULL), snap_copy_texture(NULL), snap_target(NULL), snap_texture(NULL), + black_surface(NULL), black_texture(NULL), render_snap(false), snap_rendered(false), snap_copy_target(NULL), snap_copy_texture(NULL), snap_target(NULL), snap_texture(NULL), snap_width(0), snap_height(0), lines_pending(false), backbuffer(NULL), curr_effect(NULL), default_effect(NULL), prescale_effect(NULL), post_effect(NULL), distortion_effect(NULL), - focus_effect(NULL), phosphor_effect(NULL), deconverge_effect(NULL), color_effect(NULL), yiq_encode_effect(NULL), yiq_decode_effect(NULL), bloom_effect(NULL), + focus_effect(NULL), phosphor_effect(NULL), deconverge_effect(NULL), color_effect(NULL), yiq_encode_effect(NULL), yiq_decode_effect(NULL), bloom_effect(NULL), downsample_effect(NULL), vector_effect(NULL), fsfx_vertices(NULL), curr_texture(NULL), curr_render_target(NULL), curr_poly(NULL) { master_enable = false; diff --git a/src/osd/modules/render/d3d/d3dhlsl.h b/src/osd/modules/render/d3d/d3dhlsl.h index 71661bbe625..e611ec1eecc 100644 --- a/src/osd/modules/render/d3d/d3dhlsl.h +++ b/src/osd/modules/render/d3d/d3dhlsl.h @@ -325,7 +325,7 @@ public: int defval; int maxval; int step; - int screen_type; + int screen_type; INT32(*adjustor)(running_machine &, void *, std::string *, INT32); }; diff --git a/src/osd/modules/render/drawd3d.cpp b/src/osd/modules/render/drawd3d.cpp index 34a23f80901..04fdadbcbbc 100644 --- a/src/osd/modules/render/drawd3d.cpp +++ b/src/osd/modules/render/drawd3d.cpp @@ -616,8 +616,8 @@ texture_info *texture_manager::find_texinfo(const render_texinfo *texinfo, UINT3 } renderer::renderer(osd_window *window) - : osd_renderer(window, FLAG_NONE), m_adapter(0), m_width(0), m_height(0), m_refresh(0), m_create_error_count(0), m_device(NULL), m_gamma_supported(0), m_pixformat(), - m_vertexbuf(NULL), m_lockedbuf(NULL), m_numverts(0), m_vectorbatch(NULL), m_batchindex(0), m_numpolys(0), m_restarting(false), m_mod2x_supported(0), m_mod4x_supported(0), + : osd_renderer(window, FLAG_NONE), m_adapter(0), m_width(0), m_height(0), m_refresh(0), m_create_error_count(0), m_device(NULL), m_gamma_supported(0), m_pixformat(), + m_vertexbuf(NULL), m_lockedbuf(NULL), m_numverts(0), m_vectorbatch(NULL), m_batchindex(0), m_numpolys(0), m_restarting(false), m_mod2x_supported(0), m_mod4x_supported(0), m_screen_format(), m_last_texture(NULL), m_last_texture_flags(0), m_last_blendenable(0), m_last_blendop(0), m_last_blendsrc(0), m_last_blenddst(0), m_last_filter(0), m_last_wrap(), m_last_modmode(0), m_hlsl_buf(NULL), m_shaders(NULL), m_shaders_options(NULL), m_texture_manager(NULL), m_line_count(0) { diff --git a/src/osd/modules/render/drawdd.cpp b/src/osd/modules/render/drawdd.cpp index 0240b8fc26e..a4dfc58777b 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), |
