summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Pohjolainen <[email protected]>2016-04-18 21:47:23 +0300
committerTopi Pohjolainen <[email protected]>2016-05-12 19:49:37 +0300
commitcda8c2a9111d4fc45fac6227d895dbb9770dbb84 (patch)
tree36c02eca912b1dedae85fcbc82e1e57450cc3d0c
parent683dda00830b6c5f450d4ccbc95b108fe3f091b0 (diff)
i965/wm: Don't sample lossless compressed as multisampled
Signed-off-by: Topi Pohjolainen <[email protected]> Reviewed-by: Ben Widawsky <[email protected]>
-rw-r--r--src/mesa/drivers/dri/i965/brw_wm.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c
index dbc626c0933..ced97089fac 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) {