Mesa (master): mesa: add missing ETC2_SRGB cases in formats.c

[Brian Paul]

Module: Mesa
Branch: master
Commit: 91567b83bfd8979389f66635c50f36714a08a3f5
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=91567b83bfd8979389f66635c50f36714a08a3f5

Author: Brian Paul <bri...@vmware.com>
Date:   Tue Jan 21 16:08:18 2014 -0800

mesa: add missing ETC2_SRGB cases in formats.c

In the _mesa_get_format_color_encoding() and _mesa_get_srgb_format_linear()
functions.

Reviewed-by: Marek Olšák <marek.ol...@amd.com>

---

 src/mesa/main/formats.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index 1246c4d..7bde1f1 100644
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -2032,6 +2032,9 @@ _mesa_get_format_color_encoding(gl_format format)
    case MESA_FORMAT_SRGBA_DXT3:
    case MESA_FORMAT_SRGBA_DXT5:
    case MESA_FORMAT_XBGR8888_SRGB:
+   case MESA_FORMAT_ETC2_SRGB8:
+   case MESA_FORMAT_ETC2_SRGB8_ALPHA8_EAC:
+   case MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1:
       return GL_SRGB;
    default:
       return GL_LINEAR;
@@ -2077,6 +2080,15 @@ _mesa_get_srgb_format_linear(gl_format format)
    case MESA_FORMAT_XBGR8888_SRGB:
       format = MESA_FORMAT_RGBX8888_REV;
       break;
+   case MESA_FORMAT_ETC2_SRGB8:
+      format = MESA_FORMAT_ETC2_RGB8;
+      break;
+   case MESA_FORMAT_ETC2_SRGB8_ALPHA8_EAC:
+      format = MESA_FORMAT_ETC2_RGBA8_EAC;
+      break;
+   case MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1:
+      format = MESA_FORMAT_ETC2_RGB8_PUNCHTHROUGH_ALPHA1;
+      break;
    default:
       break;
    }

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit