Merge branch 'master' into pt/minor-xml-doc-fix

Author: ptasev

Avalonia.Desktop.slnf

@@ -24,6 +24,7 @@
       "src\\Avalonia.Dialogs\\Avalonia.Dialogs.csproj",
       "src\\Avalonia.Fonts.Inter\\Avalonia.Fonts.Inter.csproj",
       "src\\Avalonia.FreeDesktop\\Avalonia.FreeDesktop.csproj",
+      "src\\Avalonia.Metal\\Avalonia.Metal.csproj",
       "src\\Avalonia.MicroCom\\Avalonia.MicroCom.csproj",
       "src\\Avalonia.Native\\Avalonia.Native.csproj",
       "src\\Avalonia.OpenGL\\Avalonia.OpenGL.csproj",

Avalonia.sln

@@ -274,6 +274,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Headless.XUnit.Uni
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MobileSandbox.Browser", "samples\MobileSandbox.Browser\MobileSandbox.Browser.csproj", "{43FCC14E-EEBE-44B3-BCBC-F1C537EECBF8}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Metal", "src\Avalonia.Metal\Avalonia.Metal.csproj", "{60B4ED1F-ECFA-453B-8A70-1788261C8355}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -661,6 +663,10 @@ Global
 		{43FCC14E-EEBE-44B3-BCBC-F1C537EECBF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{43FCC14E-EEBE-44B3-BCBC-F1C537EECBF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{43FCC14E-EEBE-44B3-BCBC-F1C537EECBF8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{60B4ED1F-ECFA-453B-8A70-1788261C8355}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60B4ED1F-ECFA-453B-8A70-1788261C8355}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60B4ED1F-ECFA-453B-8A70-1788261C8355}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{60B4ED1F-ECFA-453B-8A70-1788261C8355}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

build/CoreLibraries.props

@@ -4,6 +4,7 @@
       <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Controls/Avalonia.Controls.csproj" />
       <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj" />
       <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.OpenGL/Avalonia.OpenGL.csproj" />
+      <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Metal/Avalonia.Metal.csproj" />
       <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Dialogs/Avalonia.Dialogs.csproj" />
       <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Markup/Avalonia.Markup/Avalonia.Markup.csproj" />
       <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj" />

native/Avalonia.Native/inc/com.h

@@ -28,6 +28,7 @@ typedef DWORD ULONG;
 #define E_UNEXPECTED                     0x8000FFFFL
 #define E_HANDLE                         0x80070006L
 #define E_INVALIDARG                     0x80070057L
+#define COR_E_INVALIDOPERATION 0x80131509L
 
 struct IUnknown
 {

native/Avalonia.Native/inc/comimpl.h

@@ -43,6 +43,18 @@ class ComPtr
             _obj->AddRef();
         }
     }
+
+    ComPtr(TInterface* pObj, bool ownsHandle)
+    {
+        _obj = 0;
+
+        if (pObj)
+        {
+            _obj = pObj;
+            if(!ownsHandle)
+                _obj->AddRef();
+        }
+    }
 
     ComPtr(const ComPtr& ptr)
     {
@@ -92,6 +104,13 @@ class ComPtr
     {
         return &_obj;
     }
+
+    void setNoAddRef(TInterface* value)
+    {
+        if(_obj != nullptr)
+            _obj->Release();
+        _obj = value;
+    }
 
     operator TInterface*() const
     {

native/Avalonia.Native/inc/noarc.h

@@ -0,0 +1,11 @@
+#import <AppKit/AppKit.h>
+
+class CppAutoreleasePool
+{
+    void* _pool;
+public:
+    CppAutoreleasePool();
+    ~CppAutoreleasePool();
+};
+
+#define START_ARP_CALL CppAutoreleasePool __autoreleasePool

native/Avalonia.Native/inc/rendertarget.h

@@ -5,13 +5,21 @@
 #include "avalonia-native.h"
 
 @protocol IRenderTarget
--(void) setNewLayer: (CALayer*) layer;
--(HRESULT) setSwFrame: (AvnFramebuffer*) fb;
+
 -(void) resize: (AvnPixelSize) size withScale: (float) scale;
--(AvnPixelSize) pixelSize;
--(IAvnGlSurfaceRenderTarget*) createSurfaceRenderTarget;
+-(CALayer*) layer;
+
 @end
 
 @interface IOSurfaceRenderTarget : NSObject<IRenderTarget>
 -(IOSurfaceRenderTarget*) initWithOpenGlContext: (IAvnGlContext*) context;
+-(IAvnGlSurfaceRenderTarget*) createSurfaceRenderTarget;
+-(IAvnSoftwareRenderTarget*) createSoftwareRenderTarget;
+-(HRESULT) setSwFrame: (AvnFramebuffer*) fb;
+-(void)consumeSurfaces;
 @end
+
+@interface MetalRenderTarget : NSObject<IRenderTarget>
+-(MetalRenderTarget*) initWithDevice: (IAvnMetalDevice*) device;
+-(void) getRenderTarget: (IAvnMetalRenderTarget**) ppv;
+@end

native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj

@@ -43,6 +43,11 @@
 		523484CA26EA688F00EA0C2C /* trayicon.mm in Sources */ = {isa = PBXBuildFile; fileRef = 523484C926EA688F00EA0C2C /* trayicon.mm */; };
 		5B21A982216530F500CEE36E /* cursor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5B21A981216530F500CEE36E /* cursor.mm */; };
 		5B8BD94F215BFEA6005ED2A7 /* clipboard.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5B8BD94E215BFEA6005ED2A7 /* clipboard.mm */; };
