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

Make it possible to enable hw tessellation outside of test builds

Browse Source 
Bug: chromium:1172543
Change-Id: I9733a8758d902a8d46d442de5d099d923efc2184
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375376
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
This commit is contained in:
Chris Dalton 2021-02-24 17:41:44 -07:00 committed by Skia Commit-Bot
parent 45c57e116e
commit 4ac9aadd30
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bench/TessellateBench.cpp
View File

@ -36,7 +36,7 @@ static sk_sp<GrDirectContext> make_mock_context() {
GrContextOptions ctxOptions; GrContextOptions ctxOptions;
ctxOptions.fGpuPathRenderers = GpuPathRenderers::kTessellation; ctxOptions.fGpuPathRenderers = GpuPathRenderers::kTessellation;
ctxOptions.fSuppressTessellationShaders = false; ctxOptions.fEnableExperimentalHardwareTessellation = true;
return GrDirectContext::MakeMock(&mockOptions, ctxOptions); return GrDirectContext::MakeMock(&mockOptions, ctxOptions);
} }

10
include/gpu/GrContextOptions.h
View File

@ -251,6 +251,11 @@ struct SK_API GrContextOptions {
*/ */
bool fSuppressMipmapSupport = false; bool fSuppressMipmapSupport = false;
/**
* If true, and if supported, enables hardware tessellation in the caps.
*/
bool fEnableExperimentalHardwareTessellation = false;
#if GR_TEST_UTILS #if GR_TEST_UTILS
/** /**
* Private options that are only meant for testing within Skia's tools. * Private options that are only meant for testing within Skia's tools.
@ -266,11 +271,6 @@ struct SK_API GrContextOptions {
*/ */
bool fSuppressGeometryShaders = false; bool fSuppressGeometryShaders = false;
/**
* If true, the caps will never support tessellation shaders.
*/
bool fSuppressTessellationShaders = true;
/** /**
* If greater than zero and less than the actual hardware limit, overrides the maximum number of * If greater than zero and less than the actual hardware limit, overrides the maximum number of
* tessellation segments supported by the caps. * tessellation segments supported by the caps.

9
src/gpu/GrShaderCaps.cpp
View File

@ -175,6 +175,9 @@ void GrShaderCaps::applyOptionsOverrides(const GrContextOptions& options) {
SkASSERT(!fMustWriteToFragColor); SkASSERT(!fMustWriteToFragColor);
SkASSERT(!fNoDefaultPrecisionForExternalSamplers); SkASSERT(!fNoDefaultPrecisionForExternalSamplers);
} }
if (!options.fEnableExperimentalHardwareTessellation) {
fMaxTessellationSegments = 0;
}
#if GR_TEST_UTILS #if GR_TEST_UTILS
if (options.fSuppressDualSourceBlending) { if (options.fSuppressDualSourceBlending) {
fDualSourceBlendingSupport = false; fDualSourceBlendingSupport = false;
@ -182,15 +185,9 @@ void GrShaderCaps::applyOptionsOverrides(const GrContextOptions& options) {
if (options.fSuppressGeometryShaders) { if (options.fSuppressGeometryShaders) {
fGeometryShaderSupport = false; fGeometryShaderSupport = false;
} }
if (options.fSuppressTessellationShaders) {
fMaxTessellationSegments = 0;
}
if (options.fMaxTessellationSegmentsOverride > 0) { if (options.fMaxTessellationSegmentsOverride > 0) {
fMaxTessellationSegments = std::min(options.fMaxTessellationSegmentsOverride, fMaxTessellationSegments = std::min(options.fMaxTessellationSegmentsOverride,
fMaxTessellationSegments); fMaxTessellationSegments);
} }
#else
// Tessellation shaders are still very experimental. Always disable them outside of test builds.
fMaxTessellationSegments = 0;
#endif #endif
} }

2
tools/flags/CommonFlagsGpu.cpp
View File

@ -98,7 +98,7 @@ void SetCtxOptionsFromCommonFlags(GrContextOptions* ctxOptions) {
ctxOptions->fAllowPathMaskCaching = FLAGS_cachePathMasks; ctxOptions->fAllowPathMaskCaching = FLAGS_cachePathMasks;
ctxOptions->fAllPathsVolatile = FLAGS_allPathsVolatile; ctxOptions->fAllPathsVolatile = FLAGS_allPathsVolatile;
ctxOptions->fSuppressGeometryShaders = !FLAGS_gs; ctxOptions->fSuppressGeometryShaders = !FLAGS_gs;
ctxOptions->fSuppressTessellationShaders = !FLAGS_hwtess; ctxOptions->fEnableExperimentalHardwareTessellation = FLAGS_hwtess;
ctxOptions->fMaxTessellationSegmentsOverride = FLAGS_maxTessellationSegments; ctxOptions->fMaxTessellationSegmentsOverride = FLAGS_maxTessellationSegments;
ctxOptions->fGpuPathRenderers = collect_gpu_path_renderers_from_flags(); ctxOptions->fGpuPathRenderers = collect_gpu_path_renderers_from_flags();
ctxOptions->fInternalMultisampleCount = FLAGS_internalSamples; ctxOptions->fInternalMultisampleCount = FLAGS_internalSamples;