diff options
| author | Brian Paul <brianp@vmware.com> | 2009-02-09 09:22:22 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-02-09 09:22:22 -0700 |
| commit | e97681c7f551a2a2a6bd5eff0f4192a870c816c0 (patch) | |
| tree | dff2bf0e6d22efb92af131f64be0621ed316977c /progs/demos/spriteblast.c | |
| parent | 1a46c8a062aea59de5cf55881104489db5d609e5 (diff) | |
| parent | b907d4cd8fafe719b4f87d877562829548937485 (diff) | |
mesa: merge gallium-0.2 into gallium-master-merge
Merge commit 'origin/gallium-0.2' into gallium-master-merge
Conflicts:
Makefile
docs/relnotes-7.4.html
docs/relnotes.html
src/mesa/drivers/dri/i965/brw_wm.h
src/mesa/main/imports.c
src/mesa/main/mtypes.h
src/mesa/main/texcompress.c
src/mesa/main/texenvprogram.c
src/mesa/main/version.h
src/mesa/vbo/vbo_exec_api.c
src/mesa/vbo/vbo_save_draw.c
Diffstat (limited to 'progs/demos/spriteblast.c')
| -rw-r--r-- | progs/demos/spriteblast.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/progs/demos/spriteblast.c b/progs/demos/spriteblast.c index 5ad8e4d9a9..f6630c25d0 100644 --- a/progs/demos/spriteblast.c +++ b/progs/demos/spriteblast.c @@ -21,7 +21,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... */ @@ -509,6 +509,7 @@ main(int argc, char **argv) glutInitWindowPosition(0, 0); glutInitWindowSize(600,300); glutCreateWindow("sprite blast"); + glewInit(); glutReshapeFunc(reshape); glutDisplayFunc(redraw); glutMouseFunc(mouse); |