Module: Mesa Branch: master Commit: 3a4f8c8158df304af08681edbbfdfd40e43a6829 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3a4f8c8158df304af08681edbbfdfd40e43a6829
Author: Thong Thai <[email protected]> Date: Tue Jan 7 16:38:25 2020 -0500 mesa: Prevent _MaxLevel from being less than zero When decoding using VDPAU, the _MaxLevel value becomes -1 due to NumLevels being equal to 0 at a certain point, and decoding fails due to an assertion later on. Signed-off-by: Thong Thai <[email protected]> Signed-off-by: Marek Olšák <[email protected]> Cc: 19.2 19.3 <[email protected]> --- src/mesa/main/texobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index 0f124459f75..c5459f4540f 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -757,7 +757,7 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx, /* Adjust max level for views: the data store may have more levels than * the view exposes. */ - t->_MaxLevel = MIN2(t->_MaxLevel, t->NumLevels - 1); + t->_MaxLevel = MAX2(MIN2(t->_MaxLevel, t->NumLevels - 1), 0); } /* Compute _MaxLambda = q - p in the spec used during mipmapping */ _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
