From 9545139ce5f10180547568a3da94af9e291253fd Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Fri, 23 Jun 2017 08:56:40 +1000 Subject: [PATCH] mesa: skip FLUSH_VERTICES() if no samplers were changed MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák --- src/mesa/main/uniform_query.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp index afb9f566b80..928d3ce4fd6 100644 --- a/src/mesa/main/uniform_query.cpp +++ b/src/mesa/main/uniform_query.cpp @@ -1079,7 +1079,12 @@ _mesa_uniform(GLint location, GLsizei count, const GLvoid *values, count = MIN2(count, (int) (uni->array_elements - offset)); } - _mesa_flush_vertices_for_uniforms(ctx, uni); + /* We check samplers for changes and flush if needed in the sampler + * handling code further down, so just skip them here. + */ + if (!uni->type->is_sampler()) { + _mesa_flush_vertices_for_uniforms(ctx, uni); + } /* Store the data in the "actual type" backing storage for the uniform. */ -- 2.30.2