From: Marek Olšák <marek.olsak@amd.com>
Date: Tue, 7 Jun 2016 19:34:31 +0000 (+0200)
Subject: radeonsi: re-enable PBO ReadPixels acceleration
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f39439d1666481bd1316e865eb3507a2a397f346;p=mesa.git

radeonsi: re-enable PBO ReadPixels acceleration

disabled by 4f1cccf570112f93265a4cace504eb763fa8f73e

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 92448a47fab..0c52eee7a58 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -1784,13 +1784,16 @@ boolean si_is_format_supported(struct pipe_screen *screen,
 		}
 	}
 
-	if (usage & PIPE_BIND_SAMPLER_VIEW) {
+	if (usage & (PIPE_BIND_SAMPLER_VIEW |
+		     PIPE_BIND_SHADER_IMAGE)) {
 		if (target == PIPE_BUFFER) {
 			if (si_is_vertex_format_supported(screen, format))
-				retval |= PIPE_BIND_SAMPLER_VIEW;
+				retval |= usage & (PIPE_BIND_SAMPLER_VIEW |
+						   PIPE_BIND_SHADER_IMAGE);
 		} else {
 			if (si_is_sampler_format_supported(screen, format))
-				retval |= PIPE_BIND_SAMPLER_VIEW;
+				retval |= usage & (PIPE_BIND_SAMPLER_VIEW |
+						   PIPE_BIND_SHADER_IMAGE);
 		}
 	}