diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-02-13 01:11:25 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-02-13 01:11:25 +1000 |
| commit | 53116910b10e3b8a05f42970eff311c21808699f (patch) | |
| tree | 6831e50a56a02fed324f8cb119e05d837e00d7cf /progs/samples/blendeq.c | |
| parent | 7e104f9cde94279a902b408e8d1cf21779b393a8 (diff) | |
| parent | 0ccbc3c905f0594a35d72887a1f115e148aaa596 (diff) | |
Merge remote branch 'origin/master' into radeon-rewrite
Conflicts:
configure.ac
src/mesa/drivers/dri/r200/r200_context.c
src/mesa/drivers/dri/r300/r300_render.c
Diffstat (limited to 'progs/samples/blendeq.c')
| -rw-r--r-- | progs/samples/blendeq.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/progs/samples/blendeq.c b/progs/samples/blendeq.c index d5143ecdf5..cd0474c5ce 100644 --- a/progs/samples/blendeq.c +++ b/progs/samples/blendeq.c @@ -11,10 +11,7 @@ #include <string.h> #include <stdlib.h> #include <stdio.h> -#ifdef _WIN32 -#include <windows.h> -#endif -#define GL_GLEXT_PROTOTYPES +#include <GL/glew.h> #include <GL/glut.h> GLenum doubleBuffer; @@ -274,6 +271,8 @@ int main(int argc, char **argv) exit(1); } + glewInit(); + /* Make sure blend_logic_op extension is there. */ s = (char *) glGetString(GL_EXTENSIONS); version = (char*) glGetString(GL_VERSION); |