From 211d1b694f6f07e4b6fbb44bd781f0a470b7f6fa Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 14 Aug 2019 14:35:14 +0100
Subject: [PATCH] Make VK_Indirect less sensitive to event IDs changing

---
 .../data/VK_Indirect/{119_draw.png => 10_draw.png}  | Bin
 .../data/VK_Indirect/{120_draw.png => 11_draw.png}  | Bin
 .../data/VK_Indirect/{30_draw.png => 12_draw.png}   | Bin
 .../data/VK_Indirect/{31_draw.png => 13_draw.png}   | Bin
 .../data/VK_Indirect/{100_draw.png => 14_draw.png}  | Bin
 .../data/VK_Indirect/{102_draw.png => 15_draw.png}  | Bin
 .../data/VK_Indirect/{103_draw.png => 16_draw.png}  | Bin
 .../data/VK_Indirect/{108_draw.png => 17_draw.png}  | Bin
 .../data/VK_Indirect/{110_draw.png => 18_draw.png}  | Bin
 .../data/VK_Indirect/{115_draw.png => 19_draw.png}  | Bin
 .../data/VK_Indirect/{54_draw.png => 1_draw.png}    | Bin
 .../data/VK_Indirect/{118_draw.png => 20_draw.png}  | Bin
 .../data/VK_Indirect/{95_draw.png => 21_draw.png}   | Bin
 .../data/VK_Indirect/{55_draw.png => 22_draw.png}   | Bin
 .../data/VK_Indirect/{96_draw.png => 2_draw.png}    | Bin
 .../data/VK_Indirect/{35_draw.png => 3_draw.png}    | Bin
 .../data/VK_Indirect/{37_draw.png => 4_draw.png}    | Bin
 .../data/VK_Indirect/{38_draw.png => 5_draw.png}    | Bin
 .../data/VK_Indirect/{43_draw.png => 6_draw.png}    | Bin
 .../data/VK_Indirect/{45_draw.png => 7_draw.png}    | Bin
 .../data/VK_Indirect/{50_draw.png => 8_draw.png}    | Bin
 .../data/VK_Indirect/{53_draw.png => 9_draw.png}    | Bin
 util/test/tests/Vulkan/VK_Indirect.py               |   8 ++++++--
 23 files changed, 6 insertions(+), 2 deletions(-)
 rename util/test/data/VK_Indirect/{119_draw.png => 10_draw.png} (100%)
 rename util/test/data/VK_Indirect/{120_draw.png => 11_draw.png} (100%)
 rename util/test/data/VK_Indirect/{30_draw.png => 12_draw.png} (100%)
 rename util/test/data/VK_Indirect/{31_draw.png => 13_draw.png} (100%)
 rename util/test/data/VK_Indirect/{100_draw.png => 14_draw.png} (100%)
 rename util/test/data/VK_Indirect/{102_draw.png => 15_draw.png} (100%)
 rename util/test/data/VK_Indirect/{103_draw.png => 16_draw.png} (100%)
 rename util/test/data/VK_Indirect/{108_draw.png => 17_draw.png} (100%)
 rename util/test/data/VK_Indirect/{110_draw.png => 18_draw.png} (100%)
 rename util/test/data/VK_Indirect/{115_draw.png => 19_draw.png} (100%)
 rename util/test/data/VK_Indirect/{54_draw.png => 1_draw.png} (100%)
 rename util/test/data/VK_Indirect/{118_draw.png => 20_draw.png} (100%)
 rename util/test/data/VK_Indirect/{95_draw.png => 21_draw.png} (100%)
 rename util/test/data/VK_Indirect/{55_draw.png => 22_draw.png} (100%)
 rename util/test/data/VK_Indirect/{96_draw.png => 2_draw.png} (100%)
 rename util/test/data/VK_Indirect/{35_draw.png => 3_draw.png} (100%)
 rename util/test/data/VK_Indirect/{37_draw.png => 4_draw.png} (100%)
 rename util/test/data/VK_Indirect/{38_draw.png => 5_draw.png} (100%)
 rename util/test/data/VK_Indirect/{43_draw.png => 6_draw.png} (100%)
 rename util/test/data/VK_Indirect/{45_draw.png => 7_draw.png} (100%)
 rename util/test/data/VK_Indirect/{50_draw.png => 8_draw.png} (100%)
 rename util/test/data/VK_Indirect/{53_draw.png => 9_draw.png} (100%)

