tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Use out own opengl interface wrapper

pull/7565/head
Max Katz 5 years ago
parent
4756a0a769
commit
138d65556b
3 changed files with 48 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/iOS/Avalonia.iOS/EaglLayerSurface.cs
  2. 3
      src/iOS/Avalonia.iOS/Extensions.cs
  3. 79
      src/iOS/Avalonia.iOS/LayerFbo.cs

5
src/iOS/Avalonia.iOS/EaglLayerSurface.cs
View File

@ -4,7 +4,6 @@ using System.Threading;
using Avalonia.OpenGL; using Avalonia.OpenGL;
using Avalonia.OpenGL.Surfaces; using Avalonia.OpenGL.Surfaces;
using CoreAnimation; using CoreAnimation;
using OpenTK.Graphics.ES30;
namespace Avalonia.iOS namespace Avalonia.iOS
{ {
@ -35,7 +34,7 @@ namespace Avalonia.iOS
public void Dispose() public void Dispose()
{ {
GL.Finish(); _ctx.GlInterface.Finish();
_fbo.Present(); _fbo.Present();
_restoreContext.Dispose(); _restoreContext.Dispose();
} }
@ -85,7 +84,7 @@ namespace Avalonia.iOS
var ctx = Platform.GlFeature.Context; var ctx = Platform.GlFeature.Context;
using (ctx.MakeCurrent()) using (ctx.MakeCurrent())
{ {
var fbo = new SizeSynchronizedLayerFbo(ctx.Context, _layer); var fbo = new SizeSynchronizedLayerFbo(ctx.Context, ctx.GlInterface, _layer);
if (!fbo.Sync()) if (!fbo.Sync())
throw new InvalidOperationException("Unable to create render target"); throw new InvalidOperationException("Unable to create render target");
return new RenderTarget(ctx, fbo); return new RenderTarget(ctx, fbo);

3
src/iOS/Avalonia.iOS/Extensions.cs
View File

@ -1,6 +1,7 @@
using System; using System;
using Avalonia.Media; using Avalonia.Media;
using CoreGraphics; using CoreGraphics;
using ObjCRuntime;
using UIKit; using UIKit;
namespace Avalonia.iOS namespace Avalonia.iOS
@ -20,4 +21,4 @@ namespace Avalonia.iOS
ColorComponent(color.B), ColorComponent(color.B),
ColorComponent(color.A)); ColorComponent(color.A));
} }
} }

79
src/iOS/Avalonia.iOS/LayerFbo.cs
View File

