From: Eric Anholt <eric@anholt.net>
Date: Mon, 10 Aug 2009 22:50:22 +0000 (-0700)
Subject: demos: Fix the VBO usage in glsl/multitex.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=74504c48ade0fdf2b2c6a932f2608bb51f88a29a;p=mesa.git

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
---

diff --git a/progs/glsl/multitex.c b/progs/glsl/multitex.c
index 5e971716add..a4a8bbe38fa 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);