mesa: stop copying SamplerUnits twice
authorTimothy Arceri <timothy.arceri@collabora.com>
Sun, 3 Jul 2016 09:16:23 +0000 (19:16 +1000)
committerTimothy Arceri <timothy.arceri@collabora.com>
Tue, 5 Jul 2016 10:18:05 +0000 (20:18 +1000)
The call to _mesa_update_shader_textures_used() already takes
care of copying for us.

Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
src/mesa/main/uniform_query.cpp

index 58ee40897648f657efd17297b3084c45e287feec..ab22a0ed86a13a61ddd9f30476bb6d5ce6446847 100644 (file)
@@ -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);