Merge branch 'develop'

Author: sotanmochi

Assets/CustomTextureRenderer/Runtime/PluginTextureRenderer.cs

@@ -29,7 +29,9 @@ public sealed class PluginTextureRenderer : IDisposable
 
         private int _textureWidth;
         private int _textureHeight;
+        private TextureFormat _textureFormat = TextureFormat.RGBA32;
         private readonly int _bytesPerPixel = 4; // RGBA32. 1 byte (8 bits) per channel.
+        private readonly ColorSpace _activeColorSpace;
 
         private readonly Thread _pluginRenderThread;
         private readonly Action _loopAction;
@@ -51,18 +53,19 @@ public sealed class PluginTextureRenderer : IDisposable
 #endif
 
         public PluginTextureRenderer(RawTextureDataUpdateCallback callback, 
-                                        int textureWidth, int textureHeight, int bufferSize = 0,
+                                        int textureWidth, int textureHeight, int bufferSize = 0, TextureFormat format = TextureFormat.RGBA32, 
                                         int targetFrameRateOfPluginRenderThread = 60, bool autoDispose = true)
         {
 #if DEVELOPMENT_BUILD || UNITY_EDITOR
             _textureUpdateLoopSampler = CustomSampler.Create("RawTextureDataUpdateFunction");
 #endif
+            _activeColorSpace = UnityEngine.QualitySettings.activeColorSpace;
 
             _loopAction = RawTextureDataUpdate;
             _rawTextureDataUpdateCallback = callback;
             DebugLog($"[{nameof(PluginTextureRenderer)}] The RawTextureDataUpdateCallback is \n'{_rawTextureDataUpdateCallback.Target}.{_rawTextureDataUpdateCallback.Method.Name}'.");
 
-            CreateTextureBuffer(textureWidth, textureHeight, bufferSize);
+            CreateTextureBuffer(textureWidth, textureHeight, bufferSize, format);
 
             if (autoDispose){ UnityEngine.Application.quitting += Dispose; }
 
@@ -75,20 +78,22 @@ public PluginTextureRenderer(RawTextureDataUpdateCallback callback,
             _pluginRenderThread.Start();
         }
 
-        public PluginTextureRenderer(IssuePluginCustomTextureUpdateCallback callback, int textureWidth, int textureHeight, 
+        public PluginTextureRenderer(IssuePluginCustomTextureUpdateCallback callback, 
+                                        int textureWidth, int textureHeight, int bufferSize = 0, TextureFormat format = TextureFormat.RGBA32, 
                                         int targetFrameRateOfPluginRenderThread = 60, bool autoDispose = true)
         {
 #if DEVELOPMENT_BUILD || UNITY_EDITOR
             _textureUpdateLoopSampler = CustomSampler.Create("CustomTextureUpdateFunction");
 #endif
+            _activeColorSpace = UnityEngine.QualitySettings.activeColorSpace;
 
             _loopAction = IssuePluginCustomTextureUpdate;
             _customTextureUpdateCallback = callback;
             DebugLog($"[{nameof(PluginTextureRenderer)}] The CustomTextureUpdateCallback is \n'{_customTextureUpdateCallback.Target}.{_customTextureUpdateCallback.Method.Name}'.");
 
             _textureUpdateParamsPtr = Marshal.AllocHGlobal(Marshal.SizeOf(_textureUpdateParams));
 
-            CreateTextureBuffer(textureWidth, textureHeight);
+            CreateTextureBuffer(textureWidth, textureHeight, bufferSize, format);
 
             if (autoDispose){ UnityEngine.Application.quitting += Dispose; }
 
@@ -135,17 +140,18 @@ public void Dispose()
         /// <param name="width"></param>
         /// <param name="height"></param>
         /// <returns></returns>
-        public IntPtr CreateTextureBuffer(int width, int height, int bufferSize = 0)
+        public IntPtr CreateTextureBuffer(int width, int height, int bufferSize = 0, TextureFormat format = TextureFormat.RGBA32)
         {
             _updated = false;
 
             if (_textureWidth != width || _textureHeight != height)
             {
                 UnityEngine.Object.Destroy(_targetTexture);
 
-                _targetTexture = new Texture2D(width, height, TextureFormat.RGBA32, false);
+                _targetTexture = new Texture2D(width, height, format, false);
                 _textureWidth = width;
                 _textureHeight = height;
+                _textureFormat = format;
             }
 
             if (_rawTextureDataUpdateCallback != null)
@@ -214,6 +220,25 @@ unsafe void IssuePluginCustomTextureUpdate()
             _textureUpdateParams.bpp = (uint)_bytesPerPixel;
             _textureUpdateParams.userData = _userData;
 
+            if (_activeColorSpace is ColorSpace.Linear)
+            {
+                _textureUpdateParams.format = _textureFormat switch 
+                {
+                    TextureFormat.RGBA32 => UnityRenderingExtTextureFormat.kUnityRenderingExtFormatR8G8B8A8_SRGB,
+                    TextureFormat.BGRA32 => UnityRenderingExtTextureFormat.kUnityRenderingExtFormatB8G8R8A8_SRGB,
+                    _ => UnityRenderingExtTextureFormat.kUnityRenderingExtFormatR8G8B8A8_SRGB,
+                };
+            }
+            else
+            {
+                _textureUpdateParams.format = _textureFormat switch 
+                {
+                    TextureFormat.RGBA32 => UnityRenderingExtTextureFormat.kUnityRenderingExtFormatR8G8B8A8_UNorm,
+                    TextureFormat.BGRA32 => UnityRenderingExtTextureFormat.kUnityRenderingExtFormatB8G8R8A8_UNorm,
+                    _ => UnityRenderingExtTextureFormat.kUnityRenderingExtFormatR8G8B8A8_UNorm,
+                };
+            }
+
             var eventId = (int)UnityRenderingExtEventType.kUnityRenderingExtEventUpdateTextureBeginV2;
             Marshal.StructureToPtr(_textureUpdateParams, _textureUpdateParamsPtr, false);