summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/shaderapi.h
diff options
context:
space:
mode:
authorChristian König <[email protected]>2010-11-21 19:40:52 +0100
committerChristian König <[email protected]>2010-11-21 19:40:52 +0100
commite6b71530daea3059ee362d4df51575e27e026b22 (patch)
tree8df01693aa4bf44360647d79a340cbb4156aa91a /src/mesa/main/shaderapi.h
parent42c7291d2cb50c2bd94dd9346a8402a24303d66d (diff)
parent5e3733fadf08178fca7c9f20a0f4783f940383aa (diff)
Merge remote branch 'origin/master' into pipe-video
Conflicts: src/gallium/auxiliary/Makefile src/gallium/auxiliary/SConscript
Diffstat (limited to 'src/mesa/main/shaderapi.h')
-rw-r--r--src/mesa/main/shaderapi.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/main/shaderapi.h b/src/mesa/main/shaderapi.h
index df78351411c..e4b477660dc 100644
--- a/src/mesa/main/shaderapi.h
+++ b/src/mesa/main/shaderapi.h
@@ -28,8 +28,10 @@
#include "glheader.h"
-#include "mtypes.h"
+struct _glapi_table;
+struct gl_context;
+struct gl_shader_program;
extern GLint
_mesa_sizeof_glsl_type(GLenum type);