+		64B1EA48E308E574685AFB07 /* metal.mm in Sources */ = {isa = PBXBuildFile; fileRef = 64B1EBEECBE13D8616D7C934 /* metal.mm */; };
+		64B1ECA861163C0EFF0E502B /* noarc.h in Headers */ = {isa = PBXBuildFile; fileRef = 64B1E26F2B1B9C577BF52F06 /* noarc.h */; };
+		64B1ED7C5433AC3B815FFCC5 /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 64B1E23CAFE5FEC7AD981B1B /* Metal.framework */; };
+		64B1EE5DD4D882D587CE76CE /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 64B1E677F7791226F783ACE4 /* CoreGraphics.framework */; };
+		64B1EF3C757B71526FFAF436 /* noarc.mm in Sources */ = {isa = PBXBuildFile; fileRef = 64B1E4FA7D9D6E5F47AA8606 /* noarc.mm */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		855EDC9F28C6546F00807998 /* PlatformBehaviorInhibition.mm in Sources */ = {isa = PBXBuildFile; fileRef = 855EDC9E28C6546F00807998 /* PlatformBehaviorInhibition.mm */; };
 		8D2F3512292F6AAE007FCF54 /* AvnTextInputMethodDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D2F3511292F6AAE007FCF54 /* AvnTextInputMethodDelegate.h */; };
 		8D300D65292D0A6800320C49 /* AvnTextInputMethod.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D300D64292D0A6800320C49 /* AvnTextInputMethod.h */; };
@@ -99,6 +104,11 @@
 		5B21A981216530F500CEE36E /* cursor.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = cursor.mm; sourceTree = "<group>"; };
 		5B8BD94E215BFEA6005ED2A7 /* clipboard.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = clipboard.mm; sourceTree = "<group>"; };
 		5BF943652167AD1D009CAE35 /* cursor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cursor.h; sourceTree = "<group>"; };
+		64B1E23CAFE5FEC7AD981B1B /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; };
+		64B1E26F2B1B9C577BF52F06 /* noarc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = noarc.h; path = ../../inc/noarc.h; sourceTree = "<group>"; };
+		64B1E4FA7D9D6E5F47AA8606 /* noarc.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = noarc.mm; sourceTree = "<group>"; };
+		64B1E677F7791226F783ACE4 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
+		64B1EBEECBE13D8616D7C934 /* metal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = metal.mm; sourceTree = "<group>"; };
 		855EDC9E28C6546F00807998 /* PlatformBehaviorInhibition.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformBehaviorInhibition.mm; sourceTree = "<group>"; };
 		8D2F3511292F6AAE007FCF54 /* AvnTextInputMethodDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AvnTextInputMethodDelegate.h; sourceTree = "<group>"; };
 		8D300D64292D0A6800320C49 /* AvnTextInputMethod.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AvnTextInputMethod.h; sourceTree = "<group>"; };
@@ -126,6 +136,8 @@
 				AB1E522C217613570091CD71 /* OpenGL.framework in Frameworks */,
 				522D5959258159C1006F7F7A /* Carbon.framework in Frameworks */,
 				AB661C1E2148230F00291242 /* AppKit.framework in Frameworks */,
+				64B1ED7C5433AC3B815FFCC5 /* Metal.framework in Frameworks */,
+				64B1EE5DD4D882D587CE76CE /* CoreGraphics.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -141,6 +153,8 @@
 				1A3E5EA923E9F26C00EDE661 /* IOSurface.framework */,
 				AB1E522B217613570091CD71 /* OpenGL.framework */,
 				AB661C1D2148230F00291242 /* AppKit.framework */,
+				64B1E23CAFE5FEC7AD981B1B /* Metal.framework */,
+				64B1E677F7791226F783ACE4 /* CoreGraphics.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -198,6 +212,9 @@
 				18391DB45C7D892E61BF388C /* WindowInterfaces.h */,
 				18391BB698579F40F1783F31 /* PopupImpl.mm */,
 				183910513F396141938832B5 /* PopupImpl.h */,
+				64B1EBEECBE13D8616D7C934 /* metal.mm */,
+				64B1E4FA7D9D6E5F47AA8606 /* noarc.mm */,
+				64B1E26F2B1B9C577BF52F06 /* noarc.h */,
 			);
 			sourceTree = "<group>";
 		};
