summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/render
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2021-10-26 11:45:04 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2021-10-26 11:45:04 +0200
commit8aa5c5a29c5af282c8c89a489f91617f59a97706 (patch)
treeffc0989f406f5aa7083c74d3938c81a060ace12a /src/osd/modules/render
parent67389f4cbdd00e1b139590325d5fbae47d0e62d0 (diff)
Remove OSD_UWP from rest of code
Diffstat (limited to 'src/osd/modules/render')
-rw-r--r--src/osd/modules/render/drawbgfx.cpp25
-rw-r--r--src/osd/modules/render/drawnone.cpp8
2 files changed, 1 insertions, 32 deletions
diff --git a/src/osd/modules/render/drawbgfx.cpp b/src/osd/modules/render/drawbgfx.cpp
index 1e34cb1ee7e..29cb8deda00 100644
--- a/src/osd/modules/render/drawbgfx.cpp
+++ b/src/osd/modules/render/drawbgfx.cpp
@@ -8,7 +8,7 @@
#include <bx/math.h>
#include <bx/readerwriter.h>
-#if defined(SDLMAME_WIN32) || defined(OSD_WINDOWS) || defined(OSD_UWP)
+#if defined(SDLMAME_WIN32) || defined(OSD_WINDOWS)
// standard windows headers
#include <windows.h>
#if defined(SDLMAME_WIN32)
@@ -208,22 +208,6 @@ inline bool sdlSetWindow(SDL_Window* _window)
return true;
}
-#elif defined(OSD_UWP)
-inline void winrtSetWindow(::IUnknown* _window)
-{
- bgfx::PlatformData pd;
- pd.ndt = NULL;
- pd.nwh = _window;
- pd.context = NULL;
- pd.backBuffer = NULL;
- pd.backBufferDS = NULL;
- bgfx::setPlatformData(pd);
-}
-
-IInspectable* AsInspectable(Platform::Agile<Windows::UI::Core::CoreWindow> win)
-{
- return reinterpret_cast<IInspectable*>(win.Get());
-}
#endif
int renderer_bgfx::create()
@@ -249,9 +233,6 @@ int renderer_bgfx::create()
}
#ifdef OSD_WINDOWS
winSetHwnd(std::static_pointer_cast<win_window_info>(win)->platform_window());
-#elif defined(OSD_UWP)
-
- winrtSetWindow(AsInspectable(std::static_pointer_cast<uwp_window_info>(win)->platform_window()));
#elif defined(OSD_MAC)
macSetWindow(std::static_pointer_cast<mac_window_info>(win)->platform_window());
#else
@@ -316,8 +297,6 @@ int renderer_bgfx::create()
{
#ifdef OSD_WINDOWS
m_framebuffer = m_targets->create_backbuffer(std::static_pointer_cast<win_window_info>(win)->platform_window(), m_width[win->index()], m_height[win->index()]);
-#elif defined(OSD_UWP)
- m_framebuffer = m_targets->create_backbuffer(AsInspectable(std::static_pointer_cast<uwp_window_info>(win)->platform_window()), m_width[win->index()], m_height[win->index()]);
#elif defined(OSD_MAC)
m_framebuffer = m_targets->create_backbuffer(GetOSWindow(std::static_pointer_cast<mac_window_info>(win)->platform_window()), m_width[win->index()], m_height[win->index()]);
#else
@@ -1001,8 +980,6 @@ bool renderer_bgfx::update_dimensions()
delete m_framebuffer;
#ifdef OSD_WINDOWS
m_framebuffer = m_targets->create_backbuffer(std::static_pointer_cast<win_window_info>(win)->platform_window(), width, height);
-#elif defined(OSD_UWP)
- m_framebuffer = m_targets->create_backbuffer(AsInspectable(std::static_pointer_cast<uwp_window_info>(win)->platform_window()), width, height);
#elif defined(OSD_MAC)
m_framebuffer = m_targets->create_backbuffer(GetOSWindow(std::static_pointer_cast<mac_window_info>(win)->platform_window()), width, height);
#else
diff --git a/src/osd/modules/render/drawnone.cpp b/src/osd/modules/render/drawnone.cpp
index e8bbfa15432..6d9d433ecca 100644
--- a/src/osd/modules/render/drawnone.cpp
+++ b/src/osd/modules/render/drawnone.cpp
@@ -25,15 +25,7 @@ render_primitive_list *renderer_none::get_primitives()
return nullptr;
RECT client;
-#if defined(OSD_WINDOWS)
GetClientRect(std::static_pointer_cast<win_window_info>(win)->platform_window(), &client);
-#elif defined(OSD_UWP)
- auto bounds = std::static_pointer_cast<uwp_window_info>(win)->platform_window()->Bounds;
- client.left = bounds.Left;
- client.right = bounds.Right;
- client.top = bounds.Top;
- client.bottom = bounds.Bottom;
-#endif
if ((rect_width(&client) == 0) || (rect_height(&client) == 0))
return nullptr;
win->target()->set_bounds(rect_width(&client), rect_height(&client), win->pixel_aspect());