summaryrefslogtreecommitdiff
path: root/progs/util
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-06-30 08:56:53 -0600
committerBrian Paul <brianp@vmware.com>2009-06-30 08:56:53 -0600
commitb40dc7e7fcafc30ebaa3778ee847c8983987de83 (patch)
treeb8ed89d7d8ba3fc2c25b3e2f95a62b1820557aac /progs/util
parentb750b9fc3d12e4c23ef74181a6252e0e054a3985 (diff)
parent4c31632817a0bde28ad6c9ee8032d838ce4b7bfb (diff)
Merge branch 'mesa_7_5_branch'
Conflicts: src/mesa/vbo/vbo_exec_draw.c
Diffstat (limited to 'progs/util')
-rw-r--r--progs/util/shaderutil.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/progs/util/shaderutil.c b/progs/util/shaderutil.c
index 2f1c4e38b3..5cef84eb49 100644
--- a/progs/util/shaderutil.c
+++ b/progs/util/shaderutil.c
@@ -9,6 +9,7 @@
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
+#include <GL/glew.h>
#include <GL/glut.h>
#include "extfuncs.h"
#include "shaderutil.h"
@@ -78,8 +79,12 @@ CompileShaderFile(GLenum shaderType, const char *filename)
int n;
char *buffer = (char*) malloc(max);
GLuint shader;
+ FILE *f;
- FILE *f = fopen(filename, "r");
+ Init();
+
+
+ f = fopen(filename, "r");
if (!f) {
fprintf(stderr, "Unable to open shader file %s\n", filename);
return 0;