From: Timothy Arceri <timothy.arceri@collabora.com>
Date: Sun, 3 Jul 2016 09:16:23 +0000 (+1000)
Subject: mesa: stop copying SamplerUnits twice
X-Git-Tag: upstream/17.1.0~8291
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9c9e3e7ee1c92e67e1ceac75181871524e78d024;p=platform%2Fupstream%2Fmesa.git

mesa: stop copying SamplerUnits twice

The call to _mesa_update_shader_textures_used() already takes
care of copying for us.

Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
---

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);