mesa: Add missing include guards

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

diff --git a/src/mesa/main/glformats.h b/src/mesa/main/glformats.h
index 763307f259316201c7b0a0ae1f585f27a492e447..0aefdf50fef8ab508c7cd6d964d9bd9741e820c5 100644 (file)
--- a/src/mesa/main/glformats.h
+++ b/src/mesa/main/glformats.h
@@ -36,6 +36,8 @@
 extern "C" {
 #endif
 
+struct gl_context;
+
 extern void
 _mesa_compute_component_mapping(GLenum inFormat, GLenum outFormat, GLubyte *map);
 
@@ -117,9 +119,6 @@ _mesa_unpack_format_to_base_format(GLenum format);
 extern GLboolean
 _mesa_base_format_has_channel(GLenum base_format, GLenum pname);
 
-extern GLint
-_mesa_base_format_component_count(GLenum base_format);
-
 extern GLenum
 _mesa_generic_compressed_format_to_uncompressed_format(GLenum format);
 
@@ -148,8 +147,13 @@ _mesa_base_tex_format(const struct gl_context *ctx, GLint internalFormat );
 extern uint32_t
 _mesa_format_from_format_and_type(GLenum format, GLenum type);
 
+extern uint32_t
+_mesa_tex_format_from_format_and_type(const struct gl_context *ctx,
+                                      GLenum gl_format, GLenum type);
+
 extern bool
-_mesa_is_es3_color_renderable(GLenum internal_format);
+_mesa_is_es3_color_renderable(const struct gl_context *ctx,
+                              GLenum internal_format);
 
 extern bool
 _mesa_is_es3_texture_filterable(const struct gl_context *ctx,