Merge remote-tracking branch 'origin/master' into pipe-video

[mesa.git] / src / glsl / program.h

diff --git a/src/glsl/program.h b/src/glsl/program.h
index 0a49203d4b2f918edea159ee90b8320f967cf6ac..db602fa9ec2ee0838261f711224df00949a2b7dd 100644 (file)
--- a/src/glsl/program.h
+++ b/src/glsl/program.h
@@ -21,13 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <GL/gl.h>
-#include "main/mtypes.h"
-
-extern "C" {
-#include "program/prog_parameter.h"
-#include "program/prog_uniform.h"
-}
+#include "main/core.h"
 
 extern void
-link_shaders(struct gl_shader_program *prog);
+link_shaders(struct gl_context *ctx, struct gl_shader_program *prog);