diff options
author | Eric Anholt <[email protected]> | 2017-11-20 10:07:24 -0800 |
---|---|---|
committer | Eric Anholt <[email protected]> | 2017-11-20 13:52:33 -0800 |
commit | 9d5972da801e15670f95bc57e87ac823a797ee05 (patch) | |
tree | b6de69710742082ec1732d214d7eb1691f18fc2b /src | |
parent | 2c8913e2242dc86b7f70bbb32e9952ea3adbdfc6 (diff) |
broadcom/vc5: Clamp min lod to the last level.
Otherwise, the simulator would complain in tex-miplevel-selection that the
min/max clamp was out of order. The actual HW seems to have clamped to
the max anyway.
Diffstat (limited to 'src')
-rw-r--r-- | src/gallium/drivers/vc5/vc5_emit.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/drivers/vc5/vc5_emit.c b/src/gallium/drivers/vc5/vc5_emit.c index 72b5d85880a..d5356673e7e 100644 --- a/src/gallium/drivers/vc5/vc5_emit.c +++ b/src/gallium/drivers/vc5/vc5_emit.c @@ -141,8 +141,9 @@ emit_one_texture(struct vc5_context *vc5, struct vc5_texture_stateobj *stage_tex * TEXTURE_SHADER_STATE that ignores psview->min/max_lod to * support txf properly. */ - .min_level_of_detail = (psview->u.tex.first_level + - MAX2(psampler->min_lod, 0)), + .min_level_of_detail = MIN2(psview->u.tex.first_level + + MAX2(psampler->min_lod, 0), + psview->u.tex.last_level), .max_level_of_detail = MIN2(psview->u.tex.first_level + psampler->max_lod, psview->u.tex.last_level), |