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

Revert "Revert "Go back to blacklisting MSAA on all Intel GPUs""

Browse Source 
This reverts commit f0696bd4da.

Bug: chromium:527565, chromium:983926
Change-Id: I549c9f384c9c2ca81052a86df68501d5a7057c98
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/235021
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This commit is contained in:
Brian Osman 2019-08-15 14:52:52 -04:00 committed by Skia Commit-Bot
parent 4008519f84
commit b5391bfa0b
7 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json
View File

@ -191,7 +191,6 @@
"--config",
"gl",
"glsrgb",
"glmsaa8",
"gles",
"glessrgb",
"--match",

9
infra/bots/recipes/perf.py
View File

@ -89,9 +89,8 @@ def nanobench_flags(api, bot):
'Nexus7' in bot):
sample_count = ''
elif 'Intel' in bot:
# We don't want to test MSAA on older Intel chipsets. These are all newer (Gen9).
if 'Iris655' not in bot and 'Iris640' not in bot and 'Iris540' not in bot:
sample_count = ''
# MSAA doesn't work well on Intel GPUs chromium:527565, chromium:983926
sample_count = ''
elif 'ChromeOS' in bot:
gl_prefix = 'gles'
@ -114,8 +113,8 @@ def nanobench_flags(api, bot):
if 'Pixel2XL' not in bot:
configs.append('vkmsaa4')
else:
# skbug.com/9023
if 'IntelHD405' not in bot:
# MSAA doesn't work well on Intel GPUs chromium:527565, chromium:983926, skia:9023
if 'Intel' not in bot:
configs.append('vkmsaa8')
if 'Metal' in bot:

1
infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json
View File

@ -273,7 +273,6 @@
"--nocpu",
"--config",
"vk",
"vkmsaa8",
"--src",
"tests",
"gm",

13
infra/bots/recipes/test.py
View File

@ -127,9 +127,8 @@ def dm_flags(api, bot):
if 'NVIDIA_Shield' not in bot:
gl_prefix = 'gles'
elif 'Intel' in bot:
# We don't want to test MSAA on older Intel chipsets. These are all newer (Gen9).
if 'Iris655' not in bot and 'Iris640' not in bot and 'Iris540' not in bot:
sample_count = ''
# MSAA doesn't work well on Intel GPUs chromium:527565, chromium:983926
sample_count = ''
elif 'ChromeOS' in bot:
gl_prefix = 'gles'
@ -249,8 +248,8 @@ def dm_flags(api, bot):
if 'Android' in bot:
configs.append('vkmsaa4')
else:
# skbug.com/9023
if 'IntelHD405' not in bot:
# MSAA doesn't work well on Intel GPUs chromium:527565, chromium:983926, skia:9023
if 'Intel' not in bot:
configs.append('vkmsaa8')
if 'Metal' in bot:
@ -258,8 +257,8 @@ def dm_flags(api, bot):
if 'iOS' in bot:
configs.append('mtlmsaa4')
else:
# We don't want to test MSAA on older (pre-Gen9) Intel chipsets.
if 'IntelHD6000' not in bot:
# MSAA doesn't work well on Intel GPUs chromium:527565, chromium:983926
if 'Intel' not in bot:
configs.append('mtlmsaa8')
# Test 1010102 on our Linux/NVIDIA bots and the persistent cache config

2
src/gpu/GrUtil.h
View File

@ -33,8 +33,6 @@ enum GrIntelGpuFamily {
// 11th gen
kIceLake_IntelGpuFamily,
kFirstGen9_IntelGpuFamily = kApolloLake_IntelGpuFamily,
};
GrIntelGpuFamily GrGetIntelGpuFamily(uint32_t deviceID) {

9
src/gpu/gl/GrGLCaps.cpp
View File

@ -1022,11 +1022,10 @@ void GrGLCaps::initFSAASupport(const GrContextOptions& contextOptions, const GrG
fMSFBOType = kNone_MSFBOType;
}
// We disable MSAA for older (pre-Gen9) Intel GPUs for performance reasons.
// ApolloLake is the first Gen9 chipset.
if (kIntel_GrGLVendor == ctxInfo.vendor() &&
(ctxInfo.renderer() < kIntelApolloLake_GrGLRenderer ||
ctxInfo.renderer() == kOther_GrGLRenderer)) {
// We disable MSAA for all Intel GPUs. Before Gen9, performance was very bad. Even with Gen9,
// we've seen driver crashes in the wild. We don't have data on Gen11 yet.
// chromium:527565, chromium:983926
if (kIntel_GrGLVendor == ctxInfo.vendor()) {
fMSFBOType = kNone_MSFBOType;
}
}

6
src/gpu/vk/GrVkCaps.cpp
View File

@ -1068,10 +1068,8 @@ void GrVkCaps::FormatInfo::initSampleCounts(const GrVkInterface* interface,
return;
}
if (kIntel_VkVendor == physProps.vendorID) {
// MSAA on Intel before Gen 9 is slow and/or buggy
if (GrGetIntelGpuFamily(physProps.deviceID) < kFirstGen9_IntelGpuFamily) {
return;
}
// MSAA doesn't work well on Intel GPUs chromium:527565, chromium:983926
return;
}
if (flags & VK_SAMPLE_COUNT_2_BIT) {
fColorSampleCounts.push_back(2);