diff --git a/src/osd/modules/render/drawd3d.cpp b/src/osd/modules/render/drawd3d.cpp index 9d41a91ec02..7f3d1f20f15 100644 --- a/src/osd/modules/render/drawd3d.cpp +++ b/src/osd/modules/render/drawd3d.cpp @@ -29,13 +29,6 @@ #include "modules/render/d3d/d3dhlsl.h" -//============================================================ -// DEBUGGING -//============================================================ - -extern void mtlog_add(const char *event); - - //============================================================ // CONSTANTS //============================================================ @@ -704,7 +697,6 @@ void renderer_d3d9::begin_frame() m_texture_manager->update_textures(); // begin the scene - mtlog_add("drawd3d_window_draw: begin_scene"); result = (*d3dintf->device.begin_scene)(m_device); if (result != D3D_OK) osd_printf_verbose("Direct3D: Error %08X during device begin_scene call\n", (int)result); diff --git a/src/osd/windows/window.cpp b/src/osd/windows/window.cpp index 931af490f0f..f5030947eb6 100644 --- a/src/osd/windows/window.cpp +++ b/src/osd/windows/window.cpp @@ -6,7 +6,6 @@ // //============================================================ -#define LOG_THREADS 0 #define LOG_TEMP_PAUSE 0 // Needed for RAW Input @@ -129,48 +128,6 @@ static HANDLE window_thread_ready_event; static void create_window_class(void); -// temporary hacks -#if LOG_THREADS -struct mtlog -{ - osd_ticks_t timestamp; - const char *event; -}; - -static mtlog mtlog[100000]; -static std::atomic mtlogindex; - -void mtlog_add(const char *event) -{ - int index = mtlogindex++; - if (index < ARRAY_LENGTH(mtlog)) - { - mtlog[index].timestamp = osd_ticks(); - mtlog[index].event = event; - } -} - -static void mtlog_dump(void) -{ - osd_ticks_t cps = osd_ticks_per_second(); - osd_ticks_t last = mtlog[0].timestamp * 1000000 / cps; - int i; - - FILE *f = fopen("mt.log", "w"); - for (i = 0; i < mtlogindex; i++) - { - osd_ticks_t curr = mtlog[i].timestamp * 1000000 / cps; - fprintf(f, "%s",string_format("%20I64d %10I64d %s\n", (UINT64)curr, (UINT64)(curr - last), mtlog[i].event).c_str()); - last = curr; - } - fclose(f); -} -#else -void mtlog_add(const char *event) { } -#endif - - - //============================================================ // window_init // (main thread) @@ -892,8 +849,6 @@ void win_window_info::update() assert(GetCurrentThreadId() == main_threadid); - mtlog_add("winwindow_video_window_update: begin"); - // see if the target has changed significantly in window mode targetview = m_target->view(); targetorient = m_target->orientation(); @@ -919,8 +874,6 @@ void win_window_info::update() { bool got_lock = true; - mtlog_add("winwindow_video_window_update: try lock"); - // only block if we're throttled if (machine().video().throttled() || timeGetTime() - last_update_time > 250) m_render_lock.lock(); @@ -932,8 +885,6 @@ void win_window_info::update() { render_primitive_list *primlist; - mtlog_add("winwindow_video_window_update: got lock"); - // don't hold the lock; we just used it to see if rendering was still happening m_render_lock.unlock(); @@ -942,13 +893,10 @@ void win_window_info::update() // post a redraw request with the primitive list as a parameter last_update_time = timeGetTime(); - mtlog_add("winwindow_video_window_update: PostMessage start"); + SendMessage(platform_window(), WM_USER_REDRAW, 0, (LPARAM)primlist); - mtlog_add("winwindow_video_window_update: PostMessage end"); } } - - mtlog_add("winwindow_video_window_update: end"); } @@ -1529,10 +1477,8 @@ LRESULT CALLBACK win_window_info::video_window_proc(HWND wnd, UINT message, WPAR { HDC hdc = GetDC(wnd); - mtlog_add("winwindow_video_window_proc: WM_USER_REDRAW begin"); window->m_primlist = (render_primitive_list *)lparam; window->draw_video_contents(hdc, FALSE); - mtlog_add("winwindow_video_window_proc: WM_USER_REDRAW end"); ReleaseDC(wnd, hdc); break; @@ -1596,11 +1542,7 @@ void win_window_info::draw_video_contents(HDC dc, int update) { assert(GetCurrentThreadId() == window_threadid); - mtlog_add("draw_video_contents: begin"); - - mtlog_add("draw_video_contents: render lock acquire"); std::lock_guard lock(m_render_lock); - mtlog_add("draw_video_contents: render lock acquired"); // if we're iconic, don't bother if (platform_window() != nullptr && !IsIconic(platform_window())) @@ -1619,13 +1561,8 @@ void win_window_info::draw_video_contents(HDC dc, int update) // update DC m_dc = dc; m_renderer->draw(update); - mtlog_add("draw_video_contents: drawing finished"); } } - - mtlog_add("draw_video_contents: render lock released"); - - mtlog_add("draw_video_contents: end"); }