From 9ebb08d70a55d86bf477d808dec74d555d029e73 Mon Sep 17 00:00:00 2001
From: Johan Lindfors <johan.lindfors@coderox.se>
Date: Tue, 21 Jan 2020 09:29:16 +0100
Subject: [PATCH 1/5] Changes to existing code

---
 AngleHosting.sln                          |  20 ++++++++++++++++++++
 AngleRenderer/AngleSpriteRenderer.cpp     |  12 ++++++++++--
 AngleRenderer/AngleSpriteRendererImpl.cpp |  16 ++++++++++++++--
 AngleRenderer/AngleSpriteRendererImpl.h   |   6 +++++-
 AngleRenderer/OpenGLES.cpp                |  19 +++++++++++++++++++
 AngleRenderer/OpenGLES.h                  |   1 +
 AngleRenderer/inc/AngleSpriteRenderer.h   |   5 ++++-
 AngleRenderer/pch.h                       | Bin 1540 -> 1630 bytes
 CoreWindowHost/App.cpp                    |   3 ++-
 Win32Host/desktop.cpp                     |   3 ++-
 10 files changed, 77 insertions(+), 8 deletions(-)

diff --git a/AngleHosting.sln b/AngleHosting.sln
index ab2ac82..8445324 100644
--- a/AngleHosting.sln
+++ b/AngleHosting.sln
@@ -26,6 +26,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XamlHost", "XamlHost\XamlHost.vcxproj", "{52ADD126-DE01-4344-BD72-99914F83EFD7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM = Debug|ARM
@@ -74,6 +76,24 @@ Global
 		{5B8FEAB1-1415-446E-AFB0-95E42281D081}.Release|x86.ActiveCfg = Release|Win32
 		{5B8FEAB1-1415-446E-AFB0-95E42281D081}.Release|x86.Build.0 = Release|Win32
 		{5B8FEAB1-1415-446E-AFB0-95E42281D081}.Release|x86.Deploy.0 = Release|Win32
+		{52ADD126-DE01-4344-BD72-99914F83EFD7}.Debug|ARM.ActiveCfg = Debug|ARM
+		{52ADD126-DE01-4344-BD72-99914F83EFD7}.Debug|ARM.Build.0 = Debug|ARM
+		{52ADD126-DE01-4344-BD72-99914F83EFD7}.Debug|ARM.Deploy.0 = Debug|ARM
+		{52ADD126-DE01-4344-BD72-99914F83EFD7}.Debug|x64.ActiveCfg = Debug|x64
+		{52ADD126-DE01-4344-BD72-99914F83EFD7}.Debug|x64.Build.0 = Debug|x64
+		{52ADD126-DE01-4344-BD72-99914F83EFD7}.Debug|x64.Deploy.0 = Debug|x64
+		{52ADD126-DE01-4344-BD72-99914F83EFD7}.Debug|x86.ActiveCfg = Debug|Win32
+		{52ADD126-DE01-4344-BD72-99914F83EFD7}.Debug|x86.Build.0 = Debug|Win32
+		{52ADD126-DE01-4344-BD72-99914F83EFD7}.Debug|x86.Deploy.0 = Debug|Win32
+		{52ADD126-DE01-4344-BD72-99914F83EFD7}.Release|ARM.ActiveCfg = Release|ARM
+		{52ADD126-DE01-4344-BD72-99914F83EFD7}.Release|ARM.Build.0 = Release|ARM
+		{52ADD126-DE01-4344-BD72-99914F83EFD7}.Release|ARM.Deploy.0 = Release|ARM
+		{52ADD126-DE01-4344-BD72-99914F83EFD7}.Release|x64.ActiveCfg = Release|x64
+		{52ADD126-DE01-4344-BD72-99914F83EFD7}.Release|x64.Build.0 = Release|x64
+		{52ADD126-DE01-4344-BD72-99914F83EFD7}.Release|x64.Deploy.0 = Release|x64
+		{52ADD126-DE01-4344-BD72-99914F83EFD7}.Release|x86.ActiveCfg = Release|Win32
+		{52ADD126-DE01-4344-BD72-99914F83EFD7}.Release|x86.Build.0 = Release|Win32
+		{52ADD126-DE01-4344-BD72-99914F83EFD7}.Release|x86.Deploy.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/AngleRenderer/AngleSpriteRenderer.cpp b/AngleRenderer/AngleSpriteRenderer.cpp
index 4bcf9ce..765299d 100644
--- a/AngleRenderer/AngleSpriteRenderer.cpp
+++ b/AngleRenderer/AngleSpriteRenderer.cpp
@@ -14,6 +14,14 @@ AngleSpriteRenderer::~AngleSpriteRenderer() {
 	delete mRender;
 }
 
-void AngleSpriteRenderer::Start(const winrt::Windows::UI::Composition::SpriteVisual & withVisual) {
-	mRender->Start(withVisual);
+void AngleSpriteRenderer::Start() {
+	mRender->Start();
+}
+
+void AngleSpriteRenderer::SetVisual(const winrt::Windows::UI::Composition::SpriteVisual & withVisual) {
+	mRender->SetVisual(withVisual);
+}
+
+void AngleSpriteRenderer::SetSwapChainPanel(const winrt::Windows::UI::Xaml::Controls::SwapChainPanel& panel) {
+	mRender->SetSwapChainPanel(panel);
 }
\ No newline at end of file
diff --git a/AngleRenderer/AngleSpriteRendererImpl.cpp b/AngleRenderer/AngleSpriteRendererImpl.cpp
index 4ee998a..7c0532f 100644
--- a/AngleRenderer/AngleSpriteRendererImpl.cpp
+++ b/AngleRenderer/AngleSpriteRendererImpl.cpp
@@ -16,8 +16,15 @@ AngleSpriteRendererPrivate::~AngleSpriteRendererPrivate()
 	delete mOpenGLES;
 }
 
-void AngleSpriteRendererPrivate::Start(const SpriteVisual & withVisual) {
+void AngleSpriteRendererPrivate::SetVisual(const SpriteVisual& withVisual) {
 	mHostVisual = withVisual;
+}
+
+void AngleSpriteRendererPrivate::SetSwapChainPanel(const SwapChainPanel& panel) {
+	mSwapChainPanel = panel;
+}
+
+void AngleSpriteRendererPrivate::Start() {
 	CreateRenderSurface();
 	StartRenderLoop();
 }
@@ -26,7 +33,12 @@ void AngleSpriteRendererPrivate::CreateRenderSurface()
 {
 	if (mOpenGLES && mRenderSurface == EGL_NO_SURFACE)
 	{
-		mRenderSurface = mOpenGLES->CreateSurface(mHostVisual);
+		if (mHostVisual != nullptr) {
+			mRenderSurface = mOpenGLES->CreateSurface(mHostVisual);
+		}
+		else {
+			mRenderSurface = mOpenGLES->CreateSurface(mSwapChainPanel);
+		}
 	}
 }
 
diff --git a/AngleRenderer/AngleSpriteRendererImpl.h b/AngleRenderer/AngleSpriteRendererImpl.h
index c1345cc..c9c636a 100644
--- a/AngleRenderer/AngleSpriteRendererImpl.h
+++ b/AngleRenderer/AngleSpriteRendererImpl.h
@@ -5,13 +5,16 @@ using namespace winrt;
 using namespace Concurrency;
 using namespace Windows::Foundation;
 using namespace Windows::UI::Composition;
+using namespace Windows::UI::Xaml::Controls;
 
 class AngleSpriteRendererPrivate
 {
 public:
 	AngleSpriteRendererPrivate();
 	~AngleSpriteRendererPrivate();
-	void Start(const SpriteVisual & withVisual);
+	void Start();
+	void SetVisual(const SpriteVisual & withVisual);
+	void SetSwapChainPanel(const SwapChainPanel& panel);
 private:
 	void CreateRenderSurface();
 	void DestroyRenderSurface();
@@ -25,5 +28,6 @@ class AngleSpriteRendererPrivate
 	Concurrency::critical_section mRenderSurfaceCriticalSection;
 	IAsyncAction mRenderLoopWorker;
 	SpriteVisual mHostVisual{nullptr};
+	SwapChainPanel mSwapChainPanel{nullptr};
 };
 
diff --git a/AngleRenderer/OpenGLES.cpp b/AngleRenderer/OpenGLES.cpp
index d99673d..3a8798a 100644
--- a/AngleRenderer/OpenGLES.cpp
+++ b/AngleRenderer/OpenGLES.cpp
@@ -197,6 +197,25 @@ EGLSurface OpenGLES::CreateSurface(winrt::Windows::UI::Composition::ISpriteVisua
 	return surface;
 }
 
+EGLSurface OpenGLES::CreateSurface(const winrt::Windows::UI::Xaml::Controls::SwapChainPanel& panel) 
+{
+	EGLSurface surface = EGL_NO_SURFACE;
+
+	const EGLint surfaceAttributes[] = {
+		// EGL_ANGLE_SURFACE_RENDER_TO_BACK_BUFFER is part of the same optimization as EGL_ANGLE_DISPLAY_ALLOW_RENDER_TO_BACK_BUFFER (see above).
+		// If you have compilation issues with it then please update your Visual Studio templates.
+		// EGL_RENDER_BUFFER, EGL_BACK_BUFFER,
+		EGL_NONE
+	};
+
+	surface = eglCreateWindowSurface(mEglDisplay, mEglConfig, static_cast<EGLNativeWindowType>(winrt::get_abi(panel)), nullptr);
+	if (surface == EGL_NO_SURFACE) {
+		throw hresult_error(E_FAIL, L"Failed to create EGL surface");
+	}
+
+	return surface;
+}
+
 void OpenGLES::GetSurfaceDimensions(const EGLSurface surface, EGLint* width, EGLint* height)
 {
 	eglQuerySurface(mEglDisplay, surface, EGL_WIDTH, width);
diff --git a/AngleRenderer/OpenGLES.h b/AngleRenderer/OpenGLES.h
index 31e9ae5..3df1c8f 100644
--- a/AngleRenderer/OpenGLES.h
+++ b/AngleRenderer/OpenGLES.h
@@ -9,6 +9,7 @@ class OpenGLES
     ~OpenGLES();
 
 	EGLSurface CreateSurface(winrt::Windows::UI::Composition::ISpriteVisual & visual);
+    EGLSurface CreateSurface(const winrt::Windows::UI::Xaml::Controls::SwapChainPanel& panel);
     void GetSurfaceDimensions(const EGLSurface surface, EGLint *width, EGLint *height);
     void DestroySurface(const EGLSurface surface);
     void MakeCurrent(const EGLSurface surface);
diff --git a/AngleRenderer/inc/AngleSpriteRenderer.h b/AngleRenderer/inc/AngleSpriteRenderer.h
index 36f26d1..144ae0a 100644
--- a/AngleRenderer/inc/AngleSpriteRenderer.h
+++ b/AngleRenderer/inc/AngleSpriteRenderer.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <winrt/Windows.UI.Composition.h>
+#include <winrt/Windows.UI.Xaml.Controls.h>
 
 class AngleSpriteRendererPrivate;
 class AngleSpriteRenderer {
@@ -9,7 +10,9 @@ class AngleSpriteRenderer {
 
 	~AngleSpriteRenderer();
 
-	void Start(const winrt::Windows::UI::Composition::SpriteVisual & withVisual);
+	void Start();
+	void SetVisual(const winrt::Windows::UI::Composition::SpriteVisual& withVisual);
+	void SetSwapChainPanel(const winrt::Windows::UI::Xaml::Controls::SwapChainPanel& panel);
 private:
 	AngleSpriteRendererPrivate * mRender{ nullptr };
 };
\ No newline at end of file
diff --git a/AngleRenderer/pch.h b/AngleRenderer/pch.h
index 4e5dec4c0851407a9ae56853dfea52bce0953521..189869b31b1c0315d12cc8ab69d97f6c77401374 100644
GIT binary patch
delta 42
wcmZqSxyQ31f_d^PMl;C>hD3&3h8zYx24{wRhCGH6h9V%H!%)20mw7uA0QOr7;{X5v

delta 12
Tcmcb|)55bMf_d{M<~2+JATR`+

diff --git a/CoreWindowHost/App.cpp b/CoreWindowHost/App.cpp
index 700ce90..18f4c54 100644
--- a/CoreWindowHost/App.cpp
+++ b/CoreWindowHost/App.cpp
@@ -84,7 +84,8 @@ struct App : implements<App, IFrameworkViewSource, IFrameworkView>
 
         m_visuals.InsertAtTop(visual);
 		
-		m_render.Start(visual);
+		m_render.SetVisual(visual);
+        m_render.Start();
     }
 };
 
diff --git a/Win32Host/desktop.cpp b/Win32Host/desktop.cpp
index 51891d9..46d37cf 100644
--- a/Win32Host/desktop.cpp
+++ b/Win32Host/desktop.cpp
@@ -144,7 +144,8 @@ struct Window : DesktopWindow<Window>
 		//visual.Brush(compositor.CreateColorBrush(Windows::UI::Colors::Red()));
 
 		m_visuals.InsertAtTop(visual);
-		m_render.Start(visual);
+		m_render.SetVisual(visual);
+        m_render.Start();
     }
 
 private:

From 660b29efee31942656738572a9eba8ebff71f454 Mon Sep 17 00:00:00 2001
From: Johan Lindfors <johan.lindfors@coderox.se>
Date: Tue, 21 Jan 2020 09:33:06 +0100
Subject: [PATCH 2/5] Updated gitignore

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 5692f5b..e215666 100644
--- a/.gitignore
+++ b/.gitignore
@@ -261,4 +261,4 @@ __pycache__/
 *.pyc
 
 Dependencies
-/CoreWindowHost/Generated Files/winrt
+/**/Generated Files/winrt

From d5358978bb7d262cd041f83d80163212b4b31b98 Mon Sep 17 00:00:00 2001
From: Johan Lindfors <johan.lindfors@coderox.se>
Date: Tue, 21 Jan 2020 09:34:50 +0100
Subject: [PATCH 3/5] XamlHost sample

---
 .gitignore                                    |   2 +-
 XamlHost/App.cpp                              | 119 +++++++++++
 XamlHost/App.h                                |  14 ++
 XamlHost/App.idl                              |   3 +
 XamlHost/App.xaml                             |   7 +
 XamlHost/Assets/LockScreenLogo.scale-200.png  | Bin 0 -> 1430 bytes
 XamlHost/Assets/SplashScreen.scale-200.png    | Bin 0 -> 7700 bytes
 .../Assets/Square150x150Logo.scale-200.png    | Bin 0 -> 2937 bytes
 XamlHost/Assets/Square44x44Logo.scale-200.png | Bin 0 -> 1647 bytes
 ...x44Logo.targetsize-24_altform-unplated.png | Bin 0 -> 1255 bytes
 XamlHost/Assets/StoreLogo.png                 | Bin 0 -> 1451 bytes
 XamlHost/Assets/Wide310x150Logo.scale-200.png | Bin 0 -> 3204 bytes
 XamlHost/OpenGlPage.cpp                       |  47 +++++
 XamlHost/OpenGlPage.h                         |  25 +++
 XamlHost/OpenGlPage.idl                       |   8 +
 XamlHost/OpenGlPage.xaml                      |  10 +
 XamlHost/Package.appxmanifest                 |  32 +++
 XamlHost/PropertySheet.props                  |  16 ++
 XamlHost/XamlHost.vcxproj                     | 186 ++++++++++++++++++
 XamlHost/XamlHost.vcxproj.filters             |  69 +++++++
 XamlHost/packages.config                      |   4 +
 XamlHost/pch.cpp                              |   1 +
 XamlHost/pch.h                                |  30 +++
 XamlHost/readme.txt                           |  23 +++
 24 files changed, 595 insertions(+), 1 deletion(-)
 create mode 100644 XamlHost/App.cpp
 create mode 100644 XamlHost/App.h
 create mode 100644 XamlHost/App.idl
 create mode 100644 XamlHost/App.xaml
 create mode 100644 XamlHost/Assets/LockScreenLogo.scale-200.png
 create mode 100644 XamlHost/Assets/SplashScreen.scale-200.png
 create mode 100644 XamlHost/Assets/Square150x150Logo.scale-200.png
 create mode 100644 XamlHost/Assets/Square44x44Logo.scale-200.png
 create mode 100644 XamlHost/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
 create mode 100644 XamlHost/Assets/StoreLogo.png
 create mode 100644 XamlHost/Assets/Wide310x150Logo.scale-200.png
 create mode 100644 XamlHost/OpenGlPage.cpp
 create mode 100644 XamlHost/OpenGlPage.h
 create mode 100644 XamlHost/OpenGlPage.idl
 create mode 100644 XamlHost/OpenGlPage.xaml
 create mode 100644 XamlHost/Package.appxmanifest
 create mode 100644 XamlHost/PropertySheet.props
 create mode 100644 XamlHost/XamlHost.vcxproj
 create mode 100644 XamlHost/XamlHost.vcxproj.filters
 create mode 100644 XamlHost/packages.config
 create mode 100644 XamlHost/pch.cpp
 create mode 100644 XamlHost/pch.h
 create mode 100644 XamlHost/readme.txt

diff --git a/.gitignore b/.gitignore
index e215666..3feb566 100644
--- a/.gitignore
+++ b/.gitignore
@@ -261,4 +261,4 @@ __pycache__/
 *.pyc
 
 Dependencies
-/**/Generated Files/winrt
+/**/Generated Files/*
diff --git a/XamlHost/App.cpp b/XamlHost/App.cpp
new file mode 100644
index 0000000..d143a5d
--- /dev/null
+++ b/XamlHost/App.cpp
@@ -0,0 +1,119 @@
+#include "pch.h"
+
+#include "App.h"
+#include "OpenGlPage.h"
+
+using namespace winrt;
+using namespace Windows::ApplicationModel;
+using namespace Windows::ApplicationModel::Activation;
+using namespace Windows::Foundation;
+using namespace Windows::UI::Xaml;
+using namespace Windows::UI::Xaml::Controls;
+using namespace Windows::UI::Xaml::Navigation;
+using namespace XamlHost;
+using namespace XamlHost::implementation;
+
+/// <summary>
+/// Initializes the singleton application object.  This is the first line of authored code
+/// executed, and as such is the logical equivalent of main() or WinMain().
+/// </summary>
+App::App()
+{
+    InitializeComponent();
+    Suspending({ this, &App::OnSuspending });
+
+#if defined _DEBUG && !defined DISABLE_XAML_GENERATED_BREAK_ON_UNHANDLED_EXCEPTION
+    UnhandledException([this](IInspectable const&, UnhandledExceptionEventArgs const& e)
+    {
+        if (IsDebuggerPresent())
+        {
+            auto errorMessage = e.Message();
+            __debugbreak();
+        }
+    });
+#endif
+}
+
+/// <summary>
+/// Invoked when the application is launched normally by the end user.  Other entry points
+/// will be used such as when the application is launched to open a specific file.
+/// </summary>
+/// <param name="e">Details about the launch request and process.</param>
+void App::OnLaunched(LaunchActivatedEventArgs const& e)
+{
+    Frame rootFrame{ nullptr };
+    auto content = Window::Current().Content();
+    if (content)
+    {
+        rootFrame = content.try_as<Frame>();
+    }
+
+    // Do not repeat app initialization when the Window already has content,
+    // just ensure that the window is active
+    if (rootFrame == nullptr)
+    {
+        // Create a Frame to act as the navigation context and associate it with
+        // a SuspensionManager key
+        rootFrame = Frame();
+
+        rootFrame.NavigationFailed({ this, &App::OnNavigationFailed });
+
+        if (e.PreviousExecutionState() == ApplicationExecutionState::Terminated)
+        {
+            // Restore the saved session state only when appropriate, scheduling the
+            // final launch steps after the restore is complete
+        }
+
+        if (e.PrelaunchActivated() == false)
+        {
+            if (rootFrame.Content() == nullptr)
+            {
+                // When the navigation stack isn't restored navigate to the first page,
+                // configuring the new page by passing required information as a navigation
+                // parameter
+                rootFrame.Navigate(xaml_typename<XamlHost::OpenGlPage>(), box_value(e.Arguments()));
+            }
+            // Place the frame in the current Window
+            Window::Current().Content(rootFrame);
+            // Ensure the current window is active
+            Window::Current().Activate();
+        }
+    }
+    else
+    {
+        if (e.PrelaunchActivated() == false)
+        {
+            if (rootFrame.Content() == nullptr)
+            {
+                // When the navigation stack isn't restored navigate to the first page,
+                // configuring the new page by passing required information as a navigation
+                // parameter
+                rootFrame.Navigate(xaml_typename<XamlHost::OpenGlPage>(), box_value(e.Arguments()));
+            }
+            // Ensure the current window is active
+            Window::Current().Activate();
+        }
+    }
+}
+
+/// <summary>
+/// Invoked when application execution is being suspended.  Application state is saved
+/// without knowing whether the application will be terminated or resumed with the contents
+/// of memory still intact.
+/// </summary>
+/// <param name="sender">The source of the suspend request.</param>
+/// <param name="e">Details about the suspend request.</param>
+void App::OnSuspending([[maybe_unused]] IInspectable const& sender, [[maybe_unused]] SuspendingEventArgs const& e)
+{
+    // Save application state and stop any background activity
+}
+
+/// <summary>
+/// Invoked when Navigation to a certain page fails
+/// </summary>
+/// <param name="sender">The Frame which failed navigation</param>
+/// <param name="e">Details about the navigation failure</param>
+void App::OnNavigationFailed(IInspectable const&, NavigationFailedEventArgs const& e)
+{
+    throw hresult_error(E_FAIL, hstring(L"Failed to load Page ") + e.SourcePageType().Name);
+}
\ No newline at end of file
diff --git a/XamlHost/App.h b/XamlHost/App.h
new file mode 100644
index 0000000..4e12f0f
--- /dev/null
+++ b/XamlHost/App.h
@@ -0,0 +1,14 @@
+#pragma once
+#include "App.xaml.g.h"
+
+namespace winrt::XamlHost::implementation
+{
+    struct App : AppT<App>
+    {
+        App();
+
+        void OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs const&);
+        void OnSuspending(IInspectable const&, Windows::ApplicationModel::SuspendingEventArgs const&);
+        void OnNavigationFailed(IInspectable const&, Windows::UI::Xaml::Navigation::NavigationFailedEventArgs const&);
+    };
+}
diff --git a/XamlHost/App.idl b/XamlHost/App.idl
new file mode 100644
index 0000000..dd1c1ca
--- /dev/null
+++ b/XamlHost/App.idl
@@ -0,0 +1,3 @@
+namespace XamlHost
+{
+}
diff --git a/XamlHost/App.xaml b/XamlHost/App.xaml
new file mode 100644
index 0000000..0af7d46
--- /dev/null
+++ b/XamlHost/App.xaml
@@ -0,0 +1,7 @@
+<Application
+    x:Class="XamlHost.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:XamlHost">
+
+</Application>
diff --git a/XamlHost/Assets/LockScreenLogo.scale-200.png b/XamlHost/Assets/LockScreenLogo.scale-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..735f57adb5dfc01886d137b4e493d7e97cf13af3
GIT binary patch
literal 1430
zcmaJ>TTC2P7~aKltDttVHYH6u8Io4i*}3fO&d$gd*bA_<3j~&e7%8(eXJLfhS!M@!
zKrliY>>6yT4+Kr95$!DoD(Qn-5TP|{V_KS`k~E6(LGS@#`v$hQo&^^BKsw3HIsZBT
z_y6C2n`lK@apunKojRQ^(_P}Mgewt$(^BBKCTZ;*xa?J3wQ7~@S0lUvbcLeq1Bg4o
zH-bvQi|wt~L7q<c#Bs@6tJZpsaDp5#@^Kxb76?JKPM4Rjg?OPEsE7|VN<kaCGX4#U
zNTLm`F?$G4$N`$9k`4t_b(DF9j%I-s(fmV5p2k4~0ig1T7HA2EIn9Qy+vVUsevG5Y
zx{BItLpMm(dMXfytN_Gpv|s{3(g?#ENwbAvnU@d>$~a-gDFP!{&TQfc3fX*6=uHv*
zT&1&U(-)L%Xp^djI2?~eBF2cxC@YOP$+9d?P&h?lPy-9M2UT9fg5jKm1t$m#iWE{M
zIf%q9@;<puwV{ydMhJnB$FpTP7~V`2Oc}26A)GW4cpwmuYh636R)YU&Y^xpiwub;-
z3Bq!lBEWk1a}r>fyT?0<D?&D0xgx=$@GVYRXbXU#>UP>tcw-bLkz;s2LlKl2qeP0w
zECS7Ate+Awk|KQ+DOk;fl}Xsy4o^CY=pwq%QAAKKl628_yNPsK>?A>%D8fQG6IgdJ
ztnxttBz#NI_a@f<SS;sI0I$l5SC(56T~N^^t8%zW4j~T5dexEVYowqkN5Z-BGHpcd
z1d8+q5Q`K!fUM`4leXai7{C&K6Nxc?hQWB61{h0|4Cb>k7SU`WtrpsfZsNs9^0(2a
z@C3#YO3>k~w7?2hipBf{#b6`}Xw1hlG$yi?;1dDs7k~xDAw@jiI*+tc;t2L<e7iLm
zP}mwR5QOujz`+rgnOi!Y{({?C=+*8leK`I4)q-bwZ~S$=`Qx8za!;_&ojSySG^`y-
zUwxr;y18tmHR*DH-R#Zfn@dafJ#VG;#JXCA1?Fhi?=z+K#EYHSuZ6R;t9!2P-`Czg
zntSi!KX=pneo0;EVH+kX{Tbnm^ke?~Z}v~j1(%4Y2eEUe-ebObqI@uC5e<?ngPC8q
zexSeKJ6Lye>flg&bM)0!Y;0_@=w%`LW^8DsYpS#-bLOklX9r?Ei}TScw|4DbpW%+7
zFgAI)f51s}{y-eWb|vrU-Ya!GuYKP)J7z#*V_k^Xo>4!1Yqj*m)x&0L^tg3GJbVAJ
zJ-Pl$R=NAabouV=^z_t;^K*0AvFs!vYU>_<|I^#c?>>CR<(T?=%{;U=aI*SbZADLH
z&(f2wz_Y0??Tf|g;?|1Znw6}6U43<uVfr(7fnD33UXp<u^(nDoL&FaIfW9||8X7Y8
zWBR>Q#qNRwv1vp9uFn1)V#*4p&%$mP9x&15^OaBiDS(XppT|z^>;B{PLVEbS3IFYV
yGvCsSX<sgWK5pRdjuceaUA*+*;fQZyG$}(jP`_}c_gGYm|0&(BGUuqhq31shAo>*m

literal 0
HcmV?d00001

diff --git a/XamlHost/Assets/SplashScreen.scale-200.png b/XamlHost/Assets/SplashScreen.scale-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..023e7f1feda78d5100569825acedfd213a0d84e9
GIT binary patch
literal 7700
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

literal 0
HcmV?d00001

diff --git a/XamlHost/Assets/Square150x150Logo.scale-200.png b/XamlHost/Assets/Square150x150Logo.scale-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..af49fec1a5484db1d52a7f9b5ec90a27c7030186
GIT binary patch
literal 2937
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
bht0Iza^2ykEt4(epJ78uh5nDlX8(TxzDYwP

literal 0
HcmV?d00001

diff --git a/XamlHost/Assets/Square44x44Logo.scale-200.png b/XamlHost/Assets/Square44x44Logo.scale-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce342a2ec8a61291ba76c54604aea7e9d20af11b
GIT binary patch
literal 1647
zcmaJ?eM}Q)7(e+G1Q(|`V9JhTI2>MkceK4;p;PR&$Pi?ejk3YQ_3o`S&|W_dsOZ8#
zWPTt69g`t$ab`0cj-Y0yiBSOqmd)tG7G(}M5aP0_%&9TijB#&)I{zSE^4@#z^FF`l
z`8{8`o%wlL(UI|y2!cdsuVamHH~H86F!*-15em4)NqUpCQM5?aoC_eCf@lV4wvF2a
zjDQn1JBL69f&@2M3rvzJcfE!eZ8FZUBlFlC5RD)it33{mF9#B82AiyQE%w)`vlwa>
zv{<1sm&kSKK$&%2jSFn7$t&P%%6Ue>R=<X3cr?&}4M-g7u~pdJ8jlv6wyS~Pez6=w
zr&XkKEjB~Sl$($0L>EAnG8N7fqynWG8L3p!4801a;8{+n<rIMvj7FKJAt-eA!Js#n
zV9^*^!>liO(qd(j<j~0F)z#Iq>NJ_?+9W3#hLIDLoT6~3fx9=`CC-D}-AMrpEO7HK
zt3$GicGPc?GmDjy7K2P@La;e<bDtQtyJr&xQzrLt4ml|!<Tjf>u4!$zWCZ`ym{Z$b
zu-O6RM&K4JT|BIZB`E-gxqG%FzanI#+2FFmqHq<g$XD8cUCL&)7`%}QRzX8^7Mda`
zB~A$xhpTu6hcgyRz)6ZUQzWle5^6eNXD&RvRx$>XG7yxWB=w55RGOM)$xMb(>kSNR
z2w=1AZi%z=AmG~yea~XaXJR!v7vLn(RUnELfiB1|6D84ICOS}^Zo2AdN}<&*h}G_u
z{xZ!(%>tLT3J3<5XhWy-tg+6)0nmUUENLW8TWA{R6bgVd3X;anYFZ^IRis*_P-C-r
z;i>%1^eL3UI2-{w8nuFFcs0e~7J{O2k^~Ce%+Ly4U?|=!0LH=t6()xi<^I-rs+9sF
z*q{E-CxZbGPeu#a;XJwE;9S1?#R&uns>^0G3p`hEUF*v`M?@h%T%J%RChmD|EVydq
zmHWh*_=S%emRC*mhxaVLzT@>Z2SX0u9v*DIJ@WC^k<V?z``Q$(M}8`~@@9hcMtV<h
zde8Z&v6Hrv<iw6I|G5|6*`Tto7~DG5&b%0P`j40kroR1u$KAb_`tXQR)OGjNojrR;
zIr-Y;P|DPbNw=@$Rycaxb?Mm6+R_Q{<BFxhwGA1uSqc5x`>LVdlGV6LpK$KIrlJqc
zpJ921)+3JJdTx|<`G&kXpKkjGJv=76R`yYIQ{#c-`%+`#V(7}Q;&@6U8!Td1`d;?N
z_9mnI#?AA}4J!r)LN4!E-@H5eXauuB7TOawS>Y|{-P?NNx-lq+z1W-+y(;39P&&LP
zL{N<u_jdY@dYL+=<!7fm_;+?`-S_i4gNveMFA&McQ;PFSBL$~-w71=dIg=3{-96A2
z)LEa=cxwOqsS%!tyGy#;Z?M)!eaC#SI+BCVqg{P%kr~@ZAAA*5NZpCOdvZgJcet)L
z>80?&=C*qKmdA^moMZRuPcD!B<*mq$ch=0Cnlitw#txRWhb3%TQvPqjkC`F69G4b!
ze7z9MZ#+;_#l?H37UqUhDFb^l&s2{oM$3I0o^Q!yx;;V)QmCMo)Tb_ui|mit8MS?U
zm##6$sZZ1$@|s%?l@>4Z<*Q}sRBSKMhb4I{e5LdEhsHIHTe8Bod5c>6QtT>$XgUBz
z6MK`kO$=jmt@FqggOhJ5j~e@ygRbG;<{Vu)*+nn9aQeo0;$#j;|MS=S$&L?BeV25z
xs3B`@=#`5TF{^6(A1rvdY@|-RtQ|iS5{tyX+wH?;n8E)G$kykv-D^wh{{!TZT%7;_

literal 0
HcmV?d00001

diff --git a/XamlHost/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/XamlHost/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6c02ce97e0a802b85f6021e822c89f8bf57d5cd
GIT binary patch
literal 1255
zcmaJ>TWs4@7*5+{G#S+<G69{CW?TuiXeYkMv1xisQWlzol0`IV5A4`JZcXaTY?q{w
z&?qX=E<%VR9^fg07bdg|(uRb1SP@065)#_u(4;|M;B82}FnECDG%0(iX30M1Kj;7c
z|NCz~KVN!rD0Va!3WbL9C$eR{J{`P+2k`fodipQC4EwpNf6~_dI&@KJTC){I<W0DU
z$_Q$!XSUIJC^WEcRH}ZpSddlQOu#@V(J&p14u!@i8xB-!$R`xEXjp0T{x>&C!qC#>
zf>5N3P6jO*Cz>ug*(_DmW=)kea&m$gZ^+nyiF`;j%w@}y8)>p*SH}C`m?DXeieF2U
zyQHecc_L%Gh!7G<pwbLah*E+PlA<IYCs-^~bc$kWKufZ~$uvuJ9};_WHC--eXS=?z
zlqQ#a-;pV*Uau$WT*7u2DMpecie@R61y}=ktCkNN!16|V7P81wUBmGW+adysP_bA1
zG>Mt+hG06y;+|p4>m~}PjA}rKViGiEnn7G0ZO<>G|7q;2?NwGCM3s?eued6%hd$B+
z<J>*kQJ{#~$S=DFE(%=E+UkmlEI*%3llUf~8Ja9YU1Vui0IbGBkW_gHB%Rd&!!ioX
zs40O?i9I{};kle7GMvE7(rk`la=gTI)47=>%?q@^iL-nUo3}h4S}N-KHn8t5mVP8w
z&bSErwp+37<z5%eFWJ8BE!hr{$#kktj4l|KX4k#3piH|_XOU~XiL_bQHi=H2Wn&)>
zNJJ8?a|{r5Q3R0Z5s-LB1WHOwYC@7pCHWND#cL1cZ?{kJ368_*(UDWUDyb<}0y@o#
zfMF016iMWPCb6obAxT$JlB6(2DrlXDTB&!0`!m??4F(qWMhjVZo?JXQmz`1*58Z=&
zcDmB|S-E@j?BoFGix0flckqdS4jsPNzhfWyWIM98GxcLs89C(~dw%$_t;JjX-SD}E
zfiGV;{8Q%8r}w9x>EEigW81>`kvnU@pK)4+xk9@+bNj9L!AAZ@SZ@q|)&BmY3+HZx
zul~BeG4|}-;L%cHViQGQX?^zFfO0&#cHwel=d`lH9sJ-@Sl@n*(8J2>%Ac`IxyY?Q
z{=GhWvC#gu-~Ia7*n{=+;qM?Ul_wy1+u7ho;=`>EwP^g~R@{unBds`!#@}tluZQpS
zm)M~nYEifJWJGx?_6DcTy>#uh%>!H9=hb^(v`=m3F1{L>db=<5_tm+_&knAQ2EU$s
Mu9UqpbNZeC0BbUo^Z)<=

literal 0
HcmV?d00001

diff --git a/XamlHost/Assets/StoreLogo.png b/XamlHost/Assets/StoreLogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..7385b56c0e4d3c6b0efe3324aa1194157d837826
GIT binary patch
literal 1451
zcmaJ>eN5D57_Z|bH;{0+1#mbl)eTU3{h)Wf7EZV?;HD@XL@{B`Ui%(2aMxQ~xdXSv
z5nzWi(<Qp0OO$NM7W~Q_8E#Xi$ik*$nyFjFERiL|C5FvR_m#Nm-UE*L2eC=}zR&wU
zzvuZqU+t~gP??tUObUV^Y2GTg53Y3lH73JvZdvRkT$bsc2E9%R=n+8$h(l8R0QCli
zCg1~t)c*1XP>LW)U2=Vc-cY@s7nPt{i0hc6!7xN4NNHI#EQl>YNBy8l4%x9gr_W-j
zEZMQmmTIy(>;lblRfh`dIyTgc9W5d!VP$L4(kKrN1c5G~(O_#x<D+(L#x4){@nZr*
zXH@hSJ2p$Ip}GcjDJnoMW-Bg|6oayynX*_}jx9oIC=;ZOph=wMcuO%)(&*fSL2s%Q
z;C=3jIbTq+W6ioA<_RJaiI^kBW<_lxD30R@k|t;xhZ?xn9@2#<9@17OEVzLts&ZJD
zl@J=YDEO7_x*dZ|XF~{vtE=Y?hqSpw!ITkEAxuzak_ZOlam{FJx)1zMV?k}LzC8>G
zAJCNTstD^5SeXFB+&$h=ToJP2H>xr$iqPs-#O*;4(!Fjw25-!gEb*)mU}=)J;Iu>w
zxK(5XoD0wrPSKQ~rbL^Cw6O_03*l*}i=ydbu7adJ6y;%@tjFeXIXT+ms30pmbOP%Q
zX}S;+LBh8Tea~TSkHzvX6$rYb)+<VDq6=!86<yJql`!gZ%~TyN*er)6C88C^%QPFc
z8>n&{kSbIqh|c7hmlxmwSiq5iVhU#iEQ<>a18|O^Sln-8t&+t`*{qBWo5M?w<Zrf5
z;R%c*oS?(o7?BfgG=~RBn#Cy!Fu0#%8C>FM(JuimAOb5!K#D}XbslM@#1ZVz_;!9U
zpfEpLAOz=0g@bd6Xj_ILi-x^!M}73h^o@}hM$1jflTs|Yuj9AL@A3<-?MV4!^4q`e
z)fO@A;{9K^?W?DbnesnPr6kK>$zaKo&;FhFd(GYFCIU^T+OIMb%Tqo+P%oq(IdX7S
zf6+HLO?7o0m+p>~Tp5UrXWh!UH!wZ5kv!E`_w)PTpI(#Iw{AS`gH4^b(bm^ZCq^FZ
zY9DD7bH}rq9mg88+KgA$Zp!iWncuU2n1AuIa@=sWvUR-s`Qb{R*kk(SPU^`$6BXz8
zn#7yaFOIK%qGxyi`dYtm#&qqox0$h=pNi#u=M8zUG@bpiZ=3sT=1}Trr}39cC)H|v
zbL?W)=&s4zrh)7>L(|cc%$1#!zfL?HjpeP%T+x_a+jZ16b^iKOHxFEX$7d|8${H-*
zIrOJ5w&i$>*D>AKaIoYg`;{L@jM((Kt?$N$5OnuPqVvq**Nm}(f0wwOF%iX_Pba;V
z;m@wxX&NcV3?<1+u?A{y_DIj7#m3Af1rCE)o`D&Y3}0%7E;iX1yMDiS)sh0wKi!36
zL!Wmq?P^Ku&rK~HJd97KkLTRl>ScGFYZNlYytWnhmuu|)L&ND8_PmkayQb{HOY640
bno1(wj@u8DCVuFR|31B*4ek@pZJqxCDDe1x

literal 0
HcmV?d00001

diff --git a/XamlHost/Assets/Wide310x150Logo.scale-200.png b/XamlHost/Assets/Wide310x150Logo.scale-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..288995b397fdbef1fb7e85afd71445d5de1952c5
GIT binary patch
literal 3204
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
F{{^ZoKyCm4

literal 0
HcmV?d00001

diff --git a/XamlHost/OpenGlPage.cpp b/XamlHost/OpenGlPage.cpp
new file mode 100644
index 0000000..5170952
--- /dev/null
+++ b/XamlHost/OpenGlPage.cpp
@@ -0,0 +1,47 @@
+#include "pch.h"
+#include "OpenGlPage.h"
+#include "OpenGlPage.g.cpp"
+
+using namespace winrt;
+
+using namespace Windows;
+using namespace Windows::ApplicationModel::Core;
+using namespace Windows::Foundation::Numerics;
+using namespace Windows::UI;
+using namespace Windows::UI::Core;
+using namespace Windows::UI::Composition;
+using namespace Windows::UI::Xaml::Controls;
+
+namespace winrt::XamlHost::implementation
+{
+    OpenGlPage::OpenGlPage()
+    {
+        InitializeComponent();
+        //Compositor compositor;
+        //ContainerVisual root = compositor.CreateContainerVisual();
+        //m_target = compositor.CreateTargetForCurrentView();
+        //m_target.Root(root);
+        //m_visuals = root.Children();
+
+        AddVisual({ 10.0f, 10.0f });
+    }
+
+    void OpenGlPage::AddVisual(float2 const point)
+    {
+        //Compositor compositor = m_visuals.Compositor();
+        //SpriteVisual visual = compositor.CreateSpriteVisual();
+        //visual.Size(
+        //    {
+        //        600.0f,
+        //        600.0f
+        //    });
+
+        ////visual.Brush(compositor.CreateColorBrush(Windows::UI::Colors::Red()));
+
+        //m_visuals.InsertAtTop(visual);
+        SwapChainPanel panel;
+        Content(panel);
+        m_render.SetSwapChainPanel(panel);
+        m_render.Start();
+    }
+}
diff --git a/XamlHost/OpenGlPage.h b/XamlHost/OpenGlPage.h
new file mode 100644
index 0000000..6575a41
--- /dev/null
+++ b/XamlHost/OpenGlPage.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "OpenGlPage.g.h"
+
+namespace winrt::XamlHost::implementation
+{
+    struct OpenGlPage : OpenGlPageT<OpenGlPage>
+    {
+        OpenGlPage();
+
+    private:
+        void AddVisual(winrt::Windows::Foundation::Numerics::float2 const point);
+
+        winrt::Windows::UI::Composition::CompositionTarget m_target{ nullptr };
+        winrt::Windows::UI::Composition::VisualCollection m_visuals{ nullptr };
+        AngleSpriteRenderer m_render;
+    };
+}
+
+namespace winrt::XamlHost::factory_implementation
+{
+    struct OpenGlPage : OpenGlPageT<OpenGlPage, implementation::OpenGlPage>
+    {
+    };
+}
diff --git a/XamlHost/OpenGlPage.idl b/XamlHost/OpenGlPage.idl
new file mode 100644
index 0000000..6604de2
--- /dev/null
+++ b/XamlHost/OpenGlPage.idl
@@ -0,0 +1,8 @@
+namespace XamlHost
+{
+    [default_interface]
+    runtimeclass OpenGlPage : Windows.UI.Xaml.Controls.Page
+    {
+        OpenGlPage();
+    }
+}
diff --git a/XamlHost/OpenGlPage.xaml b/XamlHost/OpenGlPage.xaml
new file mode 100644
index 0000000..d0ef312
--- /dev/null
+++ b/XamlHost/OpenGlPage.xaml
@@ -0,0 +1,10 @@
+<Page
+    x:Class="XamlHost.OpenGlPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:XamlHost"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+</Page>
diff --git a/XamlHost/Package.appxmanifest b/XamlHost/Package.appxmanifest
new file mode 100644
index 0000000..20643dc
--- /dev/null
+++ b/XamlHost/Package.appxmanifest
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
+  <Identity
+    Name="0bbd9403-3846-42c8-87cf-31f344a48395"
+    Publisher="CN=johan"
+    Version="1.0.0.0" />
+  <mp:PhoneIdentity PhoneProductId="0bbd9403-3846-42c8-87cf-31f344a48395" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+  <Properties>
+    <DisplayName>XamlHost</DisplayName>
+    <PublisherDisplayName>johan</PublisherDisplayName>
+    <Logo>Assets\StoreLogo.png</Logo>
+  </Properties>
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
+  </Dependencies>
+  <Resources>
+    <Resource Language="x-generate" />
+  </Resources>
+  <Applications>
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="XamlHost.App">
+      <uap:VisualElements DisplayName="Windows::UI::Xaml::Controls::SwapChainPanel Angle Hosting UWP" Description="Project for a single page C++/WinRT Universal Windows Platform (UWP) app with no predefined layout"
+        Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" BackgroundColor="transparent">
+        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png">
+        </uap:DefaultTile>
+        <uap:SplashScreen Image="Assets\SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+  <Capabilities>
+    <Capability Name="internetClient" />
+  </Capabilities>
+</Package>
\ No newline at end of file
diff --git a/XamlHost/PropertySheet.props b/XamlHost/PropertySheet.props
new file mode 100644
index 0000000..e34141b
--- /dev/null
+++ b/XamlHost/PropertySheet.props
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <!--
+    To customize common C++/WinRT project properties: 
+    * right-click the project node
+    * expand the Common Properties item
+    * select the C++/WinRT property page
+
+    For more advanced scenarios, and complete documentation, please see:
+    https://github.com/Microsoft/cppwinrt/tree/master/nuget 
+    -->
+  <PropertyGroup />
+  <ItemDefinitionGroup />
+</Project>
\ No newline at end of file
diff --git a/XamlHost/XamlHost.vcxproj b/XamlHost/XamlHost.vcxproj
new file mode 100644
index 0000000..46da04c
--- /dev/null
+++ b/XamlHost/XamlHost.vcxproj
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.200107.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200107.1\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <PropertyGroup Label="Globals">
+    <CppWinRTOptimized>true</CppWinRTOptimized>
+    <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
+    <CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>
+    <MinimalCoreWin>true</MinimalCoreWin>
+    <ProjectGuid>{52add126-de01-4344-bd72-99914f83efd7}</ProjectGuid>
+    <ProjectName>XamlHost</ProjectName>
+    <RootNamespace>XamlHost</RootNamespace>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
+    <AppContainerApplication>true</AppContainerApplication>
+    <ApplicationType>Windows Store</ApplicationType>
+    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+    <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.17134.0</WindowsTargetPlatformMinVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="PropertySheet.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IncludePath>$(SolutionDir)Dependencies\angle\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
+    <LibraryPath>$(SolutionDir)x$(PlatformArchitecture)\$(Configuration)\;$(SolutionDir)Dependencies\angle\UWPLib;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level4</WarningLevel>
+      <AdditionalOptions>%(AdditionalOptions) /bigobj</AdditionalOptions>
+      <!--Temporarily disable cppwinrt heap enforcement to work around xaml compiler generated std::shared_ptr use -->
+      <AdditionalOptions Condition="'$(CppWinRTHeapEnforcement)'==''">/DWINRT_NO_MAKE_DETECTION %(AdditionalOptions)</AdditionalOptions>
+      <DisableSpecificWarnings>
+      </DisableSpecificWarnings>
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WINRT_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
+    <ClCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">WindowsApp.lib;%(AdditionalDependencies);libegl.dll.lib;AngleRenderer.lib;libglesv2.dll.lib;</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
+    <ClCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="App.h">
+      <DependentUpon>App.xaml</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="OpenGlPage.h">
+      <DependentUpon>OpenGlPage.xaml</DependentUpon>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Page Include="OpenGlPage.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="Assets\LockScreenLogo.scale-200.png" />
+    <Image Include="Assets\SplashScreen.scale-200.png" />
+    <Image Include="Assets\Square150x150Logo.scale-200.png" />
+    <Image Include="Assets\Square44x44Logo.scale-200.png" />
+    <Image Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Image Include="Assets\StoreLogo.png" />
+    <Image Include="Assets\Wide310x150Logo.scale-200.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="App.cpp">
+      <DependentUpon>App.xaml</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="OpenGlPage.cpp">
+      <DependentUpon>OpenGlPage.xaml</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Midl Include="App.idl">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Midl>
+    <Midl Include="OpenGlPage.idl">
+      <DependentUpon>OpenGlPage.xaml</DependentUpon>
+    </Midl>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\dependencies\Angle\UWPBin\libegl.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\dependencies\Angle\UWPBin\libGLESv2.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="packages.config" />
+    <None Include="PropertySheet.props" />
+    <Text Include="readme.txt">
+      <DeploymentContent>false</DeploymentContent>
+    </Text>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.200107.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200107.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200107.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.200107.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200107.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.200107.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/XamlHost/XamlHost.vcxproj.filters b/XamlHost/XamlHost.vcxproj.filters
new file mode 100644
index 0000000..7d489cf
--- /dev/null
+++ b/XamlHost/XamlHost.vcxproj.filters
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Midl Include="App.idl" />
+    <Midl Include="MainPage.idl" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="pch.cpp" />
+    <ClCompile Include="App.cpp" />
+    <ClCompile Include="MainPage.cpp" />
+    <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="Assets\Wide310x150Logo.scale-200.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\StoreLogo.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\Square150x150Logo.scale-200.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\Square44x44Logo.scale-200.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\SplashScreen.scale-200.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\LockScreenLogo.scale-200.png">
+      <Filter>Assets</Filter>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest" />
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Assets">
+      <UniqueIdentifier>{e48dc53e-40b1-40cb-970a-f89935452892}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Binaries">
+      <UniqueIdentifier>{43b0c0fe-87ed-4298-92a0-ea3dbe9b4bba}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="PropertySheet.props" />
+    <None Include="packages.config" />
+    <None Include="..\dependencies\Angle\UWPBin\libegl.dll">
+      <Filter>Binaries</Filter>
+    </None>
+    <None Include="..\dependencies\Angle\UWPBin\libGLESv2.dll">
+      <Filter>Binaries</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="readme.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="OpenGlPage.xaml" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/XamlHost/packages.config b/XamlHost/packages.config
new file mode 100644
index 0000000..768164f
--- /dev/null
+++ b/XamlHost/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.200107.1" targetFramework="native" />
+</packages>
\ No newline at end of file
diff --git a/XamlHost/pch.cpp b/XamlHost/pch.cpp
new file mode 100644
index 0000000..bcb5590
--- /dev/null
+++ b/XamlHost/pch.cpp
@@ -0,0 +1 @@
+#include "pch.h"
diff --git a/XamlHost/pch.h b/XamlHost/pch.h
new file mode 100644
index 0000000..62b83d7
--- /dev/null
+++ b/XamlHost/pch.h
@@ -0,0 +1,30 @@
+#pragma once
+#include <windows.h>
+#include <unknwn.h>
+#include <restrictederrorinfo.h>
+#include <hstring.h>
+#include <winrt/Windows.Foundation.h>
+#include <winrt/Windows.Foundation.Collections.h>
+#include <winrt/Windows.ApplicationModel.Activation.h>
+#include <winrt/Windows.UI.Xaml.h>
+#include <winrt/Windows.UI.Xaml.Controls.h>
+#include <winrt/Windows.UI.Xaml.Controls.Primitives.h>
+#include <winrt/Windows.UI.Xaml.Data.h>
+#include <winrt/Windows.UI.Xaml.Interop.h>
+#include <winrt/Windows.UI.Xaml.Markup.h>
+#include <winrt/Windows.UI.Xaml.Navigation.h>
+#include <winrt/Windows.UI.Composition.h>
+
+// Enable function definitions in the GL headers below
+#define GL_GLEXT_PROTOTYPES
+
+// OpenGL ES includes
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+
+// EGL includes
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#include <EGL/eglplatform.h>
+
+#include "../AngleRenderer/inc/AngleSpriteRenderer.h"
\ No newline at end of file
diff --git a/XamlHost/readme.txt b/XamlHost/readme.txt
new file mode 100644
index 0000000..dc7500a
--- /dev/null
+++ b/XamlHost/readme.txt
@@ -0,0 +1,23 @@
+========================================================================
+    C++/WinRT XamlHost Project Overview
+========================================================================
+
+This project demonstrates how to get started writing XAML apps directly
+with standard C++, using the C++/WinRT SDK component and XAML compiler 
+support to generate implementation headers from interface (IDL) files.
+These headers can then be used to implement the local Windows Runtime 
+classes referenced in the app's XAML pages.
+
+Steps:
+1. Create an interface (IDL) file to define any local Windows Runtime 
+    classes referenced in the app's XAML pages.
+2. Build the project once to generate implementation templates under 
+    the "Generated Files" folder, as well as skeleton class definitions 
+    under "Generated Files\sources".  
+3. Use the skeleton class definitions for reference to implement your
+    Windows Runtime classes.
+
+========================================================================
+Learn more about C++/WinRT here:
+http://aka.ms/cppwinrt/
+========================================================================

From 6ad66c0e393cbeebe7bb26b8ec8da59abca3b0ee Mon Sep 17 00:00:00 2001
From: Johan Lindfors <johan.lindfors@coderox.se>
Date: Tue, 21 Jan 2020 09:53:13 +0100
Subject: [PATCH 4/5] Clean up to mimic old behavior

---
 AngleRenderer/AngleSpriteRenderer.cpp     | 12 ++++--------
 AngleRenderer/AngleSpriteRendererImpl.cpp |  9 ++++-----
 AngleRenderer/AngleSpriteRendererImpl.h   |  5 ++---
 AngleRenderer/inc/AngleSpriteRenderer.h   |  5 ++---
 CoreWindowHost/App.cpp                    |  3 +--
 Win32Host/desktop.cpp                     |  3 +--
 XamlHost/OpenGlPage.cpp                   | 24 +++--------------------
 XamlHost/OpenGlPage.h                     |  2 +-
 8 files changed, 18 insertions(+), 45 deletions(-)

diff --git a/AngleRenderer/AngleSpriteRenderer.cpp b/AngleRenderer/AngleSpriteRenderer.cpp
index 765299d..6af25a9 100644
--- a/AngleRenderer/AngleSpriteRenderer.cpp
+++ b/AngleRenderer/AngleSpriteRenderer.cpp
@@ -14,14 +14,10 @@ AngleSpriteRenderer::~AngleSpriteRenderer() {
 	delete mRender;
 }
 
-void AngleSpriteRenderer::Start() {
-	mRender->Start();
+void AngleSpriteRenderer::Start(const winrt::Windows::UI::Composition::SpriteVisual & withVisual) {
+	mRender->Start(withVisual);
 }
 
-void AngleSpriteRenderer::SetVisual(const winrt::Windows::UI::Composition::SpriteVisual & withVisual) {
-	mRender->SetVisual(withVisual);
-}
-
-void AngleSpriteRenderer::SetSwapChainPanel(const winrt::Windows::UI::Xaml::Controls::SwapChainPanel& panel) {
-	mRender->SetSwapChainPanel(panel);
+void AngleSpriteRenderer::Start(const winrt::Windows::UI::Xaml::Controls::SwapChainPanel& panel) {
+	mRender->Start(panel);
 }
\ No newline at end of file
diff --git a/AngleRenderer/AngleSpriteRendererImpl.cpp b/AngleRenderer/AngleSpriteRendererImpl.cpp
index 7c0532f..d39e23d 100644
--- a/AngleRenderer/AngleSpriteRendererImpl.cpp
+++ b/AngleRenderer/AngleSpriteRendererImpl.cpp
@@ -16,15 +16,14 @@ AngleSpriteRendererPrivate::~AngleSpriteRendererPrivate()
 	delete mOpenGLES;
 }
 
-void AngleSpriteRendererPrivate::SetVisual(const SpriteVisual& withVisual) {
+void AngleSpriteRendererPrivate::Start(const SpriteVisual& withVisual) {
 	mHostVisual = withVisual;
+	CreateRenderSurface();
+	StartRenderLoop();
 }
 
-void AngleSpriteRendererPrivate::SetSwapChainPanel(const SwapChainPanel& panel) {
+void AngleSpriteRendererPrivate::Start(const SwapChainPanel& panel) {
 	mSwapChainPanel = panel;
-}
-
-void AngleSpriteRendererPrivate::Start() {
 	CreateRenderSurface();
 	StartRenderLoop();
 }
diff --git a/AngleRenderer/AngleSpriteRendererImpl.h b/AngleRenderer/AngleSpriteRendererImpl.h
index c9c636a..b79e875 100644
--- a/AngleRenderer/AngleSpriteRendererImpl.h
+++ b/AngleRenderer/AngleSpriteRendererImpl.h
@@ -12,9 +12,8 @@ class AngleSpriteRendererPrivate
 public:
 	AngleSpriteRendererPrivate();
 	~AngleSpriteRendererPrivate();
-	void Start();
-	void SetVisual(const SpriteVisual & withVisual);
-	void SetSwapChainPanel(const SwapChainPanel& panel);
+	void Start(const SpriteVisual & withVisual);
+	void Start(const SwapChainPanel& panel);
 private:
 	void CreateRenderSurface();
 	void DestroyRenderSurface();
diff --git a/AngleRenderer/inc/AngleSpriteRenderer.h b/AngleRenderer/inc/AngleSpriteRenderer.h
index 144ae0a..ff6f0f8 100644
--- a/AngleRenderer/inc/AngleSpriteRenderer.h
+++ b/AngleRenderer/inc/AngleSpriteRenderer.h
@@ -10,9 +10,8 @@ class AngleSpriteRenderer {
 
 	~AngleSpriteRenderer();
 
-	void Start();
-	void SetVisual(const winrt::Windows::UI::Composition::SpriteVisual& withVisual);
-	void SetSwapChainPanel(const winrt::Windows::UI::Xaml::Controls::SwapChainPanel& panel);
+	void Start(const winrt::Windows::UI::Composition::SpriteVisual& withVisual);
+	void Start(const winrt::Windows::UI::Xaml::Controls::SwapChainPanel& panel);
 private:
 	AngleSpriteRendererPrivate * mRender{ nullptr };
 };
\ No newline at end of file
diff --git a/CoreWindowHost/App.cpp b/CoreWindowHost/App.cpp
index 18f4c54..700ce90 100644
--- a/CoreWindowHost/App.cpp
+++ b/CoreWindowHost/App.cpp
@@ -84,8 +84,7 @@ struct App : implements<App, IFrameworkViewSource, IFrameworkView>
 
         m_visuals.InsertAtTop(visual);
 		
-		m_render.SetVisual(visual);
-        m_render.Start();
+		m_render.Start(visual);
     }
 };
 
diff --git a/Win32Host/desktop.cpp b/Win32Host/desktop.cpp
index 46d37cf..5045ef1 100644
--- a/Win32Host/desktop.cpp
+++ b/Win32Host/desktop.cpp
@@ -144,8 +144,7 @@ struct Window : DesktopWindow<Window>
 		//visual.Brush(compositor.CreateColorBrush(Windows::UI::Colors::Red()));
 
 		m_visuals.InsertAtTop(visual);
-		m_render.SetVisual(visual);
-        m_render.Start();
+		m_render.Start(visual);        
     }
 
 private:
diff --git a/XamlHost/OpenGlPage.cpp b/XamlHost/OpenGlPage.cpp
index 5170952..da7b746 100644
--- a/XamlHost/OpenGlPage.cpp
+++ b/XamlHost/OpenGlPage.cpp
@@ -17,31 +17,13 @@ namespace winrt::XamlHost::implementation
     OpenGlPage::OpenGlPage()
     {
         InitializeComponent();
-        //Compositor compositor;
-        //ContainerVisual root = compositor.CreateContainerVisual();
-        //m_target = compositor.CreateTargetForCurrentView();
-        //m_target.Root(root);
-        //m_visuals = root.Children();
-
-        AddVisual({ 10.0f, 10.0f });
+        AddVisual();
     }
 
-    void OpenGlPage::AddVisual(float2 const point)
+    void OpenGlPage::AddVisual()
     {
-        //Compositor compositor = m_visuals.Compositor();
-        //SpriteVisual visual = compositor.CreateSpriteVisual();
-        //visual.Size(
-        //    {
-        //        600.0f,
-        //        600.0f
-        //    });
-
-        ////visual.Brush(compositor.CreateColorBrush(Windows::UI::Colors::Red()));
-
-        //m_visuals.InsertAtTop(visual);
         SwapChainPanel panel;
         Content(panel);
-        m_render.SetSwapChainPanel(panel);
-        m_render.Start();
+        m_render.Start(panel);
     }
 }
diff --git a/XamlHost/OpenGlPage.h b/XamlHost/OpenGlPage.h
index 6575a41..39a51a9 100644
--- a/XamlHost/OpenGlPage.h
+++ b/XamlHost/OpenGlPage.h
@@ -9,7 +9,7 @@ namespace winrt::XamlHost::implementation
         OpenGlPage();
 
     private:
-        void AddVisual(winrt::Windows::Foundation::Numerics::float2 const point);
+        void AddVisual();
 
         winrt::Windows::UI::Composition::CompositionTarget m_target{ nullptr };
         winrt::Windows::UI::Composition::VisualCollection m_visuals{ nullptr };

From 9aca16dd3a3ddc230e8861fc2a60ecb0429be7f6 Mon Sep 17 00:00:00 2001
From: Johan Lindfors <johan.lindfors@coderox.se>
Date: Tue, 21 Jan 2020 09:56:34 +0100
Subject: [PATCH 5/5] Cleanup

---
 AngleRenderer/AngleSpriteRenderer.cpp     | 4 ++--
 AngleRenderer/AngleSpriteRendererImpl.cpp | 2 +-
 AngleRenderer/OpenGLES.h                  | 2 +-
 Win32Host/desktop.cpp                     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/AngleRenderer/AngleSpriteRenderer.cpp b/AngleRenderer/AngleSpriteRenderer.cpp
index 6af25a9..2b7d1ab 100644
--- a/AngleRenderer/AngleSpriteRenderer.cpp
+++ b/AngleRenderer/AngleSpriteRenderer.cpp
@@ -18,6 +18,6 @@ void AngleSpriteRenderer::Start(const winrt::Windows::UI::Composition::SpriteVis
 	mRender->Start(withVisual);
 }
 
-void AngleSpriteRenderer::Start(const winrt::Windows::UI::Xaml::Controls::SwapChainPanel& panel) {
+void AngleSpriteRenderer::Start(const winrt::Windows::UI::Xaml::Controls::SwapChainPanel & panel) {
 	mRender->Start(panel);
-}
\ No newline at end of file
+}
diff --git a/AngleRenderer/AngleSpriteRendererImpl.cpp b/AngleRenderer/AngleSpriteRendererImpl.cpp
index d39e23d..1bc4df3 100644
--- a/AngleRenderer/AngleSpriteRendererImpl.cpp
+++ b/AngleRenderer/AngleSpriteRendererImpl.cpp
@@ -16,7 +16,7 @@ AngleSpriteRendererPrivate::~AngleSpriteRendererPrivate()
 	delete mOpenGLES;
 }
 
-void AngleSpriteRendererPrivate::Start(const SpriteVisual& withVisual) {
+void AngleSpriteRendererPrivate::Start(const SpriteVisual & withVisual) {
 	mHostVisual = withVisual;
 	CreateRenderSurface();
 	StartRenderLoop();
diff --git a/AngleRenderer/OpenGLES.h b/AngleRenderer/OpenGLES.h
index 3df1c8f..085e045 100644
--- a/AngleRenderer/OpenGLES.h
+++ b/AngleRenderer/OpenGLES.h
@@ -9,7 +9,7 @@ class OpenGLES
     ~OpenGLES();
 
 	EGLSurface CreateSurface(winrt::Windows::UI::Composition::ISpriteVisual & visual);
-    EGLSurface CreateSurface(const winrt::Windows::UI::Xaml::Controls::SwapChainPanel& panel);
+    EGLSurface CreateSurface(const winrt::Windows::UI::Xaml::Controls::SwapChainPanel & panel);
     void GetSurfaceDimensions(const EGLSurface surface, EGLint *width, EGLint *height);
     void DestroySurface(const EGLSurface surface);
     void MakeCurrent(const EGLSurface surface);
diff --git a/Win32Host/desktop.cpp b/Win32Host/desktop.cpp
index 5045ef1..51891d9 100644
--- a/Win32Host/desktop.cpp
+++ b/Win32Host/desktop.cpp
@@ -144,7 +144,7 @@ struct Window : DesktopWindow<Window>
 		//visual.Brush(compositor.CreateColorBrush(Windows::UI::Colors::Red()));
 
 		m_visuals.InsertAtTop(visual);
-		m_render.Start(visual);        
+		m_render.Start(visual);
     }
 
 private: