From 9c9e3e7ee1c92e67e1ceac75181871524e78d024 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Sun, 3 Jul 2016 19:16:23 +1000 Subject: [PATCH] mesa: stop copying SamplerUnits twice MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The call to _mesa_update_shader_textures_used() already takes care of copying for us. Reviewed-by: Samuel Iglesias Gonsálvez --- src/mesa/main/uniform_query.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp index 58ee408..ab22a0e 100644 --- a/src/mesa/main/uniform_query.cpp +++ b/src/mesa/main/uniform_query.cpp @@ -859,10 +859,6 @@ _mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shProg, flushed = true; } - memcpy(prog->SamplerUnits, - sh->SamplerUnits, - sizeof(sh->SamplerUnits)); - _mesa_update_shader_textures_used(shProg, prog); if (ctx->Driver.SamplerUniformChange) ctx->Driver.SamplerUniformChange(ctx, prog->Target, prog); -- 2.7.4