Module: Mesa Branch: master Commit: cda8c2a9111d4fc45fac6227d895dbb9770dbb84 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cda8c2a9111d4fc45fac6227d895dbb9770dbb84
Author: Topi Pohjolainen <[email protected]> Date: Mon Apr 18 21:47:23 2016 +0300 i965/wm: Don't sample lossless compressed as multisampled Signed-off-by: Topi Pohjolainen <[email protected]> Reviewed-by: Ben Widawsky <[email protected]> --- src/mesa/drivers/dri/i965/brw_wm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c index dbc626c..ced9708 100644 --- a/src/mesa/drivers/dri/i965/brw_wm.c +++ b/src/mesa/drivers/dri/i965/brw_wm.c @@ -361,8 +361,12 @@ brw_populate_sampler_prog_key_data(struct gl_context *ctx, struct intel_texture_object *intel_tex = intel_texture_object((struct gl_texture_object *)t); + /* From gen9 onwards some single sampled buffers can also be + * compressed. These don't need ld2dms sampling along with mcs fetch. + */ if (brw->gen >= 7 && - intel_tex->mt->msaa_layout == INTEL_MSAA_LAYOUT_CMS) { + intel_tex->mt->msaa_layout == INTEL_MSAA_LAYOUT_CMS && + intel_tex->mt->num_samples > 1) { key->compressed_multisample_layout_mask |= 1 << s; if (intel_tex->mt->num_samples >= 16) { _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
