rebuild DLLs.

fixed a runtime error when using the IL2CPP scripting backend

.gitignore

@@ -5,6 +5,8 @@
 /[Bb]uild/
 /[Ww]iki/
 /[Mm]isc/
+/UnityPackageManager
+/Packages
 
 # Autogenerated VS/MD solution and project files
 *.csproj
@@ -28,3 +30,4 @@ sysinfo.txt
 /Assets/AssetStoreTools*
 /Assets/Extensions*
 /uDesktopDuplication.log
+.vs

Assets/uDesktopDuplication/Examples/Scripts/MultipleMonitorAnalyzer.cs

@@ -1,41 +1,41 @@
-using UnityEngine;
-
-[RequireComponent(typeof(MultipleMonitorCreator))]
-public class MultipleMonitorAnalyzer : MonoBehaviour
-{
-    MultipleMonitorCreator creator_;
-    Vector3 gazePoint_ = Vector3.zero;
-    public Vector3 gazePoint 
-    { 
-        get { return gazePoint_; } 
-        private set 
+using UnityEngine;
+
+[RequireComponent(typeof(MultipleMonitorCreator))]
+public class MultipleMonitorAnalyzer : MonoBehaviour
+{
+    MultipleMonitorCreator creator_;
+    Vector3 gazePoint_ = Vector3.zero;
+    public Vector3 gazePoint 
+    { 
+        get { return gazePoint_; } 
+        private set 
         {
             gazePoint_ += (value - gazePoint) * (gazePointFilter / (1f / 60 / Time.deltaTime));
-        }
-    }
-
-    [Header("Filters")]
-    [Range(0f, 1f)] public float gazePointFilter = 0.1f;
-    [Range(0f, 1f)] public float moveRectFilter = 0.05f;
-    [Range(0f, 1f)] public float mouseFilter = 0.05f;
-    [Range(0f, 1f)] public float dirtyRectFilter = 0.01f;
-    [Range(0f, 1f)] public float noEventFilter = 0.01f;
-    [Range(0f, 1f)] public float velocityFilter = 0.1f;
-
-    [Header("Debug")]
-    [SerializeField] bool drawGazePoint;
-    [SerializeField] bool drawAveragePos;
-    [SerializeField] bool drawMoveRects;
-    [SerializeField] bool drawDirtyRects;
-
-    void Start()
+        }
+    }
+
+    [Header("Filters")]
+    [Range(0f, 1f)] public float gazePointFilter = 0.1f;
+    [Range(0f, 1f)] public float moveRectFilter = 0.05f;
+    [Range(0f, 1f)] public float mouseFilter = 0.05f;
+    [Range(0f, 1f)] public float dirtyRectFilter = 0.01f;
+    [Range(0f, 1f)] public float noEventFilter = 0.01f;
+    [Range(0f, 1f)] public float velocityFilter = 0.1f;
+
+    [Header("Debug")]
+    [SerializeField] bool drawGazePoint;
+    [SerializeField] bool drawAveragePos;
+    [SerializeField] bool drawMoveRects;
+    [SerializeField] bool drawDirtyRects;
+
+    void Start()
     {
         creator_ = GetComponent<MultipleMonitorCreator>();
-    }
-
-    void Update()
-    {
-        var cursorMonitorId = uDesktopDuplication.Manager.cursorMonitorId;
+    }
+
+    void Update()
+    {
+        var cursorMonitorId = uDesktopDuplication.Manager.cursorMonitorId;
         for (int i = 0; i < creator_.monitors.Count; ++i) {
             var info = creator_.monitors[i];
             var analyzer = 
@@ -44,18 +44,18 @@ public class MultipleMonitorAnalyzer : MonoBehaviour
             UpdateAnalyzer(analyzer);
             if (info.uddTexture.monitorId == cursorMonitorId) {
                 gazePoint = analyzer.averagePos;
-            }
-        }
-
-        if (drawGazePoint) DrawGazePoint();
-    }
-
-    void DrawGazePoint()
+            }
+        }
+
+        if (drawGazePoint) DrawGazePoint();
+    }
+
+    void DrawGazePoint()
     {
         Debug.DrawLine(transform.position, gazePoint, Color.magenta);
-    }
-
-    void UpdateAnalyzer(GazePointAnalyzer analyzer)
+    }
+
+    void UpdateAnalyzer(GazePointAnalyzer analyzer)
     {
         analyzer.moveRectFilter = moveRectFilter;
         analyzer.mouseFilter = mouseFilter;
@@ -65,5 +65,5 @@ public class MultipleMonitorAnalyzer : MonoBehaviour
         analyzer.drawAveragePos = drawAveragePos;
         analyzer.drawMoveRects = drawMoveRects;
         analyzer.drawDirtyRects = drawDirtyRects;
-    }
-}
+    }
+}

Assets/uDesktopDuplication/Plugins/x86/uDesktopDuplication.dll.meta

@@ -1,53 +1,150 @@
 fileFormatVersion: 2
-guid: 19d4c78204afead44b6de11427d7f2f6
-timeCreated: 1480693943
+guid: d3ab0ac3a3d6bb643af0a464a93be957
+timeCreated: 1503496900
 licenseType: Pro
 PluginImporter:
-  serializedVersion: 1
+  serializedVersion: 2
   iconMap: {}
   executionOrder: {}
   isPreloaded: 0
+  isOverridable: 0
   platformData:
-    Any:
-      enabled: 1
-      settings: {}
-    Editor:
-      enabled: 0
-      settings:
-        CPU: x86
-        DefaultValueInitialized: true
-    Linux:
-      enabled: 1
-      settings:
-        CPU: x86
-    Linux64:
-      enabled: 0
-      settings:
-        CPU: None
-    LinuxUniversal:
-      enabled: 1
-      settings:
-        CPU: x86
-    OSXIntel:
-      enabled: 1
-      settings:
-        CPU: AnyCPU
-    OSXIntel64:
-      enabled: 0
-      settings:
-        CPU: None
-    OSXUniversal:
-      enabled: 0
-      settings:
-        CPU: x86
-    Win:
-      enabled: 1
-      settings:
-        CPU: AnyCPU
-    Win64:
-      enabled: 0
-      settings:
-        CPU: None
+    data:
+      first:
+        '': Any
+      second:
+        enabled: 0
+        settings:
+          Exclude Android: 0
+          Exclude Editor: 0
+          Exclude Linux: 0
+          Exclude Linux64: 0
+          Exclude LinuxUniversal: 0
+          Exclude OSXIntel: 0
+          Exclude OSXIntel64: 0
+          Exclude OSXUniversal: 0
+          Exclude Win: 0
+          Exclude Win64: 1
+    data:
+      first:
+        '': data
+      second:
+        enabled: 0
+        settings: {}
+    data:
+      first:
+        Android: Android
+      second:
+        enabled: 1
+        settings:
+          CPU: ARMv7
+    data:
+      first:
+        Any: 
+      second:
+        enabled: 1
+        settings:
+          Exclude Editor: 0
+          Exclude Linux: 0
+          Exclude Linux64: 0
+          Exclude LinuxUniversal: 0
+          Exclude OSXIntel: 0
+          Exclude OSXIntel64: 0
+          Exclude OSXUniversal: 0
+          Exclude WebGL: 0
+          Exclude Win: 0
+          Exclude Win64: 1
+    data:
+      first:
+        Editor: Editor
+      second:
+        enabled: 1
+        settings:
+          CPU: x86
+          DefaultValueInitialized: true
+          OS: AnyOS
+    data:
+      first:
+        Facebook: WebGL
+      second:
+        enabled: 1
+        settings: {}
+    data:
+      first:
+        Facebook: Win
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Facebook: Win64
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Standalone: Linux
+      second:
+        enabled: 1
+        settings:
+          CPU: x86
+    data:
+      first:
+        Standalone: Linux64
+      second:
+        enabled: 1
+        settings:
+          CPU: None
+    data:
+      first:
+        Standalone: LinuxUniversal
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Standalone: OSXIntel
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Standalone: OSXIntel64
+      second:
+        enabled: 1
+        settings:
+          CPU: None
+    data:
+      first:
+        Standalone: OSXUniversal
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Standalone: Win
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Standalone: Win64
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        WebGL: WebGL
+      second:
+        enabled: 1
+        settings: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll.meta

@@ -1,54 +1,150 @@
 fileFormatVersion: 2
-guid: 02fc121822cf2ea4e82e16c4a28bf711
-timeCreated: 1477546714
+guid: 7cb91c9ae744dc5429005b20e11f4f37
+timeCreated: 1503505907
 licenseType: Pro
 PluginImporter:
-  serializedVersion: 1
+  serializedVersion: 2
   iconMap: {}
   executionOrder: {}
   isPreloaded: 0
+  isOverridable: 0
   platformData:
-    Any:
-      enabled: 1
-      settings: {}
-    Editor:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-        DefaultValueInitialized: true
-        OS: AnyOS
-    Linux:
-      enabled: 0
-      settings:
-        CPU: x86
-    Linux64:
-      enabled: 0
-      settings:
-        CPU: x86_64
-    LinuxUniversal:
-      enabled: 0
-      settings:
-        CPU: None
-    OSXIntel:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-    OSXIntel64:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-    OSXUniversal:
-      enabled: 0
-      settings:
-        CPU: None
-    Win:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-    Win64:
-      enabled: 1
-      settings:
-        CPU: AnyCPU
+    data:
+      first:
+        '': Any
+      second:
+        enabled: 0
+        settings:
+          Exclude Android: 0
+          Exclude Editor: 0
+          Exclude Linux: 0
+          Exclude Linux64: 0
+          Exclude LinuxUniversal: 0
+          Exclude OSXIntel: 0
+          Exclude OSXIntel64: 0
+          Exclude OSXUniversal: 0
+          Exclude Win: 1
+          Exclude Win64: 0
+    data:
+      first:
+        '': data
+      second:
+        enabled: 0
+        settings: {}
+    data:
+      first:
+        Android: Android
+      second:
+        enabled: 1
+        settings:
+          CPU: ARMv7
+    data:
+      first:
+        Any: 
+      second:
+        enabled: 1
+        settings:
+          Exclude Editor: 0
+          Exclude Linux: 0
+          Exclude Linux64: 0
+          Exclude LinuxUniversal: 0
+          Exclude OSXIntel: 0
+          Exclude OSXIntel64: 0
+          Exclude OSXUniversal: 0
+          Exclude WebGL: 0
+          Exclude Win: 1
+          Exclude Win64: 0
+    data:
+      first:
+        Editor: Editor
+      second:
+        enabled: 1
+        settings:
+          CPU: x86_64
+          DefaultValueInitialized: true
+          OS: AnyOS
+    data:
+      first:
+        Facebook: WebGL
+      second:
+        enabled: 1
+        settings: {}
+    data:
+      first:
+        Facebook: Win
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Facebook: Win64
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Standalone: Linux
+      second:
+        enabled: 1
+        settings:
+          CPU: None
+    data:
+      first:
+        Standalone: Linux64
+      second:
+        enabled: 1
+        settings:
+          CPU: x86_64
+    data:
+      first:
+        Standalone: LinuxUniversal
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Standalone: OSXIntel
+      second:
+        enabled: 1
+        settings:
+          CPU: None
+    data:
+      first:
+        Standalone: OSXIntel64
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Standalone: OSXUniversal
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Standalone: Win
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Standalone: Win64
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        WebGL: WebGL
+      second:
+        enabled: 1
+        settings: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/uDesktopDuplication/Scripts/Manager.cs

@@ -62,8 +62,13 @@ public class Manager : MonoBehaviour
     private float reinitializationTimer_ = 0f;
     private bool isFirstFrame_ = true;
 
