From 2b143eba84a712ef53f0bda0bacded72e9424a95 Mon Sep 17 00:00:00 2001 From: Morten Daniel Fornes Date: Sun, 2 Apr 2023 23:49:30 +0700 Subject: [PATCH] android: update GLHelper.h includes --- Source/Fuse.Common/FramebufferPool.uno | 2 +- Source/Fuse.Common/GraphicsWorker.uno | 2 +- Source/Fuse.Controls.Native/Android/GraphicsView.uno | 8 ++++---- Source/Fuse.Controls.Video/Android/VideoPlayer.uno | 2 +- Source/Fuse.Elements/Caching/ElementAtlasPool.uno | 2 +- Source/Fuse.Elements/Resources/FileImageSource.uno | 2 +- Source/Fuse.Platform/Android/SystemUI.uno | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Source/Fuse.Common/FramebufferPool.uno b/Source/Fuse.Common/FramebufferPool.uno index ff3bedbb7..e7a512546 100644 --- a/Source/Fuse.Common/FramebufferPool.uno +++ b/Source/Fuse.Common/FramebufferPool.uno @@ -56,7 +56,7 @@ namespace Fuse } } - [extern(ANDROID) Require("Source.Include", "Uno/Graphics/GLHelper.h")] + [extern(ANDROID) Require("Source.Include", "uDroid/GLHelper.h")] internal class FramebufferPoolImpl : ISoftDisposable { public FramebufferPoolImpl() diff --git a/Source/Fuse.Common/GraphicsWorker.uno b/Source/Fuse.Common/GraphicsWorker.uno index d7f4ede81..dd8f649cf 100644 --- a/Source/Fuse.Common/GraphicsWorker.uno +++ b/Source/Fuse.Common/GraphicsWorker.uno @@ -6,7 +6,7 @@ using Fuse; namespace Fuse { - [extern(ANDROID) Require("Source.Include", "Uno/Graphics/GLHelper.h")] + [extern(ANDROID) Require("Source.Include", "uDroid/GLHelper.h")] [extern(IOS && METAL) Require("Source.Include", "MetalANGLE/MGLKit.h")] /** Allows dispatching actions on a separate thread with access to a grpahics context that shares data with the main graphics context of the @App. diff --git a/Source/Fuse.Controls.Native/Android/GraphicsView.uno b/Source/Fuse.Controls.Native/Android/GraphicsView.uno index 4092618be..53793a988 100644 --- a/Source/Fuse.Controls.Native/Android/GraphicsView.uno +++ b/Source/Fuse.Controls.Native/Android/GraphicsView.uno @@ -36,7 +36,7 @@ namespace Fuse.Controls.Native.Android IntPtr _nativeWindow = IntPtr.Zero; [TargetSpecificImplementation] - [Require("Source.Include", "Uno/Graphics/GLHelper.h")] + [Require("Source.Include", "uDroid/GLHelper.h")] protected void SetSurface(Java.Object surfaceHandle) { if (_surfaceHandle != null) @@ -51,7 +51,7 @@ namespace Fuse.Controls.Native.Android } [TargetSpecificImplementation] - [Require("Source.Include", "Uno/Graphics/GLHelper.h")] + [Require("Source.Include", "uDroid/GLHelper.h")] protected void DestroySurface() { extern(_eglSurface) "GLHelper::SwapBackToBackgroundSurface( (EGLSurface)$0 )"; @@ -63,7 +63,7 @@ namespace Fuse.Controls.Native.Android } [TargetSpecificImplementation] - [Require("Source.Include", "Uno/Graphics/GLHelper.h")] + [Require("Source.Include", "uDroid/GLHelper.h")] public bool BeginDraw(int2 size) { if (_eglSurface == IntPtr.Zero) @@ -86,7 +86,7 @@ namespace Fuse.Controls.Native.Android } [TargetSpecificImplementation] - [Require("Source.Include", "Uno/Graphics/GLHelper.h")] + [Require("Source.Include", "uDroid/GLHelper.h")] public void EndDraw() { double t; diff --git a/Source/Fuse.Controls.Video/Android/VideoPlayer.uno b/Source/Fuse.Controls.Video/Android/VideoPlayer.uno index a64b5ba39..8aa975283 100644 --- a/Source/Fuse.Controls.Video/Android/VideoPlayer.uno +++ b/Source/Fuse.Controls.Video/Android/VideoPlayer.uno @@ -272,7 +272,7 @@ namespace Fuse.Controls.VideoImpl.Android @} [Foreign(Language.Java)] - [Require("Source.Include", "Uno/Graphics/GLHelper.h")] + [Require("Source.Include", "uDroid/GLHelper.h")] public static bool IsHardwareAccelerated() @{ android.view.Window window = com.fuse.Activity.getRootActivity().getWindow(); diff --git a/Source/Fuse.Elements/Caching/ElementAtlasPool.uno b/Source/Fuse.Elements/Caching/ElementAtlasPool.uno index 469c42416..389b84cca 100644 --- a/Source/Fuse.Elements/Caching/ElementAtlasPool.uno +++ b/Source/Fuse.Elements/Caching/ElementAtlasPool.uno @@ -191,7 +191,7 @@ namespace Fuse.Elements ElementAtlasFramebufferPool.AtlasSizeChanged += OnAtlasSizeChanged; } - [Require("Source.Include", "Uno/Graphics/GLHelper.h")] + [Require("Source.Include", "uDroid/GLHelper.h")] extern(ANDROID) void DiscardPool() { diff --git a/Source/Fuse.Elements/Resources/FileImageSource.uno b/Source/Fuse.Elements/Resources/FileImageSource.uno index bccf22e9b..d631dffa0 100644 --- a/Source/Fuse.Elements/Resources/FileImageSource.uno +++ b/Source/Fuse.Elements/Resources/FileImageSource.uno @@ -145,7 +145,7 @@ namespace Fuse.Resources public float Density { get { return _proxy.Density; } set { _proxy.Density = value; } } } - [extern(ANDROID) Require("Source.Include", "Uno/Graphics/GLHelper.h")] + [extern(ANDROID) Require("Source.Include", "uDroid/GLHelper.h")] class FileImageSourceImpl : LoadingImageSource { FileSource _file; diff --git a/Source/Fuse.Platform/Android/SystemUI.uno b/Source/Fuse.Platform/Android/SystemUI.uno index 074e00e37..19c583d44 100644 --- a/Source/Fuse.Platform/Android/SystemUI.uno +++ b/Source/Fuse.Platform/Android/SystemUI.uno @@ -544,14 +544,14 @@ namespace Fuse.Platform @} - [Require("Source.Include", "Uno/Graphics/GLHelper.h")] + [Require("Source.Include", "uDroid/GLHelper.h")] static void cppOnConfigChanged() { extern "GLHelper::SwapBackToBackgroundSurface()"; ResetGeometry(); } - [Require("Source.Include", "Uno/Graphics/GLHelper.h")] + [Require("Source.Include", "uDroid/GLHelper.h")] static void ResetGeometry() { extern "GLHelper::SwapBackToBackgroundSurface()";