i915: Only use TEXCOORDTYPE_VECTOR with cube maps on gen2
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Tue, 1 Jul 2014 23:23:20 +0000 (02:23 +0300)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 20 Nov 2014 19:58:57 +0000 (21:58 +0200)
commit390799c496d363e7476afb0dbb8f28cbc6e20807
tree542e55c0c9ea22b3d5e90e8cf8bb24a96d6a9270
parentca39c46c3be82be0a36316e5da32b558c4837aea
i915: Only use TEXCOORDTYPE_VECTOR with cube maps on gen2

Check that the target is GL_TEXTURE_CUBE_MAP before emitting
TEXCOORDTYPE_VECTOR texture coordinates.

I'm not sure if the hardware would like CARTESIAN coordinates
with cube maps, and as I'm too lazy to find out just emit the
VECTOR coordinates for cube maps always. For other targets use
CARTESIAN or HOMOGENOUS depending on the number of texture
coordinates provided.

Fixes rendering of the "electric" background texture in chromium-bsu
main menu. We appear to be provided with three texture coordinates
there (I'm guessing due to the funky texture matrix rotation it does).
So the code would decide to use TEXCOORDTYPE_VECTOR instead of
TEXCOORDTYPE_CARTESIAN even though we're dealing with a 2D texure.
The results weren't what one might expect.

demos/cubemap still works, which hopefully indicates that this doesn't
break things.

Also tested with:
 bin/glean -o -v -v -v -t +texCube --quick
 bin/cubemap -auto
from piglit.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
src/mesa/drivers/dri/i915/i830_vtbl.c