mesa: Remove broken assertion about enabled texture targets.
authorKenneth Graunke <kenneth@whitecape.org>
Thu, 25 Jul 2013 21:47:58 +0000 (14:47 -0700)
committerKenneth Graunke <kenneth@whitecape.org>
Tue, 30 Jul 2013 05:35:37 +0000 (22:35 -0700)
commit07cdf426c108eca93ac8ff3c682e2c800a5f5d20
treeaf6deaedf488e99ad2b34a54aa233c2479befb9d
parent488b3ed6f40df4608f7d02758ffd4ab7070c782e
mesa: Remove broken assertion about enabled texture targets.

For GLSL programs, enabledTargets can have more than one bit set.  For
example, a shader that uses sampler2D and samplerCube uniforms will have
both TEXTURE_2D_BIT and TEXTURE_CUBE_BIT set.

The code that sets _ReallyEnabled already handles this, selecting the
"highest priority" texture target.  We should simply use that.

Fixes new Piglit test incomplete-textures-of-multiple-types.

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