diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2022-04-04 18:21:06 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-04 18:21:06 -0300 |
| commit | 0ef0fc044a3ea7e83895e1f0e2d4e687ca184cd7 (patch) | |
| tree | 6bedbccca321a38a59cee9ccb41e7ee9c4171a73 | |
| parent | 04bd87ed5a06d35f1e19d7af89e5d9d58a29f6ac (diff) | |
Small graphics abstraction layer cleanup (#3257)1.1.87
| -rw-r--r-- | Ryujinx.Graphics.GAL/DepthStencilState.cs | 47 | ||||
| -rw-r--r-- | Ryujinx.Graphics.GAL/Target.cs | 1 | ||||
| -rw-r--r-- | Ryujinx.Graphics.OpenGL/EnumConversion.cs | 4 |
3 files changed, 2 insertions, 50 deletions
diff --git a/Ryujinx.Graphics.GAL/DepthStencilState.cs b/Ryujinx.Graphics.GAL/DepthStencilState.cs deleted file mode 100644 index d81e8436..00000000 --- a/Ryujinx.Graphics.GAL/DepthStencilState.cs +++ /dev/null @@ -1,47 +0,0 @@ -namespace Ryujinx.Graphics.GAL -{ - public struct DepthStencilState - { - public bool DepthTestEnable { get; } - public bool DepthWriteEnable { get; } - public bool StencilTestEnable { get; } - - public CompareOp DepthFunc { get; } - public CompareOp StencilFrontFunc { get; } - public StencilOp StencilFrontSFail { get; } - public StencilOp StencilFrontDpPass { get; } - public StencilOp StencilFrontDpFail { get; } - public CompareOp StencilBackFunc { get; } - public StencilOp StencilBackSFail { get; } - public StencilOp StencilBackDpPass { get; } - public StencilOp StencilBackDpFail { get; } - - public DepthStencilState( - bool depthTestEnable, - bool depthWriteEnable, - bool stencilTestEnable, - CompareOp depthFunc, - CompareOp stencilFrontFunc, - StencilOp stencilFrontSFail, - StencilOp stencilFrontDpPass, - StencilOp stencilFrontDpFail, - CompareOp stencilBackFunc, - StencilOp stencilBackSFail, - StencilOp stencilBackDpPass, - StencilOp stencilBackDpFail) - { - DepthTestEnable = depthTestEnable; - DepthWriteEnable = depthWriteEnable; - StencilTestEnable = stencilTestEnable; - DepthFunc = depthFunc; - StencilFrontFunc = stencilFrontFunc; - StencilFrontSFail = stencilFrontSFail; - StencilFrontDpPass = stencilFrontDpPass; - StencilFrontDpFail = stencilFrontDpFail; - StencilBackFunc = stencilBackFunc; - StencilBackSFail = stencilBackSFail; - StencilBackDpPass = stencilBackDpPass; - StencilBackDpFail = stencilBackDpFail; - } - } -} diff --git a/Ryujinx.Graphics.GAL/Target.cs b/Ryujinx.Graphics.GAL/Target.cs index 73f77f43..a62d628a 100644 --- a/Ryujinx.Graphics.GAL/Target.cs +++ b/Ryujinx.Graphics.GAL/Target.cs @@ -9,7 +9,6 @@ namespace Ryujinx.Graphics.GAL Texture2DArray, Texture2DMultisample, Texture2DMultisampleArray, - Rectangle, Cubemap, CubemapArray, TextureBuffer diff --git a/Ryujinx.Graphics.OpenGL/EnumConversion.cs b/Ryujinx.Graphics.OpenGL/EnumConversion.cs index ccdbcfec..22e81605 100644 --- a/Ryujinx.Graphics.OpenGL/EnumConversion.cs +++ b/Ryujinx.Graphics.OpenGL/EnumConversion.cs @@ -444,8 +444,8 @@ namespace Ryujinx.Graphics.OpenGL return TextureTarget.Texture2DArray; case Target.Texture2DMultisample: return TextureTarget.Texture2DMultisample; - case Target.Rectangle: - return TextureTarget.TextureRectangle; + case Target.Texture2DMultisampleArray: + return TextureTarget.Texture2DMultisampleArray; case Target.Cubemap: return TextureTarget.TextureCubeMap; case Target.CubemapArray: |