From c6d6ef5fedd5127d84edf15e66e9a96a02b66385 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 12 Nov 2019 16:37:52 +0000
Subject: [PATCH] Fix priority of sample index (and resolve) vs mapping samples
 to arrays

* When saving a texture, if mapToArray is true then sampleIndex should be
  ignored
---
 renderdoc/replay/replay_controller.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/renderdoc/replay/replay_controller.cpp b/renderdoc/replay/replay_controller.cpp
index 6460f56d6..6bda405ae 100644
--- a/renderdoc/replay/replay_controller.cpp
+++ b/renderdoc/replay/replay_controller.cpp
@@ -728,6 +728,9 @@ bool ReplayController::SaveTexture(const TextureSave &saveData, const char *path
   uint32_t sampleCount = td.msSamp;
   bool multisampled = td.msSamp > 1;
 
+  if(sd.sample.mapToArray)
+    sd.sample.sampleIndex = 0;
+
   bool resolveSamples = (sd.sample.sampleIndex == ~0U);
 
   if(resolveSamples)