KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

panfrost: Fix norm coords on bifrost sampler 

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4844>
This commit is contained in:
Alyssa Rosenzweig 2020-04-30 17:20:08 -04:00 committed by Marge Bot
parent 401409eff3
commit bbecbedb4c
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gallium/drivers/panfrost/pan_cmdstream.c
View File

@ -492,7 +492,6 @@ void panfrost_sampler_desc_init_bifrost(const struct pipe_sampler_state *cso,
.wrap_t = translate_tex_wrap(cso->wrap_t),
.wrap_r = translate_tex_wrap(cso->wrap_r),
.unk8 = 0x8,
.unk2 = 0x2,
.min_filter = cso->min_img_filter == PIPE_TEX_FILTER_NEAREST,
.norm_coords = cso->normalized_coords,
.mip_filter = cso->min_mip_filter == PIPE_TEX_MIPFILTER_LINEAR,

5
src/panfrost/include/panfrost-job.h
View File

@ -1352,9 +1352,10 @@ struct bifrost_sampler_descriptor {
enum mali_wrap_mode wrap_s : 4;
uint8_t unk8 : 4;
uint8_t unk2 : 3;
uint8_t min_filter : 1;
uint8_t unk2 : 1;
uint8_t norm_coords : 1;
uint8_t unk3 : 1;
uint8_t min_filter : 1;
uint8_t zero1 : 1;
uint8_t mag_filter : 1;
uint8_t mip_filter : 1;

7
src/panfrost/pandecode/decode.c
View File

@ -2427,11 +2427,8 @@ pandecode_samplers(mali_ptr samplers, unsigned sampler_count, int job_no, bool i
pandecode_prop("unk8 = 0x%x", s->unk8);
}
if (s->unk2 != 2) {
pandecode_msg("XXX: unk2 tripped\n");
pandecode_prop("unk2 = 0x%x", s->unk2);
}
pandecode_prop("unk2 = 0x%x", s->unk2);
pandecode_prop("unk3 = 0x%x", s->unk3);
pandecode_prop("min_filter = %s", s->min_filter ? "nearest" : "linear");
pandecode_prop("norm_coords = 0x%x", s->norm_coords & 0x1);
pandecode_prop("zero1 = 0x%x", s->zero1 & 0x1);