AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use 4x msaa for all dm testing

Browse Source 
Bug: skia:11334
Change-Id: I57343e80cc8b39644c5f189aeee0da229517a726
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/390576
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
This commit is contained in:
Chris Dalton 2021-03-31 09:14:16 -06:00 committed by Skia Commit-Bot
parent 8037c9e2ed
commit d4756598de
2 changed files with 55 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
infra/bots/gen_tasks_logic/dm_flags.go
View File

@ -214,14 +214,12 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
args = append(args, "--nocpu")
// Add in either gles or gl configs to the canonical set based on OS
sampleCount = 8
glPrefix = "gl"
// Use 4x MSAA for all our testing. It's more consistent and 8x MSAA is nondeterministic (by
// design) on NVIDIA hardware. The problem is especially bad on ANGLE. skia:6813 skia:6545
sampleCount = 4
if b.os("Android", "iOS") {
sampleCount = 4
// We want to test the OpenGL config not the GLES config on the Shield
if !b.model("NVIDIA_Shield") {
glPrefix = "gles"
}
glPrefix = "gles"
// MSAA is disabled on Pixel3a (https://b.corp.google.com/issues/143074513).
if b.model("Pixel3a") {
sampleCount = 0
@ -229,11 +227,6 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
} else if b.matchGpu("Intel") {
// MSAA doesn't work well on Intel GPUs chromium:527565, chromium:983926
sampleCount = 0
} else if b.matchGpu("GTX", "Quadro") && b.extraConfig("ANGLE") {
// 8x MSAA is nondeterministic (by design) on NVIDIA hardware.
// The problem is especially bad on ANGLE, so use 4x instead.
// skia:6813 skia:6545
sampleCount = 4
} else if b.os("ChromeOS") {
glPrefix = "gles"
}
@ -361,24 +354,16 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
}
if b.extraConfig("Vulkan") {
configs = []string{"vk"}
if b.os("Android") {
// MSAA doesn't work well on Intel GPUs chromium:527565, chromium:983926, skia:9023
if !b.matchGpu("Intel") {
configs = append(configs, "vkmsaa4")
} else {
// MSAA doesn't work well on Intel GPUs chromium:527565, chromium:983926, skia:9023
if !b.matchGpu("Intel") {
configs = append(configs, "vkmsaa8")
}
}
}
if b.extraConfig("Metal") {
configs = []string{"mtl"}
if b.os("iOS") {
// MSAA doesn't work well on Intel GPUs chromium:527565, chromium:983926
if !b.matchGpu("Intel") {
configs = append(configs, "mtlmsaa4")
} else {
// MSAA doesn't work well on Intel GPUs chromium:527565, chromium:983926
if !b.matchGpu("Intel") {
configs = append(configs, "mtlmsaa8")
}
}
}
if b.extraConfig("Direct3D") {

94
infra/bots/tasks.json
View File

File diff suppressed because one or more lines are too long