@ -1,64 +1,72 @@
using System; using System;
using Avalonia.OpenGL;
using CoreAnimation; using CoreAnimation;
using ObjCRuntime;
using OpenGLES; using OpenGLES;
using OpenTK.Graphics.ES20;
namespace Avalonia.iOS namespace Avalonia.iOS
{ {
public class LayerFbo public class LayerFbo
{ {
private readonly EAGLContext _context; private readonly EAGLContext _context;
private readonly GlInterface _gl;
private readonly CAEAGLLayer _layer; private readonly CAEAGLLayer _layer;
private int _framebuffer; private int[] _framebuffer;
private int _renderbuffer; private int[] _renderbuffer;
private int _depthBuffer; private int[] _depthBuffer;
private bool _disposed; private bool _disposed;
private LayerFbo(EAGLContext context, CAEAGLLayer layer, in int framebuffer, in int renderbuffer, in int depthBuffer) private LayerFbo(EAGLContext context, GlInterface gl, CAEAGLLayer layer, int[] framebuffer, int[] renderbuffer, int[] depthBuffer)
{ {
_context = context; _context = context;
_gl = gl;
_layer = layer; _layer = layer;
_framebuffer = framebuffer; _framebuffer = framebuffer;
_renderbuffer = renderbuffer; _renderbuffer = renderbuffer;
_depthBuffer = depthBuffer; _depthBuffer = depthBuffer;
} }
public static LayerFbo TryCreate(EAGLContext context, CAEAGLLayer layer) public static LayerFbo TryCreate(EAGLContext context, GlInterface gl, CAEAGLLayer layer)
{ {
if (context != EAGLContext.CurrentContext) if (context != EAGLContext.CurrentContext)
return null; return null;
GL.GenFramebuffers(1, out int fb);
GL.GenRenderbuffers(1, out int rb); var fb = new int[2];
GL.BindFramebuffer(FramebufferTarget.Framebuffer, fb); var rb = new int[2];
GL.BindRenderbuffer(RenderbufferTarget.Renderbuffer, rb); var db = new int[2];
context.RenderBufferStorage((uint) All.Renderbuffer, layer);
GL.FramebufferRenderbuffer(FramebufferTarget.Framebuffer, FramebufferSlot.ColorAttachment0, RenderbufferTarget.Renderbuffer, rb); gl.GenRenderbuffers(1, rb);
gl.BindRenderbuffer(GlConsts.GL_RENDERBUFFER, rb[0]);
context.RenderBufferStorage(GlConsts.GL_RENDERBUFFER, layer);
gl.GenFramebuffers(1, fb);
gl.BindFramebuffer(GlConsts.GL_FRAMEBUFFER, fb[0]);
gl.FramebufferRenderbuffer(GlConsts.GL_FRAMEBUFFER, GlConsts.GL_COLOR_ATTACHMENT0, GlConsts.GL_RENDERBUFFER, rb[0]);
int w; int[] w = new int[1];
int h; int[] h = new int[1];
GL.GetRenderbufferParameter(RenderbufferTarget.Renderbuffer, RenderbufferParameterName.RenderbufferWidth, out w); gl.GetRenderbufferParameteriv(GlConsts.GL_RENDERBUFFER, GlConsts.GL_RENDERBUFFER_WIDTH, w);
GL.GetRenderbufferParameter(RenderbufferTarget.Renderbuffer, RenderbufferParameterName.RenderbufferHeight, out h); gl.GetRenderbufferParameteriv(GlConsts.GL_RENDERBUFFER, GlConsts.GL_RENDERBUFFER_HEIGHT, h);
GL.GenRenderbuffers(1, out int depthBuffer); gl.GenRenderbuffers(1, db);
//GL.BindRenderbuffer(RenderbufferTarget.Renderbuffer, depthBuffer); //GL.BindRenderbuffer(RenderbufferTarget.Renderbuffer, depthBuffer);
//GL.RenderbufferStorage(RenderbufferTarget.Renderbuffer, RenderbufferInternalFormat.DepthComponent16, w, h); //GL.RenderbufferStorage(RenderbufferTarget.Renderbuffer, RenderbufferInternalFormat.DepthComponent16, w, h);
GL.FramebufferRenderbuffer(FramebufferTarget.Framebuffer, FramebufferSlot.DepthAttachment, RenderbufferTarget.Renderbuffer, depthBuffer); gl.FramebufferRenderbuffer(GlConsts.GL_FRAMEBUFFER, GlConsts.GL_DEPTH_ATTACHMENT, GlConsts.GL_RENDERBUFFER, db[0]);
var frameBufferError = GL.CheckFramebufferStatus(FramebufferTarget.Framebuffer); var frameBufferError = gl.CheckFramebufferStatus(GlConsts.GL_FRAMEBUFFER);
if(frameBufferError != FramebufferErrorCode.FramebufferComplete) if(frameBufferError != GlConsts.GL_FRAMEBUFFER_COMPLETE)
{ {
GL.DeleteFramebuffers(1, ref fb); gl.DeleteFramebuffers(1, fb);
GL.DeleteRenderbuffers(1, ref depthBuffer); gl.DeleteRenderbuffers(1, db);
GL.DeleteRenderbuffers(1, ref rb); gl.DeleteRenderbuffers(1, rb);
return null; return null;
} }
return new LayerFbo(context, layer, fb, rb, depthBuffer) return new LayerFbo(context, gl, layer, fb, rb, db)
{ {
Width = w, Width = w[0],
Height = h Height = h[0]
}; };
} }
@ -67,13 +75,13 @@ namespace Avalonia.iOS
public void Bind() public void Bind()
{ {
GL.BindFramebuffer(FramebufferTarget.Framebuffer, _framebuffer); _gl.BindFramebuffer(GlConsts.GL_FRAMEBUFFER, _framebuffer[0]);
} }
public void Present() public void Present()
{ {
Bind(); Bind();
var success = _context.PresentRenderBuffer((uint) All.Renderbuffer); var success = _context.PresentRenderBuffer(GlConsts.GL_RENDERBUFFER);
} }
public void Dispose() public void Dispose()
@ -81,9 +89,9 @@ namespace Avalonia.iOS
if(_disposed) if(_disposed)
return; return;
_disposed = true; _disposed = true;
GL.DeleteFramebuffers(1, ref _framebuffer); _gl.DeleteFramebuffers(1, _framebuffer);
GL.DeleteRenderbuffers(1, ref _depthBuffer); _gl.DeleteRenderbuffers(1, _depthBuffer);
GL.DeleteRenderbuffers(1, ref _renderbuffer); _gl.DeleteRenderbuffers(1, _renderbuffer);
if (_context != EAGLContext.CurrentContext) if (_context != EAGLContext.CurrentContext)
throw new InvalidOperationException("Associated EAGLContext is not current"); throw new InvalidOperationException("Associated EAGLContext is not current");
} }
@ -92,15 +100,16 @@ namespace Avalonia.iOS
class SizeSynchronizedLayerFbo : IDisposable class SizeSynchronizedLayerFbo : IDisposable
{ {
private readonly EAGLContext _context; private readonly EAGLContext _context;
private readonly GlInterface _gl;
private readonly CAEAGLLayer _layer; private readonly CAEAGLLayer _layer;
private LayerFbo _fbo; private LayerFbo _fbo;
private nfloat _oldLayerWidth, _oldLayerHeight, _oldLayerScale; private nfloat _oldLayerWidth, _oldLayerHeight, _oldLayerScale;
public SizeSynchronizedLayerFbo(EAGLContext context, CAEAGLLayer layer) public SizeSynchronizedLayerFbo(EAGLContext context, GlInterface gl, CAEAGLLayer layer)
{ {
_context = context; _context = context;
_gl = gl;
_layer = layer; _layer = layer;
} }
public bool Sync() public bool Sync()
@ -112,7 +121,7 @@ namespace Avalonia.iOS
return true; return true;
_fbo?.Dispose(); _fbo?.Dispose();
_fbo = null; _fbo = null;
_fbo = LayerFbo.TryCreate(_context, _layer); _fbo = LayerFbo.TryCreate(_context, _gl, _layer);
_oldLayerWidth = _layer.Bounds.Width; _oldLayerWidth = _layer.Bounds.Width;
_oldLayerHeight = _layer.Bounds.Height; _oldLayerHeight = _layer.Bounds.Height;
_oldLayerScale = _layer.ContentsScale; _oldLayerScale = _layer.ContentsScale;
@ -140,4 +149,4 @@ namespace Avalonia.iOS
public int Height => _fbo?.Height ?? 0; public int Height => _fbo?.Height ?? 0;
public double Scaling => _oldLayerScale; public double Scaling => _oldLayerScale;
} }
} }

Write Preview
Loading…
Cancel
Save