manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2024-11-15 09:35:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support window resizing

Browse source
This commit is contained in:
gdk 2019-10-31 21:32:43 -03:00 committed by Thog
parent 278a4c317c
commit 63345a3098
3 changed files with 78 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Ryujinx.Graphics.GAL/IWindow.cs
View file

@ -1,5 +1,3 @@
using System;
namespace Ryujinx.Graphics.GAL namespace Ryujinx.Graphics.GAL
{ {
public interface IWindow public interface IWindow
@ -9,5 +7,7 @@ namespace Ryujinx.Graphics.GAL
void QueueTexture(ITexture texture, ImageCrop crop, object context); void QueueTexture(ITexture texture, ImageCrop crop, object context);
void RegisterTextureReleaseCallback(TextureReleaseCallback callback); void RegisterTextureReleaseCallback(TextureReleaseCallback callback);
void SetSize(int width, int height);
} }
} }

98
Ryujinx.Graphics.OpenGL/Window.cs
View file

@ -10,8 +10,15 @@ namespace Ryujinx.Graphics.OpenGL
private const int NativeWidth = 1280; private const int NativeWidth = 1280;
private const int NativeHeight = 720; private const int NativeHeight = 720;
private int _width = 1280; private int _width;
private int _height = 720; private int _height;
private int _resizeWidth;
private int _resizeHeight;
private bool _sizeChanged;
private object _resizeLocker;
private int _blitFramebufferHandle; private int _blitFramebufferHandle;
private int _copyFramebufferHandle; private int _copyFramebufferHandle;
@ -40,6 +47,11 @@ namespace Ryujinx.Graphics.OpenGL
public Window() public Window()
{ {
_width = NativeWidth;
_height = NativeHeight;
_resizeLocker = new object();
_textures = new Queue<PresentationTexture>(); _textures = new Queue<PresentationTexture>();
} }
@ -59,15 +71,18 @@ namespace Ryujinx.Graphics.OpenGL
GL.Clear(ClearBufferMask.ColorBufferBit); GL.Clear(ClearBufferMask.ColorBufferBit);
int windowWidth = _width;
int windowHeight = _height;
GL.BlitFramebuffer( GL.BlitFramebuffer(
0, 0,
0, 0,
1280, windowWidth,
720, windowHeight,
0, 0,
0, 0,
1280, windowWidth,
720, windowHeight,
ClearBufferMask.ColorBufferBit, ClearBufferMask.ColorBufferBit,
BlitFramebufferFilter.Linear); BlitFramebufferFilter.Linear);
@ -184,6 +199,17 @@ namespace Ryujinx.Graphics.OpenGL
_release = callback; _release = callback;
} }
public void SetSize(int width, int height)
{
lock (_resizeLocker)
{
_resizeWidth = width;
_resizeHeight = height;
_sizeChanged = true;
}
}
private void Release(object context) private void Release(object context)
{ {
if (_release != null) if (_release != null)
@ -210,24 +236,9 @@ namespace Ryujinx.Graphics.OpenGL
{ {
int handle = _copyFramebufferHandle; int handle = _copyFramebufferHandle;
if (handle == 0) void GenerateAndBindTexture()
{ {
int textureHandle = GL.GenTexture(); int textureHandle = GenerateWindowTexture();
GL.BindTexture(TextureTarget.Texture2D, textureHandle);
GL.TexImage2D(
TextureTarget.Texture2D,
0,
PixelInternalFormat.Rgba8,
1280,
720,
0,
PixelFormat.Rgba,
PixelType.UnsignedByte,
IntPtr.Zero);
handle = GL.GenFramebuffer();
GL.BindFramebuffer(FramebufferTarget.Framebuffer, handle); GL.BindFramebuffer(FramebufferTarget.Framebuffer, handle);
@ -238,9 +249,50 @@ namespace Ryujinx.Graphics.OpenGL
0); 0);
_screenTextureHandle = textureHandle; _screenTextureHandle = textureHandle;
}
if (handle == 0)
{
handle = GL.GenFramebuffer();
_copyFramebufferHandle = handle; _copyFramebufferHandle = handle;
GenerateAndBindTexture();
} }
else if (_sizeChanged)
{
GL.DeleteTexture(_screenTextureHandle);
lock (_resizeLocker)
{
_width = _resizeWidth;
_height = _resizeHeight;
_sizeChanged = false;
}
GenerateAndBindTexture();
}
return handle;
}
private int GenerateWindowTexture()
{
int handle = GL.GenTexture();
GL.BindTexture(TextureTarget.Texture2D, handle);
GL.TexImage2D(
TextureTarget.Texture2D,
0,
PixelInternalFormat.Rgba8,
_width,
_height,
0,
PixelFormat.Rgba,
PixelType.UnsignedByte,
IntPtr.Zero);
return handle; return handle;
} }

2
Ryujinx/Ui/GLScreen.cs
View file

@ -91,7 +91,7 @@ namespace Ryujinx.Ui
{ {
_resizeEvent = false; _resizeEvent = false;
// TODO: Resize _renderer.Window.SetSize(Width, Height);
} }
ticks += chrono.ElapsedTicks; ticks += chrono.ElapsedTicks;