i965: Improve same-buffer restriction for imports

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

diff --git a/src/mesa/program/ir_to_mesa.h b/src/mesa/program/ir_to_mesa.h
index d046b0fcf9bd19bfd82cf94b651b8aba02fb32fa..09446197b24a76264780dae156a4220d510b3395 100644 (file)
--- a/src/mesa/program/ir_to_mesa.h
+++ b/src/mesa/program/ir_to_mesa.h
@@ -21,28 +21,36 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "main/glheader.h"
+#ifndef IR_TO_MESA_H
+#define IR_TO_MESA_H
 
-struct gl_context;
-struct gl_shader;
-struct gl_shader_program;
+#include "main/glheader.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-void _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *sh);
+struct gl_context;
+struct gl_shader;
+struct gl_shader_program;
+
 void _mesa_glsl_link_shader(struct gl_context *ctx, struct gl_shader_program *prog);
-GLboolean _mesa_ir_compile_shader(struct gl_context *ctx, struct gl_shader *shader);
 GLboolean _mesa_ir_link_shader(struct gl_context *ctx, struct gl_shader_program *prog);
 
-#ifdef __cplusplus
-}
-
 void
 _mesa_generate_parameters_list_for_uniforms(struct gl_shader_program
                                            *shader_program,
-                                           struct gl_shader *sh,
+                                           struct gl_linked_shader *sh,
                                            struct gl_program_parameter_list
                                            *params);
+void
+_mesa_associate_uniform_storage(struct gl_context *ctx,
+                               struct gl_shader_program *shader_program,
+                                struct gl_program_parameter_list *params,
+                                bool propagate_to_storage);
+
+#ifdef __cplusplus
+}
 #endif
+
+#endif /* IR_TO_MESA_H */