aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2017-11-13 11:49:13 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-11-15 13:33:36 +0000
commit2b6f614dac7c984ffd10cb59c499c9bd872d9695 (patch)
tree018ece7923a774e58c719854e82b7736fd8916d0 /src
parentf5ff9968c9b4e537afdef83c7488db72ca912df2 (diff)
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>
Diffstat (limited to 'src')
-rw-r--r--src/gpu/ops/GrTextureOp.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp
index a03b40e608..410257cb7c 100644
--- a/src/gpu/ops/GrTextureOp.cpp
+++ b/src/gpu/ops/GrTextureOp.cpp
@@ -513,7 +513,7 @@ private:
}
}
}
- int actualMaxTextures = SkTMin(caps.maxFragmentImageStorages(), kMaxTextures);
+ int actualMaxTextures = SkTMin(caps.maxFragmentSamplers(), kMaxTextures);
int newProxyCnt = that->fProxyCnt - sharedProxyCnt;
if (newProxyCnt + fProxyCnt > actualMaxTextures) {
return -1;