Fix windows and android builds

LunarG · Jul 30, 2024 · 79ee258 · 79ee258
1 parent 482233e
commit 79ee258
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/framework/encode/d3d12_capture_manager.cpp b/framework/encode/d3d12_capture_manager.cpp
@@ -171,10 +171,10 @@ void D3D12CaptureManager::EndCommandListMethodCallCapture(ID3D12CommandList_Wrap
 
 void D3D12CaptureManager::WriteTrackedState(util::FileOutputStream* file_stream,
  format::ThreadId thread_id,
- util::FileOutputStream* assert_file_stream)
+ util::FileOutputStream* asset_file_stream)
 {
- Dx12StateWriter state_writer(file_stream, GetCompressor(), thread_id);
- state_tracker_->WriteState(&state_writer, GetCurrentFrame(), assert_file_stream);
+ Dx12StateWriter state_writer(file_stream, GetCompressor(), thread_id, asset_file_stream);
+ state_tracker_->WriteState(&state_writer, GetCurrentFrame());
 }
 
 void D3D12CaptureManager::PreAcquireSwapChainImages(IDXGISwapChain_Wrapper* wrapper,

diff --git a/framework/encode/d3d12_capture_manager.h b/framework/encode/d3d12_capture_manager.h
@@ -771,7 +771,7 @@ class D3D12CaptureManager : public ApiCaptureManager
 
  virtual void WriteTrackedState(util::FileOutputStream* file_stream,
  format::ThreadId thread_id,
- util::FileOutputStream* assert_file_stream = nullptr) override;
+ util::FileOutputStream* asset_file_stream = nullptr) override;
 
  void PreAcquireSwapChainImages(IDXGISwapChain_Wrapper* wrapper,
  IUnknown* command_queue,

diff --git a/framework/encode/dx12_state_writer.cpp b/framework/encode/dx12_state_writer.cpp
@@ -36,7 +36,8 @@ GFXRECON_BEGIN_NAMESPACE(encode)
 
 Dx12StateWriter::Dx12StateWriter(util::FileOutputStream* output_stream,
  util::Compressor* compressor,
- format::ThreadId thread_id) :
+ format::ThreadId thread_id,
+ util::FileOutputStream* asset_file_stream) :
  output_stream_(output_stream),
  compressor_(compressor), thread_id_(thread_id), encoder_(&parameter_stream_)
 {

diff --git a/framework/encode/dx12_state_writer.h b/framework/encode/dx12_state_writer.h
@@ -50,17 +50,19 @@ GFXRECON_BEGIN_NAMESPACE(encode)
 class Dx12StateWriter
 {
  public:
- Dx12StateWriter(util::FileOutputStream* output_stream, util::Compressor* compressor, format::ThreadId thread_id);
+ Dx12StateWriter(util::FileOutputStream* output_stream,
+ util::Compressor* compressor,
+ format::ThreadId thread_id,
+ util::FileOutputStream* asset_file_stream = nullptr);
 
  ~Dx12StateWriter();
- 
+
 #ifdef GFXRECON_AGS_SUPPORT
  void WriteState(const Dx12StateTable& state_table, const AgsStateTable& ags_state_table, uint64_t frame_number);
 #else
  void WriteState(const Dx12StateTable& state_table, uint64_t frame_number);
 #endif // GFXRECON_AGS_SUPPORT
 
-
  private:
  struct ResourceSnapshotInfo
  {

diff --git a/framework/encode/vulkan_state_tracker.cpp b/framework/encode/vulkan_state_tracker.cpp
@@ -2115,7 +2115,7 @@ void VulkanStateTracker::TrackCmdCopyBufferToImage(VkCommandBuffer comm
  uint32_t regionCount,
  const VkBufferImageCopy* pRegions)
 {
- if (dstImage != nullptr && commandBuffer != VK_NULL_HANDLE)
+ if (dstImage != VK_NULL_HANDLE && commandBuffer != VK_NULL_HANDLE)
  {
  vulkan_wrappers::CommandBufferWrapper* cmd_buf_wrapper =
  vulkan_wrappers::GetWrapper<vulkan_wrappers::CommandBufferWrapper>(commandBuffer);