Mesa (master): demos: move tests/dinoshade.c to demos/

Brian Paul brianp at kemper.freedesktop.org
Sat Apr 18 19:16:25 UTC 2009


Module: Mesa
Branch: master
Commit: 22af013f85debd0030f2fb00061ce0412fdc0797
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=22af013f85debd0030f2fb00061ce0412fdc0797

Author: Brian Paul <brianp at vmware.com>
Date:   Sat Apr 18 13:08:48 2009 -0600

demos: move tests/dinoshade.c to demos/

---

 progs/demos/Makefile               |    1 +
 progs/{tests => demos}/dinoshade.c |    6 +++---
 progs/tests/Makefile               |    1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/progs/demos/Makefile b/progs/demos/Makefile
index 2fe4079..8febc14 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
similarity index 99%
rename from progs/tests/dinoshade.c
rename to progs/demos/dinoshade.c
index fb7c3f4..451da2e 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 24275fd..e5da72a 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 \




More information about the mesa-commit mailing list