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/fbo_firecube.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/fbo_firecube.c')
| -rw-r--r-- | progs/demos/fbo_firecube.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/progs/demos/fbo_firecube.c b/progs/demos/fbo_firecube.c index f5ee82a2f1..4e42924a09 100644 --- a/progs/demos/fbo_firecube.c +++ b/progs/demos/fbo_firecube.c @@ -29,11 +29,11 @@ * */ -#define GL_GLEXT_PROTOTYPES #include <math.h> #include <stdlib.h> #include <stdio.h> #include <string.h> +#include <GL/glew.h> #include <GL/glut.h> #include "readtex.h" @@ -1037,6 +1037,7 @@ main(int argc, char *argv[]) glutInitWindowSize(WinWidth, WinHeight); Win = glutCreateWindow("fbo_firecube"); + glewInit(); init(argc, argv); glutDisplayFunc(draw); |