mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-11-27 23:22:00 +00:00
5d69d9103e
* Initial implementation. Still pending better valid-overlap handling, disposed pool, compressed format flush fix. * Very messy backend resource cache. * Oops * Dispose -> Release * Improve Release/Dispose. * More rule refinement. * View compatibility levels as an enum - you can always know if a view is only copy compatible. * General cleanup. Use locking on the resource cache, as it is likely to be used by other threads in future. * Rename resource cache to resource pool. * Address some of the smaller nits. * Fix regression with MK8 lens flare Texture flushes done the old way should trigger memory tracking. * Use TextureCreateInfo as a key. It now implements IEquatable and generates a hashcode based on width/height. * Fix size change for compressed+non-compressed view combos. Before, this could set either the compressed or non compressed texture with a size with the wrong size, depending on which texture had its size changed. This caused exceptions when flushing the texture. Now it correctly takes the block size into account, assuming that these textures are only related because a pixel in the non-compressed texture represents a block in the compressed one. * Implement JD's suggestion for HashCode Combine Co-authored-by: jduncanator <1518948+jduncanator@users.noreply.github.com> * Address feedback * Address feedback. Co-authored-by: jduncanator <1518948+jduncanator@users.noreply.github.com>
213 lines
6.2 KiB
C#
213 lines
6.2 KiB
C#
using OpenTK.Graphics.OpenGL;
|
|
using Ryujinx.Common.Logging;
|
|
using Ryujinx.Graphics.GAL;
|
|
using System;
|
|
|
|
namespace Ryujinx.Graphics.OpenGL.Image
|
|
{
|
|
class TextureStorage
|
|
{
|
|
public int Handle { get; private set; }
|
|
public float ScaleFactor { get; private set; }
|
|
|
|
public TextureCreateInfo Info { get; }
|
|
|
|
private readonly Renderer _renderer;
|
|
|
|
private int _viewsCount;
|
|
|
|
internal ITexture DefaultView { get; private set; }
|
|
|
|
public TextureStorage(Renderer renderer, TextureCreateInfo info, float scaleFactor)
|
|
{
|
|
_renderer = renderer;
|
|
Info = info;
|
|
|
|
Handle = GL.GenTexture();
|
|
ScaleFactor = scaleFactor;
|
|
|
|
CreateImmutableStorage();
|
|
}
|
|
|
|
private void CreateImmutableStorage()
|
|
{
|
|
TextureTarget target = Info.Target.Convert();
|
|
|
|
GL.ActiveTexture(TextureUnit.Texture0);
|
|
|
|
GL.BindTexture(target, Handle);
|
|
|
|
int width = (int)Math.Ceiling(Info.Width * ScaleFactor);
|
|
int height = (int)Math.Ceiling(Info.Height * ScaleFactor);
|
|
|
|
FormatInfo format = FormatTable.GetFormatInfo(Info.Format);
|
|
|
|
SizedInternalFormat internalFormat;
|
|
|
|
if (format.IsCompressed)
|
|
{
|
|
internalFormat = (SizedInternalFormat)format.PixelFormat;
|
|
}
|
|
else
|
|
{
|
|
internalFormat = (SizedInternalFormat)format.PixelInternalFormat;
|
|
}
|
|
|
|
switch (Info.Target)
|
|
{
|
|
case Target.Texture1D:
|
|
GL.TexStorage1D(
|
|
TextureTarget1d.Texture1D,
|
|
Info.Levels,
|
|
internalFormat,
|
|
width);
|
|
break;
|
|
|
|
case Target.Texture1DArray:
|
|
GL.TexStorage2D(
|
|
TextureTarget2d.Texture1DArray,
|
|
Info.Levels,
|
|
internalFormat,
|
|
width,
|
|
height);
|
|
break;
|
|
|
|
case Target.Texture2D:
|
|
GL.TexStorage2D(
|
|
TextureTarget2d.Texture2D,
|
|
Info.Levels,
|
|
internalFormat,
|
|
width,
|
|
height);
|
|
break;
|
|
|
|
case Target.Texture2DArray:
|
|
GL.TexStorage3D(
|
|
TextureTarget3d.Texture2DArray,
|
|
Info.Levels,
|
|
internalFormat,
|
|
width,
|
|
height,
|
|
Info.Depth);
|
|
break;
|
|
|
|
case Target.Texture2DMultisample:
|
|
GL.TexStorage2DMultisample(
|
|
TextureTargetMultisample2d.Texture2DMultisample,
|
|
Info.Samples,
|
|
internalFormat,
|
|
width,
|
|
height,
|
|
true);
|
|
break;
|
|
|
|
case Target.Texture2DMultisampleArray:
|
|
GL.TexStorage3DMultisample(
|
|
TextureTargetMultisample3d.Texture2DMultisampleArray,
|
|
Info.Samples,
|
|
internalFormat,
|
|
width,
|
|
height,
|
|
Info.Depth,
|
|
true);
|
|
break;
|
|
|
|
case Target.Texture3D:
|
|
GL.TexStorage3D(
|
|
TextureTarget3d.Texture3D,
|
|
Info.Levels,
|
|
internalFormat,
|
|
width,
|
|
height,
|
|
Info.Depth);
|
|
break;
|
|
|
|
case Target.Cubemap:
|
|
GL.TexStorage2D(
|
|
TextureTarget2d.TextureCubeMap,
|
|
Info.Levels,
|
|
internalFormat,
|
|
width,
|
|
height);
|
|
break;
|
|
|
|
case Target.CubemapArray:
|
|
GL.TexStorage3D(
|
|
(TextureTarget3d)All.TextureCubeMapArray,
|
|
Info.Levels,
|
|
internalFormat,
|
|
width,
|
|
height,
|
|
Info.Depth);
|
|
break;
|
|
|
|
default:
|
|
Logger.Debug?.Print(LogClass.Gpu, $"Invalid or unsupported texture target: {target}.");
|
|
break;
|
|
}
|
|
}
|
|
|
|
public ITexture CreateDefaultView()
|
|
{
|
|
DefaultView = CreateView(Info, 0, 0);
|
|
|
|
return DefaultView;
|
|
}
|
|
|
|
public ITexture CreateView(TextureCreateInfo info, int firstLayer, int firstLevel)
|
|
{
|
|
IncrementViewsCount();
|
|
|
|
return new TextureView(_renderer, this, info, firstLayer, firstLevel);
|
|
}
|
|
|
|
private void IncrementViewsCount()
|
|
{
|
|
_viewsCount++;
|
|
}
|
|
|
|
public void DecrementViewsCount()
|
|
{
|
|
// If we don't have any views, then the storage is now useless, delete it.
|
|
if (--_viewsCount == 0)
|
|
{
|
|
if (DefaultView == null)
|
|
{
|
|
Dispose();
|
|
}
|
|
else
|
|
{
|
|
// If the default view still exists, we can put it into the resource pool.
|
|
Release();
|
|
}
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Release the TextureStorage to the resource pool without disposing its handle.
|
|
/// </summary>
|
|
public void Release()
|
|
{
|
|
_viewsCount = 1; // When we are used again, we will have the default view.
|
|
|
|
_renderer.ResourcePool.AddTexture((TextureView)DefaultView);
|
|
}
|
|
|
|
public void DeleteDefault()
|
|
{
|
|
DefaultView = null;
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
DefaultView = null;
|
|
|
|
if (Handle != 0)
|
|
{
|
|
GL.DeleteTexture(Handle);
|
|
|
|
Handle = 0;
|
|
}
|
|
}
|
|
}
|
|
}
|