On Sun 16 Aug 2015, Nanley Chery wrote: > The last line of the commit message should say: > > GL_RGBA4_S3TC (0x83A3) -> COMPRESSED_RGBA_S3TC_DXT5_EXT (0x83F3)
There's another weird line too, see below. > On Wed, Aug 12, 2015 at 4:19 PM, Nanley Chery <nanleych...@gmail.com> wrote: > > > From: Nanley Chery <nanley.g.ch...@intel.com> > > > > This function's cases for non-generic compressed formats duplicate > > the GL to MESA translation in _mesa_glenum_to_compressed_format(). > > This patch replaces the switch cases with a call to the translation > > function. There are no behavioral changes except for the RGB[A]4 formats: > > > > case GL_RGB4_S3TC: > > return MESA_FORMAT_RGB_DXT1 (old) -> MESA_FORMAT_RGBA_DXT1 (new) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ I have trouble believing this line is correct. It adds an alpha channel. Can you provide the documentation for that translation? > > case GL_RGBA4_S3TC: > > return MESA_FORMAT_RGBA_DXT3 (old) -> MESA_FORMAT_RGBA_DXT5 (new) > > > > Although unclear, the old behavior was likely a bug, given that online > > documentation (few and far between) imply a format mapping of the > > following: > > > > GL_RGB_S3TC (0x83A0) -> COMPRESSED_RGB_S3TC_DXT1_EXT (0x83F0) > > GL_RGB4_S3TC (0x83A1) -> COMPRESSED_RGBA_S3TC_DXT1_EXT (0x83F1) > > GL_RGBA_S3TC (0x83A2) -> COMPRESSED_RGBA_S3TC_DXT3_EXT (0x83F2) > > GL_RGBA4_S3TC (0x83A2) -> COMPRESSED_RGBA_S3TC_DXT5_EXT (0x83F2) > > > > Cc: Brian Paul <bri...@vmware.com> > > Cc: Ian Romanick <ian.d.roman...@intel.com> > > Signed-off-by: Nanley Chery <nanley.g.ch...@intel.com> > > --- > > src/mesa/main/texformat.c | 94 > > +++++++---------------------------------------- > > 1 file changed, 13 insertions(+), 81 deletions(-) _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev