Capture/Replay: Support non-binary GLboolean

This CL contains two changes. One to how we print out GLboolean values, and another to how we capture GLbooleans. According to the spec, anything non-zero can be considered GL_TRUE when setting state: When the type of internal state is boolean, zero integer or floating-point values are converted to FALSE and non-zero values are converted to TRUE. Dota Underlords is using 0xFF for GL_TRUE. Before the change, this manifested as: // logcat glColorMask(context = 4, red = kUnknownGLenumString, green = kUnknownGLenumString, blue = kUnknownGLenumString, alpha = GL_FALSE) // trace glColorMask(GL_INVALID_ENUM, GL_INVALID_ENUM, GL_INVALID_ENUM, GL_FALSE); After: // logcat glColorMask(context = 4, red = 0x00FF, green = 0x00FF, blue = 0x00FF, alpha = GL_FALSE) // trace glColorMask(0xFF, 0xFF, 0xFF, GL_FALSE); Test: MEC for Dota Underlords Bug: b/185192780 Bug: angleproject:5857 Change-Id: Ie53aeba8d8a40f91ee375467b325d8e6be053a98 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2821947 Commit-Queue: Cody Northrop <cnorthrop@google.com> Reviewed-by: Tim Van Patten <timvp@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Capture/Replay: Support non-binary GLboolean
fdfb2b82 · Cody Northrop · Commit Bot · 7a95a620 · fdfb2b82 · fdfb2b82
Commit fdfb2b82 authored Apr 09, 2021 by Cody Northrop Committed by Commit Bot Apr 14, 2021
Show whitespace changes
Inline Side-by-side

Showing with 17 additions and 10 deletions

FrameCapture.cpp src/libANGLE/capture/FrameCapture.cpp +1 -1

gl_enum_utils.cpp src/libANGLE/capture/gl_enum_utils.cpp +16 -9

No files found.
--- a/src/libANGLE/capture/FrameCapture.cpp
+++ b/src/libANGLE/capture/FrameCapture.cpp
@@ -4949,7 +4949,7 @@ void WriteParamValueReplay<ParamType::TGLboolean>(std::ostream &os,
            os << "GL_FALSE";
            break;
        default:
-            os << "GL_INVALID_ENUM";
+            os << "0x" << std::hex << std::uppercase << GLint(value);
    }
 }

--- a/src/libANGLE/capture/gl_enum_utils.cpp
+++ b/src/libANGLE/capture/gl_enum_utils.cpp
@@ -26,6 +26,21 @@ void OutputGLenumString(std::ostream &out, GLenumGroup enumGroup, unsigned int v
        return;
    }
+    if (enumGroup == GLenumGroup::Boolean)
+    {
+        // If an unknown enum was submitted as GLboolean, just write out the value.
+        if (enumStr == kUnknownGLenumString)
+        {
+            out << value;
+        }
+        else
+        {
+            out << enumStr;
+        }
+        return;
+    }
    if (enumGroup != GLenumGroup::DefaultGroup)
    {
        // Retry with the "Default" group
@@ -47,15 +62,7 @@ void OutputGLbitfieldString(std::ostream &out, GLenumGroup enumGroup, unsigned i
 const char *GLbooleanToString(unsigned int value)
 {
-    switch (value)
+    return GLenumToString(GLenumGroup::Boolean, value);
-    {
-        case 0x0:
-            return "GL_FALSE";
-        case 0x1:
-            return "GL_TRUE";
-        default:
-            return kUnknownGLenumString;
-    }
 }
 std::string GLbitfieldToString(GLenumGroup enumGroup, unsigned int value)