Mesa (master): i965: Remove dead call to _mesa_associate_uniform_storage() .

Matt Turner mattst88 at kemper.freedesktop.org
Tue Aug 19 01:34:29 UTC 2014


Module: Mesa
Branch: master
Commit: e0f955abd3ca03fa7751a2371ad689a490cd7f7e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e0f955abd3ca03fa7751a2371ad689a490cd7f7e

Author: Matt Turner <mattst88 at gmail.com>
Date:   Fri Aug  8 21:19:42 2014 -0700

i965: Remove dead call to _mesa_associate_uniform_storage().

Dead since the call to _mesa_generate_parameters_list_for_uniforms
was removed in commit 12751ef2. So this was why all of that code that
was supposed to fix up the value of a uniform bool to wasn't happening.

Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>

---

 src/mesa/drivers/dri/i965/brw_shader.cpp |    6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp
index 0033135..28db29a 100644
--- a/src/mesa/drivers/dri/i965/brw_shader.cpp
+++ b/src/mesa/drivers/dri/i965/brw_shader.cpp
@@ -240,12 +240,6 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg)
 
       brw_add_texrect_params(prog);
 
-      /* This has to be done last.  Any operation that can cause
-       * prog->ParameterValues to get reallocated (e.g., anything that adds a
-       * program constant) has to happen before creating this linkage.
-       */
-      _mesa_associate_uniform_storage(ctx, shProg, prog->Parameters);
-
       _mesa_reference_program(ctx, &prog, NULL);
 
       if (ctx->_Shader->Flags & GLSL_DUMP) {




More information about the mesa-commit mailing list