ryujinx/Ryujinx
1
0
Fork 0
mirror of https://github.com/Ryujinx/Ryujinx.git synced 2024-11-08 17:48:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
Ryujinx/Ryujinx.Graphics/Gal/OpenGL/OGLEnumConverter.cs

428 lines
25 KiB
C#
Raw Normal View History

Merge shader branch, adding support for GLSL decompilation, a macro interpreter, and a rewrite of the GPU code.
2018-04-08 19:17:35 +00:00
using OpenTK.Graphics.OpenGL;
using System;
namespace Ryujinx.Graphics.Gal.OpenGL
{
static class OGLEnumConverter
{
Implement some GPU features (#209) * Implement stencil testing * Implement depth testing * Implement face culling * Implement front face * Comparison functions now take OGL enums too * Fix front facing when flipping was used * Add depth and stencil clear values
2018-07-05 18:47:29 +00:00
public static FrontFaceDirection GetFrontFace(GalFrontFace FrontFace)
{
switch (FrontFace)
{
case GalFrontFace.CW: return FrontFaceDirection.Cw;
case GalFrontFace.CCW: return FrontFaceDirection.Ccw;
}
Quads, QuadStrip, const attributes and half-float attributes support (#447) * Quads, QuadStrip and const attributes support * Add support for half float attributes and fix texture pitch alignment * Throw when an unsupported float type is used as const attribute aswell
2018-10-13 01:37:01 +00:00
throw new ArgumentException(nameof(FrontFace) + " \"" + FrontFace + "\" is not valid!");
Implement some GPU features (#209) * Implement stencil testing * Implement depth testing * Implement face culling * Implement front face * Comparison functions now take OGL enums too * Fix front facing when flipping was used * Add depth and stencil clear values
2018-07-05 18:47:29 +00:00
}
public static CullFaceMode GetCullFace(GalCullFace CullFace)
{
switch (CullFace)
{
case GalCullFace.Front: return CullFaceMode.Front;
case GalCullFace.Back: return CullFaceMode.Back;
case GalCullFace.FrontAndBack: return CullFaceMode.FrontAndBack;
}
Quads, QuadStrip, const attributes and half-float attributes support (#447) * Quads, QuadStrip and const attributes support * Add support for half float attributes and fix texture pitch alignment * Throw when an unsupported float type is used as const attribute aswell
2018-10-13 01:37:01 +00:00
throw new ArgumentException(nameof(CullFace) + " \"" + CullFace + "\" is not valid!");
Implement some GPU features (#209) * Implement stencil testing * Implement depth testing * Implement face culling * Implement front face * Comparison functions now take OGL enums too * Fix front facing when flipping was used * Add depth and stencil clear values
2018-07-05 18:47:29 +00:00
}
public static StencilOp GetStencilOp(GalStencilOp Op)
{
switch (Op)
{
case GalStencilOp.Keep: return StencilOp.Keep;
case GalStencilOp.Zero: return StencilOp.Zero;
case GalStencilOp.Replace: return StencilOp.Replace;
case GalStencilOp.Incr: return StencilOp.Incr;
case GalStencilOp.Decr: return StencilOp.Decr;
case GalStencilOp.Invert: return StencilOp.Invert;
case GalStencilOp.IncrWrap: return StencilOp.IncrWrap;
case GalStencilOp.DecrWrap: return StencilOp.DecrWrap;
}
Quads, QuadStrip, const attributes and half-float attributes support (#447) * Quads, QuadStrip and const attributes support * Add support for half float attributes and fix texture pitch alignment * Throw when an unsupported float type is used as const attribute aswell
2018-10-13 01:37:01 +00:00
throw new ArgumentException(nameof(Op) + " \"" + Op + "\" is not valid!");
Implement some GPU features (#209) * Implement stencil testing * Implement depth testing * Implement face culling * Implement front face * Comparison functions now take OGL enums too * Fix front facing when flipping was used * Add depth and stencil clear values
2018-07-05 18:47:29 +00:00
}
Fix vertex buffer size on the gpu when the draw vertex count is less than the buffer size, added a few more registers (currently not implemented)
2018-06-27 04:32:28 +00:00
public static DepthFunction GetDepthFunc(GalComparisonOp Func)
{
Implment common and independent blend properly (fixes #458) (#485) * Implment common and independent blend properly * Nits
2018-11-01 04:22:24 +00:00
return (DepthFunction)GetFunc(Func);
}
public static StencilFunction GetStencilFunc(GalComparisonOp Func)
{
return (StencilFunction)GetFunc(Func);
}
private static All GetFunc(GalComparisonOp Func)
{
if ((int)Func >= (int)All.Never &&
(int)Func <= (int)All.Always)
Fix vertex buffer size on the gpu when the draw vertex count is less than the buffer size, added a few more registers (currently not implemented)
2018-06-27 04:32:28 +00:00
{
Implment common and independent blend properly (fixes #458) (#485) * Implment common and independent blend properly * Nits
2018-11-01 04:22:24 +00:00
return (All)Func;
Fix vertex buffer size on the gpu when the draw vertex count is less than the buffer size, added a few more registers (currently not implemented)
2018-06-27 04:32:28 +00:00
}
Implement some GPU features (#209) * Implement stencil testing * Implement depth testing * Implement face culling * Implement front face * Comparison functions now take OGL enums too * Fix front facing when flipping was used * Add depth and stencil clear values
2018-07-05 18:47:29 +00:00
switch (Func)
{
Implment common and independent blend properly (fixes #458) (#485) * Implment common and independent blend properly * Nits
2018-11-01 04:22:24 +00:00
case GalComparisonOp.Never: return All.Never;
case GalComparisonOp.Less: return All.Less;
case GalComparisonOp.Equal: return All.Equal;
case GalComparisonOp.Lequal: return All.Lequal;
case GalComparisonOp.Greater: return All.Greater;
case GalComparisonOp.NotEqual: return All.Notequal;
case GalComparisonOp.Gequal: return All.Gequal;
case GalComparisonOp.Always: return All.Always;
Implement some GPU features (#209) * Implement stencil testing * Implement depth testing * Implement face culling * Implement front face * Comparison functions now take OGL enums too * Fix front facing when flipping was used * Add depth and stencil clear values
2018-07-05 18:47:29 +00:00
}
Quads, QuadStrip, const attributes and half-float attributes support (#447) * Quads, QuadStrip and const attributes support * Add support for half float attributes and fix texture pitch alignment * Throw when an unsupported float type is used as const attribute aswell
2018-10-13 01:37:01 +00:00
throw new ArgumentException(nameof(Func) + " \"" + Func + "\" is not valid!");
Fix vertex buffer size on the gpu when the draw vertex count is less than the buffer size, added a few more registers (currently not implemented)
2018-06-27 04:32:28 +00:00
}
Merge shader branch, adding support for GLSL decompilation, a macro interpreter, and a rewrite of the GPU code.
2018-04-08 19:17:35 +00:00
public static DrawElementsType GetDrawElementsType(GalIndexFormat Format)
{
switch (Format)
{
case GalIndexFormat.Byte: return DrawElementsType.UnsignedByte;
case GalIndexFormat.Int16: return DrawElementsType.UnsignedShort;
case GalIndexFormat.Int32: return DrawElementsType.UnsignedInt;
}
Quads, QuadStrip, const attributes and half-float attributes support (#447) * Quads, QuadStrip and const attributes support * Add support for half float attributes and fix texture pitch alignment * Throw when an unsupported float type is used as const attribute aswell
2018-10-13 01:37:01 +00:00
throw new ArgumentException(nameof(Format) + " \"" + Format + "\" is not valid!");
Merge shader branch, adding support for GLSL decompilation, a macro interpreter, and a rewrite of the GPU code.
2018-04-08 19:17:35 +00:00
}
public static PrimitiveType GetPrimitiveType(GalPrimitiveType Type)
{
switch (Type)
{
case GalPrimitiveType.Points: return PrimitiveType.Points;
case GalPrimitiveType.Lines: return PrimitiveType.Lines;
case GalPrimitiveType.LineLoop: return PrimitiveType.LineLoop;
case GalPrimitiveType.LineStrip: return PrimitiveType.LineStrip;
case GalPrimitiveType.Triangles: return PrimitiveType.Triangles;
case GalPrimitiveType.TriangleStrip: return PrimitiveType.TriangleStrip;
case GalPrimitiveType.TriangleFan: return PrimitiveType.TriangleFan;
case GalPrimitiveType.Polygon: return PrimitiveType.Polygon;
case GalPrimitiveType.LinesAdjacency: return PrimitiveType.LinesAdjacency;
case GalPrimitiveType.LineStripAdjacency: return PrimitiveType.LineStripAdjacency;
case GalPrimitiveType.TrianglesAdjacency: return PrimitiveType.TrianglesAdjacency;
case GalPrimitiveType.TriangleStripAdjacency: return PrimitiveType.TriangleStripAdjacency;
case GalPrimitiveType.Patches: return PrimitiveType.Patches;
}
Quads, QuadStrip, const attributes and half-float attributes support (#447) * Quads, QuadStrip and const attributes support * Add support for half float attributes and fix texture pitch alignment * Throw when an unsupported float type is used as const attribute aswell
2018-10-13 01:37:01 +00:00
throw new ArgumentException(nameof(Type) + " \"" + Type + "\" is not valid!");
Merge shader branch, adding support for GLSL decompilation, a macro interpreter, and a rewrite of the GPU code.
2018-04-08 19:17:35 +00:00
}
public static ShaderType GetShaderType(GalShaderType Type)
{
switch (Type)
{
case GalShaderType.Vertex: return ShaderType.VertexShader;
case GalShaderType.TessControl: return ShaderType.TessControlShader;
case GalShaderType.TessEvaluation: return ShaderType.TessEvaluationShader;
case GalShaderType.Geometry: return ShaderType.GeometryShader;
case GalShaderType.Fragment: return ShaderType.FragmentShader;
}
Quads, QuadStrip, const attributes and half-float attributes support (#447) * Quads, QuadStrip and const attributes support * Add support for half float attributes and fix texture pitch alignment * Throw when an unsupported float type is used as const attribute aswell
2018-10-13 01:37:01 +00:00
throw new ArgumentException(nameof(Type) + " \"" + Type + "\" is not valid!");
Merge shader branch, adding support for GLSL decompilation, a macro interpreter, and a rewrite of the GPU code.
2018-04-08 19:17:35 +00:00
}
Rendertarget attachments, texture and image changes (#358) * Add multiple color outputs for fragment shaders * Add registers and gal enums * Use textures for framebuffers and split color and zeta framebuffers * Abstract texture and framebuffer targets as an image * Share images between framebuffers and textures * Unstub formats * Add some formats * Disable multiple attachments * Cache framebuffer attachments * Handle format types * Add some rendertarget formats * Code cleanup * Fixup half float types * Address feedback * Disable multiple attachments in shaders * Add A4B4G4R4 image format * Add reversed section for image enums
2018-08-20 01:25:26 +00:00
public static (PixelInternalFormat, PixelFormat, PixelType) GetImageFormat(GalImageFormat Format)
[GPU] Add more shader instructions, add support for rgb565 textures
2018-04-10 19:50:32 +00:00
{
switch (Format)
{
Improve texture tables (#457) * Improve texture tables * More renaming and other tweaks * Minor tweaks
2018-10-17 21:02:23 +00:00
case GalImageFormat.RGBA32 | GalImageFormat.Float: return (PixelInternalFormat.Rgba32f, PixelFormat.Rgba, PixelType.Float);
case GalImageFormat.RGBA32 | GalImageFormat.Sint: return (PixelInternalFormat.Rgba32i, PixelFormat.RgbaInteger, PixelType.Int);
case GalImageFormat.RGBA32 | GalImageFormat.Uint: return (PixelInternalFormat.Rgba32ui, PixelFormat.RgbaInteger, PixelType.UnsignedInt);
case GalImageFormat.RGBA16 | GalImageFormat.Float: return (PixelInternalFormat.Rgba16f, PixelFormat.Rgba, PixelType.HalfFloat);
case GalImageFormat.RGBA16 | GalImageFormat.Sint: return (PixelInternalFormat.Rgba16i, PixelFormat.RgbaInteger, PixelType.Short);
case GalImageFormat.RGBA16 | GalImageFormat.Uint: return (PixelInternalFormat.Rgba16ui, PixelFormat.RgbaInteger, PixelType.UnsignedShort);
Add RGBA16 Unorm (#513)
2018-11-23 14:21:45 +00:00
case GalImageFormat.RGBA16 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgba16, PixelFormat.Rgba, PixelType.UnsignedShort);
Improve texture tables (#457) * Improve texture tables * More renaming and other tweaks * Minor tweaks
2018-10-17 21:02:23 +00:00
case GalImageFormat.RG32 | GalImageFormat.Float: return (PixelInternalFormat.Rg32f, PixelFormat.Rg, PixelType.Float);
case GalImageFormat.RG32 | GalImageFormat.Sint: return (PixelInternalFormat.Rg32i, PixelFormat.RgInteger, PixelType.Int);
case GalImageFormat.RG32 | GalImageFormat.Uint: return (PixelInternalFormat.Rg32ui, PixelFormat.RgInteger, PixelType.UnsignedInt);
Improved GPU command lists decoding (#499) * Better implementation of the DMA pusher, misc fixes * Remove some debug code * Correct RGBX8 format * Add support for linked Texture Sampler Control * Attempt to fix upside down screen issue
2018-11-17 04:01:31 +00:00
case GalImageFormat.RGBX8 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgb8, PixelFormat.Rgba, PixelType.UnsignedByte);
Improve texture tables (#457) * Improve texture tables * More renaming and other tweaks * Minor tweaks
2018-10-17 21:02:23 +00:00
case GalImageFormat.RGBA8 | GalImageFormat.Snorm: return (PixelInternalFormat.Rgba8Snorm, PixelFormat.Rgba, PixelType.Byte);
case GalImageFormat.RGBA8 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgba8, PixelFormat.Rgba, PixelType.UnsignedByte);
case GalImageFormat.RGBA8 | GalImageFormat.Sint: return (PixelInternalFormat.Rgba8i, PixelFormat.RgbaInteger, PixelType.Byte);
case GalImageFormat.RGBA8 | GalImageFormat.Uint: return (PixelInternalFormat.Rgba8ui, PixelFormat.RgbaInteger, PixelType.UnsignedByte);
case GalImageFormat.RGBA8 | GalImageFormat.Srgb: return (PixelInternalFormat.Srgb8Alpha8, PixelFormat.Rgba, PixelType.UnsignedByte);
case GalImageFormat.BGRA8 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgba8, PixelFormat.Bgra, PixelType.UnsignedByte);
Add BGRA8 Srgb (#505)
2018-11-19 04:07:09 +00:00
case GalImageFormat.BGRA8 | GalImageFormat.Srgb: return (PixelInternalFormat.Srgb8Alpha8, PixelFormat.Bgra, PixelType.UnsignedByte);
Improve texture tables (#457) * Improve texture tables * More renaming and other tweaks * Minor tweaks
2018-10-17 21:02:23 +00:00
case GalImageFormat.RGBA4 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgba4, PixelFormat.Rgba, PixelType.UnsignedShort4444Reversed);
case GalImageFormat.RGB10A2 | GalImageFormat.Uint: return (PixelInternalFormat.Rgb10A2ui, PixelFormat.RgbaInteger, PixelType.UnsignedInt2101010Reversed);
case GalImageFormat.RGB10A2 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgb10A2, PixelFormat.Rgba, PixelType.UnsignedInt2101010Reversed);
case GalImageFormat.R32 | GalImageFormat.Float: return (PixelInternalFormat.R32f, PixelFormat.Red, PixelType.Float);
case GalImageFormat.R32 | GalImageFormat.Sint: return (PixelInternalFormat.R32i, PixelFormat.Red, PixelType.Int);
case GalImageFormat.R32 | GalImageFormat.Uint: return (PixelInternalFormat.R32ui, PixelFormat.Red, PixelType.UnsignedInt);
Add BGR5A1 Image Format (#495) * Add `BGR5A1` to ImageUtils.cs Add `BGR5A1` Image Format. * Add BGR5A1 to OGLEnumConverter.cs
2018-11-11 04:27:06 +00:00
case GalImageFormat.BGR5A1 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgb5A1, PixelFormat.Rgba, PixelType.UnsignedShort5551);
Improve texture tables (#457) * Improve texture tables * More renaming and other tweaks * Minor tweaks
2018-10-17 21:02:23 +00:00
case GalImageFormat.RGB5A1 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgb5A1, PixelFormat.Rgba, PixelType.UnsignedShort1555Reversed);
case GalImageFormat.RGB565 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgba, PixelFormat.Rgb, PixelType.UnsignedShort565Reversed);
Some improvements for nvnflinger (#555) * Initial fixes for last release of libnx For now, the framebuffer aren't okay but it will not crash/ * Improve code reaadability in NvFlinger parsing * Make surfaces access more userfriendly * Add ColorFormat * Fix code style in ColorFormat.cs * Add multiple framebuffer support in nvnflinger This fix libnx console rendering * Move ReadStruct/WriteStruct to Ryujinx.Common * fix the last nit * Fix inverted color for R5G6B5 Also add some other format that libnx might uses. * Remove hardcoded BlockHeight in nvflinger
2019-01-05 21:26:16 +00:00
case GalImageFormat.BGR565 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgba, PixelFormat.Rgb, PixelType.UnsignedShort565);
Improve texture tables (#457) * Improve texture tables * More renaming and other tweaks * Minor tweaks
2018-10-17 21:02:23 +00:00
case GalImageFormat.RG16 | GalImageFormat.Float: return (PixelInternalFormat.Rg16f, PixelFormat.Rg, PixelType.HalfFloat);
case GalImageFormat.RG16 | GalImageFormat.Sint: return (PixelInternalFormat.Rg16i, PixelFormat.RgInteger, PixelType.Short);
case GalImageFormat.RG16 | GalImageFormat.Snorm: return (PixelInternalFormat.Rg16Snorm, PixelFormat.Rg, PixelType.Short);
case GalImageFormat.RG16 | GalImageFormat.Uint: return (PixelInternalFormat.Rg16ui, PixelFormat.RgInteger, PixelType.UnsignedShort);
case GalImageFormat.RG16 | GalImageFormat.Unorm: return (PixelInternalFormat.Rg16, PixelFormat.Rg, PixelType.UnsignedShort);
case GalImageFormat.RG8 | GalImageFormat.Sint: return (PixelInternalFormat.Rg8i, PixelFormat.RgInteger, PixelType.Byte);
case GalImageFormat.RG8 | GalImageFormat.Snorm: return (PixelInternalFormat.Rg8Snorm, PixelFormat.Rg, PixelType.Byte);
case GalImageFormat.RG8 | GalImageFormat.Uint: return (PixelInternalFormat.Rg8ui, PixelFormat.RgInteger, PixelType.UnsignedByte);
case GalImageFormat.RG8 | GalImageFormat.Unorm: return (PixelInternalFormat.Rg8, PixelFormat.Rg, PixelType.UnsignedByte);
case GalImageFormat.R16 | GalImageFormat.Float: return (PixelInternalFormat.R16f, PixelFormat.Red, PixelType.HalfFloat);
case GalImageFormat.R16 | GalImageFormat.Sint: return (PixelInternalFormat.R16i, PixelFormat.RedInteger, PixelType.Short);
case GalImageFormat.R16 | GalImageFormat.Snorm: return (PixelInternalFormat.R16Snorm, PixelFormat.Red, PixelType.Short);
case GalImageFormat.R16 | GalImageFormat.Uint: return (PixelInternalFormat.R16ui, PixelFormat.RedInteger, PixelType.UnsignedShort);
case GalImageFormat.R16 | GalImageFormat.Unorm: return (PixelInternalFormat.R16, PixelFormat.Red, PixelType.UnsignedShort);
case GalImageFormat.R8 | GalImageFormat.Sint: return (PixelInternalFormat.R8i, PixelFormat.RedInteger, PixelType.Byte);
case GalImageFormat.R8 | GalImageFormat.Snorm: return (PixelInternalFormat.R8Snorm, PixelFormat.Red, PixelType.Byte);
case GalImageFormat.R8 | GalImageFormat.Uint: return (PixelInternalFormat.R8ui, PixelFormat.RedInteger, PixelType.UnsignedByte);
case GalImageFormat.R8 | GalImageFormat.Unorm: return (PixelInternalFormat.R8, PixelFormat.Red, PixelType.UnsignedByte);
case GalImageFormat.R11G11B10 | GalImageFormat.Float: return (PixelInternalFormat.R11fG11fB10f, PixelFormat.Rgb, PixelType.UnsignedInt10F11F11FRev);
Improved GPU command lists decoding (#499) * Better implementation of the DMA pusher, misc fixes * Remove some debug code * Correct RGBX8 format * Add support for linked Texture Sampler Control * Attempt to fix upside down screen issue
2018-11-17 04:01:31 +00:00
case GalImageFormat.D16 | GalImageFormat.Unorm: return (PixelInternalFormat.DepthComponent16, PixelFormat.DepthComponent, PixelType.UnsignedShort);
case GalImageFormat.D24 | GalImageFormat.Unorm: return (PixelInternalFormat.DepthComponent24, PixelFormat.DepthComponent, PixelType.UnsignedInt);
Improve texture tables (#457) * Improve texture tables * More renaming and other tweaks * Minor tweaks
2018-10-17 21:02:23 +00:00
case GalImageFormat.D24S8 | GalImageFormat.Uint: return (PixelInternalFormat.Depth24Stencil8, PixelFormat.DepthStencil, PixelType.UnsignedInt248);
case GalImageFormat.D24S8 | GalImageFormat.Unorm: return (PixelInternalFormat.Depth24Stencil8, PixelFormat.DepthStencil, PixelType.UnsignedInt248);
case GalImageFormat.D32 | GalImageFormat.Float: return (PixelInternalFormat.DepthComponent32f, PixelFormat.DepthComponent, PixelType.Float);
case GalImageFormat.D32S8 | GalImageFormat.Float: return (PixelInternalFormat.Depth32fStencil8, PixelFormat.DepthStencil, PixelType.Float32UnsignedInt248Rev);
[GPU] Add more shader instructions, add support for rgb565 textures
2018-04-10 19:50:32 +00:00
}
Fixup image error message and add G8R8 to size query (#410)
2018-09-11 15:48:13 +00:00
throw new NotImplementedException($"{Format & GalImageFormat.FormatMask} {Format & GalImageFormat.TypeMask}");
[GPU] Add more shader instructions, add support for rgb565 textures
2018-04-10 19:50:32 +00:00
}
Initial non 2D textures support (#525) * 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
2019-02-28 01:12:24 +00:00
public static All GetDepthCompareFunc(DepthCompareFunc DepthCompareFunc)
{
switch (DepthCompareFunc)
{
case DepthCompareFunc.LEqual:
return All.Lequal;
case DepthCompareFunc.GEqual:
return All.Gequal;
case DepthCompareFunc.Less:
return All.Less;
case DepthCompareFunc.Greater:
return All.Greater;
case DepthCompareFunc.Equal:
return All.Equal;
case DepthCompareFunc.NotEqual:
return All.Notequal;
case DepthCompareFunc.Always:
return All.Always;
case DepthCompareFunc.Never:
return All.Never;
default:
throw new ArgumentException(nameof(DepthCompareFunc) + " \"" + DepthCompareFunc + "\" is not valid!");
}
}
Rendertarget attachments, texture and image changes (#358) * Add multiple color outputs for fragment shaders * Add registers and gal enums * Use textures for framebuffers and split color and zeta framebuffers * Abstract texture and framebuffer targets as an image * Share images between framebuffers and textures * Unstub formats * Add some formats * Disable multiple attachments * Cache framebuffer attachments * Handle format types * Add some rendertarget formats * Code cleanup * Fixup half float types * Address feedback * Disable multiple attachments in shaders * Add A4B4G4R4 image format * Add reversed section for image enums
2018-08-20 01:25:26 +00:00
public static InternalFormat GetCompressedImageFormat(GalImageFormat Format)
Merge shader branch, adding support for GLSL decompilation, a macro interpreter, and a rewrite of the GPU code.
2018-04-08 19:17:35 +00:00
{
switch (Format)
{
Improve texture tables (#457) * Improve texture tables * More renaming and other tweaks * Minor tweaks
2018-10-17 21:02:23 +00:00
case GalImageFormat.BptcSfloat | GalImageFormat.Float: return InternalFormat.CompressedRgbBptcSignedFloat;
case GalImageFormat.BptcUfloat | GalImageFormat.Float: return InternalFormat.CompressedRgbBptcUnsignedFloat;
case GalImageFormat.BptcUnorm | GalImageFormat.Unorm: return InternalFormat.CompressedRgbaBptcUnorm;
case GalImageFormat.BptcUnorm | GalImageFormat.Srgb: return InternalFormat.CompressedSrgbAlphaBptcUnorm;
case GalImageFormat.BC1 | GalImageFormat.Unorm: return InternalFormat.CompressedRgbaS3tcDxt1Ext;
case GalImageFormat.BC1 | GalImageFormat.Srgb: return InternalFormat.CompressedSrgbAlphaS3tcDxt1Ext;
case GalImageFormat.BC2 | GalImageFormat.Unorm: return InternalFormat.CompressedRgbaS3tcDxt3Ext;
case GalImageFormat.BC2 | GalImageFormat.Srgb: return InternalFormat.CompressedSrgbAlphaS3tcDxt3Ext;
case GalImageFormat.BC3 | GalImageFormat.Unorm: return InternalFormat.CompressedRgbaS3tcDxt5Ext;
case GalImageFormat.BC3 | GalImageFormat.Srgb: return InternalFormat.CompressedSrgbAlphaS3tcDxt5Ext;
case GalImageFormat.BC4 | GalImageFormat.Snorm: return InternalFormat.CompressedSignedRedRgtc1;
case GalImageFormat.BC4 | GalImageFormat.Unorm: return InternalFormat.CompressedRedRgtc1;
case GalImageFormat.BC5 | GalImageFormat.Snorm: return InternalFormat.CompressedSignedRgRgtc2;
case GalImageFormat.BC5 | GalImageFormat.Unorm: return InternalFormat.CompressedRgRgtc2;
Merge shader branch, adding support for GLSL decompilation, a macro interpreter, and a rewrite of the GPU code.
2018-04-08 19:17:35 +00:00
}
Fixup image error message and add G8R8 to size query (#410)
2018-09-11 15:48:13 +00:00
throw new NotImplementedException($"{Format & GalImageFormat.FormatMask} {Format & GalImageFormat.TypeMask}");
Merge shader branch, adding support for GLSL decompilation, a macro interpreter, and a rewrite of the GPU code.
2018-04-08 19:17:35 +00:00
}
Added more shader instructions, including BFE, BRA (partial), FMNMX, ISCADD, SHL, LD_C, some shader related fixes, added support for texture component selection
2018-05-17 18:25:42 +00:00
public static All GetTextureSwizzle(GalTextureSource Source)
{
switch (Source)
{
case GalTextureSource.Zero: return All.Zero;
case GalTextureSource.Red: return All.Red;
case GalTextureSource.Green: return All.Green;
case GalTextureSource.Blue: return All.Blue;
case GalTextureSource.Alpha: return All.Alpha;
case GalTextureSource.OneInt: return All.One;
case GalTextureSource.OneFloat: return All.One;
}
Quads, QuadStrip, const attributes and half-float attributes support (#447) * Quads, QuadStrip and const attributes support * Add support for half float attributes and fix texture pitch alignment * Throw when an unsupported float type is used as const attribute aswell
2018-10-13 01:37:01 +00:00
throw new ArgumentException(nameof(Source) + " \"" + Source + "\" is not valid!");
Added more shader instructions, including BFE, BRA (partial), FMNMX, ISCADD, SHL, LD_C, some shader related fixes, added support for texture component selection
2018-05-17 18:25:42 +00:00
}
Merge shader branch, adding support for GLSL decompilation, a macro interpreter, and a rewrite of the GPU code.
2018-04-08 19:17:35 +00:00
public static TextureWrapMode GetTextureWrapMode(GalTextureWrap Wrap)
{
switch (Wrap)
{
Use mirrored texture wraps when available (#361)
2018-08-25 19:39:08 +00:00
case GalTextureWrap.Repeat: return TextureWrapMode.Repeat;
case GalTextureWrap.MirroredRepeat: return TextureWrapMode.MirroredRepeat;
case GalTextureWrap.ClampToEdge: return TextureWrapMode.ClampToEdge;
case GalTextureWrap.ClampToBorder: return TextureWrapMode.ClampToBorder;
case GalTextureWrap.Clamp: return TextureWrapMode.Clamp;
}
Fix multiple rendertargets (#427) * Simplify render target bindings * Implement multiple viewports * Pack glViewportIndexed calls into a single glViewportArray * Use ARB_viewport_array when available * Cache framebuffer attachments * Use get accessors in OGLExtension * Address feedback
2018-09-25 22:55:30 +00:00
if (OGLExtension.TextureMirrorClamp)
Use mirrored texture wraps when available (#361)
2018-08-25 19:39:08 +00:00
{
switch (Wrap)
{
case GalTextureWrap.MirrorClampToEdge: return (TextureWrapMode)ExtTextureMirrorClamp.MirrorClampToEdgeExt;
case GalTextureWrap.MirrorClampToBorder: return (TextureWrapMode)ExtTextureMirrorClamp.MirrorClampToBorderExt;
case GalTextureWrap.MirrorClamp: return (TextureWrapMode)ExtTextureMirrorClamp.MirrorClampExt;
}
}
else
{
//Fallback to non-mirrored clamps
switch (Wrap)
{
case GalTextureWrap.MirrorClampToEdge: return TextureWrapMode.ClampToEdge;
case GalTextureWrap.MirrorClampToBorder: return TextureWrapMode.ClampToBorder;
case GalTextureWrap.MirrorClamp: return TextureWrapMode.Clamp;
}
Merge shader branch, adding support for GLSL decompilation, a macro interpreter, and a rewrite of the GPU code.
2018-04-08 19:17:35 +00:00
}
Quads, QuadStrip, const attributes and half-float attributes support (#447) * Quads, QuadStrip and const attributes support * Add support for half float attributes and fix texture pitch alignment * Throw when an unsupported float type is used as const attribute aswell
2018-10-13 01:37:01 +00:00
throw new ArgumentException(nameof(Wrap) + " \"" + Wrap + "\" is not valid!");
Merge shader branch, adding support for GLSL decompilation, a macro interpreter, and a rewrite of the GPU code.
2018-04-08 19:17:35 +00:00
}
public static TextureMinFilter GetTextureMinFilter(
GalTextureFilter MinFilter,
GalTextureMipFilter MipFilter)
{
//TODO: Mip (needs mipmap support first).
switch (MinFilter)
{
case GalTextureFilter.Nearest: return TextureMinFilter.Nearest;
case GalTextureFilter.Linear: return TextureMinFilter.Linear;
}
Quads, QuadStrip, const attributes and half-float attributes support (#447) * Quads, QuadStrip and const attributes support * Add support for half float attributes and fix texture pitch alignment * Throw when an unsupported float type is used as const attribute aswell
2018-10-13 01:37:01 +00:00
throw new ArgumentException(nameof(MinFilter) + " \"" + MinFilter + "\" is not valid!");
Merge shader branch, adding support for GLSL decompilation, a macro interpreter, and a rewrite of the GPU code.
2018-04-08 19:17:35 +00:00
}
public static TextureMagFilter GetTextureMagFilter(GalTextureFilter Filter)
{
switch (Filter)
{
case GalTextureFilter.Nearest: return TextureMagFilter.Nearest;
case GalTextureFilter.Linear: return TextureMagFilter.Linear;
}
Quads, QuadStrip, const attributes and half-float attributes support (#447) * Quads, QuadStrip and const attributes support * Add support for half float attributes and fix texture pitch alignment * Throw when an unsupported float type is used as const attribute aswell
2018-10-13 01:37:01 +00:00
throw new ArgumentException(nameof(Filter) + " \"" + Filter + "\" is not valid!");
Merge shader branch, adding support for GLSL decompilation, a macro interpreter, and a rewrite of the GPU code.
2018-04-08 19:17:35 +00:00
}
public static BlendEquationMode GetBlendEquation(GalBlendEquation BlendEquation)
{
Fix for current framebuffer issues (#78) [GPU] Fix some of the current framebuffer issues
2018-04-13 18:12:58 +00:00
switch (BlendEquation)
{
Implment common and independent blend properly (fixes #458) (#485) * Implment common and independent blend properly * Nits
2018-11-01 04:22:24 +00:00
case GalBlendEquation.FuncAdd:
case GalBlendEquation.FuncAddGl:
return BlendEquationMode.FuncAdd;
case GalBlendEquation.FuncSubtract:
case GalBlendEquation.FuncSubtractGl:
return BlendEquationMode.FuncSubtract;
case GalBlendEquation.FuncReverseSubtract:
case GalBlendEquation.FuncReverseSubtractGl:
return BlendEquationMode.FuncReverseSubtract;
case GalBlendEquation.Min:
case GalBlendEquation.MinGl:
return BlendEquationMode.Min;
case GalBlendEquation.Max:
case GalBlendEquation.MaxGl:
return BlendEquationMode.Max;
Fix for current framebuffer issues (#78) [GPU] Fix some of the current framebuffer issues
2018-04-13 18:12:58 +00:00
}
Some small gpu improvements and shader improvements, add support for ASTC 4x4 textures (slow!)
2018-06-02 03:50:56 +00:00
Quads, QuadStrip, const attributes and half-float attributes support (#447) * Quads, QuadStrip and const attributes support * Add support for half float attributes and fix texture pitch alignment * Throw when an unsupported float type is used as const attribute aswell
2018-10-13 01:37:01 +00:00
throw new ArgumentException(nameof(BlendEquation) + " \"" + BlendEquation + "\" is not valid!");
Merge shader branch, adding support for GLSL decompilation, a macro interpreter, and a rewrite of the GPU code.
2018-04-08 19:17:35 +00:00
}
Port from OpenTK.NETCore to OpenTK.NetStandard (#176) * Minor code changes * Forgot to remove a method
2018-06-21 21:10:19 +00:00
public static BlendingFactor GetBlendFactor(GalBlendFactor BlendFactor)
Merge shader branch, adding support for GLSL decompilation, a macro interpreter, and a rewrite of the GPU code.
2018-04-08 19:17:35 +00:00
{
Fix for current framebuffer issues (#78) [GPU] Fix some of the current framebuffer issues
2018-04-13 18:12:58 +00:00
switch (BlendFactor)
{
Implment common and independent blend properly (fixes #458) (#485) * Implment common and independent blend properly * Nits
2018-11-01 04:22:24 +00:00
case GalBlendFactor.Zero:
case GalBlendFactor.ZeroGl:
return BlendingFactor.Zero;
case GalBlendFactor.One:
case GalBlendFactor.OneGl:
return BlendingFactor.One;
case GalBlendFactor.SrcColor:
case GalBlendFactor.SrcColorGl:
return BlendingFactor.SrcColor;
case GalBlendFactor.OneMinusSrcColor:
case GalBlendFactor.OneMinusSrcColorGl:
return BlendingFactor.OneMinusSrcColor;
case GalBlendFactor.DstColor:
case GalBlendFactor.DstColorGl:
return BlendingFactor.DstColor;
case GalBlendFactor.OneMinusDstColor:
case GalBlendFactor.OneMinusDstColorGl:
return BlendingFactor.OneMinusDstColor;
case GalBlendFactor.SrcAlpha:
case GalBlendFactor.SrcAlphaGl:
return BlendingFactor.SrcAlpha;
case GalBlendFactor.OneMinusSrcAlpha:
case GalBlendFactor.OneMinusSrcAlphaGl:
return BlendingFactor.OneMinusSrcAlpha;
case GalBlendFactor.DstAlpha:
case GalBlendFactor.DstAlphaGl:
return BlendingFactor.DstAlpha;
case GalBlendFactor.OneMinusDstAlpha:
case GalBlendFactor.OneMinusDstAlphaGl:
return BlendingFactor.OneMinusDstAlpha;
case GalBlendFactor.OneMinusConstantColor:
case GalBlendFactor.OneMinusConstantColorGl:
return BlendingFactor.OneMinusConstantColor;
case GalBlendFactor.ConstantAlpha:
case GalBlendFactor.ConstantAlphaGl:
return BlendingFactor.ConstantAlpha;
case GalBlendFactor.OneMinusConstantAlpha:
case GalBlendFactor.OneMinusConstantAlphaGl:
return BlendingFactor.OneMinusConstantAlpha;
case GalBlendFactor.SrcAlphaSaturate:
case GalBlendFactor.SrcAlphaSaturateGl:
return BlendingFactor.SrcAlphaSaturate;
case GalBlendFactor.Src1Color:
case GalBlendFactor.Src1ColorGl:
return BlendingFactor.Src1Color;
case GalBlendFactor.OneMinusSrc1Color:
case GalBlendFactor.OneMinusSrc1ColorGl:
return (BlendingFactor)BlendingFactorSrc.OneMinusSrc1Color;
case GalBlendFactor.Src1Alpha:
case GalBlendFactor.Src1AlphaGl:
return BlendingFactor.Src1Alpha;
case GalBlendFactor.OneMinusSrc1Alpha:
case GalBlendFactor.OneMinusSrc1AlphaGl:
return (BlendingFactor)BlendingFactorSrc.OneMinusSrc1Alpha;
Add FaceAttr in GLSL, unmanaged case in EmitTex and ConstantColorG80 blend factor (#207) * Add FaceAttr (0x3fc) input attribute in GLSL * Implement unmanaged case in EmitTex * Add ConstantColor for 0xC001 (G80) from PR #145
2018-07-03 23:06:13 +00:00
case GalBlendFactor.ConstantColor:
Implment common and independent blend properly (fixes #458) (#485) * Implment common and independent blend properly * Nits
2018-11-01 04:22:24 +00:00
case GalBlendFactor.ConstantColorGl:
Add FaceAttr in GLSL, unmanaged case in EmitTex and ConstantColorG80 blend factor (#207) * Add FaceAttr (0x3fc) input attribute in GLSL * Implement unmanaged case in EmitTex * Add ConstantColor for 0xC001 (G80) from PR #145
2018-07-03 23:06:13 +00:00
return BlendingFactor.ConstantColor;
Fix for current framebuffer issues (#78) [GPU] Fix some of the current framebuffer issues
2018-04-13 18:12:58 +00:00
}
Some small gpu improvements and shader improvements, add support for ASTC 4x4 textures (slow!)
2018-06-02 03:50:56 +00:00
Quads, QuadStrip, const attributes and half-float attributes support (#447) * Quads, QuadStrip and const attributes support * Add support for half float attributes and fix texture pitch alignment * Throw when an unsupported float type is used as const attribute aswell
2018-10-13 01:37:01 +00:00
throw new ArgumentException(nameof(BlendFactor) + " \"" + BlendFactor + "\" is not valid!");
Merge shader branch, adding support for GLSL decompilation, a macro interpreter, and a rewrite of the GPU code.
2018-04-08 19:17:35 +00:00
}
}
Implement BC6H_SF16 & BC6H_UF16 Texture Formats (#255) * Implement BC6H_SF16 & BC6H_UF16 * correct coding style (1/5) * correct coding style (2/5) * correct coding style (3/5) * correct coding style (4/5) * correct coding style (5/5)
2018-07-16 18:09:34 +00:00
}
Reference in a new issue Copy permalink