Turn off caps.multisampleDisableSupport()
Disabling multisample while rendering to an MSAA target is a dwindling
feature that comes with a heavy performance cost on some devices, and
many devices don't support it at all. This CL just flips a bit so we
never disable multisample. After a few days or weeks of soak time, we
will come back and yank out all the code that supports disabling
multisample.
Bug: skia:12196
Change-Id: Iae54d25d0e28e24eda6295d7155e5c9fbb398081
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/429299
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
diff --git a/src/gpu/d3d/GrD3DCaps.cpp b/src/gpu/d3d/GrD3DCaps.cpp
index 9597280..d6c0668 100644
--- a/src/gpu/d3d/GrD3DCaps.cpp
+++ b/src/gpu/d3d/GrD3DCaps.cpp
@@ -180,6 +180,7 @@
// Can use standard sample locations
fSampleLocationsSupport = true;
+#if 0
D3D12_FEATURE_DATA_D3D12_OPTIONS2 options2Desc;
if (SUCCEEDED(device->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS2, &options2Desc,
sizeof(options2Desc))) &&
@@ -188,6 +189,7 @@
// We "disable" multisample by colocating all samples at pixel center.
fMultisampleDisableSupport = true;
}
+#endif
if (D3D12_CONSERVATIVE_RASTERIZATION_TIER_NOT_SUPPORTED !=
optionsDesc.ConservativeRasterizationTier) {
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index 9e8f56b..ea5ac06 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -221,11 +221,13 @@
fClientCanDisableMultisample = ctxInfo.hasExtension("GL_EXT_multisample_compatibility");
} // no WebGL support
+#if 0
#ifdef SK_BUILD_FOR_MAC
fMultisampleDisableSupport = false;
#else
fMultisampleDisableSupport = fClientCanDisableMultisample;
#endif
+#endif
if (GR_IS_GR_GL(standard)) {
// 3.1 has draw_instanced but not instanced_arrays, for the time being we only care about
