FrameCapture: More fixes for app updates

src/libANGLE/Context.cpp

@@ -3475,6 +3475,10 @@ void Context::initCaps()
         INFO() << "Limiting binary format support count to zero while FrameCapture enabled"
                << std::endl;
         mDisplay->overrideFrontendFeatures({"disable_program_binary"}, true);
+
+        INFO() << "Disabling GL_EXT_map_buffer_range during capture, it is not supported on "
+               << "some native drivers" << std::endl;
+        mState.mExtensions.mapBufferRange = false;
     }
 
     // Disable support for OES_get_program_binary

src/libANGLE/FrameCapture.cpp

@@ -839,6 +839,18 @@ void MaybeResetResources(std::stringstream &out,
             BufferSet &buffersToRestore = resourceTracker->getBuffersToRestore();
             for (const gl::BufferID id : buffersToRestore)
             {
+                if (resourceTracker->getStartingBuffersMappedCurrent(id))
+                {
+                    // Some drivers require the buffer to be unmapped before you can update data,
+                    // which violates the spec. See gl::Buffer::bufferDataImpl().
+                    for (CallCapture &call : bufferUnmapCalls[id])
+                    {
+                        out << "    ";
+                        WriteCppReplayForCall(call, dataTracker, out, header, binaryData);
+                        out << ";\n";
+                    }
+                }
+
                 // Emit their restore calls
                 for (CallCapture &call : bufferRestoreCalls[id])
                 {