mesa: Fix generic compressed texture formats' handling in glTexImage/glCopyTexImage
authorAnuj Phogat <anuj.phogat@gmail.com>
Tue, 21 Aug 2012 18:03:48 +0000 (11:03 -0700)
committerAnuj Phogat <anuj.phogat@gmail.com>
Tue, 21 Aug 2012 22:00:06 +0000 (15:00 -0700)
commitdf2c4cbcedb2dcf2aa44adaa6462d9becccbea49
tree3e6db794049f1cb6ed01396657b073c4b89474af
parent1cb07bd3b8abd5e52e9dbd80bb1666058545387e
mesa: Fix generic compressed texture formats' handling in glTexImage/glCopyTexImage

The generic texture formats should be accepted by the <internalformat>
parameter of TexImage1D, TexImage2D, TexImage3D, CopyTexImage1D, and
CopyTexImage2D functions. When the application specifies a generic
format, the driver is free to pick an uncompressed format.

This patch reverts the changes due to following commit:
commit a36581ccc06693231011c3fe136207e73191b1ce
mesa: do more teximage error checking for generic compressed formats

This patch fixes compressed texture format failures in intel oglconform
pxconv-gettex test case:
https://bugs.freedesktop.org/show_bug.cgi?id=47220

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
src/mesa/main/teximage.c