diff --git a/doc/articles/controls/GLCanvasElement.md b/doc/articles/controls/GLCanvasElement.md index 3f1c56d2e3c9..403107cfea2a 100644 --- a/doc/articles/controls/GLCanvasElement.md +++ b/doc/articles/controls/GLCanvasElement.md @@ -25,7 +25,7 @@ The protected constructor additionally requires a `Func` argument that f The 3 abstract methods above all take a `Silk.NET.OpenGL.GL` parameter that can be used to make OpenGL calls. -The `Init` method is a regular OpenGL setup method that you can use to set up the needed OpenGL objects, like textures, Vertex Array Buffers (VAOs), Element Array Buffers (EBOs), etc. The `OnDestroy` method is the complement of `Init` and is used to clean up any allocated resources. `Init` and `OnDestroy` might be called multiple times alternatingly. In other words, 2 `OnDestroy` calls are guaranteed to have an `Init` call in between and vice versa. +The `Init` method is a regular OpenGL setup method that you can use to set up the needed OpenGL objects, like textures, Vertex Array Buffers (VAOs), Element Array Buffers (EBOs), etc. The `OnDestroy` method is the complement of `Init` and is used to clean up any allocated resources. `Init` and `OnDestroy` might be called multiple times alternatingly. In other words, 2 `OnDestroy` calls are guaranteed to have an `Init` call in between and vice versa. The `RenderOverride` is the main render-loop function. When adding your drawing logic in `RenderOverride`, you can assume that the OpenGL viewport rectangle is already set and its dimensions are equal to the `resolution` parameter provided to the `GLCanvasElement` constructor. diff --git a/src/AddIns/Uno.WinUI.Graphics3DGL/GLCanvasElement.cs b/src/AddIns/Uno.WinUI.Graphics3DGL/GLCanvasElement.cs index 9e0d390b9a61..ba81c3581263 100644 --- a/src/AddIns/Uno.WinUI.Graphics3DGL/GLCanvasElement.cs +++ b/src/AddIns/Uno.WinUI.Graphics3DGL/GLCanvasElement.cs @@ -44,7 +44,8 @@ public abstract partial class GLCanvasElement : Grid, INativeContext private readonly WriteableBitmap _backBuffer; private bool _loadedAtleastOnce; - private INativeOpenGLWrapper? _nativeOpenGlWrapper; // valid if and only if _loadedAtleastOnce and _glAvailable + // valid if and only if _loadedAtleastOnce and _glAvailable + private INativeOpenGLWrapper? _nativeOpenGlWrapper; // These are valid if and only if IsLoaded and _glAvailable private GL? _gl; private uint _framebuffer; diff --git a/src/Uno.UI/XamlMerge.targets b/src/Uno.UI/XamlMerge.targets index c48e88e40453..d5a88a997369 100644 --- a/src/Uno.UI/XamlMerge.targets +++ b/src/Uno.UI/XamlMerge.targets @@ -9,7 +9,7 @@ - $(MSBuildProjectDirectory)\UI\Xaml\Style\mergedstyles.xaml + $(MSBuildProjectDirectory)\UI\Xaml\Style\mergedstyles.xaml