commit 0b4d8aa108f2fd14f1ee4de1affacab166d7a357
author Brian Salomon <bsalomon@google.com> Wed Oct 11 15:34:27 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Oct 11 20:32:49 2017 +0000
tree 1a63c56bd675ebf9400980f25ebc61bb88bfaa56
parent ba1c7901a7448a388fd835e487b6b9d223236826

Add benchmark for comparing multitexturing to non-multitexturing image draws.

Allows benchmarks to override GrContextOptions.

Removes the ability to use the same GrContext for all benchmarks in a config.

Change-Id: I5ab9f6e81055451ac912a66537843d1a49f3b479
Reviewed-on: https://skia-review.googlesource.com/34080
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/ops/GrTextureOp.cpp

diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp
index ab82a9c..3606a01 100644
--- a/src/gpu/ops/GrTextureOp.cpp
+++ b/src/gpu/ops/GrTextureOp.cpp
@@ -54,7 +54,9 @@
     static constexpr int kMaxTextures = 8;
 #endif
 
-    static int SupportsMultitexture(const GrShaderCaps& caps) { return caps.integerSupport(); }
+    static int SupportsMultitexture(const GrShaderCaps& caps) {
+        return caps.integerSupport() && !caps.disableImageMultitexturingSupport();
+    }
 
     static sk_sp<GrGeometryProcessor> Make(sk_sp<GrTextureProxy> proxies[], int proxyCnt,
                                            sk_sp<GrColorSpaceXform> csxf,