From 6f0395538b8e8af3bba7536b44780d57e51e8697 Mon Sep 17 00:00:00 2001 From: Emmanuel Hansen Date: Mon, 19 Sep 2022 18:05:26 +0000 Subject: Avalonia - Use embedded window for avalonia (#3674) * wip * use embedded window * fix race condition on opengl Windows * fix glx issues on prime nvidia * fix mouse support win32 * clean up * addressed review * addressed review * fix warnings * fix sotware keyboard dialog * Update Ryujinx.Ava/Ui/Applet/SwkbdAppletDialog.axaml.cs Co-authored-by: gdkchan * remove double semi Co-authored-by: gdkchan --- Ryujinx.Headless.SDL2/OpenGL/OpenGLWindow.cs | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to 'Ryujinx.Headless.SDL2/OpenGL') diff --git a/Ryujinx.Headless.SDL2/OpenGL/OpenGLWindow.cs b/Ryujinx.Headless.SDL2/OpenGL/OpenGLWindow.cs index aa2e86d9..d1d0872b 100644 --- a/Ryujinx.Headless.SDL2/OpenGL/OpenGLWindow.cs +++ b/Ryujinx.Headless.SDL2/OpenGL/OpenGLWindow.cs @@ -136,7 +136,7 @@ namespace Ryujinx.Headless.SDL2.OpenGL GL.ClearColor(0, 0, 0, 1.0f); GL.Clear(ClearBufferMask.ColorBufferBit); - SwapBuffers(0); + SwapBuffers(); Renderer?.Window.SetSize(DefaultWidth, DefaultHeight); MouseDriver.SetClientSize(DefaultWidth, DefaultHeight); @@ -156,28 +156,8 @@ namespace Ryujinx.Headless.SDL2.OpenGL _openGLContext.Dispose(); } - protected override void SwapBuffers(object image) + protected override void SwapBuffers() { - if ((int)image != 0) - { - // The game's framebruffer is already bound, so blit it to the window's backbuffer - GL.BindFramebuffer(FramebufferTarget.DrawFramebuffer, 0); - - GL.Clear(ClearBufferMask.ColorBufferBit); - GL.ClearColor(0, 0, 0, 1); - - GL.BlitFramebuffer(0, - 0, - Width, - Height, - 0, - 0, - Width, - Height, - ClearBufferMask.ColorBufferBit, - BlitFramebufferFilter.Linear); - } - SDL_GL_SwapWindow(WindowHandle); } } -- cgit v1.2.3