diff options
| author | Kenneth Graunke <[email protected]> | 2016-03-29 15:35:07 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2016-03-29 15:35:07 -0700 |
| commit | f8c69fbb5491c8790dd3bcf991f06151d15d92b9 (patch) | |
| tree | 156b04a29161e7c9616142145b9d6f3428fbc95b /src | |
| parent | 7087e0ab27da5eaad10a18ddba3234960a2b5524 (diff) | |
Revert "i965: Set address rounding bits for GL_NEAREST filtering as well."
This reverts commit 60d6a8989ab44cf47accee6bc692ba6fb98f6a9f.
It's pretty sketchy, and apparently regressed a bunch of dEQP tests
on Sandybridge.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_sampler_state.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_sampler_state.c b/src/mesa/drivers/dri/i965/brw_sampler_state.c index 7bd21f7aaf0..3bd22c7559f 100644 --- a/src/mesa/drivers/dri/i965/brw_sampler_state.c +++ b/src/mesa/drivers/dri/i965/brw_sampler_state.c @@ -436,17 +436,14 @@ brw_update_sampler_state(struct brw_context *brw, } } - /* Set address rounding bits. The conditions are empirically - * derived in order to pass test cases. - */ - bool round_nearest = brw->gen >= 6 && target != GL_TEXTURE_3D; + /* Set address rounding bits if not using nearest filtering. */ unsigned address_rounding = 0; - if (min_filter != BRW_MAPFILTER_NEAREST || round_nearest) { + if (min_filter != BRW_MAPFILTER_NEAREST) { address_rounding |= BRW_ADDRESS_ROUNDING_ENABLE_U_MIN | BRW_ADDRESS_ROUNDING_ENABLE_V_MIN | BRW_ADDRESS_ROUNDING_ENABLE_R_MIN; } - if (mag_filter != BRW_MAPFILTER_NEAREST || round_nearest) { + if (mag_filter != BRW_MAPFILTER_NEAREST) { address_rounding |= BRW_ADDRESS_ROUNDING_ENABLE_U_MAG | BRW_ADDRESS_ROUNDING_ENABLE_V_MAG | BRW_ADDRESS_ROUNDING_ENABLE_R_MAG; |