summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2009-04-18 13:08:48 -0600
committerBrian Paul <[email protected]>2009-04-18 13:08:48 -0600
commit22af013f85debd0030f2fb00061ce0412fdc0797 (patch)
treeac5494b339fc097c2c46211c8f66acbcf4ac2152
parent49c3e7172db1ee2afef6bcd19c3cd55dbe60bd33 (diff)
demos: move tests/dinoshade.c to demos/
-rw-r--r--progs/demos/Makefile1
-rw-r--r--progs/demos/dinoshade.c (renamed from progs/tests/dinoshade.c)6
-rw-r--r--progs/tests/Makefile1
3 files changed, 4 insertions, 4 deletions
diff --git a/progs/demos/Makefile b/progs/demos/Makefile
index 2fe407972d7..8febc14d410 100644
--- a/progs/demos/Makefile
+++ b/progs/demos/Makefile
@@ -19,6 +19,7 @@ PROGS = \
clearspd \
copypix \
cubemap \
+ dinoshade \
drawpix \
engine \
fbo_firecube \
diff --git a/progs/tests/dinoshade.c b/progs/demos/dinoshade.c
index fb7c3f4535c..451da2ec895 100644
--- a/progs/tests/dinoshade.c
+++ b/progs/demos/dinoshade.c
@@ -165,7 +165,7 @@ enum {
};
/* Create a matrix that will project the desired shadow. */
-void
+static void
shadowMatrix(GLfloat shadowMat[4][4],
GLfloat groundplane[4],
GLfloat lightpos[4])
@@ -201,7 +201,7 @@ shadowMatrix(GLfloat shadowMat[4][4],
}
/* Find the plane equation given 3 points. */
-void
+static void
findPlane(GLfloat plane[4],
GLfloat v0[3], GLfloat v1[3], GLfloat v2[3])
{
@@ -224,7 +224,7 @@ findPlane(GLfloat plane[4],
plane[D] = -(plane[A] * v0[X] + plane[B] * v0[Y] + plane[C] * v0[Z]);
}
-void
+static void
extrudeSolidFromPolygon(GLfloat data[][2], unsigned int dataSize,
GLdouble thickness, GLuint side, GLuint edge, GLuint whole)
{
diff --git a/progs/tests/Makefile b/progs/tests/Makefile
index 24275fdc2f1..e5da72a3e4b 100644
--- a/progs/tests/Makefile
+++ b/progs/tests/Makefile
@@ -37,7 +37,6 @@ SOURCES = \
copypixrate.c \
crossbar.c \
cva.c \
- dinoshade.c \
drawbuffers.c \
exactrast.c \
floattex.c \