diff options
| author | Marek Olšák <[email protected]> | 2017-02-23 00:30:49 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-02-25 00:03:09 +0100 |
| commit | a40b76143d8b929412bed6fbed04810902844c40 (patch) | |
| tree | 23f34b2a90c021a9973762ae6783f69df025163a /src/mesa | |
| parent | 1a36bea44594d02bd96e2961f62f5d432c62d52a (diff) | |
st/mesa: reset sample_mask, min_sample, and render_condition for PBO ops
Cc: 13.0 17.0 <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_readpixels.c | 7 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_cb_texture.c | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_cb_readpixels.c b/src/mesa/state_tracker/st_cb_readpixels.c index ea91bb93b87..5ce2421bbfb 100644 --- a/src/mesa/state_tracker/st_cb_readpixels.c +++ b/src/mesa/state_tracker/st_cb_readpixels.c @@ -139,9 +139,16 @@ try_pbo_readpixels(struct st_context *st, struct st_renderbuffer *strb, CSO_BIT_DEPTH_STENCIL_ALPHA | CSO_BIT_STREAM_OUTPUTS | CSO_BIT_PAUSE_QUERIES | + CSO_BIT_SAMPLE_MASK | + CSO_BIT_MIN_SAMPLES | + CSO_BIT_RENDER_CONDITION | CSO_BITS_ALL_SHADERS)); cso_save_constant_buffer_slot0(cso, PIPE_SHADER_FRAGMENT); + cso_set_sample_mask(cso, ~0); + cso_set_min_samples(cso, 1); + cso_set_render_condition(cso, NULL, FALSE, 0); + /* Set up the sampler_view */ { struct pipe_sampler_view templ; diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index 7c493fc1143..bc6f108a860 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -1155,9 +1155,15 @@ try_pbo_upload_common(struct gl_context *ctx, CSO_BIT_RASTERIZER | CSO_BIT_STREAM_OUTPUTS | CSO_BIT_PAUSE_QUERIES | + CSO_BIT_SAMPLE_MASK | + CSO_BIT_MIN_SAMPLES | + CSO_BIT_RENDER_CONDITION | CSO_BITS_ALL_SHADERS)); cso_save_constant_buffer_slot0(cso, PIPE_SHADER_FRAGMENT); + cso_set_sample_mask(cso, ~0); + cso_set_min_samples(cso, 1); + cso_set_render_condition(cso, NULL, FALSE, 0); /* Set up the sampler_view */ { |