From: Rob Clark <robdclark@gmail.com>
Date: Tue, 17 Jul 2018 13:44:23 +0000 (-0400)
Subject: freedreno: fix samples=0 vs samples=1 confusion
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=15f6c0509a8b6928a94023e095e08419cf1fe589;p=mesa.git

freedreno: fix samples=0 vs samples=1 confusion

pipe_framebuffer_state can have samples=0 in various cases, which is
actually the same thing as samples=1.  So use the _get_num_samples()
helper to populate the key, to avoid this looking like two distinct
fb states to the cache.

Signed-off-by: Rob Clark <robdclark@gmail.com>
---

diff --git a/src/gallium/drivers/freedreno/freedreno_batch_cache.c b/src/gallium/drivers/freedreno/freedreno_batch_cache.c
index 804a73664f7..1bf656cf208 100644
--- a/src/gallium/drivers/freedreno/freedreno_batch_cache.c
+++ b/src/gallium/drivers/freedreno/freedreno_batch_cache.c
@@ -414,7 +414,7 @@ fd_batch_from_fb(struct fd_batch_cache *cache, struct fd_context *ctx,
 	key->width = pfb->width;
 	key->height = pfb->height;
 	key->layers = pfb->layers;
-	key->samples = pfb->samples;
+	key->samples = util_framebuffer_get_num_samples(pfb);
 	key->ctx = ctx;
 
 	if (pfb->zsbuf)