-    public static event Lib.DebugLogDelegate onDebugLog = msg => Debug.Log(msg);
-    public static event Lib.DebugLogDelegate onDebugErr = msg => Debug.LogError(msg);
+    public static event Lib.DebugLogDelegate onDebugLog = OnDebugLog;
+    public static event Lib.DebugLogDelegate onDebugErr = OnDebugErr;
+
+    [AOT.MonoPInvokeCallback(typeof(Lib.DebugLogDelegate))]
+    private static void OnDebugLog(string msg) { Debug.Log(msg); }
+    [AOT.MonoPInvokeCallback(typeof(Lib.DebugLogDelegate))]
+    private static void OnDebugErr(string msg) { Debug.LogError(msg); }
 
     public delegate void ReinitializeHandler();
     public static event ReinitializeHandler onReinitialized;
@@ -99,6 +104,12 @@ public class Manager : MonoBehaviour
         Lib.Initialize();
 
         CreateMonitors();
+
+        #if UNITY_2018_1_OR_NEWER
+        Shader.DisableKeyword("USE_GAMMA_TO_LINEAR_SPACE");
+        #else
+        Shader.EnableKeyword("USE_GAMMA_TO_LINEAR_SPACE");
+        #endif
     }
 
     void OnApplicationQuit()

Assets/uDesktopDuplication/Scripts/Texture.cs

@@ -240,6 +240,13 @@ public class Texture : MonoBehaviour
         }
     }
 
+    int clipPositionScaleKey_;
+
+    void Awake()
+    {
+        clipPositionScaleKey_ = Shader.PropertyToID("_ClipPositionScale");
+    }
+
     void OnEnable()
     {
         if (monitor == null) {
@@ -271,7 +278,9 @@ public class Texture : MonoBehaviour
 
     void RequireUpdate()
     {
-        monitor.shouldBeUpdated = true;
+        if (monitor != null) {
+            monitor.shouldBeUpdated = true;
+        }
     }
 
     void Reinitialize()
@@ -283,8 +292,12 @@ public class Texture : MonoBehaviour
     void UpdateMaterial()
     {
         width = transform.localScale.x;
-        rotation = monitor.rotation;
-        material.SetVector("_ClipPositionScale", new Vector4(clipPos.x, clipPos.y, clipScale.x, clipScale.y));
+
+        if (monitor != null) {
+            rotation = monitor.rotation;
+        }
+
+        material.SetVector(clipPositionScaleKey_, new Vector4(clipPos.x, clipPos.y, clipScale.x, clipScale.y));
     }
 
     public Vector3 GetWorldPositionFromCoord(Vector2 coord)
@@ -401,6 +414,19 @@ public class Texture : MonoBehaviour
         // Calculate coordinates.
         var coordX = toAngle / halfWidthAngle * 0.5f;
         var coordY = ly / halfHeight * 0.5f;
+
+        // Zoom
+        if (useClip) {
+            coordX = clipPos.x + (0.5f + coordX) * clipScale.x;
+            coordX -= Mathf.Floor(coordX);
+            coordX -= 0.5f;
+
+            coordY = (1f - clipPos.y) + (coordY - 0.5f) * clipScale.y;
+            coordY -= Mathf.Floor(coordY);
+            coordY -= 0.5f;
+        }
+
+        // Desktop position
         int desktopX = monitor.left + (int)((coordX + 0.5f) * monitor.width);
         int desktopY = monitor.top + (int)((0.5f - coordY) * monitor.height);
 

Assets/uDesktopDuplication/Shaders/uDD_Common.cginc

@@ -58,9 +58,11 @@ inline float2 uddClipUV(float2 uv)
 
 inline void uddConvertToLinearIfNeeded(inout fixed3 rgb)
 {
+#ifdef USE_GAMMA_TO_LINEAR_SPACE
     if (!IsGammaSpace()) {
         rgb = GammaToLinearSpace(rgb);
     }
+#endif
 }
 
 inline fixed4 uddGetTexture(sampler2D tex, float2 uv)

Assets/uDesktopDuplication/Shaders/uDD_Standard.shader

@@ -31,6 +31,7 @@ SubShader
     #pragma multi_compile ___ USE_CLIP
     #pragma multi_compile ___ BEND_ON
     #pragma multi_compile _FORWARD_Y _FORWARD_Z
+    #pragma multi_compile ___ USE_GAMMA_TO_LINEAR_SPACE
 
     #define SURFACE_SHADER
     #include "./uDD_Common.cginc"

Assets/uDesktopDuplication/Shaders/uDD_Unlit.shader

@@ -55,6 +55,7 @@ Pass
     #pragma multi_compile ___ USE_CLIP
     #pragma multi_compile ___ BEND_ON
     #pragma multi_compile _FORWARD_Y _FORWARD_Z
+    #pragma multi_compile ___ USE_GAMMA_TO_LINEAR_SPACE
     ENDCG
 }
 

Assets/uDesktopDuplication/Shaders/uDD_Unlit_BlackMask.shader

@@ -61,6 +61,7 @@ Pass
     #pragma multi_compile ___ USE_CLIP
     #pragma multi_compile ___ BEND_ON
     #pragma multi_compile _FORWARD_Y _FORWARD_Z
+    #pragma multi_compile ___ USE_GAMMA_TO_LINEAR_SPACE
     ENDCG
 }
 

Assets/uDesktopDuplication/Shaders/uDD_Unlit_Displacement.shader

@@ -142,7 +142,7 @@ DsOutput domain(
     float disp = length(_DispTex.SampleLevel(sampler_DispTex, o.f2TexCoord, 0)) * _DispFactor;
     f3Position.xyz += f3Normal * disp;
 
-    o.f4Position = mul(UNITY_MATRIX_MVP, float4(f3Position.xyz, 1.0));
+    o.f4Position = UnityObjectToClipPos(float4(f3Position.xyz, 1.0));
         
     return o;
 }
@@ -168,6 +168,7 @@ Pass
     #pragma multi_compile ___ USE_CLIP
     #pragma multi_compile ___ BEND_ON
     #pragma multi_compile _FORWARD_Y _FORWARD_Z
+    #pragma multi_compile ___ USE_GAMMA_TO_LINEAR_SPACE
     ENDCG
 }
 

Assets/uDesktopDuplication/Shaders/uDD_Unlit_Transparent.shader

@@ -57,6 +57,7 @@ Pass
     #pragma multi_compile ___ USE_CLIP
     #pragma multi_compile ___ BEND_ON
     #pragma multi_compile _FORWARD_Y _FORWARD_Z
+    #pragma multi_compile ___ USE_GAMMA_TO_LINEAR_SPACE
     ENDCG
 }
 

Plugins/uDesktopDuplication/uDesktopDuplication.def

@@ -0,0 +1,5 @@
+LIBRARY
+
+EXPORTS
+    UnityPluginLoad
+    UnityPluginUnload

Plugins/uDesktopDuplication/uDesktopDuplication.sln

