From: Ilia Mirkin Date: Sun, 5 Jun 2016 22:56:12 +0000 (-0400) Subject: st/mesa: check shader image format support before using PBO download X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4f1cccf570112f93265a4cace504eb763fa8f73e;p=mesa.git st/mesa: check shader image format support before using PBO download ARB_shader_image_load_store only requires a very fixed list of formats to be supported, while textures may be in all kinds of formats, like BGRA which are presently not supported on at least Kepler. Signed-off-by: Ilia Mirkin Tested-by: Samuel Pitoiset Reviewed-by: Nicolai Hähnle Reviewed-by: Marek Olšák --- diff --git a/src/mesa/state_tracker/st_cb_readpixels.c b/src/mesa/state_tracker/st_cb_readpixels.c index 6df3a39c053..09450c9f41b 100644 --- a/src/mesa/state_tracker/st_cb_readpixels.c +++ b/src/mesa/state_tracker/st_cb_readpixels.c @@ -79,6 +79,7 @@ try_pbo_readpixels(struct st_context *st, struct st_renderbuffer *strb, const struct gl_pixelstore_attrib *pack, void *pixels) { struct pipe_context *pipe = st->pipe; + struct pipe_screen *screen = pipe->screen; struct cso_context *cso = st->cso_context; struct pipe_surface *surface = strb->surface; struct pipe_resource *texture = strb->texture; @@ -91,6 +92,11 @@ try_pbo_readpixels(struct st_context *st, struct st_renderbuffer *strb, if (texture->nr_samples > 1) return false; + if (!screen->is_format_supported(screen, dst_format, PIPE_TEXTURE_2D, + texture->nr_samples, + PIPE_BIND_SHADER_IMAGE)) + return false; + desc = util_format_description(dst_format); /* Compute PBO addresses */