From: Anuj Phogat <anuj.phogat@gmail.com>
Date: Thu, 11 Feb 2016 20:09:51 +0000 (-0800)
Subject: mesa: Account for astc 3d formats in _mesa_is_astc_format()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cf85ef1618f5d05a1f4017aec6a9fa81cc935e79;p=mesa.git

mesa: Account for astc 3d formats in _mesa_is_astc_format()

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
index 6f862d7848f..6dcdefc3aaa 100644
--- a/src/mesa/main/glformats.c
+++ b/src/mesa/main/glformats.c
@@ -823,10 +823,10 @@ _mesa_is_enum_format_signed_int(GLenum format)
 }
 
 /**
- * Test if the given format is an ASTC format.
+ * Test if the given format is an ASTC 2D format.
  */
-GLboolean
-_mesa_is_astc_format(GLenum internalFormat)
+static bool
+is_astc_2d_format(GLenum internalFormat)
 {
    switch (internalFormat) {
    case GL_COMPRESSED_RGBA_ASTC_4x4_KHR:
@@ -896,6 +896,16 @@ is_astc_3d_format(GLenum internalFormat)
    }
 }
 
+/**
+ * Test if the given format is an ASTC format.
+ */
+GLboolean
+_mesa_is_astc_format(GLenum internalFormat)
+{
+   return is_astc_2d_format(internalFormat) ||
+          is_astc_3d_format(internalFormat);
+}
+
 /**
  * Test if the given format is an integer (non-normalized) format.
  */