Remove block index from thread data

Author: panos-lunarg

framework/encode/capture_manager.cpp

@@ -1269,12 +1269,9 @@ void CommonCaptureManager::WriteFileHeader(util::FileOutputStream* file_stream)
                             { option_list.data(), option_list.size() * sizeof(format::FileOptionPair) } },
                           file_stream);
 
-    // File header does not count as a block
-    assert(block_index_ > 0);
+    // File header does not count as a block when replaying
+    GFXRECON_ASSERT(block_index_ > 0);
     --block_index_;
-
-    auto thread_data          = GetThreadData();
-    thread_data->block_index_ = block_index_.load();
 }
 
 void CommonCaptureManager::BuildOptionList(const format::EnabledOptions&        enabled_options,
@@ -1507,11 +1504,7 @@ void CommonCaptureManager::WriteToFile(const void* data, size_t size, util::File
     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()

framework/encode/capture_manager.h

@@ -172,11 +172,7 @@ class CommonCaptureManager
     uint16_t GetDescriptorMask() const { return rv_annotation_info_.descriptor_mask; }
     uint64_t GetShaderIDMask() const { return rv_annotation_info_.shaderid_mask; }
 
-    uint64_t GetBlockIndex()
-    {
-        auto thread_data = GetThreadData();
-        return thread_data->block_index_ == 0 ? 0 : thread_data->block_index_ - 1;
-    }
+    uint64_t GetBlockIndex() { return block_index_ == 0 ? 0 : block_index_ - 1; }
 
     static bool CreateInstance(ApiCaptureManager* api_instance_, const std::function<void()>& destroyer);
     template <typename Derived>
@@ -296,18 +292,10 @@ class CommonCaptureManager
                     : 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)
-    {
-        block_index_ += blocks;
-        GetThreadData()->block_index_ = block_index_;
-    }
+    void IncrementBlockIndex(uint64_t blocks) { block_index_ += blocks; }
 
     void SetWriteAssets() { write_assets_ = true; }
 

framework/util/thread_data.cpp

@@ -30,8 +30,7 @@ format::ThreadId                               ThreadData::thread_count_ = 0;
 std::unordered_map<uint64_t, format::ThreadId> ThreadData::id_map_;
 
 ThreadData::ThreadData() :
-    thread_id_(GetThreadId()), object_id_(format::kNullHandleId), call_id_(format::ApiCallId::ApiCall_Unknown),
-    block_index_(0)
+    thread_id_(GetThreadId()), object_id_(format::kNullHandleId), call_id_(format::ApiCallId::ApiCall_Unknown)
 {
     parameter_buffer_  = std::make_unique<encode::ParameterBuffer>();
     parameter_encoder_ = std::make_unique<encode::ParameterEncoder>(parameter_buffer_.get());

framework/util/thread_data.h

@@ -46,7 +46,6 @@ class ThreadData
     std::unique_ptr<encode::ParameterEncoder> parameter_encoder_;
     std::vector<uint8_t>                      compressed_buffer_;
     encode::HandleUnwrapMemory                handle_unwrap_memory_;
-    uint64_t                                  block_index_;
 
   private:
     static format::ThreadId GetThreadId();