diff options
author | Michael J. Bishop <mbtyke@gmail.com> | 2013-11-01 13:52:49 -0400 |
---|---|---|
committer | Michael J. Bishop <mbtyke@gmail.com> | 2013-11-01 13:52:49 -0400 |
commit | 504683b8ecabf0c73c06444dd0f103bc461a52b6 (patch) | |
tree | d519bff6e6e7682e107377154deee92a13fa55a7 /tests/cubegeom.c | |
parent | 90dcac551fee69cf284ae4431db949bc69796a1c (diff) |
Adds to a test case verifying glGetIntegerv returns
correct results when the current texture id is not TEXTURE0 and fixes
library_gl.js so that it returns correct results.
Diffstat (limited to 'tests/cubegeom.c')
-rw-r--r-- | tests/cubegeom.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/cubegeom.c b/tests/cubegeom.c index fac0da2b..96d56339 100644 --- a/tests/cubegeom.c +++ b/tests/cubegeom.c @@ -194,8 +194,14 @@ int main(int argc, char *argv[]) // sauer vertex data is apparently 0-12: V3F, 12: N1B, 16-24: T2F, 24-28: T2S, 28-32: C4B glVertexPointer(3, GL_FLOAT, 32, (void*)0); // all these apply to the ARRAY_BUFFER that is bound glTexCoordPointer(2, GL_FLOAT, 32, (void*)16); + glClientActiveTexture(GL_TEXTURE1); // XXX seems to be ignored in native build glTexCoordPointer(2, GL_SHORT, 32, (void*)24); + glGetIntegerv(GL_TEXTURE_COORD_ARRAY_SIZE, &tempInt); assert(tempInt == 2); + glGetIntegerv(GL_TEXTURE_COORD_ARRAY_TYPE, &tempInt); assert(tempInt == GL_SHORT); + glGetIntegerv(GL_TEXTURE_COORD_ARRAY_STRIDE, &tempInt); assert(tempInt == 32); + glGetPointerv(GL_TEXTURE_COORD_ARRAY_POINTER, &tempPtr); assert(tempPtr == (void *)24); + glClientActiveTexture(GL_TEXTURE0); // likely not needed, it is a cleanup glNormalPointer(GL_BYTE, 32, (void*)12); glColorPointer(4, GL_UNSIGNED_BYTE, 32, (void*)28); |