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

diff --git a/src/mesa/main/glformats.h b/src/mesa/main/glformats.h
index cdd2b942716..0a65ef6cace 100644
--- a/src/mesa/main/glformats.h
+++ b/src/mesa/main/glformats.h
@@ -18,15 +18,17 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #ifndef GLFORMATS_H
 #define GLFORMATS_H
 
 
+#include <stdbool.h>
 #include <GL/gl.h>
 
 
@@ -34,6 +36,11 @@
 extern "C" {
 #endif
 
+struct gl_context;
+
+extern void
+_mesa_compute_component_mapping(GLenum inFormat, GLenum outFormat, GLubyte *map);
+
 extern GLboolean
 _mesa_type_is_packed(GLenum type);
 
@@ -53,11 +60,23 @@ extern GLint
 _mesa_bytes_per_vertex_attrib(GLint comps, GLenum type);
 
 extern GLboolean
-_mesa_is_type_integer(GLenum type);
+_mesa_is_astc_format(GLenum internalFormat);
+
+extern GLboolean
+_mesa_is_etc2_format(GLenum internalFormat);
 
 extern GLboolean
 _mesa_is_type_unsigned(GLenum type);
 
+extern GLboolean
+_mesa_is_enum_format_unsized(GLenum format);
+
+extern GLboolean
+_mesa_is_enum_format_unorm(GLenum format);
+
+extern GLboolean
+_mesa_is_enum_format_snorm(GLenum format);
+
 extern GLboolean
 _mesa_is_enum_format_integer(GLenum format);
 
@@ -67,9 +86,6 @@ _mesa_is_enum_format_unsigned_int(GLenum format);
 extern GLboolean
 _mesa_is_enum_format_signed_int(GLenum format);
 
-extern GLboolean
-_mesa_is_enum_format_or_type_integer(GLenum format, GLenum type);
-
 extern GLboolean
 _mesa_is_color_format(GLenum format);
 
@@ -89,20 +105,20 @@ extern GLboolean
 _mesa_is_depth_or_stencil_format(GLenum format);
 
 extern GLboolean
-_mesa_is_dudv_format(GLenum format);
+_mesa_is_compressed_format(const struct gl_context *ctx, GLenum format);
 
 extern GLboolean
-_mesa_is_compressed_format(struct gl_context *ctx, GLenum format);
+_mesa_is_srgb_format(GLenum format);
 
 extern GLenum
 _mesa_base_format_to_integer_format(GLenum format);
 
+extern GLenum
+_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);
 
@@ -117,13 +133,34 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx,
                                   GLenum format, GLenum type);
 
 extern GLenum
-_mesa_es_error_check_format_and_type(GLenum format, GLenum type,
+_mesa_es_error_check_format_and_type(const struct gl_context *ctx,
+                                     GLenum format, GLenum type,
                                      unsigned dimensions);
 
 extern GLenum
-_mesa_es3_error_check_format_and_type(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
 }