summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2016-07-03 19:16:23 +1000
committerTimothy Arceri <[email protected]>2016-07-05 20:18:05 +1000
commit9c9e3e7ee1c92e67e1ceac75181871524e78d024 (patch)
treece489b5e3b1d23e692fa97825defb7e1573323be
parent25a32c2cbffcb9c64e154b8088adf96c293e3ca0 (diff)
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 <[email protected]>
-rw-r--r--src/mesa/main/uniform_query.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
index 58ee4089764..ab22a0ed86a 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);