improve performance.

hecomi · hecomi · commit 8e5ae01cf071 · 2021-04-30T19:10:59.000+09:00
diff --git a/Assets/uWindowCapture/Examples/Single Window/Single Window.unity b/Assets/uWindowCapture/Examples/Single Window/Single Window.unity
diff --git a/Assets/uWindowCapture/Plugins/x86/uWindowCapture.dll b/Assets/uWindowCapture/Plugins/x86/uWindowCapture.dll
diff --git a/Assets/uWindowCapture/Plugins/x86_64/uWindowCapture.dll b/Assets/uWindowCapture/Plugins/x86_64/uWindowCapture.dll
diff --git a/Assets/uWindowCapture/Scripts/UwcLib.cs b/Assets/uWindowCapture/Scripts/UwcLib.cs
@@ -86,8 +86,6 @@ public static class Lib
     public static extern IntPtr GetRenderEventFunc();
     [DllImport(name, EntryPoint = "UwcUpdate")]
     public static extern void Update(float dt);
-    [DllImport(name, EntryPoint = "UwcTriggerGpuUpload")]
-    public static extern void TriggerGpuUpload();
     [DllImport(name, EntryPoint = "UwcGetMessageCount")]
     private static extern int GetMessageCount();
     [DllImport(name, EntryPoint = "UwcGetMessages")]
diff --git a/Assets/uWindowCapture/Scripts/UwcManager.cs b/Assets/uWindowCapture/Scripts/UwcManager.cs
@@ -167,7 +167,6 @@ IEnumerator Render()
         for (;;) {
             yield return new WaitForEndOfFrame();
             GL.IssuePluginEvent(renderEventFunc_, 0);
-            Lib.TriggerGpuUpload();
         }
     }
 
diff --git a/Plugins/uWindowCapture/uWindowCapture/Main.cpp b/Plugins/uWindowCapture/uWindowCapture/Main.cpp
@@ -126,12 +126,6 @@ extern "C"
         WindowManager::Get().Update(dt);
     }
 
-    UNITY_INTERFACE_EXPORT void UNITY_INTERFACE_API UwcTriggerGpuUpload()
-    {
-        if (WindowManager::IsNull()) return;
-        WindowManager::Get().GetUploadManager()->TriggerGpuUpload();
-    }
-
     UNITY_INTERFACE_EXPORT UINT UNITY_INTERFACE_API UwcGetMessageCount()
     {
         if (MessageManager::IsNull()) return 0;
diff --git a/Plugins/uWindowCapture/uWindowCapture/UploadManager.cpp b/Plugins/uWindowCapture/uWindowCapture/UploadManager.cpp
@@ -20,6 +20,15 @@ using TexturePtr = Microsoft::WRL::ComPtr<ID3D11Texture2D>;
 
 
 
+namespace
+{
+    constexpr auto kLoopMinTime = std::chrono::microseconds(100);
+}
+
+
+// ---
+
+
 UploadManager::UploadManager()
 {
     initThread_ = std::thread([this]
@@ -120,10 +129,6 @@ void UploadManager::StartUploadThread()
 {
     threadLoop_.Start([this] 
     { 
-        // Waiting for being triggered...
-        if (!hasUploadTriggered_) return;
-        hasUploadTriggered_ = false;
-
         // Check window upload
         const int windowId = windowUploadQueue_.Dequeue();
         if (windowId >= 0 && WindowManager::Get().CheckExistence(windowId))
@@ -149,7 +154,7 @@ void UploadManager::StartUploadThread()
         {
             cursor->Upload();
         }
-    }, std::chrono::microseconds(1000));
+    }, kLoopMinTime);
 }
 
 
@@ -168,10 +173,4 @@ void UploadManager::RequestUploadWindow(int id)
 void UploadManager::RequestUploadIcon(int id)
 {
     iconUploadQueue_.Enqueue(id);
-}
-
-
-void UploadManager::TriggerGpuUpload()
-{
-    hasUploadTriggered_ = true;
 }
diff --git a/Plugins/uWindowCapture/uWindowCapture/UploadManager.h b/Plugins/uWindowCapture/uWindowCapture/UploadManager.h
@@ -27,7 +27,6 @@ class UploadManager
     void RequestUploadIcon(int id);
     void StartUploadThread();
     void StopUploadThread();
-    void TriggerGpuUpload();
 
 private:
     void CreateDevice();
@@ -38,5 +37,4 @@ class UploadManager
     ThreadLoop threadLoop_;
     WindowQueue windowUploadQueue_;
     WindowQueue iconUploadQueue_;
-    std::atomic<bool> hasUploadTriggered_ = false;
 };