diff --git a/util/test/data/VK_Indirect/119_draw.png b/util/test/data/VK_Indirect/10_draw.png
similarity index 100%
rename from util/test/data/VK_Indirect/119_draw.png
rename to util/test/data/VK_Indirect/10_draw.png
diff --git a/util/test/data/VK_Indirect/120_draw.png b/util/test/data/VK_Indirect/11_draw.png
similarity index 100%
rename from util/test/data/VK_Indirect/120_draw.png
rename to util/test/data/VK_Indirect/11_draw.png
diff --git a/util/test/data/VK_Indirect/30_draw.png b/util/test/data/VK_Indirect/12_draw.png
similarity index 100%
rename from util/test/data/VK_Indirect/30_draw.png
rename to util/test/data/VK_Indirect/12_draw.png
diff --git a/util/test/data/VK_Indirect/31_draw.png b/util/test/data/VK_Indirect/13_draw.png
similarity index 100%
rename from util/test/data/VK_Indirect/31_draw.png
rename to util/test/data/VK_Indirect/13_draw.png
diff --git a/util/test/data/VK_Indirect/100_draw.png b/util/test/data/VK_Indirect/14_draw.png
similarity index 100%
rename from util/test/data/VK_Indirect/100_draw.png
rename to util/test/data/VK_Indirect/14_draw.png
diff --git a/util/test/data/VK_Indirect/102_draw.png b/util/test/data/VK_Indirect/15_draw.png
similarity index 100%
rename from util/test/data/VK_Indirect/102_draw.png
rename to util/test/data/VK_Indirect/15_draw.png
diff --git a/util/test/data/VK_Indirect/103_draw.png b/util/test/data/VK_Indirect/16_draw.png
similarity index 100%
rename from util/test/data/VK_Indirect/103_draw.png
rename to util/test/data/VK_Indirect/16_draw.png
diff --git a/util/test/data/VK_Indirect/108_draw.png b/util/test/data/VK_Indirect/17_draw.png
similarity index 100%
rename from util/test/data/VK_Indirect/108_draw.png
rename to util/test/data/VK_Indirect/17_draw.png
diff --git a/util/test/data/VK_Indirect/110_draw.png b/util/test/data/VK_Indirect/18_draw.png
similarity index 100%
rename from util/test/data/VK_Indirect/110_draw.png
rename to util/test/data/VK_Indirect/18_draw.png
diff --git a/util/test/data/VK_Indirect/115_draw.png b/util/test/data/VK_Indirect/19_draw.png
similarity index 100%
rename from util/test/data/VK_Indirect/115_draw.png
rename to util/test/data/VK_Indirect/19_draw.png
diff --git a/util/test/data/VK_Indirect/54_draw.png b/util/test/data/VK_Indirect/1_draw.png
similarity index 100%
rename from util/test/data/VK_Indirect/54_draw.png
rename to util/test/data/VK_Indirect/1_draw.png
diff --git a/util/test/data/VK_Indirect/118_draw.png b/util/test/data/VK_Indirect/20_draw.png
similarity index 100%
rename from util/test/data/VK_Indirect/118_draw.png
rename to util/test/data/VK_Indirect/20_draw.png
diff --git a/util/test/data/VK_Indirect/95_draw.png b/util/test/data/VK_Indirect/21_draw.png
similarity index 100%
rename from util/test/data/VK_Indirect/95_draw.png
rename to util/test/data/VK_Indirect/21_draw.png
diff --git a/util/test/data/VK_Indirect/55_draw.png b/util/test/data/VK_Indirect/22_draw.png
similarity index 100%
rename from util/test/data/VK_Indirect/55_draw.png
rename to util/test/data/VK_Indirect/22_draw.png
diff --git a/util/test/data/VK_Indirect/96_draw.png b/util/test/data/VK_Indirect/2_draw.png
similarity index 100%
rename from util/test/data/VK_Indirect/96_draw.png
rename to util/test/data/VK_Indirect/2_draw.png
diff --git a/util/test/data/VK_Indirect/35_draw.png b/util/test/data/VK_Indirect/3_draw.png
similarity index 100%
rename from util/test/data/VK_Indirect/35_draw.png
rename to util/test/data/VK_Indirect/3_draw.png
diff --git a/util/test/data/VK_Indirect/37_draw.png b/util/test/data/VK_Indirect/4_draw.png
similarity index 100%
rename from util/test/data/VK_Indirect/37_draw.png
rename to util/test/data/VK_Indirect/4_draw.png
diff --git a/util/test/data/VK_Indirect/38_draw.png b/util/test/data/VK_Indirect/5_draw.png
similarity index 100%
rename from util/test/data/VK_Indirect/38_draw.png
rename to util/test/data/VK_Indirect/5_draw.png
diff --git a/util/test/data/VK_Indirect/43_draw.png b/util/test/data/VK_Indirect/6_draw.png
similarity index 100%
rename from util/test/data/VK_Indirect/43_draw.png
rename to util/test/data/VK_Indirect/6_draw.png
diff --git a/util/test/data/VK_Indirect/45_draw.png b/util/test/data/VK_Indirect/7_draw.png
similarity index 100%
rename from util/test/data/VK_Indirect/45_draw.png
rename to util/test/data/VK_Indirect/7_draw.png
diff --git a/util/test/data/VK_Indirect/50_draw.png b/util/test/data/VK_Indirect/8_draw.png
similarity index 100%
rename from util/test/data/VK_Indirect/50_draw.png
rename to util/test/data/VK_Indirect/8_draw.png
diff --git a/util/test/data/VK_Indirect/53_draw.png b/util/test/data/VK_Indirect/9_draw.png
similarity index 100%
rename from util/test/data/VK_Indirect/53_draw.png
rename to util/test/data/VK_Indirect/9_draw.png
diff --git a/util/test/tests/Vulkan/VK_Indirect.py b/util/test/tests/Vulkan/VK_Indirect.py
index 54be5af54..e4bd8163a 100644
--- a/util/test/tests/Vulkan/VK_Indirect.py
+++ b/util/test/tests/Vulkan/VK_Indirect.py
@@ -14,8 +14,8 @@ class VK_Indirect(rdtest.TestCase):
 
         out.SetTextureDisplay(tex)
 
-        overlay_path = rdtest.get_tmp_path(str(eventId) + '_draw.png')
-        ref_path = self.get_ref_path(str(eventId) + '_draw.png')
+        overlay_path = rdtest.get_tmp_path(str(self.overlay_idx) + '_draw.png')
+        ref_path = self.get_ref_path(str(self.overlay_idx) + '_draw.png')
 
         save_data.resourceId = out.GetDebugOverlayTexID()
 
@@ -25,9 +25,13 @@ class VK_Indirect(rdtest.TestCase):
             raise rdtest.TestFailureException("Reference and output image differ @ EID {}".format(str(eventId)),
                                               ref_path, overlay_path)
 
+        self.overlay_idx = self.overlay_idx + 1
+
     def check_capture(self):
         self.check_final_backbuffer()
 
+        self.overlay_idx = 1
+
         for level in ["Primary", "Secondary"]:
             rdtest.log.print("Checking {} indirect calls".format(level))