From ac77b7899deddadf67ccbd6cdbf225fbcdd5f367 Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 19 Mar 2020 12:06:01 +0000 Subject: [PATCH] Remove VK_Indirect use of image comparisons --- util/test/data/VK_Indirect/10_draw.png | Bin 925 -> 0 bytes util/test/data/VK_Indirect/11_draw.png | Bin 1142 -> 0 bytes util/test/data/VK_Indirect/12_draw.png | Bin 925 -> 0 bytes util/test/data/VK_Indirect/13_draw.png | Bin 925 -> 0 bytes util/test/data/VK_Indirect/14_draw.png | Bin 1064 -> 0 bytes util/test/data/VK_Indirect/15_draw.png | Bin 1035 -> 0 bytes util/test/data/VK_Indirect/16_draw.png | Bin 1144 -> 0 bytes util/test/data/VK_Indirect/17_draw.png | Bin 545 -> 0 bytes util/test/data/VK_Indirect/18_draw.png | Bin 545 -> 0 bytes util/test/data/VK_Indirect/19_draw.png | Bin 1062 -> 0 bytes util/test/data/VK_Indirect/1_draw.png | Bin 925 -> 0 bytes util/test/data/VK_Indirect/20_draw.png | Bin 1034 -> 0 bytes util/test/data/VK_Indirect/21_draw.png | Bin 925 -> 0 bytes util/test/data/VK_Indirect/22_draw.png | Bin 1142 -> 0 bytes util/test/data/VK_Indirect/2_draw.png | Bin 925 -> 0 bytes util/test/data/VK_Indirect/3_draw.png | Bin 1064 -> 0 bytes util/test/data/VK_Indirect/4_draw.png | Bin 1035 -> 0 bytes util/test/data/VK_Indirect/5_draw.png | Bin 1144 -> 0 bytes util/test/data/VK_Indirect/6_draw.png | Bin 545 -> 0 bytes util/test/data/VK_Indirect/7_draw.png | Bin 545 -> 0 bytes util/test/data/VK_Indirect/8_draw.png | Bin 1062 -> 0 bytes util/test/data/VK_Indirect/9_draw.png | Bin 1034 -> 0 bytes util/test/rdtest/shared/Overlay_Test.py | 6 -- util/test/tests/Vulkan/VK_Indirect.py | 96 ++++++++++++++++-------- 24 files changed, 65 insertions(+), 37 deletions(-) delete mode 100644 util/test/data/VK_Indirect/10_draw.png delete mode 100644 util/test/data/VK_Indirect/11_draw.png delete mode 100644 util/test/data/VK_Indirect/12_draw.png delete mode 100644 util/test/data/VK_Indirect/13_draw.png delete mode 100644 util/test/data/VK_Indirect/14_draw.png delete mode 100644 util/test/data/VK_Indirect/15_draw.png delete mode 100644 util/test/data/VK_Indirect/16_draw.png delete mode 100644 util/test/data/VK_Indirect/17_draw.png delete mode 100644 util/test/data/VK_Indirect/18_draw.png delete mode 100644 util/test/data/VK_Indirect/19_draw.png delete mode 100644 util/test/data/VK_Indirect/1_draw.png delete mode 100644 util/test/data/VK_Indirect/20_draw.png delete mode 100644 util/test/data/VK_Indirect/21_draw.png delete mode 100644 util/test/data/VK_Indirect/22_draw.png delete mode 100644 util/test/data/VK_Indirect/2_draw.png delete mode 100644 util/test/data/VK_Indirect/3_draw.png delete mode 100644 util/test/data/VK_Indirect/4_draw.png delete mode 100644 util/test/data/VK_Indirect/5_draw.png delete mode 100644 util/test/data/VK_Indirect/6_draw.png delete mode 100644 util/test/data/VK_Indirect/7_draw.png delete mode 100644 util/test/data/VK_Indirect/8_draw.png delete mode 100644 util/test/data/VK_Indirect/9_draw.png diff --git a/util/test/data/VK_Indirect/10_draw.png b/util/test/data/VK_Indirect/10_draw.png deleted file mode 100644 index 99927a932c57906790d7552d6ea3db22179f327d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 925 zcmeAS@N?(olHy`uVBq!ia0y~yV4MKNIvi|3k+<8Q9%5i%PVsbc45_&F_NpQy0|Uo_ z4d%oF?hQAxvXKK)|N9Md$LCN=Ju+&e`HDET^yRQBV*mKl*x(*J+d7I01o}N6%Op7oInb%bmIG zEH@|w9!Qz%b8sB2`Od(2@Ur_6BVUld={tZ%Z14f9a4MX?=iJIYK9_;|4yxt>jd&IJ z`0Dh`TR?+>X>VQO=cWdMBjx-K4m0*0v&OXh`?=S1{E+QFXL=9K?%tp87&$mDU#~cx zI?D{`7Cn%e2{UJjv$Q;l+k5UMvgQB2OTFI*b_}C~LqRXltu1aqr?a%Y%(h7cd#TC$ z4$x^4%Rv6zQEc141Z3!+Q%1*b{N-h+U;=7m5D;KsVF4jVy73@Z!tA3iZ^3kRySf*G U-_1oF?hQAxvXoF?hQAxvXsU}0fkWCS9r@G3W* z|6O+WX@uEwb^!rKMu7?M9~TM>GB64XKyapooD!3Q0uvD5tmxoqXy5?il*fun3`|N2 z3`~=H+dCLIIvOC@gZ-lbRPV`S&MpirE)EPVD$@Ldj1aSPY+P6z99W>(sspCi!wjz_ zAd4EK>>uQ!i&GMF6{Qz zRnr+*SQr=|{{4FKH=BR}h{KY?ym#_cV==Hrmah+UF@jVmme)oof?e=r9ltgUOzFg# zlc%67O+4GQ!HI#9(ZS(FEMFK0)WL@i-?Ol^OlAc6W5RBcH3AL}3<3g0;!UDVApbbM zGlFUYin6V>(1a?DkO!Nfpim#j05PlMYho)fG{6C(v-R=G6O!B@*BtrvA^$+Vj9{P* zGlLlQgNvv@hr|#pdZ^BWrvb1HwC2IQ0f|4V^Qe`M2Sda(G*mD#q}>sYi2D2D;SL{Q PCTH+;^>bP0l+XkK@&va( diff --git a/util/test/data/VK_Indirect/16_draw.png b/util/test/data/VK_Indirect/16_draw.png deleted file mode 100644 index 29d6f2832e978b13ff172ac2c6962b8e912c3211..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1144 zcmeAS@N?(olHy`uVBq!ia0y~yV4MKNIvi|3k+<8Q9%5i%vG;Uw45_&F_U1+2rU0I{ zi`|8s-xBO4C)mauX07=k)wAWlCG(6a?RBiv4UZ)=99S~jouQ$DK|z6mgM)#I35Y1> z&3q@vXx#Vp#`!;c-|l?-j5S}OqrIYoor!7x)NMXTnHdk>c0Xa{J6oKEW%`avM~4kQ zXStc23e#)Ot=!^s`57zYLDjrC0fApJkFQS4ytN1HvUP=@n;Hbp{FhTusQBFxu`CnF zeIR76&%rTmCC~_sceBr1PMr=`z2gYTxVzbVenISDU_59FGOy{!eP#iHW$Qokoi@n@ z@?#!>tTHkMnsK!DljZWuNKRT&+*=+Ewgeb3JC1=2O#b(sfu-eT_MXQ`>Yz@4Z}+?; z4#`c|_a57=e|ZbgVGKZf9s})JDEPmcf$7i}(|H?^yr>fl^hUs)jdInOK!*NHl}xs= zVPn|SNY&^dK2pIc03Q8R=fTn##0DDk;NAcyXsYw5kxvFq#Bg-L%7B>L-0T0p5WL!- SWC<)$7(8A5T-G@yGywprdI2{8 diff --git a/util/test/data/VK_Indirect/17_draw.png b/util/test/data/VK_Indirect/17_draw.png deleted file mode 100644 index fe034dadb3cd724f3e7be31521fe9197e5234b76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 545 zcmeAS@N?(olHy`uVBq!ia0y~yV4MKNIvi|3k+<8Q9s+V+c)B=-RK&eKXvhc@Jhb4e le=aZo0w8k~45tvNFb|o^!1(L&=1P#SJYD@<);T3K0RU8C7a0Hm diff --git a/util/test/data/VK_Indirect/18_draw.png b/util/test/data/VK_Indirect/18_draw.png deleted file mode 100644 index fe034dadb3cd724f3e7be31521fe9197e5234b76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 545 zcmeAS@N?(olHy`uVBq!ia0y~yV4MKNIvi|3k+<8Q9s+V+c)B=-RK&eKXvhc@Jhb4e le=aZo0w8k~45tvNFb|o^!1(L&=1P#SJYD@<);T3K0RU8C7a0Hm diff --git a/util/test/data/VK_Indirect/19_draw.png b/util/test/data/VK_Indirect/19_draw.png deleted file mode 100644 index 26f37252c8e1a69025e05a4d5fbf496884817b45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1062 zcmeAS@N?(olHy`uVBq!ia0y~yV4MKNIvi|3k+<8Q9%5i%e(UMt7*cWT?Oj9B1_vIO zgU)PrAJ~~bHuB1`GHFEU-SL@hr&%|1<<@Ox3>6td0t_rH42+Bp4h#YUAVh6mHUq?H zu(@!HXvGtxz6Wpz3X;cwOd9Zz;sVH|J}-sm_n!RgF@34URSb;4pku7Gmopb+6cAv9 z;0b+?6_ps6loS}4CiS*=FmQA&590=h6WBO7U{sNBn563$h;s0 zET$loAglvh*$B1hzzW8nT2PG!Q4ah1pf>ghO^AC0b1I7QAFelik>VF*WO>4Fe-Y>_ kNGMVz9S(xD)*$6~I>AjK+UavTF#j`ny85}Sb4q9e08>teN&o-= diff --git a/util/test/data/VK_Indirect/1_draw.png b/util/test/data/VK_Indirect/1_draw.png deleted file mode 100644 index 99927a932c57906790d7552d6ea3db22179f327d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 925 zcmeAS@N?(olHy`uVBq!ia0y~yV4MKNIvi|3k+<8Q9%5i%PVsbc45_&F_NpQy0|Uo_ z4d%oF?hQAxvXL=w8X9ySyi0l7!^*+I zz~q!x8=(jkR8UB{-Y&`n7Ak`Y0YxXIRDH z|9ht__bMpfh#bzzt2$AdQIBO?w^;}iboFyt I=akR{0EBLj6951J diff --git a/util/test/data/VK_Indirect/21_draw.png b/util/test/data/VK_Indirect/21_draw.png deleted file mode 100644 index 99927a932c57906790d7552d6ea3db22179f327d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 925 zcmeAS@N?(olHy`uVBq!ia0y~yV4MKNIvi|3k+<8Q9%5i%PVsbc45_&F_NpQy0|Uo_ z4d%oF?hQAxvXKK)|N9Md$LCN=Ju+&e`HDET^yRQBV*mKl*x(*J+d7I01o}N6%Op7oInb%bmIG zEH@|w9!Qz%b8sB2`Od(2@Ur_6BVUld={tZ%Z14f9a4MX?=iJIYK9_;|4yxt>jd&IJ z`0Dh`TR?+>X>VQO=cWdMBjx-K4m0*0v&OXh`?=S1{E+QFXL=9K?%tp87&$mDU#~cx zI?D{`7Cn%e2{UJjv$Q;l+k5UMvgQB2OTFI*b_}C~LqRXltu1aqr?a%Y%(h7cd#TC$ z4$x^4%Rv6zQEc141Z3!+Q%1*b{N-h+U;=7m5D;KsVF4jVy73@Z!tA3iZ^3kRySf*G U-_1oF?hQAxvXsU}0fkWCS9r@G3W* z|6O+WX@uEwb^!rKMu7?M9~TM>GB64XKyapooD!3Q0uvD5tmxoqXy5?il*fun3`|N2 z3`~=H+dCLIIvOC@gZ-lbRPV`S&MpirE)EPVD$@Ldj1aSPY+P6z99W>(sspCi!wjz_ zAd4EK>>uQ!i&GMF6{Qz zRnr+*SQr=|{{4FKH=BR}h{KY?ym#_cV==Hrmah+UF@jVmme)oof?e=r9ltgUOzFg# zlc%67O+4GQ!HI#9(ZS(FEMFK0)WL@i-?Ol^OlAc6W5RBcH3AL}3<3g0;!UDVApbbM zGlFUYin6V>(1a?DkO!Nfpim#j05PlMYho)fG{6C(v-R=G6O!B@*BtrvA^$+Vj9{P* zGlLlQgNvv@hr|#pdZ^BWrvb1HwC2IQ0f|4V^Qe`M2Sda(G*mD#q}>sYi2D2D;SL{Q PCTH+;^>bP0l+XkK@&va( diff --git a/util/test/data/VK_Indirect/5_draw.png b/util/test/data/VK_Indirect/5_draw.png deleted file mode 100644 index 29d6f2832e978b13ff172ac2c6962b8e912c3211..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1144 zcmeAS@N?(olHy`uVBq!ia0y~yV4MKNIvi|3k+<8Q9%5i%vG;Uw45_&F_U1+2rU0I{ zi`|8s-xBO4C)mauX07=k)wAWlCG(6a?RBiv4UZ)=99S~jouQ$DK|z6mgM)#I35Y1> z&3q@vXx#Vp#`!;c-|l?-j5S}OqrIYoor!7x)NMXTnHdk>c0Xa{J6oKEW%`avM~4kQ zXStc23e#)Ot=!^s`57zYLDjrC0fApJkFQS4ytN1HvUP=@n;Hbp{FhTusQBFxu`CnF zeIR76&%rTmCC~_sceBr1PMr=`z2gYTxVzbVenISDU_59FGOy{!eP#iHW$Qokoi@n@ z@?#!>tTHkMnsK!DljZWuNKRT&+*=+Ewgeb3JC1=2O#b(sfu-eT_MXQ`>Yz@4Z}+?; z4#`c|_a57=e|ZbgVGKZf9s})JDEPmcf$7i}(|H?^yr>fl^hUs)jdInOK!*NHl}xs= zVPn|SNY&^dK2pIc03Q8R=fTn##0DDk;NAcyXsYw5kxvFq#Bg-L%7B>L-0T0p5WL!- SWC<)$7(8A5T-G@yGywprdI2{8 diff --git a/util/test/data/VK_Indirect/6_draw.png b/util/test/data/VK_Indirect/6_draw.png deleted file mode 100644 index fe034dadb3cd724f3e7be31521fe9197e5234b76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 545 zcmeAS@N?(olHy`uVBq!ia0y~yV4MKNIvi|3k+<8Q9s+V+c)B=-RK&eKXvhc@Jhb4e le=aZo0w8k~45tvNFb|o^!1(L&=1P#SJYD@<);T3K0RU8C7a0Hm diff --git a/util/test/data/VK_Indirect/7_draw.png b/util/test/data/VK_Indirect/7_draw.png deleted file mode 100644 index fe034dadb3cd724f3e7be31521fe9197e5234b76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 545 zcmeAS@N?(olHy`uVBq!ia0y~yV4MKNIvi|3k+<8Q9s+V+c)B=-RK&eKXvhc@Jhb4e le=aZo0w8k~45tvNFb|o^!1(L&=1P#SJYD@<);T3K0RU8C7a0Hm diff --git a/util/test/data/VK_Indirect/8_draw.png b/util/test/data/VK_Indirect/8_draw.png deleted file mode 100644 index 26f37252c8e1a69025e05a4d5fbf496884817b45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1062 zcmeAS@N?(olHy`uVBq!ia0y~yV4MKNIvi|3k+<8Q9%5i%e(UMt7*cWT?Oj9B1_vIO zgU)PrAJ~~bHuB1`GHFEU-SL@hr&%|1<<@Ox3>6td0t_rH42+Bp4h#YUAVh6mHUq?H zu(@!HXvGtxz6Wpz3X;cwOd9Zz;sVH|J}-sm_n!RgF@34URSb;4pku7Gmopb+6cAv9 z;0b+?6_ps6loS}4CiS*=FmQA&590=h6WBO7U{sNBn563$h;s0 zET$loAglvh*$B1hzzW8nT2PG!Q4ah1pf>ghO^AC0b1I7QAFelik>VF*WO>4Fe-Y>_ kNGMVz9S(xD)*$6~I>AjK+UavTF#j`ny85}Sb4q9e08>teN&o-= diff --git a/util/test/data/VK_Indirect/9_draw.png b/util/test/data/VK_Indirect/9_draw.png deleted file mode 100644 index 657319dbe6f03e4051562cac6a8cad3eaf504a61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1034 zcmeAS@N?(olHy`uVBq!ia0y~yV4MKNIvi|3k+<8Q9%5i%zUb-V7*cWT?TwAR4F&=% z2ix^lToZY*D5K#B$2qZCog5PL=w8X9ySyi0l7!^*+I zz~q!x8=(jkR8UB{-Y&`n7Ak`Y0YxXIRDH z|9ht__bMpfh#bzzt2$AdQIBO?w^;}iboFyt I=akR{0EBLj6951J diff --git a/util/test/rdtest/shared/Overlay_Test.py b/util/test/rdtest/shared/Overlay_Test.py index b80f0cbb3..2c3ef1438 100644 --- a/util/test/rdtest/shared/Overlay_Test.py +++ b/util/test/rdtest/shared/Overlay_Test.py @@ -76,12 +76,6 @@ class Overlay_Test(rdtest.TestCase): overlay_id: rd.ResourceId = out.GetDebugOverlayTexID() - save_data = rd.TextureSave() - save_data.resourceId = overlay_id - save_data.destType = rd.FileType.PNG - - self.controller.SaveTexture(save_data, rdtest.get_tmp_path('asdf.png')) - # We test a few key spots: # 4 points along the left side of the big triangle, above/in/below its intersection with the tri behind # 4 points outside all triangles diff --git a/util/test/tests/Vulkan/VK_Indirect.py b/util/test/tests/Vulkan/VK_Indirect.py index bc8139a45..1209904f9 100644 --- a/util/test/tests/Vulkan/VK_Indirect.py +++ b/util/test/tests/Vulkan/VK_Indirect.py @@ -6,30 +6,69 @@ import renderdoc as rd class VK_Indirect(rdtest.TestCase): demos_test_name = 'VK_Indirect' - def check_overlay(self, eventId: int, out: rd.ReplayOutput, tex: rd.TextureDisplay, save_data: rd.TextureSave): + def check_overlay(self, pass_samples, *, no_overlay = False): pipe: rd.PipeState = self.controller.GetPipelineState() - # Check that the highlight draw overlay is empty + tex = rd.TextureDisplay() + tex.overlay = rd.DebugOverlay.Drawcall tex.resourceId = pipe.GetOutputTargets()[0].resourceId - out.SetTextureDisplay(tex) + self.out.SetTextureDisplay(tex) - overlay_path = rdtest.get_tmp_path(str(self.overlay_idx) + '_draw.png') - ref_path = self.get_ref_path(str(self.overlay_idx) + '_draw.png') + self.out.Display() - save_data.resourceId = out.GetDebugOverlayTexID() + overlay_id = self.out.GetDebugOverlayTexID() - self.controller.SaveTexture(save_data, overlay_path) + samples = [ + (50, 40), + (60, 40), + (70, 40), - if not rdtest.png_compare(overlay_path, ref_path): - raise rdtest.TestFailureException("Reference and output image differ @ EID {}".format(str(eventId)), - ref_path, overlay_path) + (90, 40), + (100, 40), + (110, 40), - self.overlay_idx = self.overlay_idx + 1 + (130, 40), + (140, 40), + (160, 40), + + (190, 40), + (200, 40), + (220, 40), + + + + (50, 190), + (60, 190), + (70, 190), + + (90, 190), + (100, 190), + (110, 190), + + (130, 190), + (140, 190), + (160, 190), + + (190, 190), + (200, 190), + (220, 190), + ] + + # Every sample that isn't passing should be off + off_alpha = 0.5 + # If the overlay isn't even for a draw, it will be cleared to black + if no_overlay: + off_alpha = 0.0 + self.check(len(pass_samples) == 0) + for s in [s for s in samples if s not in pass_samples]: + self.check_pixel_value(overlay_id, s[0], s[1], [0.0, 0.0, 0.0, off_alpha], eps=1.0/256.0) + + # And the passing samples should be on + for s in pass_samples: + self.check_pixel_value(overlay_id, s[0], s[1], [0.8, 0.1, 0.8, 1.0], eps=1.0/256.0) def check_capture(self): - self.overlay_idx = 1 - fill = self.find_draw("vkCmdFillBuffer") self.check(fill is not None) @@ -69,16 +108,10 @@ class VK_Indirect(rdtest.TestCase): dispatches = self.find_draw("{}: Dispatches".format(level)) # Set up a ReplayOutput and TextureSave for quickly testing the drawcall highlight overlay - out: rd.ReplayOutput = self.controller.CreateOutput(rd.CreateHeadlessWindowingData(100, 100), - rd.ReplayOutputType.Texture) + self.out: rd.ReplayOutput = self.controller.CreateOutput(rd.CreateHeadlessWindowingData(100, 100), + rd.ReplayOutputType.Texture) - self.check(out is not None) - - tex = rd.TextureDisplay() - tex.overlay = rd.DebugOverlay.Drawcall - - save_data = rd.TextureSave() - save_data.destType = rd.FileType.PNG + self.check(self.out is not None) # Rewind to the start of the capture draw: rd.DrawcallDescription = dispatches.children[0] @@ -137,7 +170,8 @@ class VK_Indirect(rdtest.TestCase): postvs_data = self.get_postvs(rd.MeshDataStage.VSOut, 0, 1) self.check(len(postvs_data) == 0) - self.check_overlay(draw.eventId, out, tex, save_data) + # No samples should be passing in the empties + self.check_overlay([]) rdtest.log.success("{} empty draws are empty".format(level)) @@ -170,7 +204,7 @@ class VK_Indirect(rdtest.TestCase): self.check_mesh_data(postvs_ref, postvs_data) self.check(len(postvs_data) == len(postvs_ref)) # We shouldn't have any extra vertices - self.check_overlay(draw.eventId, out, tex, save_data) + self.check_overlay([(60, 40)]) rdtest.log.success("{} {} is as expected".format(level, draw.name)) @@ -197,7 +231,7 @@ class VK_Indirect(rdtest.TestCase): self.check_mesh_data(postvs_ref, postvs_data) self.check(len(postvs_data) == len(postvs_ref)) # We shouldn't have any extra vertices - self.check_overlay(draw.eventId, out, tex, save_data) + self.check_overlay([(100, 40)]) rdtest.log.success("{} {} is as expected".format(level, draw.name)) @@ -224,7 +258,7 @@ class VK_Indirect(rdtest.TestCase): self.check_mesh_data(postvs_ref, postvs_data) self.check(len(postvs_data) == len(postvs_ref)) # We shouldn't have any extra vertices - self.check_overlay(draw.eventId, out, tex, save_data) + self.check_overlay([(140, 40), (200, 40)]) rdtest.log.success("{} {} is as expected".format(level, draw.name)) @@ -247,7 +281,7 @@ class VK_Indirect(rdtest.TestCase): postvs_data = self.get_postvs(rd.MeshDataStage.VSOut, 0, 1) self.check(len(postvs_data) == 0) - self.check_overlay(draw.eventId, out, tex, save_data) + self.check_overlay([], no_overlay=True) # vkCmdDrawIndirectCountKHR draw_indirect = indirect_count_root.children[1].children[0] @@ -278,7 +312,7 @@ class VK_Indirect(rdtest.TestCase): self.check_mesh_data(postvs_ref, postvs_data) self.check(len(postvs_data) == len(postvs_ref)) # We shouldn't have any extra vertices - self.check_overlay(draw.eventId, out, tex, save_data) + self.check_overlay([(60, 190)]) rdtest.log.success("{} {} is as expected".format(level, draw.name)) @@ -308,7 +342,7 @@ class VK_Indirect(rdtest.TestCase): self.check_mesh_data(postvs_ref, postvs_data) self.check(len(postvs_data) == len(postvs_ref)) # We shouldn't have any extra vertices - self.check_overlay(draw.eventId, out, tex, save_data) + self.check_overlay([(100, 190)]) rdtest.log.success("{} {} is as expected".format(level, draw.name)) @@ -323,7 +357,7 @@ class VK_Indirect(rdtest.TestCase): self.check(len(postvs_data) == 0) - self.check_overlay(draw.eventId, out, tex, save_data) + self.check_overlay([]) rdtest.log.success("{} {} is as expected".format(level, draw.name)) @@ -352,7 +386,7 @@ class VK_Indirect(rdtest.TestCase): self.check_mesh_data(postvs_ref, postvs_data) self.check(len(postvs_data) == len(postvs_ref)) # We shouldn't have any extra vertices - self.check_overlay(draw.eventId, out, tex, save_data) + self.check_overlay([(140, 190), (200, 190)]) rdtest.log.success("{} {} is as expected".format(level, draw.name)) else: