fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 11:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: Remove base miplevel from sampler state.

Browse source 
Gen9 changes the meaning of this to coarse LOD quality mode. Although that's a
desirable thing to be setting, it doesn't match the gen8 behavior and this was
unintentional. More importantly, we don't ever use this field. So instead of
getting it "wrong" drop it entirely.

This is a respin of a patch which only [incorrectly] tried to address gen9.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Ben Widawsky 2015-09-04 10:42:33 -07:00
parent 509ba61d5a
commit 5165e464f2
3 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/mesa/drivers/dri/i965/brw_sampler_state.c
View file

@ -88,13 +88,11 @@ brw_emit_sampler_state(struct brw_context *brw,
unsigned min_lod,
unsigned max_lod,
int lod_bias,
unsigned base_level,
unsigned shadow_function,
bool non_normalized_coordinates,
uint32_t border_color_offset)
{
ss[0] = BRW_SAMPLER_LOD_PRECLAMP_ENABLE |
SET_FIELD(base_level, BRW_SAMPLER_BASE_MIPLEVEL) |
SET_FIELD(mip_filter, BRW_SAMPLER_MIP_FILTER) |
SET_FIELD(mag_filter, BRW_SAMPLER_MAG_FILTER) |
SET_FIELD(min_filter, BRW_SAMPLER_MIN_FILTER);
@ -491,7 +489,6 @@ brw_update_sampler_state(struct brw_context *brw,
const unsigned max_lod = U_FIXED(CLAMP(sampler->MaxLod, 0, 13), lod_bits);
const int lod_bias =
S_FIXED(CLAMP(tex_unit_lod_bias + sampler->LodBias, -16, 15), lod_bits);
const unsigned base_level = U_FIXED(0, 1);
/* Upload the border color if necessary. If not, just point it at
* offset 0 (the start of the batch) - the color should be ignored,
@ -515,7 +512,7 @@ brw_update_sampler_state(struct brw_context *brw,
max_anisotropy,
address_rounding,
wrap_s, wrap_t, wrap_r,
min_lod, max_lod, lod_bias, base_level,
min_lod, max_lod, lod_bias,
shadow_function,
non_normalized_coords,
border_color_offset);

1
src/mesa/drivers/dri/i965/brw_state.h
View file

@ -312,7 +312,6 @@ void brw_emit_sampler_state(struct brw_context *brw,
unsigned min_lod,
unsigned max_lod,
int lod_bias,
unsigned base_level,
unsigned shadow_function,
bool non_normalized_coordinates,
uint32_t border_color_offset);

1
src/mesa/drivers/dri/i965/gen6_blorp.cpp
View file

@ -486,7 +486,6 @@ gen6_blorp_emit_sampler_state(struct brw_context *brw,
0, /* min LOD */
max_lod,
0, /* LOD bias */
0, /* base miplevel */
0, /* shadow function */
non_normalized_coords,
0); /* border color offset - unused */