For the series: Reviewed-by: Marek Olšák <[email protected]>
Marek On Mon, Feb 15, 2016 at 6:06 PM, Brian Paul <[email protected]> wrote: > --- > src/mesa/state_tracker/st_cb_bitmap.c | 9 +++------ > src/mesa/state_tracker/st_cb_clear.c | 8 ++------ > src/mesa/state_tracker/st_cb_drawpixels.c | 8 ++------ > 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 e27d487..4fd2dfe 100644 > --- a/src/mesa/state_tracker/st_cb_bitmap.c > +++ b/src/mesa/state_tracker/st_cb_bitmap.c > @@ -220,14 +220,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 01f1c05..5580146 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 9c955a5..d1fe330 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 5f76e44..a06cc72 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); > > > -- > 1.9.1 > > _______________________________________________ > mesa-dev mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
