mesa: Fix unpack function for ETC2_SRGB8_PUNCHTHROUGH_ALPHA1. 70/6170/1
authorKenneth Graunke <kenneth@whitecape.org>
Tue, 23 Apr 2013 05:58:49 +0000 (22:58 -0700)
committerKenneth Graunke <kenneth@whitecape.org>
Wed, 24 Apr 2013 05:12:50 +0000 (22:12 -0700)
We accidentally set MESA_FORMAT_ETC2_RGB8_PUNCHTHROUGH_ALPHA1 twice,
rather than setting the RGB8 and SRGB8 formats.

NOTE: This is a candidate for stable branches.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=63569
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
src/mesa/main/format_unpack.c

index e583178..03221c3 100644 (file)
@@ -1853,7 +1853,7 @@ get_unpack_rgba_function(gl_format format)
       table[MESA_FORMAT_ETC2_SIGNED_RG11_EAC] = unpack_ETC2_SIGNED_RG11_EAC;
       table[MESA_FORMAT_ETC2_RGB8_PUNCHTHROUGH_ALPHA1] =
          unpack_ETC2_RGB8_PUNCHTHROUGH_ALPHA1;
-      table[MESA_FORMAT_ETC2_RGB8_PUNCHTHROUGH_ALPHA1] =
+      table[MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1] =
          unpack_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1;
       table[MESA_FORMAT_SIGNED_A8] = unpack_SIGNED_A8;
       table[MESA_FORMAT_SIGNED_L8] = unpack_SIGNED_L8;