main/base_tex_format: Properly handle STENCIL_INDEX1/4/16

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

diff --git a/src/mesa/main/glformats.h b/src/mesa/main/glformats.h
index 1a7b569b2e9e686866640570cecdc537706a3f89..e1ecd64d5f9b439381f24e95ddd3e31ab549e3e7 100644 (file)
--- a/src/mesa/main/glformats.h
+++ b/src/mesa/main/glformats.h
@@ -18,9 +18,10 @@
  * 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 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.
+ * 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
@@ -34,6 +35,9 @@
 extern "C" {
 #endif
 
+extern void
+_mesa_compute_component_mapping(GLenum inFormat, GLenum outFormat, GLubyte *map);
+
 extern GLboolean
 _mesa_type_is_packed(GLenum type);
 
@@ -53,10 +57,16 @@ extern GLint
 _mesa_bytes_per_vertex_attrib(GLint comps, GLenum type);
 
 extern GLboolean
-_mesa_is_type_integer(GLenum type);
+_mesa_is_type_unsigned(GLenum type);
 
 extern GLboolean
-_mesa_is_type_unsigned(GLenum type);
+_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 +77,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);
 
@@ -88,9 +95,6 @@ _mesa_is_depthstencil_format(GLenum format);
 extern GLboolean
 _mesa_is_depth_or_stencil_format(GLenum format);
 
-extern GLboolean
-_mesa_is_dudv_format(GLenum format);
-
 extern GLboolean
 _mesa_is_compressed_format(struct gl_context *ctx, GLenum format);
 
@@ -121,9 +125,12 @@ _mesa_es_error_check_format_and_type(GLenum format, GLenum type,
                                      unsigned dimensions);
 
 extern GLenum
-_mesa_es3_error_check_format_and_type(GLenum format, GLenum type,
+_mesa_es3_error_check_format_and_type(const struct gl_context *ctx,
+                                      GLenum format, GLenum type,
                                       GLenum internalFormat);
 
+extern uint32_t
+_mesa_format_from_format_and_type(GLenum format, GLenum type);
 
 #ifdef __cplusplus
 }