commit 2b6f614dac7c984ffd10cb59c499c9bd872d9695
author Brian Salomon <bsalomon@google.com> Mon Nov 13 11:49:13 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Nov 15 13:33:36 2017 +0000
tree 018ece7923a774e58c719854e82b7736fd8916d0
parent f5ff9968c9b4e537afdef83c7488db72ca912df2

Fix GrTextureOp to check the correct cap for multitexturing

Change-Id: I276dff12055b046423ed261d014bc58302fb1347
Reviewed-on: https://skia-review.googlesource.com/70680
Reviewed-by: Robert Phillips <robertphillips@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 a03b40e..410257c 100644
--- a/src/gpu/ops/GrTextureOp.cpp
+++ b/src/gpu/ops/GrTextureOp.cpp
@@ -513,7 +513,7 @@
                 }
             }
         }
-        int actualMaxTextures = SkTMin(caps.maxFragmentImageStorages(), kMaxTextures);
+        int actualMaxTextures = SkTMin(caps.maxFragmentSamplers(), kMaxTextures);
         int newProxyCnt = that->fProxyCnt - sharedProxyCnt;
         if (newProxyCnt + fProxyCnt > actualMaxTextures) {
             return -1;