diff options
| author | Matt Turner <mattst88@gmail.com> | 2013-03-11 14:57:16 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2013-08-02 09:51:57 -0700 |
| commit | 58548833129f0e197cd84e357b1df14b1b135d96 (patch) | |
| tree | 716077bd03c89e3c60e608bcc4d8d495dd35e644 | |
| parent | 01bdad3173479176e579a8f6bb8309f683c5fa79 (diff) | |
| download | external_mesa3d-58548833129f0e197cd84e357b1df14b1b135d96.zip external_mesa3d-58548833129f0e197cd84e357b1df14b1b135d96.tar.gz external_mesa3d-58548833129f0e197cd84e357b1df14b1b135d96.tar.bz2 | |
mesa: Use MIN3 instead of two MIN2s.
| -rw-r--r-- | src/mesa/main/texobj.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index c395b29..1666a66 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -548,10 +548,11 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx, ASSERT(maxLevels > 0); - t->_MaxLevel = - baseLevel + baseImage->MaxNumLevels - 1; /* 'p' in the GL spec */ - t->_MaxLevel = MIN2(t->_MaxLevel, t->MaxLevel); - t->_MaxLevel = MIN2(t->_MaxLevel, maxLevels - 1); /* 'q' in the GL spec */ + t->_MaxLevel = MIN3(t->MaxLevel, + /* 'p' in the GL spec */ + baseLevel + baseImage->MaxNumLevels - 1, + /* 'q' in the GL spec */ + maxLevels - 1); /* Compute _MaxLambda = q - p in the spec used during mipmapping */ t->_MaxLambda = (GLfloat) (t->_MaxLevel - baseLevel); |