3 files changed, 93 insertions, 0 deletions
diff --git a/progs/trivial/Makefile b/progs/trivial/Makefile
index e15ec33ab59..5e08d603890 100644
--- a/progs/trivial/Makefile
+++ b/progs/trivial/Makefile
@@ -119,6 +119,7 @@ SOURCES = \
 	tri-lit-material.c \
 	tri-mask-tri.c \
 	tri-orig.c \
+	tri-point-line-clipped.c \
 	tri-query.c \
 	tri-repeat.c \
 	tri-scissor-tri.c \
diff --git a/progs/trivial/SConscript b/progs/trivial/SConscript
index 613383c77b1..e9ed1cb71e0 100644
--- a/progs/trivial/SConscript
+++ b/progs/trivial/SConscript
@@ -96,6 +96,7 @@ progs = [
 	'tri-logicop-xor',
 	'tri-mask-tri',
 	'tri-orig',
+	'tri-point-line-clipped',
 	'tri-query',
 	'tri-repeat',
 	'tri-scissor-tri',
diff --git a/progs/trivial/tri-point-line-clipped.c b/progs/trivial/tri-point-line-clipped.c
new file mode 100644
index 00000000000..eef926c24c7
--- /dev/null
+++ b/progs/trivial/tri-point-line-clipped.c
@@ -0,0 +1,91 @@
+/**
+ * Test frustum clipping w/ glPolygonMode LINE/POINT.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <GL/glut.h>
+
+
+static int win;
+
+
+static void
+Tri(void)
+{
+   glBegin(GL_TRIANGLES);
+   glColor3f(1, 0, 0);   glVertex3f(-1.5, -0.8, 0.0);
+   glColor3f(0, 1, 0);   glVertex3f( 1.5, -0.8, 0.0);
+   glColor3f(0, 0, 1);   glVertex3f( 0.0,  0.9, 0.0);
+   glEnd();
+}
+
+
+static void
+Draw(void)
+{
+   glPointSize(13.0);
+   glLineWidth(5.0);
+
+   glClear(GL_COLOR_BUFFER_BIT); 
+
+   glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+   Tri();
+
+   glPolygonMode(GL_FRONT_AND_BACK, GL_POINT);
+   Tri();
+
+   glutSwapBuffers();
+}
+
+
+static void Reshape(int width, int height)
+{
+   glViewport(0, 0, (GLint)width, (GLint)height);
+   glMatrixMode(GL_PROJECTION);
+   glLoadIdentity();
+   glOrtho(-1.0, 1.0, -1.0, 1.0, -1.0, 1.0);
+   glMatrixMode(GL_MODELVIEW);
+}
+
+
+static void
+Key(unsigned char key, int x, int y)
+{
+   if (key == 27) {
+      glutDestroyWindow(win);
+      exit(0);
+   }
+   else {
+      glutPostRedisplay();
+   }
+}
+
+
+static void
+Init(void)
+{
+   fprintf(stderr, "GL_RENDERER   = %s\n", (char *) glGetString(GL_RENDERER));
+   fprintf(stderr, "GL_VERSION    = %s\n", (char *) glGetString(GL_VERSION));
+   fprintf(stderr, "GL_VENDOR     = %s\n", (char *) glGetString(GL_VENDOR));
+   fflush(stderr);
+}
+
+
+int
+main(int argc, char **argv)
+{
+   glutInitWindowSize(300, 300);
+   glutInit(&argc, argv);
+   glutInitDisplayMode(GLUT_DOUBLE | GLUT_DEPTH);
+   win = glutCreateWindow(*argv);
+   if (!win) {
+      return 1;
+   }
+   Init();
+   glutReshapeFunc(Reshape);
+   glutKeyboardFunc(Key);
+   glutDisplayFunc(Draw);
+   glutMainLoop();
+   return 0;
+}