util: use standard name for strdup()

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

diff --git a/src/mesa/program/program.h b/src/mesa/program/program.h
index 18122f75b742df4fc519d76bd91b00ee90b2ae5e..49e888e57df248e60ebff7921653c15e0e9934aa 100644 (file)
--- a/src/mesa/program/program.h
+++ b/src/mesa/program/program.h
@@ -40,8 +40,7 @@
 #ifndef PROGRAM_H
 #define PROGRAM_H
 
-#include "main/compiler.h"
-#include "main/mtypes.h"
+#include "prog_parameter.h"
 
 
 #ifdef __cplusplus
@@ -64,10 +63,12 @@ extern void
 _mesa_set_program_error(struct gl_context *ctx, GLint pos, const char *string);
 
 extern struct gl_program *
-_mesa_init_gl_program(struct gl_program *prog, GLenum target, GLuint id);
+_mesa_init_gl_program(struct gl_program *prog, GLenum target, GLuint id,
+                      bool is_arb_asm);
 
 extern struct gl_program *
-_mesa_new_program(struct gl_context *ctx, GLenum target, GLuint id);
+_mesa_new_program(struct gl_context *ctx, GLenum target, GLuint id,
+                  bool is_arb_asm);
 
 extern void
 _mesa_delete_program(struct gl_context *ctx, struct gl_program *prog);
@@ -107,8 +108,7 @@ _mesa_find_free_register(const GLboolean used[],
 
 extern GLint
 _mesa_get_min_invocations_per_fragment(struct gl_context *ctx,
-                                       const struct gl_program *prog,
-                                       bool ignore_sample_qualifier);
+                                       const struct gl_program *prog);
 
 static inline GLuint
 _mesa_program_enum_to_shader_stage(GLenum v)
@@ -157,6 +157,11 @@ _mesa_shader_stage_to_program(unsigned stage)
    return GL_VERTEX_PROGRAM_ARB;
 }
 
+
+GLbitfield
+gl_external_samplers(const struct gl_program *prog);
+
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif