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 92448a47fab6a2b85c4bdbbef0247cfd20806c41..0c52eee7a585b71bf4d82e49f2532604c9eea6bb 100644 (file)
--- 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);
                }
        }