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

Add vksrgb config to dm (Vulkan sRGB). Fix help formatting of vk.

Browse Source 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2005863002

Review-Url: https://codereview.chromium.org/2005863002
This commit is contained in:
brianosman 2016-05-23 10:11:07 -07:00 committed by Commit bot
parent 8cc2091118
commit a56800a05d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/flags/SkCommonFlagsConfig.cpp
View File

@ -45,7 +45,7 @@ static const char configHelp[] =
" hwui"
#endif
#ifdef SK_VULKAN
" vk"
" vk vksrgb"
#endif
" or use extended form 'backend(option=value,...)'.\n";
@ -124,7 +124,8 @@ static const char configExtendedHelp[] =
"\tmesa \t= gpu(api=mesa)\n"
#endif
#ifdef SK_VULKAN
"\vk \t= gpu(api=vulkan)\n"
"\tvk \t= gpu(api=vulkan)\n"
"\tvksrgb \t= gpu(api=vulkan,color=srgb)\n"
#endif
#endif
;
@ -170,6 +171,7 @@ static const struct {
#endif
#ifdef SK_VULKAN
, { "vk", "gpu", "api=vulkan" }
, { "vksrgb", "gpu", "api=vulkan,color=srgb" }
#endif
#else

3
tools/gpu/GrContextFactory.cpp
View File

@ -163,8 +163,7 @@ ContextInfo GrContextFactory::getContextInfo(ContextType type, ContextOptions op
#ifdef SK_VULKAN
case kVulkan_GrBackend:
SkASSERT(kVulkan_ContextType == type);
if ((kEnableNVPR_ContextOptions & options) ||
(kRequireSRGBSupport_ContextOptions & options)) {
if (kEnableNVPR_ContextOptions & options) {
return ContextInfo();
}
testCtx.reset(CreatePlatformVkTestContext());