Block index was being increased more than it should for trimmed captures

CaptureFileOutputStream::Write should not handle the block index
increment as it leads to miscalculations during trimmed captures.

Author: panos-lunarg

framework/encode/capture_manager.cpp

@@ -1505,6 +1505,13 @@ void CommonCaptureManager::WriteCreateHeapAllocationCmd(format::ApiFamilyId api_
 void CommonCaptureManager::WriteToFile(const void* data, size_t size, util::FileOutputStream* file_stream)
 {
     file_stream ? file_stream->Write(data, size) : file_stream_->Write(data, size);
+
+    // Increment block index
+    auto thread_data = GetThreadData();
+    assert(thread_data != nullptr);
+
+    ++block_index_;
+    thread_data->block_index_ = block_index_.load();
 }
 
 void CommonCaptureManager::AtExit()
@@ -1667,8 +1674,6 @@ bool CaptureFileOutputStream::Write(const void* data, size_t len)
         }
     }
 
-    capture_manager_->IncrementBlockIndex(1);
-
     return ret;
 }
 

framework/encode/capture_manager.h

@@ -294,6 +294,13 @@ class CommonCaptureManager
     {
         file_stream ? file_stream->CombineAndWrite<N>(buffers, GetThreadData()->GetScratchBuffer())
                     : file_stream_->CombineAndWrite<N>(buffers, GetThreadData()->GetScratchBuffer());
+
+        // Increment block index
+        auto thread_data = GetThreadData();
+        assert(thread_data != nullptr);
+
+        ++block_index_;
+        thread_data->block_index_ = block_index_.load();
     }
 
     void IncrementBlockIndex(uint64_t blocks)