diff options
| author | Neil Roberts <neil@linux.intel.com> | 2016-01-21 17:28:07 +0000 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2016-01-21 21:45:53 +0000 |
| commit | cbf0e64ee1e2d4514dbec9e4fbf688098fcef318 (patch) | |
| tree | 099eb1b92a0d13c4e90db1c32759f731732b00dd /src/mesa | |
| parent | 666d96d1697fc9a1452519285758cc16240290d2 (diff) | |
| download | external_mesa3d-cbf0e64ee1e2d4514dbec9e4fbf688098fcef318.zip external_mesa3d-cbf0e64ee1e2d4514dbec9e4fbf688098fcef318.tar.gz external_mesa3d-cbf0e64ee1e2d4514dbec9e4fbf688098fcef318.tar.bz2 | |
texobj: Remove redundant checks that the texture cube faces match size
The texture mipmap completeness checking code was checking whether all
of the faces have the same size. However this is pointless because the
code just above it checks whether the face has the expected size
calculated for the mipmap level anyway so the error condition could
never be reached. This patch just removes it.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/texobj.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index 9ce7b4c..e926c7b 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -868,16 +868,6 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx, img->Depth2); return; } - - /* Extra checks for cube textures */ - if (face > 0) { - /* check that cube faces are the same size */ - if (img->Width2 != t->Image[0][i]->Width2 || - img->Height2 != t->Image[0][i]->Height2) { - incomplete(t, MIPMAP, "CubeMap Image[n][i] bad size"); - return; - } - } } } |