commit c405c27b1a9f8e3e01040c1f8ed7939e2c09c4e9
author Brian Salomon <bsalomon@google.com> Fri Feb 15 09:44:01 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Feb 15 15:08:39 2019 +0000
tree af78d2de7411614eb0d57fe332a44813ba2f573e
parent d4d1be8dedf0b03cfe1b901ccdb8178e86328f76

Remove unused fields related to old multitexturing TextureOp.

Change-Id: I6a48410f2203a0a88831d02713b9b7475fb6e5a6
Reviewed-on: https://skia-review.googlesource.com/c/192826
Commit-Queue: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

include/gpu/GrContextOptions.h

diff --git a/include/gpu/GrContextOptions.h b/include/gpu/GrContextOptions.h
index 77e2970..44bf353 100644
--- a/include/gpu/GrContextOptions.h
+++ b/include/gpu/GrContextOptions.h
@@ -218,12 +218,6 @@
      * Include or exclude specific GPU path renderers.
      */
     GpuPathRenderers fGpuPathRenderers = GpuPathRenderers::kAll;
-
-    /**
-     * Disables using multiple texture units to batch multiple images into a single draw on
-     * supported GPUs.
-     */
-    bool fDisableImageMultitexturing = false;
 #endif
 
 #if SK_SUPPORT_ATLAS_TEXT

src/gpu/GrShaderCaps.h

diff --git a/src/gpu/GrShaderCaps.h b/src/gpu/GrShaderCaps.h
index fb1b17f..6f0af37 100644
--- a/src/gpu/GrShaderCaps.h
+++ b/src/gpu/GrShaderCaps.h
@@ -295,8 +295,6 @@
 
     int fMaxFragmentSamplers;
 
-    size_t fDisableImageMultitexturingDstRectAreaThreshold;
-
     AdvBlendEqInteraction fAdvBlendEqInteraction;
 
     GrSwizzle fConfigTextureSwizzle[kGrPixelConfigCnt];