diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2020-12-14 11:48:39 -0500 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-12-29 16:48:39 +0000 |
| commit | 36097fc7ef70471ecfecd428f990233276e9c45b (patch) | |
| tree | a0c325076926add53bd42dec33d8149d5b7d8c63 /src/mesa/state_tracker/st_cb_readpixels.c | |
| parent | accc2222174a90fd24ee56ce751feb6022ecc0c7 (diff) | |
st/pbo: fix pbo uploads without PIPE_CAP_TGSI_VS_LAYER_VIEWPORT and skip gs
the previous commit handling this forced geometry shader usage for all cases,
but this is not ideal, so instead there are now fragment shader variants for
both depth==1 and depth!=1, corresponding to the existence of gl_Layer in the
shader
Fixes: 614c77772ac ("st/pbo: fix pbo uploads without PIPE_CAP_TGSI_VS_LAYER_VIEWPORT")
Acked-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8089>
Diffstat (limited to 'src/mesa/state_tracker/st_cb_readpixels.c')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_readpixels.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_cb_readpixels.c b/src/mesa/state_tracker/st_cb_readpixels.c index 69e74f5d57e..1fd84b02420 100644 --- a/src/mesa/state_tracker/st_cb_readpixels.c +++ b/src/mesa/state_tracker/st_cb_readpixels.c @@ -242,7 +242,7 @@ try_pbo_readpixels(struct st_context *st, struct st_renderbuffer *strb, /* Set up the fragment shader */ { - void *fs = st_pbo_get_download_fs(st, view_target, src_format, dst_format); + void *fs = st_pbo_get_download_fs(st, view_target, src_format, dst_format, addr.depth != 1); if (!fs) goto fail; |