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

Revert "Test MSAA on Gen9 Intel GPUs"

Browse Source 
This reverts commit e0b2dafeb6.

Reason for revert: Need to blacklist more unit tests

Original change's description:
> Test MSAA on Gen9 Intel GPUs
> 
> Change-Id: Ie5441350fc150356ffb7d6acffe1089ca1de4364
> Bug: skia:9225
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/224539
> Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>

TBR=bsalomon@google.com,benjaminwagner@google.com,brianosman@google.com

Change-Id: I49c7a2f1132baeef80fa5296c2f2313f2bef0830
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:9225
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/224956
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This commit is contained in:
Brian Osman 2019-07-01 18:04:35 +00:00 committed by Skia Commit-Bot
parent 1e87a5410e
commit 41f937f042
5 changed files with 4 additions and 14 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",

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

@ -89,9 +89,7 @@ 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 = ''
sample_count = ''
elif 'ChromeOS' in bot:
gl_prefix = 'gles'

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

@ -440,7 +440,6 @@
"--match",
"~VkHeapTests",
"~GLPrograms",
"~^SRGBReadWritePixels$",
"--nonativeFonts",
"--verbose"
],

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

@ -127,9 +127,7 @@ 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 = ''
sample_count = ''
elif 'ChromeOS' in bot:
gl_prefix = 'gles'
@ -697,7 +695,6 @@ def dm_flags(api, bot):
if api.vars.is_linux and 'IntelIris640' in bot:
match.extend(['~GLPrograms']) # skia:7849
match.append('~^SRGBReadWritePixels$') # skia:9225
if 'Vulkan' in bot and api.vars.is_linux and 'IntelHD405' in bot:
# skia:7322

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

@ -1095,11 +1095,8 @@ 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 across the board for Intel GPUs for performance reasons.
if (kIntel_GrGLVendor == ctxInfo.vendor()) {
fMSFBOType = kNone_MSFBOType;
}
}