diff options
| author | Brian Paul <brianp@vmware.com> | 2009-02-10 16:44:02 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-02-10 16:44:02 -0700 |
| commit | 5340b6dff73a0a23531ce2a5f28fba8303adab6e (patch) | |
| tree | b141fc3648568dd8b941c966059e6ed32a8bd0ad /progs/demos/pointblast.c | |
| parent | 9fd26daec24f21dbe17afcb2e2ab272667ee9a69 (diff) | |
| parent | ee4c921b65fb76998711f3c40330505cbc49a0e0 (diff) | |
Merge commit 'origin/gallium-master-merge'
This is the big merge of the gallium-0.2 branch into master.
gallium-master-merge was just the staging area for it.
Both gallium-0.2 and gallium-master-merge are considered closed now.
Conflicts:
progs/demos/Makefile
src/mesa/main/state.c
src/mesa/main/texenvprogram.c
Diffstat (limited to 'progs/demos/pointblast.c')
| -rw-r--r-- | progs/demos/pointblast.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/progs/demos/pointblast.c b/progs/demos/pointblast.c index dbbe2f35a2..2a91b76ad3 100644 --- a/progs/demos/pointblast.c +++ b/progs/demos/pointblast.c @@ -18,7 +18,7 @@ #ifdef _WIN32 #include <windows.h> #endif -#define GL_GLEXT_PROTOTYPES +#include <GL/glew.h> #include <GL/glut.h> /* Some <math.h> files do not define M_PI... */ @@ -444,6 +444,7 @@ main(int argc, char **argv) } glutCreateWindow("point burst"); + glewInit(); glutDisplayFunc(redraw); glutMouseFunc(mouse); glutMotionFunc(mouseMotion); |