Capture/Replay: Emit SetupReplay() late

src/libANGLE/capture/FrameCapture.cpp

@@ -1071,24 +1071,6 @@ void WriteCppReplay(bool compression,
         out << "extern \"C\" {\n";
     }
 
-    if (frameIndex == 1)
-    {
-        std::stringstream setupCallStream;
-
-        setupCallStream << "void " << FmtSetupFunction(kNoPartId) << "\n";
-        setupCallStream << "{\n";
-
-        size_t maxClientArraySize = MaxClientArraySize(clientArraySizes);
-
-        WriteInitReplayCall(compression, setupCallStream, context->id(), captureLabel,
-                            maxClientArraySize, readBufferSize);
-        WriteCppReplayFunctionWithParts(context, ReplayFunc::Setup, &dataTracker, frameIndex,
-                                        binaryData, setupCalls, header, setupCallStream, out);
-
-        out << setupCallStream.str();
-        out << "}\n";
-    }
-
     if (frameIndex == frameCount)
     {
         // Emit code to reset back to starting state
@@ -4907,6 +4889,8 @@ void FrameCapture::writeCppReplayIndexFiles(const gl::Context *context, bool wri
     const egl::Config *config           = context->getConfig();
     const egl::AttributeMap &attributes = context->getDisplay()->getAttributeMap();
 
+    DataTracker dataTracker;
+
     unsigned frameCount = getFrameCount();
 
     std::stringstream header;
@@ -4996,6 +4980,22 @@ void FrameCapture::writeCppReplayIndexFiles(const gl::Context *context, bool wri
         source << "\n";
     }
 
+    {
+        std::stringstream setupCallStream;
+
+        setupCallStream << "void " << FmtSetupFunction(kNoPartId) << "\n";
+        setupCallStream << "{\n";
+
+        WriteInitReplayCall(mCompression, setupCallStream, context->id(), mCaptureLabel,
+                            MaxClientArraySize(mClientArraySizes), mReadBufferSize);
+
+        WriteCppReplayFunctionWithParts(context, ReplayFunc::Setup, &dataTracker, mFrameIndex,
+                                        &mBinaryData, mSetupCalls, header, setupCallStream, source);
+
+        source << setupCallStream.str();
+        source << "}\n";
+    }
+
     source << "extern \"C\" {\n";
     source << "void ReplayFrame(uint32_t frameIndex)\n";
     source << "{\n";

src/tests/capture_replay_tests/capture_replay_expectations.txt

@@ -35,9 +35,18 @@ ColorMaskTest.AMDZeroColorMaskBug/ES3_OpenGL
 SimpleOperationTest.ClearAndSwap/*
 SimpleOperationTest.DrawQuadAndSwap/*
 
+
+# Tests that fail randomly when run in groups but pass when run standalone
+BufferDataTest.ZeroNonNULLData/ES2_Vulkan
+BufferDataTest.ZeroNonNULLData/ES2_Vulkan_AsyncQueue
+BufferDataTest.NULLResolvedData/ES2_Vulkan
+BufferDataTest.NULLResolvedData/ES2_Vulkan_AsyncQueue
+BufferDataTest.ExtensionDependency/ES2_Vulkan_AsyncQueue
+BufferDataTest.RepeatedDrawWithDynamic/ES2_Vulkan
+BufferDataTest.MapBufferOES/ES2_Vulkan_AsyncQueue
+
 # Crashed tests
 BlitFramebufferANGLETest.*
-BufferDataTest.*
 ClipDistanceTest.*
 CopyCompressedTextureTest.InternalFormat/*
 DebugMarkerTest.*