mesa: Fix regression introduced by commit "mesa: fix packing of float texels to GL_SH...
authorPavel Popov <pavel.e.popov@intel.com>
Mon, 30 Jun 2014 15:21:56 +0000 (22:21 +0700)
committerChris Forbes <chrisf@ijw.co.nz>
Thu, 17 Jul 2014 20:01:07 +0000 (08:01 +1200)
commit4ceb612a10d7776631b196ae13be9c5588154468
tree293424745e0a418273427bbef9e719c6ac0610a2
parent3cfe6bc9cc369b29e5475b1bb0c60bbb37a6a1a2
mesa: Fix regression introduced by commit "mesa: fix packing of float texels to GL_SHORT/GL_BYTE".

This commit "mesa: fix packing of float texels to GL_SHORT/GL_BYTE" replaced *_TO_BYTE to *_TO_BYTE_TEX because *_TO_FLOAT_TEX are used to unpack the texels to floats.
In this case *_TO_FLOATZ in function extract_float_rgba also should be replaced to *_TO_FLOAT_TEX. Underline that these macros automatically preserve zero when converting.

The regression was observed on 3 oglconform tests:
    snorm-textures basic.getTexImage
    snorm-textures advanced.mipmap.manual.getTex
    snorm-textures advanced.mipmap.upload.getTex

Signed-off-by: Pavel Popov <pavel.e.popov@intel.com>
Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>
src/mesa/main/pack.c