Merge remote branch 'origin/master' into glsl2

[mesa.git] / src / glsl / linker.cpp

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 7c30a40a6ce1fb89bb16489637e9989c35b26a52..ea0274eac33d96381d342c94d14ef6459e355e55 100644 (file)
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -74,11 +74,11 @@ extern "C" {
 
 #include "main/mtypes.h"
 #include "main/macros.h"
+#include "main/shaderobj.h"
 #include "glsl_symbol_table.h"
 #include "ir.h"
 #include "program.h"
 #include "hash_table.h"
-#include "shader_api.h"
 #include "linker.h"
 #include "ir_optimization.h"