fix bug that caused darker screen #22.

hecomi · Aug 4, 2018 · 70cfad9 · 70cfad9
1 parent c926127
commit 70cfad9
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 1 deletion.
diff --git a/Assets/uDesktopDuplication/Scripts/Manager.cs b/Assets/uDesktopDuplication/Scripts/Manager.cs
@@ -99,6 +99,12 @@ void Awake()
         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()

diff --git a/Assets/uDesktopDuplication/Scripts/Texture.cs b/Assets/uDesktopDuplication/Scripts/Texture.cs
@@ -283,13 +283,16 @@ void Reinitialize()
         monitor = Manager.GetMonitor(lastMonitorId_);
     }
 
+    int clipPositionScaleKey_ = Shader.PropertyToID("_ClipPositionScale");
     void UpdateMaterial()
     {
         width = transform.localScale.x;
+
         if (monitor != null) {
             rotation = monitor.rotation;
         }
-        material.SetVector("_ClipPositionScale", new Vector4(clipPos.x, clipPos.y, clipScale.x, clipScale.y));
+
+        material.SetVector(clipPositionScaleKey_, new Vector4(clipPos.x, clipPos.y, clipScale.x, clipScale.y));
     }
 
     public Vector3 GetWorldPositionFromCoord(Vector2 coord)

diff --git a/Assets/uDesktopDuplication/Shaders/uDD_Common.cginc b/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)

diff --git a/Assets/uDesktopDuplication/Shaders/uDD_Standard.shader b/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"

diff --git a/Assets/uDesktopDuplication/Shaders/uDD_Unlit.shader b/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
 }
 

diff --git a/Assets/uDesktopDuplication/Shaders/uDD_Unlit_BlackMask.shader b/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
 }
 

diff --git a/Assets/uDesktopDuplication/Shaders/uDD_Unlit_Displacement.shader b/Assets/uDesktopDuplication/Shaders/uDD_Unlit_Displacement.shader
@@ -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
 }
 

diff --git a/Assets/uDesktopDuplication/Shaders/uDD_Unlit_Transparent.shader b/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
 }