Capture/Replay: Fix temp shader ID.

src/libANGLE/FrameCapture.cpp

@@ -2799,8 +2799,8 @@ void CaptureMidExecutionSetup(const gl::Context *context,
     const gl::ResourceMap<gl::Program, gl::ShaderProgramID> &programs =
         shadersAndPrograms.getProgramsForCapture();
 
-    // Capture Program binary state. Use shader ID 1 as a temporary shader ID.
-    gl::ShaderProgramID tempShaderID = {1};
+    // Capture Program binary state. Use max ID as a temporary shader ID.
+    gl::ShaderProgramID tempShaderID = {resourceTracker->getMaxShaderPrograms()};
     for (const auto &programIter : programs)
     {
         gl::ShaderProgramID id     = {programIter.first};
@@ -2874,6 +2874,8 @@ void CaptureMidExecutionSetup(const gl::Context *context,
         cap(CaptureLinkProgram(replayState, true, id));
         CaptureUpdateUniformLocations(program, setupCalls);
         CaptureUpdateUniformValues(replayState, context, program, setupCalls);
+
+        resourceTracker->onShaderProgramAccess(id);
     }
 
     // Handle shaders.
@@ -3382,6 +3384,20 @@ bool SkipCall(gl::EntryPoint entryPoint)
 
     return false;
 }
+
+bool FindShaderProgramIDInCall(const CallCapture &call, gl::ShaderProgramID *idOut)
+{
+    for (const ParamCapture &param : call.params.getParamCaptures())
+    {
+        if (param.type == ParamType::TShaderProgramID && param.name == "programPacked")
+        {
+            *idOut = param.value.ShaderProgramIDVal;
+            return true;
+        }
+    }
+
+    return false;
+}
 }  // namespace
 
 ParamCapture::ParamCapture() : type(ParamType::TGLenum), enumGroup(gl::GLenumGroup::DefaultGroup) {}
@@ -3874,7 +3890,7 @@ void FrameCapture::maybeOverrideEntryPoint(const gl::Context *context, CallCaptu
     }
 }
 
-void FrameCapture::maybeCaptureClientData(const gl::Context *context, CallCapture &call)
+void FrameCapture::maybeCapturePreCallUpdates(const gl::Context *context, CallCapture &call)
 {
     switch (call.entryPoint)
     {
@@ -4138,6 +4154,14 @@ void FrameCapture::maybeCaptureClientData(const gl::Context *context, CallCaptur
         default:
             break;
     }
+
+    mReadBufferSize = std::max(mReadBufferSize, call.params.getReadBufferSize());
+
+    gl::ShaderProgramID shaderProgramID;
+    if (FindShaderProgramIDInCall(call, &shaderProgramID))
+    {
+        mResourceTracker.onShaderProgramAccess(shaderProgramID);
+    }
 }
 
 void FrameCapture::captureCall(const gl::Context *context, CallCapture &&call)
@@ -4147,10 +4171,8 @@ void FrameCapture::captureCall(const gl::Context *context, CallCapture &&call)
 
     maybeOverrideEntryPoint(context, call);
 
-    // Process client data snapshots.
-    maybeCaptureClientData(context, call);
+    maybeCapturePreCallUpdates(context, call);
 
-    mReadBufferSize = std::max(mReadBufferSize, call.params.getReadBufferSize());
     mFrameCalls.emplace_back(std::move(call));
 
     maybeCapturePostCallUpdates(context);
@@ -4522,6 +4544,11 @@ void ResourceTracker::setBufferUnmapped(gl::BufferID id)
     }
 }
 
+void ResourceTracker::onShaderProgramAccess(gl::ShaderProgramID shaderProgramID)
+{
+    mMaxShaderPrograms = std::max(mMaxShaderPrograms, shaderProgramID.value + 1);
+}
+
 bool FrameCapture::isCapturing() const
 {
     // Currently we will always do a capture up until the last frame. In the future we could improve
@@ -4816,20 +4843,6 @@ void WriteParamValueReplay<ParamType::TVertexArrayID>(std::ostream &os,
     os << "gVertexArrayMap[" << value.value << "]";
 }
 
-bool FindShaderProgramIDInCall(const CallCapture &call, gl::ShaderProgramID *idOut)
-{
-    for (const ParamCapture &param : call.params.getParamCaptures())
-    {
-        if (param.type == ParamType::TShaderProgramID && param.name == "programPacked")
-        {
-            *idOut = param.value.ShaderProgramIDVal;
-            return true;
-        }
-    }
-
-    return false;
-}
-
 template <>
 void WriteParamValueReplay<ParamType::TUniformLocation>(std::ostream &os,
                                                         const CallCapture &call,

src/libANGLE/FrameCapture.h

@@ -253,6 +253,9 @@ class ResourceTracker final : angle::NonCopyable
         mStartingBuffersMappedInitial[id] = mapped;
     }
 
+    void onShaderProgramAccess(gl::ShaderProgramID shaderProgramID);
+    uint32_t getMaxShaderPrograms() const { return mMaxShaderPrograms; }
+
   private:
     // Buffer regen calls will delete and gen a buffer
     BufferCalls mBufferRegenCalls;
@@ -276,6 +279,9 @@ class ResourceTracker final : angle::NonCopyable
     BufferMapStatusMap mStartingBuffersMappedInitial;
     // The status of buffer mapping throughout the trace, modified with each Map/Unmap call
     BufferMapStatusMap mStartingBuffersMappedCurrent;
+
+    // Maximum accessed shader program ID.
+    uint32_t mMaxShaderPrograms = 0;
 };
 
 // Used by the CPP replay to filter out unnecessary code.
@@ -329,7 +335,7 @@ class FrameCapture final : angle::NonCopyable
 
     void reset();
     void maybeOverrideEntryPoint(const gl::Context *context, CallCapture &call);
-    void maybeCaptureClientData(const gl::Context *context, CallCapture &call);
+    void maybeCapturePreCallUpdates(const gl::Context *context, CallCapture &call);
     void maybeCapturePostCallUpdates(const gl::Context *context);
 
     static void ReplayCall(gl::Context *context,