Attachment 42913 Details for Bug 33886 – second patch for state tracker

[patch] second patch for state tracker

0004-st-mesa-Clamp-min_lod-to-the-max-miplevel-as-well.patch (text/plain), 1.31 KB, created by Brian Paul on 2011-02-03 16:20:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Paul

Created: 2011-02-03 16:20:43 UTC

Size: 1.31 KB

patch

obsolete

>From 2c7953a1a94199e6a0ab241001cd6241c3ebb963 Mon Sep 17 00:00:00 2001
>From: Henri Verbeet <hverbeet@gmail.com>
>Date: Mon, 17 Jan 2011 22:03:30 +0100
>Subject: [PATCH 4/4] st/mesa: Clamp min_lod to the max miplevel as well.
>
>Otherwise min_lod can potentially be larger than the clamped max_lod. The
>code that follows will swap min_lod and max_lod in that case, resulting in a
>max_lod larger than MAX_LEVEL.
>
>Signed-off-by: Brian Paul <brianp@vmware.com>
>---
> src/mesa/state_tracker/st_atom_sampler.c |    4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
>diff --git a/src/mesa/state_tracker/st_atom_sampler.c b/src/mesa/state_tracker/st_atom_sampler.c
>index e47cb94..2b663dc 100644
>--- a/src/mesa/state_tracker/st_atom_sampler.c
>+++ b/src/mesa/state_tracker/st_atom_sampler.c
>@@ -207,7 +207,9 @@ update_samplers(struct st_context *st)
> 
>          sampler->lod_bias = st->ctx->Texture.Unit[su].LodBias;
> 
>-         sampler->min_lod = MAX2(0.0f, texobj->MinLod);
>+         sampler->min_lod = CLAMP(texobj->MinLod,
>+                                  0.0f,
>+                                  (GLfloat) texobj->MaxLevel - texobj->BaseLevel);
>          sampler->max_lod = MIN2((GLfloat) texobj->MaxLevel - texobj->BaseLevel,
>                                  texobj->MaxLod);
>          if (sampler->max_lod < sampler->min_lod) {
>-- 
>1.7.3.4
>

Actions: View | Splinter Review

Attachments on bug 33886: 42910 | 42911 | 42912 | 42913 | 44101 | 45093

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.