Explorar el Código

Fix incorrect GPU GL blend func values (#1612)

gdkchan hace 5 años
padre
commit
329ba5b39b
Se han modificado 2 ficheros con 10 adiciones y 10 borrados
  1. 4 4
      Ryujinx.Graphics.GAL/BlendOp.cs
  2. 6 6
      Ryujinx.Graphics.OpenGL/EnumConversion.cs

+ 4 - 4
Ryujinx.Graphics.GAL/BlendOp.cs

@@ -9,9 +9,9 @@ namespace Ryujinx.Graphics.GAL
         Maximum,
 
         AddGl             = 0x8006,
-        SubtractGl        = 0x8007,
-        ReverseSubtractGl = 0x8008,
-        MinimumGl         = 0x800a,
-        MaximumGl         = 0x800b
+        MinimumGl         = 0x8007,
+        MaximumGl         = 0x8008,
+        SubtractGl        = 0x800a,
+        ReverseSubtractGl = 0x800b
     }
 }

+ 6 - 6
Ryujinx.Graphics.OpenGL/EnumConversion.cs

@@ -104,18 +104,18 @@ namespace Ryujinx.Graphics.OpenGL
                 case BlendOp.Add:
                 case BlendOp.AddGl:
                     return BlendEquationMode.FuncAdd;
-                case BlendOp.Subtract:
-                case BlendOp.SubtractGl:
-                    return BlendEquationMode.FuncSubtract;
-                case BlendOp.ReverseSubtract:
-                case BlendOp.ReverseSubtractGl:
-                    return BlendEquationMode.FuncReverseSubtract;
                 case BlendOp.Minimum:
                 case BlendOp.MinimumGl:
                     return BlendEquationMode.Min;
                 case BlendOp.Maximum:
                 case BlendOp.MaximumGl:
                     return BlendEquationMode.Max;
+                case BlendOp.Subtract:
+                case BlendOp.SubtractGl:
+                    return BlendEquationMode.FuncSubtract;
+                case BlendOp.ReverseSubtract:
+                case BlendOp.ReverseSubtractGl:
+                    return BlendEquationMode.FuncReverseSubtract;
             }
 
             Logger.Debug?.Print(LogClass.Gpu, $"Invalid {nameof(BlendOp)} enum value: {op}.");