Revert "main: _mesa_cube_level_complete checks NumLayers."
authorLaura Ekstrand <laura@jlekstrand.net>
Tue, 17 Mar 2015 16:43:52 +0000 (09:43 -0700)
committerLaura Ekstrand <laura@jlekstrand.net>
Tue, 17 Mar 2015 17:04:10 +0000 (10:04 -0700)
commit44ecf0793d872e771edc448436f7a2fd7c3390f5
tree83a17a2ebcd9eb38ab141a676ff7b5757f48b2b0
parent5a06ee7384934f8b5177b2f01bb7dff08b370145
Revert "main: _mesa_cube_level_complete checks NumLayers."

This reverts commit 1ee000a0b6737d6c140d4f07b6044908b8ebfdc7.
Failures with the GLES3 conformance suite and Synmark2 OGLHdrBloom revealed
that this commit was in error.

Extensive testing with Piglit prior to patch review and upstreaming did not
reveal this problem because, in the few Piglit tests that test for cube
completeness, NumLayers = 6.  This is because all of the existing tests use
TextureStorage to initialize the texture, which sets NumLayers.

A new Piglit test has been sent to the mailing list that reproduces the bug
related to this patch ("texturing: Testing
glGenerateMipmap(GL_TEXTURE_CUBE_MAP) without glTexStorage2D").

Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
src/mesa/main/texobj.c