@@ -230,6 +247,7 @@
 				18391F1E2411C79405A9943A /* WindowProtocol.h in Headers */,
 				183914E50CF6D2EFC1667F7C /* WindowInterfaces.h in Headers */,
 				18391AC65ADD7DDD33FBE737 /* PopupImpl.h in Headers */,
+				64B1ECA861163C0EFF0E502B /* noarc.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -319,6 +337,8 @@
 				18391AC16726CBC45856233B /* AvnWindow.mm in Sources */,
 				18391D8CD1756DC858DC1A09 /* PopupImpl.mm in Sources */,
 				EDF8CDCD2964CB01001EE34F /* PlatformSettings.mm in Sources */,
+				64B1EA48E308E574685AFB07 /* metal.mm in Sources */,
+				64B1EF3C757B71526FFAF436 /* noarc.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

native/Avalonia.Native/src/OSX/AvnView.h

@@ -11,15 +11,16 @@
 #include "KeyTransform.h"
 
 @class AvnAccessibilityElement;
+@protocol IRenderTarget;
 
-@interface AvnView : NSView<NSTextInputClient, NSDraggingDestination, AvnTextInputMethodDelegate>
+@interface AvnView : NSView<NSTextInputClient, NSDraggingDestination, AvnTextInputMethodDelegate, CALayerDelegate>
 -(AvnView* _Nonnull) initWithParent: (WindowBaseImpl* _Nonnull) parent;
 -(NSEvent* _Nonnull) lastMouseDownEvent;
 -(AvnPoint) translateLocalPoint:(AvnPoint)pt;
--(void) setSwRenderedFrame: (AvnFramebuffer* _Nonnull) fb dispose: (IUnknown* _Nonnull) dispose;
 -(void) onClosed;
 
 -(AvnPlatformResizeReason) getResizeReason;
 -(void) setResizeReason:(AvnPlatformResizeReason)reason;
+-(void) setRenderTarget:(NSObject<IRenderTarget>*)target;
 + (AvnPoint)toAvnPoint:(CGPoint)p;
 @end

native/Avalonia.Native/src/OSX/AvnView.mm

@@ -17,7 +17,7 @@ @implementation AvnView
     NSEvent* _lastMouseDownEvent;
     bool _lastKeyHandled;
     AvnPixelSize _lastPixelSize;
-    NSObject<IRenderTarget>* _renderTarget;
+    NSObject<IRenderTarget>* _currentRenderTarget;
     AvnPlatformResizeReason _resizeReason;
     AvnAccessibilityElement* _accessibilityChild;
     NSRect _cursorRect;
@@ -41,15 +41,39 @@ - (NSEvent*) lastMouseDownEvent
 
 - (void) updateRenderTarget
 {
-    [_renderTarget resize:_lastPixelSize withScale:static_cast<float>([[self window] backingScaleFactor])];
-    [self setNeedsDisplayInRect:[self frame]];
+    if(_currentRenderTarget) {
+        [_currentRenderTarget resize:_lastPixelSize withScale:static_cast<float>([[self window] backingScaleFactor])];
+        [self setNeedsDisplayInRect:[self frame]];
+    }
+}
+
+
+-(void) setRenderTarget:(NSObject<IRenderTarget>*)target
+{
+    if([self layer])
+    {
+        [self layer].delegate = nil;
+    }
+    _currentRenderTarget = target;
+    auto layer = [target layer];
+    [self setLayer: layer];
+    [layer setDelegate: self];
+    layer.needsDisplayOnBoundsChange = YES;
+    [self updateRenderTarget];
+}
+
+-(void)displayLayer: (CALayer*)layer
+{
+    [self updateLayer];
 }
 
 -(AvnView*)  initWithParent: (WindowBaseImpl*) parent
 {
     self = [super init];
-    _renderTarget = parent->renderTarget;
     [self setWantsLayer:YES];
+    [self setLayerContentsPlacement: NSViewLayerContentsPlacementTopLeft];
+
+    [self setCanDrawSubviewsIntoLayer: NO];
     [self setLayerContentsRedrawPolicy: NSViewLayerContentsRedrawDuringViewResize];
 
     _parent = parent;
@@ -77,12 +101,6 @@ - (BOOL)wantsUpdateLayer
     return YES;
 }
 
-- (void)setLayer:(CALayer *)layer
-{
-    [_renderTarget setNewLayer: layer];
-    [super setLayer: layer];
-}
-
 - (BOOL)isOpaque
 {
     return YES;
@@ -164,14 +182,6 @@ - (void)drawRect:(NSRect)dirtyRect
     return;
 }
 
--(void) setSwRenderedFrame: (AvnFramebuffer*) fb dispose: (IUnknown*) dispose
-{
-    @autoreleasepool {
-        [_renderTarget setSwFrame:fb];
-        dispose->Release();
-    }
-}
-
 - (AvnPoint) translateLocalPoint:(AvnPoint)pt
 {
     pt.Y = [self bounds].size.height - pt.Y;