summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-08-21 09:42:53 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-21 09:42:53 -0700
commit58f853b1cfe6e5b9ea3985617bdadded1acc4ec8 (patch)
treeca868c203aa07cce52592c1381b365ac276c70ce /opengl
parent83b3e3515aff1bd7618df256345229891ab8a657 (diff)
parentb3aaf3baa7fd811af19835bbc8837a88984c160a (diff)
downloadframeworks_base-58f853b1cfe6e5b9ea3985617bdadded1acc4ec8.zip
frameworks_base-58f853b1cfe6e5b9ea3985617bdadded1acc4ec8.tar.gz
frameworks_base-58f853b1cfe6e5b9ea3985617bdadded1acc4ec8.tar.bz2
am b3aaf3ba: am bccfcd95: Merge "fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used." into gingerbread
Merge commit 'b3aaf3baa7fd811af19835bbc8837a88984c160a' * commit 'b3aaf3baa7fd811af19835bbc8837a88984c160a': fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used.
Diffstat (limited to 'opengl')
-rw-r--r--opengl/libagl/array.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/opengl/libagl/array.cpp b/opengl/libagl/array.cpp
index 4997dc8..7fbe9b5 100644
--- a/opengl/libagl/array.cpp
+++ b/opengl/libagl/array.cpp
@@ -685,8 +685,8 @@ static void drawPrimitivesTriangleFanOrStrip(ogles_context_t* c,
} while (num);
}
if (count) {
- v0 = c->vc.vBuffer + 2 + num - 2;
- v1 = c->vc.vBuffer + 2 + num - 1;
+ v0 = c->vc.vBuffer + 2 + vcs - 2;
+ v1 = c->vc.vBuffer + 2 + vcs - 1;
if ((winding&2) == 0) {
// for strips copy back the two last compiled vertices
c->vc.vBuffer[0] = *v0;