diff options
author | 2016-09-13 12:12:45 -0400 | |
---|---|---|
committer | 2016-09-14 08:32:05 -0400 | |
commit | bf52d118267c0326c74fec648d789731d05ae304 (patch) | |
tree | fe18da62c2286af9e8591cd33235d2c76f384637 /src/osd/modules/render/drawd3d.cpp | |
parent | 56b7dabf548455f386f643df29d34fcf32009177 (diff) |
Convert OSD monitor info to modules plus add DXGI implementation
Diffstat (limited to 'src/osd/modules/render/drawd3d.cpp')
-rw-r--r-- | src/osd/modules/render/drawd3d.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/osd/modules/render/drawd3d.cpp b/src/osd/modules/render/drawd3d.cpp index 17d77dd4446..61371a05184 100644 --- a/src/osd/modules/render/drawd3d.cpp +++ b/src/osd/modules/render/drawd3d.cpp @@ -19,6 +19,7 @@ #include "window.h" #include "drawd3d.h" #include "modules/render/d3d/d3dhlsl.h" +#include "modules/monitor/monitor_module.h" #undef min #undef max #include <utility> @@ -1227,7 +1228,7 @@ int renderer_d3d9::config_adapter_mode() // make sure it's a pixel format we can get behind if (m_pixformat != D3DFMT_X1R5G5B5 && m_pixformat != D3DFMT_R5G6B5 && m_pixformat != D3DFMT_X8R8G8B8) { - osd_printf_error("Device %s currently in an unsupported mode\n", win->monitor()->devicename()); + osd_printf_error("Device %s currently in an unsupported mode\n", win->monitor()->devicename().c_str()); return 1; } } @@ -1250,7 +1251,7 @@ int renderer_d3d9::config_adapter_mode() result = d3dintf->d3dobj->CheckDeviceType(m_adapter, D3DDEVTYPE_HAL, m_pixformat, m_pixformat, !win->fullscreen()); if (FAILED(result)) { - osd_printf_error("Proposed video mode not supported on device %s\n", win->monitor()->devicename()); + osd_printf_error("Proposed video mode not supported on device %s\n", win->monitor()->devicename().c_str()); return 1; } return 0; @@ -1274,7 +1275,7 @@ int renderer_d3d9::get_adapter_for_monitor() HMONITOR curmonitor = d3dintf->d3dobj->GetAdapterMonitor(adapternum); // if we match the proposed monitor, this is it - if (curmonitor == *((HMONITOR *)win->monitor()->oshandle())) + if (curmonitor == reinterpret_cast<HMONITOR>(win->monitor()->oshandle())) { return adapternum; } |