i965: make sure check_and_emit_atom gets inlined

[mesa.git] / src / mesa / state_tracker / st_format.h

diff --git a/src/mesa/state_tracker/st_format.h b/src/mesa/state_tracker/st_format.h
index 90e00e8ebf62857ffe81d217f9045c8e096cbc75..3dd9c10341a04ac55345e37c353530f07257f3a1 100644 (file)
--- a/src/mesa/state_tracker/st_format.h
+++ b/src/mesa/state_tracker/st_format.h
@@ -36,12 +36,16 @@
 #include "pipe/p_defines.h"
 #include "pipe/p_format.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct gl_context;
 struct pipe_screen;
 
 
 extern enum pipe_format
-st_mesa_format_to_pipe_format(struct st_context *st, mesa_format mesaFormat);
+st_mesa_format_to_pipe_format(const struct st_context *st, mesa_format mesaFormat);
 
 extern mesa_format
 st_pipe_format_to_mesa_format(enum pipe_format pipeFormat);
@@ -66,15 +70,17 @@ st_ChooseTextureFormat(struct gl_context * ctx, GLenum target,
                        GLint internalFormat,
                        GLenum format, GLenum type);
 
-size_t
-st_QuerySamplesForFormat(struct gl_context *ctx, GLenum target,
-                         GLenum internalFormat, int samples[16]);
-
-
+void
+st_QueryInternalFormat(struct gl_context *ctx, GLenum target,
+                       GLenum internalFormat, GLenum pname, GLint *params);
 
 extern void
 st_translate_color(const union gl_color_union *colorIn,
                    union pipe_color_union *colorOut,
                    GLenum baseFormat, GLboolean is_integer);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* ST_FORMAT_H */