From d9c5bbb1061ebcb7e0a2c111e9cdb359208e2a0f Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Mon, 11 May 2020 23:21:45 +0300
Subject: [PATCH] Updates for master

---
 src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs    | 9 ++++++---
 src/Skia/Avalonia.Skia/PlatformRenderInterface.cs | 2 +-
 src/Skia/Avalonia.Skia/SkiaOptions.cs             | 6 +-----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs b/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs
index 6121e11af0..de188f42bd 100644
--- a/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs
+++ b/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs
@@ -9,7 +9,7 @@ namespace Avalonia.Skia
     {
         private GRContext _grContext;
 
-        public GlSkiaGpu(IWindowingPlatformGlFeature gl, long maxResourceBytes)
+        public GlSkiaGpu(IWindowingPlatformGlFeature gl, long? maxResourceBytes)
         {
             var context = gl.MainContext;
             using (context.MakeCurrent())
@@ -19,8 +19,11 @@ namespace Avalonia.Skia
                     GRGlInterface.AssembleGlesInterface((_, proc) => context.GlInterface.GetProcAddress(proc)))
                 {
                     _grContext = GRContext.Create(GRBackend.OpenGL, iface);
-                    _grContext.GetResourceCacheLimits(out var maxResources, out _);
-                    _grContext.SetResourceCacheLimits(maxResources, maxResourceBytes);
+                    if (maxResourceBytes.HasValue)
+                    {
+                        _grContext.GetResourceCacheLimits(out var maxResources, out _);
+                        _grContext.SetResourceCacheLimits(maxResources, maxResourceBytes.Value);
+                    }
                 }
             }
         }
diff --git a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
index 3a1af9fdc0..2fee282860 100644
--- a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
+++ b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
@@ -19,7 +19,7 @@ namespace Avalonia.Skia
     {
         private readonly ISkiaGpu _skiaGpu;
 
-        public PlatformRenderInterface(ISkiaGpu skiaGpu, long maxResourceBytes)
+        public PlatformRenderInterface(ISkiaGpu skiaGpu, long? maxResourceBytes = null)
         {
             if (skiaGpu != null)
             {
diff --git a/src/Skia/Avalonia.Skia/SkiaOptions.cs b/src/Skia/Avalonia.Skia/SkiaOptions.cs
index ce818bf69d..cbe0b5ef42 100644
--- a/src/Skia/Avalonia.Skia/SkiaOptions.cs
+++ b/src/Skia/Avalonia.Skia/SkiaOptions.cs
@@ -8,10 +8,6 @@ namespace Avalonia
     /// </summary>
     public class SkiaOptions
     {
-        public SkiaOptions()
-        {
-            MaxGpuResourceSizeBytes = 100663296; // Value taken from skia.
-        }
         /// <summary>
         /// Custom gpu factory to use. Can be used to customize behavior of Skia renderer.
         /// </summary>
@@ -20,6 +16,6 @@ namespace Avalonia
         /// <summary>
         /// The maximum number of bytes for video memory to store textures and resources.
         /// </summary>
-        public long MaxGpuResourceSizeBytes { get; set; }
+        public long? MaxGpuResourceSizeBytes { get; set; }
     }
 }