diff options
| author | Brian Paul <[email protected]> | 2016-02-16 10:22:32 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2016-02-16 10:22:32 -0700 |
| commit | f90801cd400ec251ef3ad9a7c2ebc6feadbc7860 (patch) | |
| tree | 9bbf12226ad2a29e7561b4511b1bbbc7a8f07bd6 | |
| parent | 1bf8fa82770622c0a8ba88e7cb506e507fb56061 (diff) | |
st/mesa: use new CSO_BITS_ALL_SHADERS
Reviewed-by: Marek Olšák <[email protected]>
| -rw-r--r-- | src/mesa/state_tracker/st_cb_bitmap.c | 9 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_cb_clear.c | 8 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_cb_drawpixels.c | 8 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_cb_texture.c | 8 |
4 files changed, 9 insertions, 24 deletions
diff --git a/src/mesa/state_tracker/st_cb_bitmap.c b/src/mesa/state_tracker/st_cb_bitmap.c index 8293b9e3f5f..9c44458d141 100644 --- a/src/mesa/state_tracker/st_cb_bitmap.c +++ b/src/mesa/state_tracker/st_cb_bitmap.c @@ -217,14 +217,11 @@ setup_render_state(struct gl_context *ctx, CSO_BIT_FRAGMENT_SAMPLERS | CSO_BIT_FRAGMENT_SAMPLER_VIEWS | CSO_BIT_VIEWPORT | - CSO_BIT_FRAGMENT_SHADER | CSO_BIT_STREAM_OUTPUTS | - CSO_BIT_TESSCTRL_SHADER | - CSO_BIT_TESSEVAL_SHADER | - CSO_BIT_GEOMETRY_SHADER | CSO_BIT_VERTEX_ELEMENTS | - CSO_BIT_VERTEX_SHADER | - CSO_BIT_AUX_VERTEX_BUFFER_SLOT)); + CSO_BIT_AUX_VERTEX_BUFFER_SLOT | + CSO_BITS_ALL_SHADERS)); + /* rasterizer state: just scissor */ st->bitmap.rasterizer.scissor = ctx->Scissor.EnableFlags & 1; diff --git a/src/mesa/state_tracker/st_cb_clear.c b/src/mesa/state_tracker/st_cb_clear.c index 01f1c05d7c9..55801469f23 100644 --- a/src/mesa/state_tracker/st_cb_clear.c +++ b/src/mesa/state_tracker/st_cb_clear.c @@ -203,14 +203,10 @@ clear_with_quad(struct gl_context *ctx, unsigned clear_buffers) CSO_BIT_SAMPLE_MASK | CSO_BIT_MIN_SAMPLES | CSO_BIT_VIEWPORT | - CSO_BIT_FRAGMENT_SHADER | CSO_BIT_STREAM_OUTPUTS | - CSO_BIT_VERTEX_SHADER | - CSO_BIT_TESSCTRL_SHADER | - CSO_BIT_TESSEVAL_SHADER | - CSO_BIT_GEOMETRY_SHADER | CSO_BIT_VERTEX_ELEMENTS | - CSO_BIT_AUX_VERTEX_BUFFER_SLOT)); + CSO_BIT_AUX_VERTEX_BUFFER_SLOT | + CSO_BITS_ALL_SHADERS)); /* blend state: RGBA masking */ { diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c index 9c955a51bce..d1fe3302c60 100644 --- a/src/mesa/state_tracker/st_cb_drawpixels.c +++ b/src/mesa/state_tracker/st_cb_drawpixels.c @@ -479,14 +479,10 @@ draw_textured_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z, CSO_BIT_VIEWPORT | CSO_BIT_FRAGMENT_SAMPLERS | CSO_BIT_FRAGMENT_SAMPLER_VIEWS | - CSO_BIT_FRAGMENT_SHADER | CSO_BIT_STREAM_OUTPUTS | - CSO_BIT_VERTEX_SHADER | - CSO_BIT_TESSCTRL_SHADER | - CSO_BIT_TESSEVAL_SHADER | - CSO_BIT_GEOMETRY_SHADER | CSO_BIT_VERTEX_ELEMENTS | - CSO_BIT_AUX_VERTEX_BUFFER_SLOT); + CSO_BIT_AUX_VERTEX_BUFFER_SLOT | + CSO_BITS_ALL_SHADERS); if (write_stencil) { cso_state_mask |= (CSO_BIT_DEPTH_STENCIL_ALPHA | CSO_BIT_BLEND); diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index 5f76e449343..a06cc72bdd2 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -1341,12 +1341,8 @@ try_pbo_upload_common(struct gl_context *ctx, CSO_BIT_VIEWPORT | CSO_BIT_BLEND | CSO_BIT_RASTERIZER | - CSO_BIT_VERTEX_SHADER | - CSO_BIT_GEOMETRY_SHADER | - CSO_BIT_TESSCTRL_SHADER | - CSO_BIT_TESSEVAL_SHADER | - CSO_BIT_FRAGMENT_SHADER | - CSO_BIT_STREAM_OUTPUTS)); + CSO_BIT_STREAM_OUTPUTS | + CSO_BITS_ALL_SHADERS)); cso_save_constant_buffer_slot0(cso, PIPE_SHADER_FRAGMENT); |