X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fglformats.h;h=0a65ef6cace954fa4229bd940cefda849c9f7404;hb=a0d667036d8c8b77fa62f74263583b07909f8637;hp=b3668556da2dad5f1b768f48d40870d389a0bd1a;hpb=0396eaaf80c5d7955d7926c4e448f006c7682d2e;p=mesa.git

diff --git a/src/mesa/main/glformats.h b/src/mesa/main/glformats.h
index b3668556da2..0a65ef6cace 100644
--- a/src/mesa/main/glformats.h
+++ b/src/mesa/main/glformats.h
@@ -28,6 +28,7 @@
 #define GLFORMATS_H
 
 
+#include <stdbool.h>
 #include <GL/gl.h>
 
 
@@ -35,6 +36,8 @@
 extern "C" {
 #endif
 
+struct gl_context;
+
 extern void
 _mesa_compute_component_mapping(GLenum inFormat, GLenum outFormat, GLubyte *map);
 
@@ -59,6 +62,9 @@ _mesa_bytes_per_vertex_attrib(GLint comps, GLenum type);
 extern GLboolean
 _mesa_is_astc_format(GLenum internalFormat);
 
+extern GLboolean
+_mesa_is_etc2_format(GLenum internalFormat);
+
 extern GLboolean
 _mesa_is_type_unsigned(GLenum type);
 
@@ -101,6 +107,9 @@ _mesa_is_depth_or_stencil_format(GLenum format);
 extern GLboolean
 _mesa_is_compressed_format(const struct gl_context *ctx, GLenum format);
 
+extern GLboolean
+_mesa_is_srgb_format(GLenum format);
+
 extern GLenum
 _mesa_base_format_to_integer_format(GLenum format);
 
@@ -110,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);
 
@@ -132,15 +138,30 @@ _mesa_es_error_check_format_and_type(const struct gl_context *ctx,
                                      unsigned dimensions);
 
 extern GLenum
-_mesa_es3_error_check_format_and_type(const struct gl_context *ctx,
-                                      GLenum format, GLenum type,
-                                      GLenum internalFormat);
+_mesa_gles_error_check_format_and_type(const struct gl_context *ctx,
+                                       GLenum format, GLenum type,
+                                       GLenum internalFormat);
 extern GLint
 _mesa_base_tex_format(const struct gl_context *ctx, GLint internalFormat );
 
 extern uint32_t
 _mesa_format_from_format_and_type(GLenum format, GLenum type);
 
+bool
+_mesa_swap_bytes_in_type_enum(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(const struct gl_context *ctx,
+                              GLenum internal_format);
+
+extern bool
+_mesa_is_es3_texture_filterable(const struct gl_context *ctx,
+                                GLenum internal_format);
+
 #ifdef __cplusplus
 }
 #endif