Mesa (master): demos: Fix the VBO usage in glsl/multitex.
Eric Anholt
anholt at kemper.freedesktop.org
Mon Aug 10 22:54:01 UTC 2009
Module: Mesa
Branch: master
Commit: 74504c48ade0fdf2b2c6a932f2608bb51f88a29a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=74504c48ade0fdf2b2c6a932f2608bb51f88a29a
Author: Eric Anholt <eric at anholt.net>
Date: Mon Aug 10 15:50:22 2009 -0700
demos: Fix the VBO usage in glsl/multitex.
The fix for 965 to be noisy when apps sent pointers instead of VBO offsets
caught this app in the act of doing exactly that.
Bug #23203
---
progs/glsl/multitex.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/progs/glsl/multitex.c b/progs/glsl/multitex.c
index 5e97171..a4a8bbe 100644
--- a/progs/glsl/multitex.c
+++ b/progs/glsl/multitex.c
@@ -134,7 +134,7 @@ DrawPolygonArray(void)
if (VertCoord_attr >= 0) {
glVertexAttribPointer(VertCoord_attr, 2, GL_FLOAT, GL_FALSE,
- 0, VertCoords);
+ 0, vertPtr);
glEnableVertexAttribArray(VertCoord_attr);
}
else {
@@ -143,11 +143,11 @@ DrawPolygonArray(void)
}
glVertexAttribPointer(TexCoord0_attr, 2, GL_FLOAT, GL_FALSE,
- 0, Tex0Coords);
+ 0, tex0Ptr);
glEnableVertexAttribArray(TexCoord0_attr);
glVertexAttribPointer(TexCoord1_attr, 2, GL_FLOAT, GL_FALSE,
- 0, Tex1Coords);
+ 0, tex1Ptr);
glEnableVertexAttribArray(TexCoord1_attr);
glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
More information about the mesa-commit
mailing list