diff --git a/Plugins/uWindowCapture/uWindowCapture/Util.h b/Plugins/uWindowCapture/uWindowCapture/Util.h
@@ -5,7 +5,7 @@
 #include <chrono>
 #include <Windows.h>
 
-// #define UWC_DEBUG_ON
+#define UWC_DEBUG_ON
 
 
 // Window utilities
diff --git a/Plugins/uWindowCapture/uWindowCapture/WindowTexture.cpp b/Plugins/uWindowCapture/uWindowCapture/WindowTexture.cpp
@@ -437,7 +437,7 @@ bool WindowTexture::Upload()
 
 bool WindowTexture::RecreateSharedTextureIfNeeded()
 {
-    UWC_SCOPE_TIMER(UploadByWin32API)
+    UWC_SCOPE_TIMER(RecreateSharedTextureIfNeeded)
 
     if (!unityTexture_.load()) 
     {
@@ -512,6 +512,8 @@ bool WindowTexture::RecreateSharedTextureIfNeeded()
 
 bool WindowTexture::UploadByWin32API()
 {
+    UWC_SCOPE_TIMER(UploadByWin32API)
+
     std::lock_guard<std::mutex> lock(bufferMutex_);
 
     const auto& uploader = WindowManager::GetUploadManager();
@@ -544,6 +546,7 @@ bool WindowTexture::UploadByWindowsGraphicsCapture()
 
     ComPtr<ID3D11DeviceContext> context;
     uploader->GetDevice()->GetImmediateContext(&context);
+    /*
     context->CopySubresourceRegion(
         sharedTexture_.Get(), 
         D3D11CalcSubresource(0, 0, 1), 
@@ -552,7 +555,8 @@ bool WindowTexture::UploadByWindowsGraphicsCapture()
         0,
         result.pTexture,
         0, 
-        NULL);
+        NULL);*/
+    context->CopyResource(sharedTexture_.Get(), result.pTexture);
     context->Flush();
 
     if (result.hasSizeChanged)
diff --git a/Plugins/uWindowCapture/uWindowCapture/WindowsGraphicsCapture.cpp b/Plugins/uWindowCapture/uWindowCapture/WindowsGraphicsCapture.cpp
@@ -2,6 +2,7 @@
 #include "WindowManager.h"
 #include "UploadManager.h"
 #include "Debug.h"
+#include "Util.h"
 #include <inspectable.h>
 #include <winrt/base.h>
 #include <winrt/Windows.Foundation.h>
@@ -229,6 +230,10 @@ void WindowsGraphicsCapture::Update(float dt)
 
 void WindowsGraphicsCapture::EnableCursorCapture(bool enabled)
 {
+    if (isCursorCaptureEnabled_ == enabled) return;
+
+    isCursorCaptureEnabled_ = enabled;
+
     if (!IsCursorCaptureEnabledApiSupported())
     {
         Debug::Log("CursorCaptureEnabled API is not available.");
@@ -244,6 +249,8 @@ void WindowsGraphicsCapture::EnableCursorCapture(bool enabled)
 
 WindowsGraphicsCapture::Result WindowsGraphicsCapture::TryGetLatestResult()
 {
+    UWC_SCOPE_TIMER(TryGetLatestResult)
+
     stopTimer_ = 0.f;
 
     if (!captureFramePool_) return {};
diff --git a/Plugins/uWindowCapture/uWindowCapture/WindowsGraphicsCapture.h b/Plugins/uWindowCapture/uWindowCapture/WindowsGraphicsCapture.h
@@ -63,6 +63,7 @@ class WindowsGraphicsCapture
 
     float stopTimer_ = 0.f;
     bool hasStopRequested_ = false;
+    bool isCursorCaptureEnabled_ = true;
 };
 
 

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,6 @@ IEnumerator Render()`
`167`	`167`	`for (;;) {`
`168`	`168`	`yield return new WaitForEndOfFrame();`
`169`	`169`	`GL.IssuePluginEvent(renderEventFunc_, 0);`
`170`		`- Lib.TriggerGpuUpload();`
`171`	`170`	`}`
`172`	`171`	`}`
`173`	`172`
Original file line number	Diff line number	Diff line change
`@@ -126,12 +126,6 @@ extern "C"`
`126`	`126`	`WindowManager::Get().Update(dt);`
`127`	`127`	`}`
`128`	`128`
`129`		`- UNITY_INTERFACE_EXPORT void UNITY_INTERFACE_API UwcTriggerGpuUpload()`
`130`		`- {`
`131`		`- if (WindowManager::IsNull()) return;`
`132`		`- WindowManager::Get().GetUploadManager()->TriggerGpuUpload();`
`133`		`- }`
`134`		`-`
`135`	`129`	`UNITY_INTERFACE_EXPORT UINT UNITY_INTERFACE_API UwcGetMessageCount()`
`136`	`130`	`{`
`137`	`131`	`if (MessageManager::IsNull()) return 0;`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,15 @@ using TexturePtr = Microsoft::WRL::ComPtr<ID3D11Texture2D>;`
`20`	`20`
`21`	`21`
`22`	`22`
	`23`	`+namespace`
	`24`	`+{`
	`25`	`+ constexpr auto kLoopMinTime = std::chrono::microseconds(100);`
	`26`	`+}`
	`27`	`+`
	`28`	`+`
	`29`	`+// ---`
	`30`	`+`
	`31`	`+`
`23`	`32`	`UploadManager::UploadManager()`
`24`	`33`	`{`
`25`	`34`	`initThread_ = std::thread([this]`
`@@ -120,10 +129,6 @@ void UploadManager::StartUploadThread()`
`120`	`129`	`{`
`121`	`130`	`threadLoop_.Start([this]`
`122`	`131`	`{`
`123`		`- // Waiting for being triggered...`
`124`		`- if (!hasUploadTriggered_) return;`
`125`		`- hasUploadTriggered_ = false;`
`126`		`-`
`127`	`132`	`// Check window upload`
`128`	`133`	`const int windowId = windowUploadQueue_.Dequeue();`
`129`	`134`	`if (windowId >= 0 && WindowManager::Get().CheckExistence(windowId))`
`@@ -149,7 +154,7 @@ void UploadManager::StartUploadThread()`
`149`	`154`	`{`
`150`	`155`	`cursor->Upload();`
`151`	`156`	`}`
`152`		`- }, std::chrono::microseconds(1000));`
	`157`	`+ }, kLoopMinTime);`
`153`	`158`	`}`
`154`	`159`
`155`	`160`
`@@ -168,10 +173,4 @@ void UploadManager::RequestUploadWindow(int id)`
`168`	`173`	`void UploadManager::RequestUploadIcon(int id)`
`169`	`174`	`{`
`170`	`175`	`iconUploadQueue_.Enqueue(id);`
`171`		`-}`
`172`		`-`
`173`		`-`
`174`		`-void UploadManager::TriggerGpuUpload()`
`175`		`-{`
`176`		`- hasUploadTriggered_ = true;`
`177`	`176`	`}`