Re: [Mesa-dev] [PATCH] nir: use nir_variable_create instead of open-coding the logic

[Jason Ekstrand]

Rb

On February 25, 2019 05:35:17 Tapani Pälli  wrote:


Fixes: 3d7611e9 "st/nir: use NIR for asm programs"
Reported-by: Matthias Lorenz 
Signed-off-by: Tapani Pälli 
---
src/mesa/program/prog_to_nir.c | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/mesa/program/prog_to_nir.c b/src/mesa/program/prog_to_nir.c
index 1c9d0018d55..aa4f2aaf72a 100644
--- a/src/mesa/program/prog_to_nir.c
+++ b/src/mesa/program/prog_to_nir.c
@@ -1012,13 +1012,11 @@ prog_to_nir(const struct gl_program *prog,
   s = c->build.shader;

   if (prog->Parameters->NumParameters > 0) {
-  c->parameters = rzalloc(s, nir_variable);
-  c->parameters->type =
+  const struct glsl_type *type =
 glsl_array_type(glsl_vec4_type(), prog->Parameters->NumParameters, 0);
-  c->parameters->name = strdup(prog->Parameters->Parameters[0].Name);
-  c->parameters->data.read_only = true;
-  c->parameters->data.mode = nir_var_uniform;
-  exec_list_push_tail(&s->uniforms, &c->parameters->node);
+  c->parameters =
+ nir_variable_create(s, nir_var_uniform, type,
+ prog->Parameters->Parameters[0].Name);
   }

   setup_registers_and_variables(c);
--
2.20.1

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev




___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] nir: use nir_variable_create instead of open-coding the logic

[Tapani Pälli]

Fixes: 3d7611e9 "st/nir: use NIR for asm programs"
Reported-by: Matthias Lorenz 
Signed-off-by: Tapani Pälli 
---
 src/mesa/program/prog_to_nir.c | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/mesa/program/prog_to_nir.c b/src/mesa/program/prog_to_nir.c
index 1c9d0018d55..aa4f2aaf72a 100644
--- a/src/mesa/program/prog_to_nir.c
+++ b/src/mesa/program/prog_to_nir.c
@@ -1012,13 +1012,11 @@ prog_to_nir(const struct gl_program *prog,
s = c->build.shader;
 
if (prog->Parameters->NumParameters > 0) {
-  c->parameters = rzalloc(s, nir_variable);
-  c->parameters->type =
+  const struct glsl_type *type =
  glsl_array_type(glsl_vec4_type(), prog->Parameters->NumParameters, 0);
-  c->parameters->name = strdup(prog->Parameters->Parameters[0].Name);
-  c->parameters->data.read_only = true;
-  c->parameters->data.mode = nir_var_uniform;
-  exec_list_push_tail(&s->uniforms, &c->parameters->node);
+  c->parameters =
+ nir_variable_create(s, nir_var_uniform, type,
+ prog->Parameters->Parameters[0].Name);
}
 
setup_registers_and_variables(c);
-- 
2.20.1

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev