Capture/Replay: Don't force built-in attribs to have a location

CaptureMidExecutionSetup() hits an assert while capturing "World War Doh": ANGLE : FATAL: FrameCapture.cpp:2876 (CaptureMidExecutionSetup): ! Assert failed [[[...]]] attrib.location != -1 This is due to CaptureMidExecutionSetup() enforcing that all attributes, including built-ins, have a location. However, in the case of "World War Doh", the built-in 'gl_GlobalInvocationID' does not have a location. Moving the assert to after the gl::IsBuiltInName() check allows the capture to complete without hitting any asserts. Bug: angleproject:4048 Test: Capture "World War Doh" Change-Id: Ice96dec629b1477b11a710283c4ec4bf1c95c6e2 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2606807Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Cody Northrop <cnorthrop@google.com> Commit-Queue: Tim Van Patten <timvp@google.com>

Capture/Replay: Don't force built-in attribs to have a location
e09e947d · Tim Van Patten · Commit Bot · bf6cc88a · e09e947d
Commit e09e947d authored Dec 29, 2020 by Tim Van Patten Committed by Commit Bot Jan 06, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

FrameCapture.cpp src/libANGLE/FrameCapture.cpp +2 -2

No files found.
--- a/src/libANGLE/FrameCapture.cpp
+++ b/src/libANGLE/FrameCapture.cpp
@@ -2817,14 +2817,14 @@ void CaptureMidExecutionSetup(const gl::Context *context,
        // This can affect attributes that are optimized out in some implementations.
        for (const sh::ShaderVariable &attrib : program->getState().getProgramInputs())
        {
-            ASSERT(attrib.location != -1);
-
            if (gl::IsBuiltInName(attrib.name))
            {
                // Don't try to bind built-in attributes
                continue;
            }

+            ASSERT(attrib.location != -1);
+
            cap(CaptureBindAttribLocation(
                replayState, true, id, static_cast<GLuint>(attrib.location), attrib.name.c_str()));
        }