Make CompositorNativeWindow work in UWP as well as Win32

clarkezone · Jan 19, 2020 · 4c8370f · 4c8370f
1 parent 579c594
commit 4c8370f
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 13 deletions.
diff --git a/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp b/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
@@ -64,6 +64,7 @@
 
 #ifdef ANGLE_ENABLE_WINDOWS_UWP
 #    include "libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h"
+#    include "libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.h"
 #else
 #    include "libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.h"
 #    include "libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.h"
@@ -1254,13 +1255,11 @@ void Renderer11::generateDisplayExtensions(egl::DisplayExtensions *outExtensions
     // All D3D feature levels support robust resource init
     outExtensions->robustResourceInitialization = true;
 
-#if !defined(ANGLE_ENABLE_WINDOWS_UWP)
     // Compositor Native Window capabilies require WinVer >= 1803
     if (CompositorNativeWindow11::IsSupportedWinRelease())
     {
         outExtensions->windowsUIComposition = true;
     }
-#endif
 }
 
 angle::Result Renderer11::flush(Context11 *context11)
@@ -1319,7 +1318,12 @@ bool Renderer11::isValidNativeWindow(EGLNativeWindowType window) const
                   "Pointer size must match Window Handle size");
 
 #if defined(ANGLE_ENABLE_WINDOWS_UWP)
-    return NativeWindow11WinRT::IsValidNativeWindow(window);
+    bool winrt = NativeWindow11WinRT::IsValidNativeWindow(window);
+    if (!winrt)
+    {
+        return CompositorNativeWindow11::IsValidNativeWindow(window);
+    }
+    return true;
 #else
     if (NativeWindow11Win32::IsValidNativeWindow(window))
     {
@@ -1334,8 +1338,17 @@ NativeWindowD3D *Renderer11::createNativeWindow(EGLNativeWindowType window,
                                                 const egl::Config *config,
                                                 const egl::AttributeMap &attribs) const
 {
+//TODO: why does the non-winrt path not validate against compositornativewindow
 #if defined(ANGLE_ENABLE_WINDOWS_UWP)
-    return new NativeWindow11WinRT(window, config->alphaSize > 0);
+    auto useWinUiComp = window != nullptr && CompositorNativeWindow11::IsValidNativeWindow(window);
+    if (useWinUiComp)
+    {
+        return new CompositorNativeWindow11(window, config->alphaSize > 0);
+    }
+    else
+    {
+        return new NativeWindow11WinRT(window, config->alphaSize > 0);
+    }
 #else
     auto useWinUiComp = window != nullptr && !NativeWindow11Win32::IsValidNativeWindow(window);
 

diff --git a/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.cpp b/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.cpp
@@ -237,10 +237,21 @@ RoHelper::RoHelper()
       mComBaseModule(nullptr),
       mCoreMessagingModule(nullptr)
 {
-    if (!IsWindows10OrGreater())
+    /*if (!IsWindows10OrGreater())
     {
         return;
-    }
+    }*/
+
+	#ifdef ANGLE_ENABLE_WINDOWS_UWP
+    mFpWindowsCreateStringReference    = &::WindowsCreateStringReference;
+    mFpRoInitialize                    = &::RoInitialize;
+    mFpRoUninitialize                  = &::RoUninitialize;
+    mFpWindowsDeleteString             = &::WindowsDeleteString;
+    mFpGetActivationFactory            = &::RoGetActivationFactory;
+    mFpWindowsCompareStringOrdinal     = &::WindowsCompareStringOrdinal;
+    mFpCreateDispatcherQueueController = &::CreateDispatcherQueueController;
+
+	#else
 
     mComBaseModule = LoadLibraryA("ComBase.dll");
 
@@ -255,6 +266,7 @@ RoHelper::RoHelper()
         return;
     }
 
+
     if (!AssignProcAddress(mComBaseModule, "RoGetActivationFactory", mFpGetActivationFactory))
     {
         return;
@@ -294,17 +306,23 @@ RoHelper::RoHelper()
         return;
     }
 
-    if (SUCCEEDED(RoInitialize(RO_INIT_MULTITHREADED)))
+	auto result = RoInitialize(RO_INIT_SINGLETHREADED);
+
+    if (SUCCEEDED(result))
     {
-        mWinRtAvailable = true;
+        //TODO
     }
+	#endif
+
+	mWinRtAvailable = true;
 }
 
 RoHelper::~RoHelper()
 {
     if (mWinRtAvailable)
     {
-        RoUninitialize();
+		//TODO
+        //RoUninitialize();
     }
 
     if (mCoreMessagingModule != nullptr)
@@ -327,7 +345,8 @@ bool RoHelper::WinRtAvailable() const
 
 bool RoHelper::SupportedWindowsRelease()
 {
-    if (!IsWindows10OrGreater() || !mWinRtAvailable)
+    //if (!IsWindows10OrGreater() || !mWinRtAvailable)
+    if (!mWinRtAvailable)
     {
         return false;
     }

diff --git a/src/libGLESv2.gni b/src/libGLESv2.gni
@@ -696,6 +696,8 @@ libangle_d3d11_winuwp_sources = [
   "src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h",
   "src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp",
   "src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h",
+  "src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.cpp",
+  "src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.h",
 ]
 
 libangle_gl_sources = [

diff --git a/util/test_utils.cpp b/util/test_utils.cpp
@@ -15,13 +15,14 @@ namespace angle
 {
 bool CreateTemporaryFile(char *tempFileNameOut, uint32_t maxFileNameLen)
 {
-    constexpr uint32_t kMaxPath = 1000u;
+    /*constexpr uint32_t kMaxPath = 1000u;
     char tempPath[kMaxPath];
 
     if (!GetTempDir(tempPath, kMaxPath))
         return false;
 
-    return CreateTemporaryFileInDir(tempPath, tempFileNameOut, maxFileNameLen);
+    return CreateTemporaryFileInDir(tempPath, tempFileNameOut, maxFileNameLen);*/
+    return false;
 }
 
 bool GetFileSize(const char *filePath, uint32_t *sizeOut)
@@ -67,7 +68,7 @@ ProcessHandle::ProcessHandle(Process *process) : mProcess(process) {}
 ProcessHandle::ProcessHandle(const std::vector<const char *> &args,
                              bool captureStdout,
                              bool captureStderr)
-    : mProcess(LaunchProcess(args, captureStdout, captureStderr))
+    //: mProcess(LaunchProcess(args, captureStdout, captureStderr))
 {}
 
 ProcessHandle::~ProcessHandle()