diff options
6 files changed, 7 insertions, 18 deletions
diff --git a/infra/bots/assets/moltenvk/VERSION b/infra/bots/assets/moltenvk/VERSION index 56a6051ca2..d8263ee986 100644 --- a/infra/bots/assets/moltenvk/VERSION +++ b/infra/bots/assets/moltenvk/VERSION @@ -1 +1 @@ -1
\ No newline at end of file +2
\ No newline at end of file diff --git a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json index 5c7f41a73d..2166ee450f 100644 --- a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json +++ b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json @@ -174,7 +174,7 @@ "1.1", "--nocpu", "--config", - "vknostencils", + "vk", "--match", "~^path_text_clipped_uncached$", "~^path_text_uncached$", diff --git a/infra/bots/recipes/perf.py b/infra/bots/recipes/perf.py index 7880b48273..db7a96729f 100644 --- a/infra/bots/recipes/perf.py +++ b/infra/bots/recipes/perf.py @@ -118,8 +118,7 @@ def nanobench_flags(api, bot): if 'CommandBuffer' in bot: configs = ['commandbuffer'] if 'Vulkan' in bot: - # skbug.com/7961 - configs = ['vk' if not 'MoltenVK' in bot else 'vknostencils'] + configs = ['vk'] if 'ANGLE' in bot: # Test only ANGLE configs. diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json index ca8ed00111..71dfa9861f 100644 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json @@ -252,7 +252,7 @@ "--randomProcessorTest", "--nocpu", "--config", - "vknostencils", + "vk", "--src", "tests", "gm", @@ -486,13 +486,9 @@ "vertices", "--match", "~^InitialTextureClear$", - "~^ProcessorCloneTest$", "~^RGB565TextureTest$", "~^RGBA4444TextureTest$", "~^WritePixelsNonTextureMSAA_Gpu$", - "~^GrDefaultPathRendererTest$", - "~^ResourceCacheStencilBuffers$", - "~^SurfaceCopyOnWrite_Gpu$", "--nonativeFonts", "--verbose" ], diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index 62e222a332..c172ef5456 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -245,8 +245,7 @@ def dm_flags(api, bot): # Vulkan bot *only* runs the vk config. if 'Vulkan' in bot: - # skbug.com/7961 - configs = ['vk' if not 'MoltenVK' in bot else 'vknostencils'] + configs = ['vk'] # Test 1010102 on our Linux/NVIDIA bots if 'QuadroP400' in bot and api.vars.is_linux: @@ -745,14 +744,9 @@ def dm_flags(api, bot): blacklist(['_', 'gm', '_', 'vertices_scaled_shader']) blacklist(['_', 'gm', '_', 'vertices']) match.append('~^InitialTextureClear$') - match.append('~^ProcessorCloneTest$') match.append('~^RGB565TextureTest$') match.append('~^RGBA4444TextureTest$') match.append('~^WritePixelsNonTextureMSAA_Gpu$') - # skbug.com/7961 - match.append('~^GrDefaultPathRendererTest$') - match.append('~^ResourceCacheStencilBuffers$') - match.append('~^SurfaceCopyOnWrite_Gpu$') if (('RadeonR9M470X' in bot or 'RadeonHD7770' in bot) and 'ANGLE' in bot): # skia:7096 diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index bc2560c471..13fa8de867 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -13446,7 +13446,7 @@ { "name": "skia/bots/moltenvk", "path": "moltenvk", - "version": "version:1" + "version": "version:2" } ], "command": [ @@ -13823,7 +13823,7 @@ { "name": "skia/bots/moltenvk", "path": "moltenvk", - "version": "version:1" + "version": "version:2" } ], "command": [ |