etc/ryujinx-mirror
0
0
Fork 0
mirror of https://github.com/ryujinx-mirror/ryujinx.git synced 2024-11-25 11:35:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix intel view copy workaround. (#2216)

Browse source 
The texture target must be taken from the storage rather than the view, when using the storage handle for the copy.
This commit is contained in:
riperiperi 2021-04-17 21:16:28 +01:00 committed by GitHub
parent dc8c781d7a
commit 38be18ef2a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ryujinx.Graphics.OpenGL/Image/ITextureInfo.cs
View file

@ -4,8 +4,8 @@ namespace Ryujinx.Graphics.OpenGL.Image
{ {
interface ITextureInfo interface ITextureInfo
{ {
ITextureInfo Storage { get; }
int Handle { get; } int Handle { get; }
int StorageHandle { get; }
int FirstLayer => 0; int FirstLayer => 0;
int FirstLevel => 0; int FirstLevel => 0;

8
Ryujinx.Graphics.OpenGL/Image/TextureCopy.cs
View file

@ -208,14 +208,14 @@ namespace Ryujinx.Graphics.OpenGL.Image
if (HwCapabilities.Vendor == HwCapabilities.GpuVendor.Intel) if (HwCapabilities.Vendor == HwCapabilities.GpuVendor.Intel)
{ {
GL.CopyImageSubData( GL.CopyImageSubData(
src.StorageHandle, src.Storage.Handle,
srcInfo.Target.ConvertToImageTarget(), src.Storage.Info.Target.ConvertToImageTarget(),
src.FirstLevel + srcLevel + level, src.FirstLevel + srcLevel + level,
0, 0,
0, 0,
src.FirstLayer + srcLayer, src.FirstLayer + srcLayer,
dst.StorageHandle, dst.Storage.Handle,
dstInfo.Target.ConvertToImageTarget(), dst.Storage.Info.Target.ConvertToImageTarget(),
dst.FirstLevel + dstLevel + level, dst.FirstLevel + dstLevel + level,
0, 0,
0, 0,

4
Ryujinx.Graphics.OpenGL/Image/TextureStorage.cs
View file

@ -4,10 +4,10 @@ using Ryujinx.Graphics.GAL;
namespace Ryujinx.Graphics.OpenGL.Image namespace Ryujinx.Graphics.OpenGL.Image
{ {
class TextureStorage : ITextureInfo class TextureStorage : ITextureInfo
{ {
public ITextureInfo Storage => this;
public int Handle { get; private set; } public int Handle { get; private set; }
public int StorageHandle => Handle;
public float ScaleFactor { get; private set; } public float ScaleFactor { get; private set; }
public TextureCreateInfo Info { get; } public TextureCreateInfo Info { get; }

4
Ryujinx.Graphics.OpenGL/Image/TextureView.cs
View file

@ -10,10 +10,10 @@ namespace Ryujinx.Graphics.OpenGL.Image
private readonly TextureStorage _parent; private readonly TextureStorage _parent;
public int StorageHandle => _parent.Handle;
private TextureView _incompatibleFormatView; private TextureView _incompatibleFormatView;
public ITextureInfo Storage => _parent;
public int FirstLayer { get; private set; } public int FirstLayer { get; private set; }
public int FirstLevel { get; private set; } public int FirstLevel { get; private set; }