From 0973daefa1a509a8b08c936384251f1fee475587 Mon Sep 17 00:00:00 2001 From: BaronKiko Date: Sat, 2 Mar 2019 10:50:21 +0000 Subject: Fixed Scissor Test on Intel based GPUs (#595) * Reworked scissor tests to remove fixme and handle issues with intel gpu's * Error handling for scissor tests * Disable strict opengl by default * Reformatting for JD * Updated scheme for new property in config * Fixed typo * Moved magic value to constant. I liked the magic :( * Fixed ordering for undertale * Fixed undertale bug * Removed strict opengl in favour of required. With this an exception is no longer thrown, just a warning for required extensions * Uses clamp instead of if's * Removed evil tabs and no longer used include --- Ryujinx.Graphics/Gal/OpenGL/OGLExtension.cs | 36 +++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) (limited to 'Ryujinx.Graphics/Gal/OpenGL/OGLExtension.cs') diff --git a/Ryujinx.Graphics/Gal/OpenGL/OGLExtension.cs b/Ryujinx.Graphics/Gal/OpenGL/OGLExtension.cs index 52b3d0ce..eb06f83c 100644 --- a/Ryujinx.Graphics/Gal/OpenGL/OGLExtension.cs +++ b/Ryujinx.Graphics/Gal/OpenGL/OGLExtension.cs @@ -1,19 +1,23 @@ using OpenTK.Graphics.OpenGL; +using Ryujinx.Common.Logging; using System; namespace Ryujinx.Graphics.Gal.OpenGL { static class OGLExtension { + // Private lazy backing variables private static Lazy s_EnhancedLayouts = new Lazy(() => HasExtension("GL_ARB_enhanced_layouts")); private static Lazy s_TextureMirrorClamp = new Lazy(() => HasExtension("GL_EXT_texture_mirror_clamp")); private static Lazy s_ViewportArray = new Lazy(() => HasExtension("GL_ARB_viewport_array")); private static Lazy s_NvidiaDriver = new Lazy(() => IsNvidiaDriver()); + // Public accessors public static bool EnhancedLayouts => s_EnhancedLayouts.Value; public static bool TextureMirrorClamp => s_TextureMirrorClamp.Value; public static bool ViewportArray => s_ViewportArray.Value; + public static bool NvidiaDrvier => s_NvidiaDriver.Value; private static bool HasExtension(string Name) @@ -28,11 +32,39 @@ namespace Ryujinx.Graphics.Gal.OpenGL } } + Logger.PrintInfo(LogClass.Gpu, $"OpenGL extension {Name} unavailable. You may experience some performance degredation"); + return false; } - private static bool IsNvidiaDriver() { + private static bool IsNvidiaDriver() + { return GL.GetString(StringName.Vendor).Equals("NVIDIA Corporation"); } + + public static class Required + { + // Public accessors + public static bool EnhancedLayouts => s_EnhancedLayoutsRequired.Value; + public static bool TextureMirrorClamp => s_TextureMirrorClampRequired.Value; + public static bool ViewportArray => s_ViewportArrayRequired.Value; + + // Private lazy backing variables + private static Lazy s_EnhancedLayoutsRequired = new Lazy(() => HasExtensionRequired(OGLExtension.EnhancedLayouts, "GL_ARB_enhanced_layouts")); + private static Lazy s_TextureMirrorClampRequired = new Lazy(() => HasExtensionRequired(OGLExtension.TextureMirrorClamp, "GL_EXT_texture_mirror_clamp")); + private static Lazy s_ViewportArrayRequired = new Lazy(() => HasExtensionRequired(OGLExtension.ViewportArray, "GL_ARB_viewport_array")); + + private static bool HasExtensionRequired(bool Value, string Name) + { + if (Value) + { + return true; + } + + Logger.PrintWarning(LogClass.Gpu, $"Required OpenGL extension {Name} unavailable. You may experience some rendering issues"); + + return false; + } + } } -} \ No newline at end of file +} -- cgit v1.2.3