From cb171f6ebfa7e1aa5721503d1c1115719957932d Mon Sep 17 00:00:00 2001
From: gdkchan <gab.dark.100@gmail.com>
Date: Fri, 6 Dec 2019 19:37:00 -0300
Subject: Support shared color mask, implement more shader instructions

Support shared color masks (used by Nouveau and maybe the NVIDIA
driver).
Support draw buffers (also required by OpenGL).
Support viewport transform disable (disabled for now as it breaks some
games).
Fix instanced rendering draw being ignored for multi draw.
Fix IADD and IADD3 immediate shader encodings, that was not matching
some ops.
Implement FFMA32I shader instruction.
Implement IMAD shader instruction.
---
 Ryujinx.Graphics.Gpu/Engine/MethodDraw.cs | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'Ryujinx.Graphics.Gpu/Engine/MethodDraw.cs')

diff --git a/Ryujinx.Graphics.Gpu/Engine/MethodDraw.cs b/Ryujinx.Graphics.Gpu/Engine/MethodDraw.cs
index d69b9ea0..b7e8a64b 100644
--- a/Ryujinx.Graphics.Gpu/Engine/MethodDraw.cs
+++ b/Ryujinx.Graphics.Gpu/Engine/MethodDraw.cs
@@ -10,7 +10,7 @@ namespace Ryujinx.Graphics.Gpu.Engine
         private int _firstIndex;
         private int _indexCount;
 
-        private bool _instancedHasState;
+        private bool _instancedDrawPending;
         private bool _instancedIndexed;
 
         private int _instancedFirstIndex;
@@ -32,9 +32,9 @@ namespace Ryujinx.Graphics.Gpu.Engine
 
             if (instanced)
             {
-                if (!_instancedHasState)
+                if (!_instancedDrawPending)
                 {
-                    _instancedHasState = true;
+                    _instancedDrawPending = true;
 
                     _instancedIndexed = _drawIndexed;
 
@@ -82,20 +82,22 @@ namespace Ryujinx.Graphics.Gpu.Engine
 
         private void DrawBegin(GpuState state, int argument)
         {
-            PrimitiveType type = (PrimitiveType)(argument & 0xffff);
-
-            _context.Renderer.Pipeline.SetPrimitiveTopology(type.Convert());
-
-            PrimitiveType = type;
-
             if ((argument & (1 << 26)) != 0)
             {
                 _instanceIndex++;
             }
             else if ((argument & (1 << 27)) == 0)
             {
+                PerformDeferredDraws();
+
                 _instanceIndex = 0;
             }
+
+            PrimitiveType type = (PrimitiveType)(argument & 0xffff);
+
+            _context.Renderer.Pipeline.SetPrimitiveTopology(type.Convert());
+
+            PrimitiveType = type;
         }
 
         private void SetIndexBufferCount(GpuState state, int argument)
@@ -106,9 +108,9 @@ namespace Ryujinx.Graphics.Gpu.Engine
         public void PerformDeferredDraws()
         {
             // Perform any pending instanced draw.
-            if (_instancedHasState)
+            if (_instancedDrawPending)
             {
-                _instancedHasState = false;
+                _instancedDrawPending = false;
 
                 if (_instancedIndexed)
                 {
-- 
cgit v1.2.3