commit b235168f55a4a1aa8682ef761be8a7730cb52200
author joshualitt <joshualitt@chromium.org> Fri Oct 02 06:49:23 2015 -0700
committer Commit bot <commit-bot@chromium.org> Fri Oct 02 06:49:23 2015 -0700
tree 63363cc03c18c554414aab5a0ebdd5b05593e90e
parent b1ac52fb0f8c5f03844ef3bbb198ba32427194b5

S4 only has 8 texture units on the GLContext we create

BUG=skia:4373

Review URL: https://codereview.chromium.org/1386643002

bench/GLBench.cpp

diff --git a/bench/GLBench.cpp b/bench/GLBench.cpp
index e51adba..f184d77 100644
--- a/bench/GLBench.cpp
+++ b/bench/GLBench.cpp
@@ -110,7 +110,7 @@
     //Setup framebuffer
     GrGLuint texture;
     GR_GL_CALL(gl, GenTextures(1, &texture));
-    GR_GL_CALL(gl, ActiveTexture(GR_GL_TEXTURE15));
+    GR_GL_CALL(gl, ActiveTexture(GR_GL_TEXTURE7));
     GR_GL_CALL(gl, BindTexture(GR_GL_TEXTURE_2D, texture));
     GR_GL_CALL(gl, TexParameteri(GR_GL_TEXTURE_2D, GR_GL_TEXTURE_MAG_FILTER, GR_GL_NEAREST));
     GR_GL_CALL(gl, TexParameteri(GR_GL_TEXTURE_2D, GR_GL_TEXTURE_MIN_FILTER, GR_GL_NEAREST));