[Mesa-dev] [PATCH] mesa: stop copying SamplerUnits twice

Timothy Arceri timothy.arceri at collabora.com
Sun Jul 3 09:16:23 UTC 2016


The call to _mesa_update_shader_textures_used() already takes
care of copying for us.
---
 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 67375a1..f2a9d3d 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



More information about the mesa-dev mailing list