aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Ryujinx.Graphics.OpenGL/Image/ITextureInfo.cs2
-rw-r--r--Ryujinx.Graphics.OpenGL/Image/TextureCopy.cs8
-rw-r--r--Ryujinx.Graphics.OpenGL/Image/TextureStorage.cs4
-rw-r--r--Ryujinx.Graphics.OpenGL/Image/TextureView.cs4
4 files changed, 9 insertions, 9 deletions
diff --git a/Ryujinx.Graphics.OpenGL/Image/ITextureInfo.cs b/Ryujinx.Graphics.OpenGL/Image/ITextureInfo.cs
index 0e9f6f11..4c8d7fef 100644
--- a/Ryujinx.Graphics.OpenGL/Image/ITextureInfo.cs
+++ b/Ryujinx.Graphics.OpenGL/Image/ITextureInfo.cs
@@ -4,8 +4,8 @@ namespace Ryujinx.Graphics.OpenGL.Image
{
interface ITextureInfo
{
+ ITextureInfo Storage { get; }
int Handle { get; }
- int StorageHandle { get; }
int FirstLayer => 0;
int FirstLevel => 0;
diff --git a/Ryujinx.Graphics.OpenGL/Image/TextureCopy.cs b/Ryujinx.Graphics.OpenGL/Image/TextureCopy.cs
index 3c0546d2..621388ce 100644
--- a/Ryujinx.Graphics.OpenGL/Image/TextureCopy.cs
+++ b/Ryujinx.Graphics.OpenGL/Image/TextureCopy.cs
@@ -208,14 +208,14 @@ namespace Ryujinx.Graphics.OpenGL.Image
if (HwCapabilities.Vendor == HwCapabilities.GpuVendor.Intel)
{
GL.CopyImageSubData(
- src.StorageHandle,
- srcInfo.Target.ConvertToImageTarget(),
+ src.Storage.Handle,
+ src.Storage.Info.Target.ConvertToImageTarget(),
src.FirstLevel + srcLevel + level,
0,
0,
src.FirstLayer + srcLayer,
- dst.StorageHandle,
- dstInfo.Target.ConvertToImageTarget(),
+ dst.Storage.Handle,
+ dst.Storage.Info.Target.ConvertToImageTarget(),
dst.FirstLevel + dstLevel + level,
0,
0,
diff --git a/Ryujinx.Graphics.OpenGL/Image/TextureStorage.cs b/Ryujinx.Graphics.OpenGL/Image/TextureStorage.cs
index c5108893..ce4616e4 100644
--- a/Ryujinx.Graphics.OpenGL/Image/TextureStorage.cs
+++ b/Ryujinx.Graphics.OpenGL/Image/TextureStorage.cs
@@ -4,10 +4,10 @@ using Ryujinx.Graphics.GAL;
namespace Ryujinx.Graphics.OpenGL.Image
{
- class TextureStorage : ITextureInfo
+ class TextureStorage : ITextureInfo
{
+ public ITextureInfo Storage => this;
public int Handle { get; private set; }
- public int StorageHandle => Handle;
public float ScaleFactor { get; private set; }
public TextureCreateInfo Info { get; }
diff --git a/Ryujinx.Graphics.OpenGL/Image/TextureView.cs b/Ryujinx.Graphics.OpenGL/Image/TextureView.cs
index 8799167a..e8c3e3be 100644
--- a/Ryujinx.Graphics.OpenGL/Image/TextureView.cs
+++ b/Ryujinx.Graphics.OpenGL/Image/TextureView.cs
@@ -10,10 +10,10 @@ namespace Ryujinx.Graphics.OpenGL.Image
private readonly TextureStorage _parent;
- public int StorageHandle => _parent.Handle;
-
private TextureView _incompatibleFormatView;
+ public ITextureInfo Storage => _parent;
+
public int FirstLayer { get; private set; }
public int FirstLevel { get; private set; }