Mesa (gallium-mesa-7.4): trivial: add dedicated test for index buffers

[Keith Whitwell]

Module: Mesa
Branch: gallium-mesa-7.4
Commit: fde646def3c1db0730fbb8d774c7c3d68ff02cf7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fde646def3c1db0730fbb8d774c7c3d68ff02cf7

Author: Keith Whitwell <keithw at vmware.com>
Date:   Tue Feb 17 16:35:10 2009 +0000

trivial: add dedicated test for index buffers

---

 progs/trivial/Makefile           |    1 +
 progs/trivial/vbo-drawrange-ib.c |  138 ++++++++++++++++++++++++++++++++++++++
 progs/trivial/vbo-drawrange.c    |   13 ----
 3 files changed, 139 insertions(+), 13 deletions(-)

diff --git a/progs/trivial/Makefile b/progs/trivial/Makefile
index dce96f6..b258f05 100644
--- a/progs/trivial/Makefile
+++ b/progs/trivial/Makefile
@@ -131,6 +131,7 @@ SOURCES = \
 	vbo-drawarrays.c \
 	vbo-drawelements.c \
 	vbo-drawrange.c \
+	vbo-drawrange-ib.c \
 	vp-array.c \
 	vp-array-int.c \
 	vp-clip.c \
diff --git a/progs/trivial/vbo-drawrange-ib.c b/progs/trivial/vbo-drawrange-ib.c
new file mode 100644
index 0000000..efad1c1
--- /dev/null
+++ b/progs/trivial/vbo-drawrange-ib.c
@@ -0,0 +1,138 @@
+/* Basic VBO */
+
+#include <assert.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include <GL/glew.h>
+#include <GL/glut.h>
+
+struct {
+   GLfloat pos[3];
+   GLubyte color[4];
+} verts[] =  
+{
+   { {  0.9, -0.9, 0.0 },
+     { 0x00, 0x00, 0xff, 0x00 } 
+   },
+
+   { {  0.9,  0.9, 0.0 },
+     { 0x00, 0xff, 0x00, 0x00 }
+   },
+
+   { { -0.9,  0.9, 0.0 },
+     { 0xff, 0x00, 0x00, 0x00 } 
+   },
+
+   { { -0.9, -0.9, 0.0 },
+     { 0xff, 0xff, 0xff, 0x00 }
+   },
+};
+
+GLuint indices[] = { 1, 2, 3 };
+
+GLuint arrayObj, elementObj;
+
+static void Init( void )
+{
+   GLint errno;
+   GLuint prognum;
+   
+   static const char *prog1 =
+      "!!ARBvp1.0\n"
+      "MOV  result.color, vertex.color;\n"
+      "MOV  result.position, vertex.position;\n"
+      "END\n";
+
+   glGenProgramsARB(1, &prognum);
+   glBindProgramARB(GL_VERTEX_PROGRAM_ARB, prognum);
+   glProgramStringARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,
+		      strlen(prog1), (const GLubyte *) prog1);
+
+   assert(glIsProgramARB(prognum));
+   errno = glGetError();
+   printf("glGetError = %d\n", errno);
+   if (errno != GL_NO_ERROR)
+   {
+      GLint errorpos;
+
+      glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errorpos);
+      printf("errorpos: %d\n", errorpos);
+      printf("%s\n", (char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB));
+   }
+
+
+   glEnableClientState( GL_VERTEX_ARRAY );
+   glEnableClientState( GL_COLOR_ARRAY );
+
+   glGenBuffersARB(1, &arrayObj);
+   glBindBufferARB(GL_ARRAY_BUFFER_ARB, arrayObj);
+   glBufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), verts, GL_STATIC_DRAW_ARB);
+
+   glGenBuffersARB(1, &elementObj);
+   glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, elementObj);
+   glBufferDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, sizeof(indices), indices, GL_STATIC_DRAW_ARB);
+
+   glVertexPointer( 3, GL_FLOAT, sizeof(verts[0]), 0 );
+   glColorPointer( 4, GL_UNSIGNED_BYTE, sizeof(verts[0]), (void *)(3*sizeof(float)) );
+
+}
+
+
+
+static void Display( void )
+{
+   glClearColor(0.3, 0.3, 0.3, 1);
+   glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
+
+   glEnable(GL_VERTEX_PROGRAM_ARB);
+
+   glDrawRangeElements( GL_TRIANGLES, 1, 3, 3, GL_UNSIGNED_INT, NULL );
+
+   glFlush(); 
+}
+
+
+static void Reshape( int width, int height )
+{
+   glViewport( 0, 0, width, height );
+   glMatrixMode( GL_PROJECTION );
+   glLoadIdentity();
+   glOrtho(-1.0, 1.0, -1.0, 1.0, -0.5, 1000.0);
+   glMatrixMode( GL_MODELVIEW );
+   glLoadIdentity();
+   /*glTranslatef( 0.0, 0.0, -15.0 );*/
+}
+
+
+static void Key( unsigned char key, int x, int y )
+{
+   (void) x;
+   (void) y;
+   switch (key) {
+      case 27:
+         exit(0);
+         break;
+   }
+   glutPostRedisplay();
+}
+
+
+
+
+int main( int argc, char *argv[] )
+{
+   glutInit( &argc, argv );
+   glutInitWindowPosition( 0, 0 );
+   glutInitWindowSize( 250, 250 );
+   glutInitDisplayMode( GLUT_RGB | GLUT_SINGLE | GLUT_DEPTH );
+   glutCreateWindow(argv[0]);
+   glewInit();
+   glutReshapeFunc( Reshape );
+   glutKeyboardFunc( Key );
+   glutDisplayFunc( Display );
+   Init();
+   glutMainLoop();
+   return 0;
+}
diff --git a/progs/trivial/vbo-drawrange.c b/progs/trivial/vbo-drawrange.c
index fa87eaf..f24f24d 100644
--- a/progs/trivial/vbo-drawrange.c
+++ b/progs/trivial/vbo-drawrange.c
@@ -8,8 +8,6 @@
 #include <GL/glew.h>
 #include <GL/glut.h>
 
-#define ELTOBJ 0
-
 struct {
    GLfloat pos[3];
    GLubyte color[4];
@@ -72,12 +70,6 @@ static void Init( void )
    glBindBufferARB(GL_ARRAY_BUFFER_ARB, arrayObj);
    glBufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), verts, GL_STATIC_DRAW_ARB);
 
-#if ELTOBJ
-   glGenBuffersARB(1, &elementObj);
-   glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, elementObj);
-   glBufferDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, sizeof(indices), indices, GL_STATIC_DRAW_ARB);
-#endif
-
    glVertexPointer( 3, GL_FLOAT, sizeof(verts[0]), 0 );
    glColorPointer( 4, GL_UNSIGNED_BYTE, sizeof(verts[0]), (void *)(3*sizeof(float)) );
 
@@ -91,12 +83,7 @@ static void Display( void )
    glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
 
    glEnable(GL_VERTEX_PROGRAM_ARB);
-
-#if ELTOBJ
-   glDrawRangeElements( GL_TRIANGLES, 1, 3, 3, GL_UNSIGNED_INT, NULL );
-#else
    glDrawRangeElements( GL_TRIANGLES, 1, 3, 3, GL_UNSIGNED_INT, indices );
-#endif
 
    glFlush(); 
 }