mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-09-20 01:59:45 +02:00
884b4e5fd3
* Initial non 2D textures support - Shaders still need to be changed - Some types aren't yet implemented * Start implementing texture instructions suffixes Fix wrong texture type with cube and TEXS Also support array textures in TEX and TEX.B Clean up TEX and TEXS coords managment Fix TEXS.LL with non-2d textures Implement TEX.AOFFI Get the right arguments for TEX, TEXS and TLDS Also, store suffix operands in appropriate values to support multiple suffix combinaisons * Support depth in read/writeTexture Also support WrapR and detect mipmap * Proper cube map textures support + fix TEXS.LZ * Implement depth compare * some code clean up * Implement CubeMap textures in OGLTexture.Create * Implement TLD4 and TLD4S * Add Texture 1D support * updates comments * fix some code style issues * Fix some nits + rename some things to be less confusing * Remove GetSuffix local functions * AOFFI => AOffI * TextureType => GalTextureTarget * finish renaming TextureType to TextureTarget * Disable LL, LZ and LB support in the decompiler This needs more work at the GL level (GLSL implementation should be right) * Revert "Disable LL, LZ and LB support in the decompiler" This reverts commit 64536c3d9f673645faff3152838d1413c3203395. * Fix TEXS ARRAY_2D index * ImageFormat depth should be 1 for all image format * Fix shader build issues with sampler1DShadow and texture * Fix DC & AOFFI combinaison with TEX/TEXS * Support AOFFI with TLD4 and TLD4S * Fix shader compilation error for TLD4.AOFFI with no DC * Fix binding isuses on the 2d copy engine TODO: support 2d array copy * Support 2D array copy operation in the 2D engine This make every copy right in the GPU side. Thie CPU copy probably needs to be updated * Implement GetGpuSize + fix somes issues with 2d engine copies TODO: mipmap level in it * Don't throw an exception in the layer handling * Fix because of rebase * Reject 2d layers of non textures in 2d copy engine * Add 3D textures and mipmap support on BlockLinearSwizzle * Fix naming on new BitUtils methods * gpu cache: Make sure to invalidate textures that doesn't have the same target * Add the concept of layer count for array instead of using depth Also cleanup GetGpuSize as Swizzle can compute the size with mipmap * Support multi layer with mip map in ReadTexture * Add more check for cache invalidation & remove cubemap and cubemap array code for now Also fix compressed 2d array * Fix texelFetchOffset shader build error * Start looking into cube map again Also add some way to log write in register in engines * fix write register log levles * Remove debug logs in WriteRegister * Disable AOFFI support on non NVIDIA drivers * Fix code align
382 lines
14 KiB
C#
382 lines
14 KiB
C#
using OpenTK.Graphics.OpenGL;
|
|
using Ryujinx.Graphics.Texture;
|
|
using System;
|
|
|
|
namespace Ryujinx.Graphics.Gal.OpenGL
|
|
{
|
|
class OGLTexture : IGalTexture
|
|
{
|
|
private const long MaxTextureCacheSize = 768 * 1024 * 1024;
|
|
|
|
private OGLCachedResource<ImageHandler> TextureCache;
|
|
|
|
public EventHandler<int> TextureDeleted { get; set; }
|
|
|
|
public OGLTexture()
|
|
{
|
|
TextureCache = new OGLCachedResource<ImageHandler>(DeleteTexture, MaxTextureCacheSize);
|
|
}
|
|
|
|
public void LockCache()
|
|
{
|
|
TextureCache.Lock();
|
|
}
|
|
|
|
public void UnlockCache()
|
|
{
|
|
TextureCache.Unlock();
|
|
}
|
|
|
|
private void DeleteTexture(ImageHandler CachedImage)
|
|
{
|
|
TextureDeleted?.Invoke(this, CachedImage.Handle);
|
|
|
|
GL.DeleteTexture(CachedImage.Handle);
|
|
}
|
|
|
|
public void Create(long Key, int Size, GalImage Image)
|
|
{
|
|
int Handle = GL.GenTexture();
|
|
|
|
TextureTarget Target = ImageUtils.GetTextureTarget(Image.TextureTarget);
|
|
|
|
GL.BindTexture(Target, Handle);
|
|
|
|
const int Level = 0; //TODO: Support mipmap textures.
|
|
const int Border = 0;
|
|
|
|
TextureCache.AddOrUpdate(Key, new ImageHandler(Handle, Image), (uint)Size);
|
|
|
|
if (ImageUtils.IsCompressed(Image.Format))
|
|
{
|
|
throw new InvalidOperationException("Surfaces with compressed formats are not supported!");
|
|
}
|
|
|
|
(PixelInternalFormat InternalFmt,
|
|
PixelFormat Format,
|
|
PixelType Type) = OGLEnumConverter.GetImageFormat(Image.Format);
|
|
|
|
switch (Target)
|
|
{
|
|
case TextureTarget.Texture1D:
|
|
GL.TexImage1D(
|
|
Target,
|
|
Level,
|
|
InternalFmt,
|
|
Image.Width,
|
|
Border,
|
|
Format,
|
|
Type,
|
|
IntPtr.Zero);
|
|
break;
|
|
|
|
case TextureTarget.Texture2D:
|
|
GL.TexImage2D(
|
|
Target,
|
|
Level,
|
|
InternalFmt,
|
|
Image.Width,
|
|
Image.Height,
|
|
Border,
|
|
Format,
|
|
Type,
|
|
IntPtr.Zero);
|
|
break;
|
|
case TextureTarget.Texture3D:
|
|
GL.TexImage3D(
|
|
Target,
|
|
Level,
|
|
InternalFmt,
|
|
Image.Width,
|
|
Image.Height,
|
|
Image.Depth,
|
|
Border,
|
|
Format,
|
|
Type,
|
|
IntPtr.Zero);
|
|
break;
|
|
case TextureTarget.Texture2DArray:
|
|
GL.TexImage3D(
|
|
Target,
|
|
Level,
|
|
InternalFmt,
|
|
Image.Width,
|
|
Image.Height,
|
|
Image.LayerCount,
|
|
Border,
|
|
Format,
|
|
Type,
|
|
IntPtr.Zero);
|
|
break;
|
|
default:
|
|
throw new NotImplementedException($"Unsupported texture target type: {Target}");
|
|
}
|
|
}
|
|
|
|
public void Create(long Key, byte[] Data, GalImage Image)
|
|
{
|
|
int Handle = GL.GenTexture();
|
|
|
|
TextureTarget Target = ImageUtils.GetTextureTarget(Image.TextureTarget);
|
|
|
|
GL.BindTexture(Target, Handle);
|
|
|
|
const int Level = 0; //TODO: Support mipmap textures.
|
|
const int Border = 0;
|
|
|
|
TextureCache.AddOrUpdate(Key, new ImageHandler(Handle, Image), (uint)Data.Length);
|
|
|
|
if (ImageUtils.IsCompressed(Image.Format) && !IsAstc(Image.Format))
|
|
{
|
|
InternalFormat InternalFmt = OGLEnumConverter.GetCompressedImageFormat(Image.Format);
|
|
|
|
switch (Target)
|
|
{
|
|
case TextureTarget.Texture1D:
|
|
GL.CompressedTexImage1D(
|
|
Target,
|
|
Level,
|
|
InternalFmt,
|
|
Image.Width,
|
|
Border,
|
|
Data.Length,
|
|
Data);
|
|
break;
|
|
case TextureTarget.Texture2D:
|
|
GL.CompressedTexImage2D(
|
|
Target,
|
|
Level,
|
|
InternalFmt,
|
|
Image.Width,
|
|
Image.Height,
|
|
Border,
|
|
Data.Length,
|
|
Data);
|
|
break;
|
|
case TextureTarget.Texture3D:
|
|
GL.CompressedTexImage3D(
|
|
Target,
|
|
Level,
|
|
InternalFmt,
|
|
Image.Width,
|
|
Image.Height,
|
|
Image.Depth,
|
|
Border,
|
|
Data.Length,
|
|
Data);
|
|
break;
|
|
case TextureTarget.Texture2DArray:
|
|
GL.CompressedTexImage3D(
|
|
Target,
|
|
Level,
|
|
InternalFmt,
|
|
Image.Width,
|
|
Image.Height,
|
|
Image.LayerCount,
|
|
Border,
|
|
Data.Length,
|
|
Data);
|
|
break;
|
|
default:
|
|
throw new NotImplementedException($"Unsupported texture target type: {Target}");
|
|
}
|
|
}
|
|
else
|
|
{
|
|
//TODO: Use KHR_texture_compression_astc_hdr when available
|
|
if (IsAstc(Image.Format))
|
|
{
|
|
int TextureBlockWidth = ImageUtils.GetBlockWidth(Image.Format);
|
|
int TextureBlockHeight = ImageUtils.GetBlockHeight(Image.Format);
|
|
int TextureBlockDepth = ImageUtils.GetBlockDepth(Image.Format);
|
|
|
|
Data = ASTCDecoder.DecodeToRGBA8888(
|
|
Data,
|
|
TextureBlockWidth,
|
|
TextureBlockHeight,
|
|
TextureBlockDepth,
|
|
Image.Width,
|
|
Image.Height,
|
|
Image.Depth);
|
|
|
|
Image.Format = GalImageFormat.RGBA8 | (Image.Format & GalImageFormat.TypeMask);
|
|
}
|
|
|
|
(PixelInternalFormat InternalFmt,
|
|
PixelFormat Format,
|
|
PixelType Type) = OGLEnumConverter.GetImageFormat(Image.Format);
|
|
|
|
|
|
switch (Target)
|
|
{
|
|
case TextureTarget.Texture1D:
|
|
GL.TexImage1D(
|
|
Target,
|
|
Level,
|
|
InternalFmt,
|
|
Image.Width,
|
|
Border,
|
|
Format,
|
|
Type,
|
|
Data);
|
|
break;
|
|
case TextureTarget.Texture2D:
|
|
GL.TexImage2D(
|
|
Target,
|
|
Level,
|
|
InternalFmt,
|
|
Image.Width,
|
|
Image.Height,
|
|
Border,
|
|
Format,
|
|
Type,
|
|
Data);
|
|
break;
|
|
case TextureTarget.Texture3D:
|
|
GL.TexImage3D(
|
|
Target,
|
|
Level,
|
|
InternalFmt,
|
|
Image.Width,
|
|
Image.Height,
|
|
Image.Depth,
|
|
Border,
|
|
Format,
|
|
Type,
|
|
Data);
|
|
break;
|
|
case TextureTarget.Texture2DArray:
|
|
GL.TexImage3D(
|
|
Target,
|
|
Level,
|
|
InternalFmt,
|
|
Image.Width,
|
|
Image.Height,
|
|
Image.LayerCount,
|
|
Border,
|
|
Format,
|
|
Type,
|
|
Data);
|
|
break;
|
|
case TextureTarget.TextureCubeMap:
|
|
Span<byte> Array = new Span<byte>(Data);
|
|
|
|
int FaceSize = ImageUtils.GetSize(Image) / 6;
|
|
|
|
for (int Face = 0; Face < 6; Face++)
|
|
{
|
|
GL.TexImage2D(
|
|
TextureTarget.TextureCubeMapPositiveX + Face,
|
|
Level,
|
|
InternalFmt,
|
|
Image.Width,
|
|
Image.Height,
|
|
Border,
|
|
Format,
|
|
Type,
|
|
Array.Slice(Face * FaceSize, FaceSize).ToArray());
|
|
}
|
|
break;
|
|
default:
|
|
throw new NotImplementedException($"Unsupported texture target type: {Target}");
|
|
}
|
|
}
|
|
}
|
|
|
|
private static bool IsAstc(GalImageFormat Format)
|
|
{
|
|
Format &= GalImageFormat.FormatMask;
|
|
|
|
return Format > GalImageFormat.Astc2DStart && Format < GalImageFormat.Astc2DEnd;
|
|
}
|
|
|
|
public bool TryGetImage(long Key, out GalImage Image)
|
|
{
|
|
if (TextureCache.TryGetValue(Key, out ImageHandler CachedImage))
|
|
{
|
|
Image = CachedImage.Image;
|
|
|
|
return true;
|
|
}
|
|
|
|
Image = default(GalImage);
|
|
|
|
return false;
|
|
}
|
|
|
|
public bool TryGetImageHandler(long Key, out ImageHandler CachedImage)
|
|
{
|
|
if (TextureCache.TryGetValue(Key, out CachedImage))
|
|
{
|
|
return true;
|
|
}
|
|
|
|
CachedImage = null;
|
|
|
|
return false;
|
|
}
|
|
|
|
public void Bind(long Key, int Index, GalImage Image)
|
|
{
|
|
if (TextureCache.TryGetValue(Key, out ImageHandler CachedImage))
|
|
{
|
|
GL.ActiveTexture(TextureUnit.Texture0 + Index);
|
|
|
|
TextureTarget Target = ImageUtils.GetTextureTarget(Image.TextureTarget);
|
|
|
|
GL.BindTexture(Target, CachedImage.Handle);
|
|
|
|
int[] SwizzleRgba = new int[]
|
|
{
|
|
(int)OGLEnumConverter.GetTextureSwizzle(Image.XSource),
|
|
(int)OGLEnumConverter.GetTextureSwizzle(Image.YSource),
|
|
(int)OGLEnumConverter.GetTextureSwizzle(Image.ZSource),
|
|
(int)OGLEnumConverter.GetTextureSwizzle(Image.WSource)
|
|
};
|
|
|
|
GL.TexParameter(Target, TextureParameterName.TextureSwizzleRgba, SwizzleRgba);
|
|
}
|
|
}
|
|
|
|
public void SetSampler(GalImage Image, GalTextureSampler Sampler)
|
|
{
|
|
int WrapS = (int)OGLEnumConverter.GetTextureWrapMode(Sampler.AddressU);
|
|
int WrapT = (int)OGLEnumConverter.GetTextureWrapMode(Sampler.AddressV);
|
|
int WrapR = (int)OGLEnumConverter.GetTextureWrapMode(Sampler.AddressP);
|
|
|
|
int MinFilter = (int)OGLEnumConverter.GetTextureMinFilter(Sampler.MinFilter, Sampler.MipFilter);
|
|
int MagFilter = (int)OGLEnumConverter.GetTextureMagFilter(Sampler.MagFilter);
|
|
|
|
TextureTarget Target = ImageUtils.GetTextureTarget(Image.TextureTarget);
|
|
|
|
GL.TexParameter(Target, TextureParameterName.TextureWrapS, WrapS);
|
|
GL.TexParameter(Target, TextureParameterName.TextureWrapT, WrapT);
|
|
GL.TexParameter(Target, TextureParameterName.TextureWrapR, WrapR);
|
|
|
|
GL.TexParameter(Target, TextureParameterName.TextureMinFilter, MinFilter);
|
|
GL.TexParameter(Target, TextureParameterName.TextureMagFilter, MagFilter);
|
|
|
|
float[] Color = new float[]
|
|
{
|
|
Sampler.BorderColor.Red,
|
|
Sampler.BorderColor.Green,
|
|
Sampler.BorderColor.Blue,
|
|
Sampler.BorderColor.Alpha
|
|
};
|
|
|
|
GL.TexParameter(Target, TextureParameterName.TextureBorderColor, Color);
|
|
|
|
if (Sampler.DepthCompare)
|
|
{
|
|
GL.TexParameter(Target, TextureParameterName.TextureCompareMode, (int)All.CompareRToTexture);
|
|
GL.TexParameter(Target, TextureParameterName.TextureCompareFunc, (int)OGLEnumConverter.GetDepthCompareFunc(Sampler.DepthCompareFunc));
|
|
}
|
|
else
|
|
{
|
|
GL.TexParameter(Target, TextureParameterName.TextureCompareMode, (int)All.None);
|
|
GL.TexParameter(Target, TextureParameterName.TextureCompareFunc, (int)All.Never);
|
|
}
|
|
}
|
|
}
|
|
}
|