From: Marek Olšák Date: Sat, 10 Jun 2017 13:41:22 +0000 (+0200) Subject: mesa: flush vertices before updating ctx->_Shader X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0b70d6ec568a2c5d7b2ff814e6e26b6d1379c829;p=mesa.git mesa: flush vertices before updating ctx->_Shader Cc: 17.1 Reviewed-by: Nicolai Hähnle Reviewed-by: Brian Paul Reviewed-by: Timothy Arceri --- diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c index 0d1d57cb7e6..0f0d1dafffe 100644 --- a/src/mesa/main/pipelineobj.c +++ b/src/mesa/main/pipelineobj.c @@ -525,6 +525,8 @@ _mesa_bind_pipeline(struct gl_context *ctx, * considered current." */ if (&ctx->Shader != ctx->_Shader) { + FLUSH_VERTICES(ctx, _NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS); + if (pipe != NULL) { /* Bound the pipeline to the current program and * restore the pipeline state @@ -536,8 +538,6 @@ _mesa_bind_pipeline(struct gl_context *ctx, ctx->Pipeline.Default); } - FLUSH_VERTICES(ctx, _NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS); - for (i = 0; i < MESA_SHADER_STAGES; i++) { struct gl_program *prog = ctx->_Shader->CurrentProgram[i]; if (prog) {