diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-09-30 11:57:45 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-09-30 11:57:45 +1000 |
| commit | 8cd046c9b1da31e4ff178816bdfe2ee3451a1553 (patch) | |
| tree | 6b9de732a9d75c3005a80b078af0c97b9cb6c0ab /progs/demos | |
| parent | 8c14bd6992e338da8e467775b0237c8db7cbe44d (diff) | |
| parent | 5dc8e67078be8b8c42a809311debd275ac7d64a7 (diff) | |
Merge remote branch 'origin/gallium-0.2' into gallium-0.2
Diffstat (limited to 'progs/demos')
| -rw-r--r-- | progs/demos/.gitignore | 1 | ||||
| -rw-r--r-- | progs/demos/fslight.c | 2 | ||||
| -rw-r--r-- | progs/demos/rain.cxx | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/progs/demos/.gitignore b/progs/demos/.gitignore index 3693fafd4e..f033a0505d 100644 --- a/progs/demos/.gitignore +++ b/progs/demos/.gitignore @@ -8,6 +8,7 @@ cubemap drawpix engine extfuncs.h +fbo_firecube fire fogcoord fplight diff --git a/progs/demos/fslight.c b/progs/demos/fslight.c index e79b5cc197..c7931f4697 100644 --- a/progs/demos/fslight.c +++ b/progs/demos/fslight.c @@ -45,7 +45,7 @@ static GLint uTexture; static GLuint SphereList, RectList, CurList; static GLint win = 0; -static GLboolean anim = GL_TRUE; +static GLboolean anim = 0*GL_TRUE; static GLboolean wire = GL_FALSE; static GLboolean pixelLight = GL_TRUE; diff --git a/progs/demos/rain.cxx b/progs/demos/rain.cxx index 5c53d4248c..59b6471ef8 100644 --- a/progs/demos/rain.cxx +++ b/progs/demos/rain.cxx @@ -114,7 +114,7 @@ static void calcposobs(void) rainParticle::setRainingArea(obs[0]-7.0f,-0.2f,obs[2]-7.0f,obs[0]+7.0f,8.0f,obs[2]+7.0f); } -static void printstring(void *font, char *string) +static void printstring(void *font, const char *string) { int len,i; |