summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-08-19 11:46:43 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-19 11:46:43 -0700
commitb3aaf3baa7fd811af19835bbc8837a88984c160a (patch)
tree045bd5b0991900dc9ab635125b63efff030d633e /opengl
parent873ebfb825cb498d9ff3012d1d31b02e31a79980 (diff)
parentbccfcd95d3cc4029c1ed8514d31436a857283873 (diff)
downloadframeworks_base-b3aaf3baa7fd811af19835bbc8837a88984c160a.zip
frameworks_base-b3aaf3baa7fd811af19835bbc8837a88984c160a.tar.gz
frameworks_base-b3aaf3baa7fd811af19835bbc8837a88984c160a.tar.bz2
am bccfcd95: Merge "fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used." into gingerbread
Merge commit 'bccfcd95d3cc4029c1ed8514d31436a857283873' into gingerbread-plus-aosp * commit 'bccfcd95d3cc4029c1ed8514d31436a857283873': 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;