Mesa (glsl2): glsl2: No need to strdup the name passed in to ir_variable constructor.

Eric Anholt anholt at kemper.freedesktop.org
Tue Aug 3 18:47:39 UTC 2010


Module: Mesa
Branch: glsl2
Commit: 900ab2f564018856133c19b68713a6dfd206c184
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=900ab2f564018856133c19b68713a6dfd206c184

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Aug  3 11:40:26 2010 -0700

glsl2: No need to strdup the name passed in to ir_variable constructor.

ir_variable always strdups the incoming name so that it matches the
lifetime of the ir_variable.

---

 src/glsl/ast_function.cpp |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/glsl/ast_function.cpp b/src/glsl/ast_function.cpp
index bbc3bc1..661f8f6 100644
--- a/src/glsl/ast_function.cpp
+++ b/src/glsl/ast_function.cpp
@@ -554,9 +554,7 @@ emit_inline_vector_constructor(const glsl_type *type,
 {
    assert(!parameters->is_empty());
 
-   ir_variable *var = new(ctx) ir_variable(type,
-					   talloc_strdup(ctx, "vec_ctor"),
-					   ir_var_temporary);
+   ir_variable *var = new(ctx) ir_variable(type, "vec_ctor", ir_var_temporary);
    instructions->push_tail(var);
 
    /* There are two kinds of vector constructors.
@@ -667,9 +665,7 @@ emit_inline_matrix_constructor(const glsl_type *type,
 {
    assert(!parameters->is_empty());
 
-   ir_variable *var = new(ctx) ir_variable(type,
-					   talloc_strdup(ctx, "mat_ctor"),
-					   ir_var_temporary);
+   ir_variable *var = new(ctx) ir_variable(type, "mat_ctor", ir_var_temporary);
    instructions->push_tail(var);
 
    /* There are three kinds of matrix constructors.
@@ -692,8 +688,7 @@ emit_inline_matrix_constructor(const glsl_type *type,
        * components with zero.
        */
       ir_variable *rhs_var =
-	 new(ctx) ir_variable(glsl_type::vec4_type,
-			      talloc_strdup(ctx, "mat_ctor_vec"),
+	 new(ctx) ir_variable(glsl_type::vec4_type, "mat_ctor_vec",
 			      ir_var_temporary);
       instructions->push_tail(rhs_var);
 
@@ -807,8 +802,7 @@ emit_inline_matrix_constructor(const glsl_type *type,
        * generate a temporary and copy the paramter there.
        */
       ir_variable *const rhs_var =
-	 new(ctx) ir_variable(first_param->type,
-			      talloc_strdup(ctx, "mat_ctor_mat"),
+	 new(ctx) ir_variable(first_param->type, "mat_ctor_mat",
 			      ir_var_temporary);
       instructions->push_tail(rhs_var);
 
@@ -874,9 +868,7 @@ emit_inline_matrix_constructor(const glsl_type *type,
 	  * generate a temporary and copy the paramter there.
 	  */
 	 ir_variable *rhs_var =
-	    new(ctx) ir_variable(rhs->type,
-				 talloc_strdup(ctx, "mat_ctor_vec"),
-				 ir_var_temporary);
+	    new(ctx) ir_variable(rhs->type, "mat_ctor_vec", ir_var_temporary);
 	 instructions->push_tail(rhs_var);
 
 	 ir_dereference *rhs_var_ref =




More information about the mesa-commit mailing list