Fix Context::colorWriteActive to consider all rendertargets

Even in the GLES backend, we support RENDERTARGETS=8. This check only
ever considered the first 4.

Bug: b/126719156
Change-Id: I0084aa005f342f06373c53c007bee33268466b92
Reviewed-on: https://swiftshader-review.googlesource.com/c/25808
Tested-by: Chris Forbes <chrisforbes@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

diff --git a/src/Device/Context.cpp b/src/Device/Context.cpp
index d4ed3dc..afa3931 100644 (file)
--- a/src/Device/Context.cpp
+++ b/src/Device/Context.cpp
@@ -730,9 +730,17 @@ namespace sw
                }
        }
 
-       int Context::colorWriteActive()
+       bool Context::colorWriteActive()
        {
-               return colorWriteActive(0) | colorWriteActive(1) | colorWriteActive(2) | colorWriteActive(3);
+               for (int i = 0; i < RENDERTARGETS; i++)
+               {
+                       if (colorWriteActive(i))
+                       {
+                               return true;
+                       }
+               }
+
+               return false;
        }
 
        int Context::colorWriteActive(int index)

diff --git a/src/Device/Context.hpp b/src/Device/Context.hpp
index 50cff6b..99aedba 100644 (file)
--- a/src/Device/Context.hpp
+++ b/src/Device/Context.hpp
@@ -189,7 +189,7 @@ namespace sw
                float slopeDepthBias;
 
                VkFormat renderTargetInternalFormat(int index);
-               int colorWriteActive();
+               bool colorWriteActive();
                int colorWriteActive(int index);
                bool colorUsed();
 

diff --git a/src/Renderer/Context.cpp b/src/Renderer/Context.cpp
index 25c5775..ab54d0b 100644 (file)
--- a/src/Renderer/Context.cpp
+++ b/src/Renderer/Context.cpp
@@ -1468,9 +1468,17 @@ namespace sw
                }
        }
 
-       int Context::colorWriteActive()
+       bool Context::colorWriteActive()
        {
-               return colorWriteActive(0) | colorWriteActive(1) | colorWriteActive(2) | colorWriteActive(3);
+               for (int i = 0; i < RENDERTARGETS; i++)
+               {
+                       if (colorWriteActive(i))
+                       {
+                               return true;
+                       }
+               }
+
+               return false;
        }
 
        int Context::colorWriteActive(int index)

diff --git a/src/Renderer/Context.hpp b/src/Renderer/Context.hpp
index 8b5a8eb..9aec6ea 100644 (file)
--- a/src/Renderer/Context.hpp
+++ b/src/Renderer/Context.hpp
@@ -442,7 +442,7 @@ namespace sw
                Sampler sampler[TOTAL_IMAGE_UNITS];
 
                Format renderTargetInternalFormat(int index);
-               int colorWriteActive();
+               bool colorWriteActive();
                int colorWriteActive(int index);
                bool colorUsed();