OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/mesa: remove the sampler min_lod/max_lod value swap

Browse Source 
It might not be needed at all.

v2: fix v3d assertion failure

Acked-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11428>
This commit is contained in:
Marek Olšák
2021-06-07 06:55:12 -04:00
committed by Marge Bot
parent ef5d427413
commit 9de9e83735
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/drivers/v3d/v3dx_emit.c
View File

@@ -177,7 +177,8 @@ emit_one_texture(struct v3d_context *v3d, struct v3d_texture_stateobj *stage_tex
MAX2(psampler->min_lod, 0),
psview->u.tex.last_level),
.max_level_of_detail = MIN2(psview->u.tex.first_level +
psampler->max_lod,
MAX2(psampler->max_lod,
psampler->min_lod),
psview->u.tex.last_level),
.texture_base_pointer = cl_address(rsc->bo,

3
src/gallium/drivers/v3d/v3dx_state.c
View File

@@ -550,7 +550,8 @@ v3d_upload_sampler_state_variant(void *map,
sampler.min_level_of_detail = MIN2(MAX2(0, cso->min_lod),
15);
sampler.max_level_of_detail = MIN2(cso->max_lod, 15);
sampler.max_level_of_detail = MIN2(MAX2(cso->max_lod,
cso->min_lod), 15);
/* If we're not doing inter-miplevel filtering, we need to
* clamp the LOD so that we only sample from baselevel.

9
src/mesa/state_tracker/st_atom_sampler.c
View File

@@ -169,15 +169,6 @@ st_convert_sampler(const struct st_context *st,
sampler->min_lod = MAX2(msamp->Attrib.MinLod, 0.0f);
sampler->max_lod = msamp->Attrib.MaxLod;
if (sampler->max_lod < sampler->min_lod) {
/* The GL spec doesn't seem to specify what to do in this case.
* Swap the values.
*/
float tmp = sampler->max_lod;
sampler->max_lod = sampler->min_lod;
sampler->min_lod = tmp;
assert(sampler->min_lod <= sampler->max_lod);
}
/* Check that only wrap modes using the border color have the first bit
* set.