Module: Mesa Branch: master Commit: cfd5b14dac6a197be3fa85b5448b45802951aa3d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cfd5b14dac6a197be3fa85b5448b45802951aa3d
Author: Brian Paul <[email protected]> Date: Sat Mar 17 16:30:02 2012 -0600 mesa: use MAX3() macro for 3D texture in _mesa_test_texobj_completeness() Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: José Fonseca <[email protected]> Reviewed-by: Eric Anholt <[email protected]> --- src/mesa/main/texobj.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index 5905948..def09e2 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -465,9 +465,9 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx, maxLevels = ctx->Const.MaxTextureLevels; } else if (t->Target == GL_TEXTURE_3D) { - GLint max = MAX2(t->Image[0][baseLevel]->WidthLog2, - t->Image[0][baseLevel]->HeightLog2); - maxLog2 = MAX2(max, (GLint)(t->Image[0][baseLevel]->DepthLog2)); + maxLog2 = MAX3(t->Image[0][baseLevel]->WidthLog2, + t->Image[0][baseLevel]->HeightLog2, + t->Image[0][baseLevel]->DepthLog2); maxLevels = ctx->Const.Max3DTextureLevels; } else if (t->Target == GL_TEXTURE_CUBE_MAP_ARB) { _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
