diff options
| author | Laura Ekstrand <laura@jlekstrand.net> | 2015-03-17 09:43:52 -0700 |
|---|---|---|
| committer | Laura Ekstrand <laura@jlekstrand.net> | 2015-03-17 10:04:10 -0700 |
| commit | 44ecf0793d872e771edc448436f7a2fd7c3390f5 (patch) | |
| tree | 83a17a2ebcd9eb38ab141a676ff7b5757f48b2b0 /src/mesa/main/texobj.c | |
| parent | 5a06ee7384934f8b5177b2f01bb7dff08b370145 (diff) | |
| download | external_mesa3d-44ecf0793d872e771edc448436f7a2fd7c3390f5.zip external_mesa3d-44ecf0793d872e771edc448436f7a2fd7c3390f5.tar.gz external_mesa3d-44ecf0793d872e771edc448436f7a2fd7c3390f5.tar.bz2 | |
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>
Diffstat (limited to 'src/mesa/main/texobj.c')
| -rw-r--r-- | src/mesa/main/texobj.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index a99b108..e018ab9 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -879,10 +879,6 @@ _mesa_cube_level_complete(const struct gl_texture_object *texObj, if (texObj->Target != GL_TEXTURE_CUBE_MAP) return GL_FALSE; - /* Make sure we have enough image planes for a cube map. */ - if (texObj->NumLayers < 6) - return GL_FALSE; - if ((level < 0) || (level >= MAX_TEXTURE_LEVELS)) return GL_FALSE; |