mesa: reimplement IROUND(), add F_TO_I()

[mesa.git] / src / mesa / main / uniforms.h

diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h
index c73aab3c1d56079e22696c9138ff081750ca7af6..7b512a527597b5fd0d7a246ce3453936f53a7f4c 100644 (file)
--- a/src/mesa/main/uniforms.h
+++ b/src/mesa/main/uniforms.h
@@ -30,6 +30,11 @@
 #include "../glsl/glsl_types.h"
 #include "../glsl/ir_uniform.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 struct gl_program;
 struct _glapi_table;
 
@@ -207,8 +212,12 @@ _mesa_propagate_uniforms_to_driver_storage(struct gl_uniform_storage *uni,
                                           unsigned count);
 
 extern void
-_mesa_update_shader_textures_used(struct gl_program *prog);
+_mesa_update_shader_textures_used(struct gl_shader_program *shProg,
+                                 struct gl_program *prog);
 
+extern bool
+_mesa_sampler_uniforms_are_valid(const struct gl_shader_program *shProg,
+                                char *errMsg, size_t errMsgLength);
 
 extern void
 _mesa_init_shader_uniform_dispatch(struct _glapi_table *exec);
@@ -281,4 +290,10 @@ _mesa_uniform_split_location_offset(GLint location, unsigned *base_location,
 }
 /*@}*/
 
+
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* UNIFORMS_H */