Revert "Use a dst size threshold for multitexturing images."

This reverts commit edfa0d2f623dc66e695fac631d5fb03599b264b7.

Reason for revert: ubsan bug

Original change's description:
> Use a dst size threshold for multitexturing images.
> 
> TODO: Set thresholds based on GPU in use.
> 
> Change-Id: I0aeac596d11ab63922f2df0d76c668b4f8be5353
> Reviewed-on: https://skia-review.googlesource.com/77900
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>

TBR=bsalomon@google.com,robertphillips@google.com

Change-Id: Iea56ce73cf8f7bca265fe58907a72ecf96497d22
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/78542
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

1 files changed, 6 insertions, 8 deletions

diff --git a/src/gpu/GrShaderCaps.cpp b/src/gpu/GrShaderCaps.cpp
index 65721ee897..2d9cd0a39b 100644
--- a/src/gpu/GrShaderCaps.cpp
+++ b/src/gpu/GrShaderCaps.cpp
@@ -68,9 +68,11 @@ GrShaderCaps::GrShaderCaps(const GrContextOptions& options) {
     fMaxCombinedSamplers = 0;
     fAdvBlendEqInteraction = kNotSupported_AdvBlendEqInteraction;
 
-    // TODO: Default this to 0 and only enable image multitexturing when a "safe" threshold is
-    // known for a GPU class.
-    fDisableImageMultitexturingDstRectAreaThreshold = std::numeric_limits<size_t>::max();
+#if GR_TEST_UTILS
+    fDisableImageMultitexturing = options.fDisableImageMultitexturing;
+#else
+    fDisableImageMultitexturing = false;
+#endif
 }
 
 void GrShaderCaps::dumpJSON(SkJSONWriter* writer) const {
@@ -128,8 +130,7 @@ void GrShaderCaps::dumpJSON(SkJSONWriter* writer) const {
     writer->appendS32("Max Combined Samplers", fMaxFragmentSamplers);
     writer->appendString("Advanced blend equation interaction",
                          kAdvBlendEqInteractionStr[fAdvBlendEqInteraction]);
-    writer->appendU64("Disable image multitexturing dst area threshold",
-                      fDisableImageMultitexturingDstRectAreaThreshold);
+    writer->appendBool("Disable image multitexturing", fDisableImageMultitexturing);
 
     writer->endObject();
 }
@@ -137,8 +138,5 @@ void GrShaderCaps::dumpJSON(SkJSONWriter* writer) const {
 void GrShaderCaps::applyOptionsOverrides(const GrContextOptions& options) {
 #if GR_TEST_UTILS
     fDualSourceBlendingSupport = fDualSourceBlendingSupport && !options.fSuppressDualSourceBlending;
-    if (options.fDisableImageMultitexturing) {
-        fDisableImageMultitexturingDstRectAreaThreshold = 0;
-    }
 #endif
 }