From cbf0e64ee1e2d4514dbec9e4fbf688098fcef318 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Thu, 21 Jan 2016 17:28:07 +0000 Subject: 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 --- src/mesa/main/texobj.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/mesa/main') diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index 9ce7b4c4754..e926c7b6cd2 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; - } - } } } -- cgit v1.2.3