From: Brian Paul <brianp@vmware.com>
Date: Thu, 29 Oct 2009 15:31:29 +0000 (-0600)
Subject: mesa: remove unneedded is_srgb_teximage() function
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cf7040594e7987c021903f022784e2c6dae2db36;p=mesa.git

mesa: remove unneedded is_srgb_teximage() function

Use _mesa_get_format_color_encoding() function instead.
---

diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
index 1338d4552db..9a88ec9ce3e 100644
--- a/src/mesa/main/texgetimage.c
+++ b/src/mesa/main/texgetimage.c
@@ -44,29 +44,6 @@
 
 #if FEATURE_EXT_texture_sRGB
 
-/**
- * Test if given texture image is an sRGB format.
- */
-static GLboolean
-is_srgb_teximage(const struct gl_texture_image *texImage)
-{
-   switch (texImage->TexFormat) {
-   case MESA_FORMAT_SRGB8:
-   case MESA_FORMAT_SRGBA8:
-   case MESA_FORMAT_SARGB8:
-   case MESA_FORMAT_SL8:
-   case MESA_FORMAT_SLA8:
-   case MESA_FORMAT_SRGB_DXT1:
-   case MESA_FORMAT_SRGBA_DXT1:
-   case MESA_FORMAT_SRGBA_DXT3:
-   case MESA_FORMAT_SRGBA_DXT5:
-      return GL_TRUE;
-   default:
-      return GL_FALSE;
-   }
-}
-
-
 /**
  * Convert a float value from linear space to a
  * non-linear sRGB value in [0, 255].
@@ -224,7 +201,8 @@ _mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
                }
             }
 #if FEATURE_EXT_texture_sRGB
-            else if (is_srgb_teximage(texImage)) {
+            else if (_mesa_get_format_color_encoding(texImage->TexFormat)
+                     == GL_SRGB) {
                /* special case this since need to backconvert values */
                /* convert row to RGBA format */
                GLfloat rgba[MAX_WIDTH][4];