@@ -0,0 +1,34 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uDesktopDuplication", "uDesktopDuplication\uDesktopDuplication.vcxproj", "{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}.Debug|Win32.Build.0 = Debug|Win32
+		{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}.Debug|x64.ActiveCfg = Debug|x64
+		{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}.Debug|x64.Build.0 = Debug|x64
+		{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}.Debug|x86.ActiveCfg = Debug|Win32
+		{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}.Debug|x86.Build.0 = Debug|Win32
+		{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}.Release|Win32.ActiveCfg = Release|Win32
+		{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}.Release|Win32.Build.0 = Release|Win32
+		{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}.Release|x64.ActiveCfg = Release|x64
+		{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}.Release|x64.Build.0 = Release|x64
+		{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}.Release|x86.ActiveCfg = Release|Win32
+		{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Plugins/uDesktopDuplication/uDesktopDuplication/Cursor.cpp

@@ -218,7 +218,7 @@ void Cursor::UpdateTexture(
         desc.Usage              = D3D11_USAGE_STAGING;
         desc.BindFlags          = 0;
         desc.CPUAccessFlags     = D3D11_CPU_ACCESS_READ;
-        desc.MiscFlags          = D3D11_RESOURCE_MISC_SHARED;
+        desc.MiscFlags          = 0;
 
         if (FAILED(duplicator->GetDevice()->CreateTexture2D(&desc, nullptr, &texture)))
         {

Plugins/uDesktopDuplication/uDesktopDuplication/Debug.h

@@ -157,4 +157,5 @@ private:
     });
 #else
 #define UDD_FUNCTION_SCOPE_TIMER
+#define UDD_SCOPE_TIMER(Name)
 #endif

Plugins/uDesktopDuplication/uDesktopDuplication/Duplicator.cpp

@@ -46,7 +46,8 @@ void Duplicator::InitializeDevice()
 void Duplicator::InitializeDuplication()
 {
 	ComPtr<IDXGIOutput1> output1;
-	if (FAILED(monitor_->GetOutput().As(&output1))) {
+	if (FAILED(monitor_->GetOutput().As(&output1))) 
+    {
 		return;
 	}
 
@@ -237,6 +238,8 @@ void Duplicator::Duplicate(UINT timeout)
 {
     if (!dupl_ || !device_) return;
 
+    Release();
+
     ComPtr<IDXGIResource> resource;
     DXGI_OUTDUPL_FRAME_INFO frameInfo;
     const auto hr = dupl_->AcquireNextFrame(timeout, &frameInfo, &resource);
@@ -279,33 +282,7 @@ void Duplicator::Duplicate(UINT timeout)
         return;
     }
 
-    ScopedReleaser releaser([this] 
-    {
-        const auto hr = dupl_->ReleaseFrame();
-        if (FAILED(hr))
-        {
-            switch (hr)
-            {
-                case DXGI_ERROR_ACCESS_LOST:
-                {
-                    Debug::Log("Duplicator::Duplicate() => DXGI_ERROR_ACCESS_LOST.");
-                    state_ = State::AccessLost;
-                    break;
-                }
-                case DXGI_ERROR_INVALID_CALL:
-                {
-                    Debug::Error("Duplicator::Duplicate() => DXGI_ERROR_INVALID_CALL.");
-                    break;
-                }
-                default:
-                {
-                    state_ = State::Unknown;
-                    Debug::Error("Duplicator::Duplicate() => Unknown Error.");
-                    break;
-                }
-            }
-        }
-    });
+    isFrameAcquired_ = true;
 
     ComPtr<ID3D11Texture2D> texture;
     if (FAILED(resource.As(&texture))) 
@@ -322,7 +299,6 @@ void Duplicator::Duplicate(UINT timeout)
     }
 
     {
-        UDD_SCOPE_TIMER(CopyResource);
         ComPtr<ID3D11DeviceContext> context;
         device_->GetDevice()->GetImmediateContext(&context);
         context->CopyResource(sharedTexture.Get(), texture.Get());
@@ -344,6 +320,39 @@ void Duplicator::Duplicate(UINT timeout)
 }
 
 
+void Duplicator::Release()
+{
+    if (!isFrameAcquired_) return;
+
+    const auto hr = dupl_->ReleaseFrame();
+    if (FAILED(hr))
+    {
+        switch (hr)
+        {
+            case DXGI_ERROR_ACCESS_LOST:
+            {
+                Debug::Log("Duplicator::Duplicate() => DXGI_ERROR_ACCESS_LOST.");
+                state_ = State::AccessLost;
+                break;
+            }
+            case DXGI_ERROR_INVALID_CALL:
+            {
+                Debug::Error("Duplicator::Duplicate() => DXGI_ERROR_INVALID_CALL.");
+                break;
+            }
+            default:
+            {
+                state_ = State::Unknown;
+                Debug::Error("Duplicator::Duplicate() => Unknown Error.");
+                break;
+            }
+        }
+    }
+
+    isFrameAcquired_ = false;
+}
+
+
 void Duplicator::UpdateCursor(
     const ComPtr<ID3D11Texture2D>& texture,
     const DXGI_OUTDUPL_FRAME_INFO& frameInfo)

Plugins/uDesktopDuplication/uDesktopDuplication/Duplicator.h

@@ -68,6 +68,7 @@ private:
     void CheckUnityAdapter();
 
     void Duplicate(UINT timeout);
+    void Release();
 
     void UpdateCursor(
         const Microsoft::WRL::ComPtr<ID3D11Texture2D>& texture,
@@ -83,6 +84,7 @@ private:
     Microsoft::WRL::ComPtr<IDXGIOutputDuplication> dupl_;
     Frame lastFrame_;
     UINT lastFrameId_ = 0;
+    bool isFrameAcquired_ = false;
 
     volatile bool shouldRun_ = false;
     std::thread thread_;

Plugins/uDesktopDuplication/uDesktopDuplication/Monitor.cpp

@@ -75,29 +75,41 @@ void Monitor::Render()
     if (frame.id == lastFrameId_) return;
     lastFrameId_ = frame.id;
 
-	if (unityTexture_)
-	{
-		D3D11_TEXTURE2D_DESC srcDesc, dstDesc;
-		frame.texture->GetDesc(&srcDesc);
-		unityTexture_->GetDesc(&dstDesc);
-		if (srcDesc.Width  != dstDesc.Width ||
-			srcDesc.Height != dstDesc.Height)
-		{
-			Debug::Error("Monitor::Render() => Texture sizes are defferent.");
-			Debug::Error("    Source : (", srcDesc.Width, ", ", srcDesc.Height, ")");
-			Debug::Error("    Dest   : (", dstDesc.Width, ", ", dstDesc.Height, ")");
-            return;
-		}
-		else
-		{
-			ComPtr<ID3D11DeviceContext> context;
-			GetDevice()->GetImmediateContext(&context);
-			context->CopyResource(unityTexture_, frame.texture.Get());
+    if (unityTexture_ == nullptr) 
+    {
+        Debug::Error("Monitor::Render() => Target texture has not been set yet.");
+        return;
+    }
 
-            auto cursor = GetMonitorManager()->GetCursor();
-            cursor->Draw(unityTexture_);
-		}
-	}
+    if (!frame.texture)
+    {
+        Debug::Error("Monitor::Render() => frame doesn't have texture.");
+        return;
+    }
+
+    D3D11_TEXTURE2D_DESC srcDesc, dstDesc;
+    frame.texture->GetDesc(&srcDesc);
+    unityTexture_->GetDesc(&dstDesc);
+    if (srcDesc.Width  != dstDesc.Width ||
+        srcDesc.Height != dstDesc.Height)
+    {
+        Debug::Error("Monitor::Render() => Texture sizes are defferent.");
+        Debug::Error("    Source : (", srcDesc.Width, ", ", srcDesc.Height, ")");
+        Debug::Error("    Dest   : (", dstDesc.Width, ", ", dstDesc.Height, ")");
+        return;
+    }
+    else
+    {
+        ComPtr<ID3D11DeviceContext> context;
+        GetDevice()->GetImmediateContext(&context);
+        context->CopyResource(unityTexture_, frame.texture.Get());
+
+        auto& manager = GetMonitorManager();
+        if (id_ == manager->GetCursorMonitorId())
+        {
+            manager->GetCursor()->Draw(unityTexture_);
+        }
+    }
 
 	if (UseGetPixels())
 	{
@@ -452,7 +464,6 @@ bool Monitor::GetPixels(BYTE* output, int x, int y, int width, int height)
             const auto outCol = col;
             const auto outIndex = 4 * (outRow * width + outCol);
 
-
             // BGRA -> RGBA
             output[outIndex + 0] = bufferForGetPixels_[inIndex + 2];
             output[outIndex + 1] = bufferForGetPixels_[inIndex + 1];

Plugins/uDesktopDuplication/uDesktopDuplication/MonitorManager.cpp

@@ -84,6 +84,7 @@ void MonitorManager::Update()
 
 void MonitorManager::RequireReinitilization()
 {
+    Debug::Log("MonitorManager::Reinitialize() was required.");
     isReinitializationRequired_ = true;
 }
 

Plugins/uDesktopDuplication/uDesktopDuplication/main.cpp

@@ -42,14 +42,16 @@ extern "C"
 			auto device = g_unity->Get<IUnityGraphicsD3D11>()->GetDevice();
 
 			Microsoft::WRL::ComPtr<IDXGIDevice1> dxgiDevice;
-			if (FAILED(device->QueryInterface(IID_PPV_ARGS(&dxgiDevice)))){
-				Debug::Error("fatal");
+			if (FAILED(device->QueryInterface(IID_PPV_ARGS(&dxgiDevice))))
+            {
+				Debug::Error("Initialize() => device->QueryInterface() failed.");
 				return;
 			}
 
 			Microsoft::WRL::ComPtr<IDXGIAdapter> dxgiAdapter;
-			if (FAILED(dxgiDevice->GetAdapter(&dxgiAdapter))) {
-				Debug::Error("fatal");
+			if (FAILED(dxgiDevice->GetAdapter(&dxgiAdapter))) 
+            {
+				Debug::Error("Initialize() => dxgiDevice->GetAdapter() failed.");
 				return;
 			}
 

Plugins/uDesktopDuplication/uDesktopDuplication/uDesktopDuplication.vcxproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -21,7 +21,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}</ProjectGuid>
     <RootNamespace>uDesktopDuplication</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <ProjectName>uDesktopDuplication</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -82,6 +82,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);include</IncludePath>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -92,6 +94,10 @@
     <PostBuildEvent>
       <Command>copy /Y "$(SolutionDir)$(Platform)\$(Configuration)\$(TargetFileName)" "$(SolutionDir)..\..\Assets\$(ProjectName)\Plugins\x86_64"</Command>
     </PostBuildEvent>
+    <Link>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -100,8 +106,11 @@
       <SDLCheck>true</SDLCheck>
     </ClCompile>
     <PostBuildEvent>
-      <Command>copy /Y "$(SolutionDir)$(Platform)\$(Configuration)\$(TargetFileName)" "$(SolutionDir)..\..\Assets\$(ProjectName)\Plugins\x86_64"</Command>
+      <Command>copy /Y "$(SolutionDir)$(Platform)\$(Configuration)\$(TargetFileName)" "$(SolutionDir)..\..\Assets\$(ProjectName)\Plugins\x86"</Command>
     </PostBuildEvent>
+    <Link>
+      <ModuleDefinitionFile>$(SolutionDir)$(ProjectName).def</ModuleDefinitionFile>
+    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -115,6 +124,8 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
     </Link>
     <PostBuildEvent>
       <Command>copy /Y "$(SolutionDir)$(Platform)\$(Configuration)\$(TargetFileName)" "$(SolutionDir)..\..\Assets\$(ProjectName)\Plugins\x86_64"</Command>
@@ -132,6 +143,7 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <ModuleDefinitionFile>$(SolutionDir)$(ProjectName).def</ModuleDefinitionFile>
     </Link>
     <PostBuildEvent>
       <Command>copy /Y "$(SolutionDir)$(Platform)\$(Configuration)\$(TargetFileName)" "$(SolutionDir)..\..\Assets\$(ProjectName)\Plugins\x86"</Command>

ProjectSettings/PresetManager.asset

@@ -0,0 +1,6 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1386491679 &1
+PresetManager:
+  m_ObjectHideFlags: 0
+  m_DefaultList: []

ProjectSettings/ProjectVersion.txt

@@ -1 +1 @@
-m_EditorVersion: 5.5.0f3
+m_EditorVersion: 2018.2.15f1

README.md

@@ -2,7 +2,6 @@ uDesktopDuplication
 ===================
 
 ![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)
-![Build Status](http://unitybuildbadge.azurewebsites.net/api/status/7566d616-2916-4c99-bb14-e7ab9501cf7e)
 
 **uDesktopDuplication** is an Unity asset to use the realtime screen capture as `Texture2D` using Desktop Duplication API.
 
@@ -28,7 +27,7 @@ Usage
 Attach `uDesktopDuplication/Texture` component to the target object, then its main texture will be replaced with the captured screen. Please see example scenes for more details.
 
 
-Lisence
+License
 -------
 The MIT License (MIT)