diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-05-09 15:18:06 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-05-09 15:18:06 +1000 |
| commit | 00446d8b6b35f8bf0b491a4ad0359111f549ffdb (patch) | |
| tree | e553d3d082bd5703f4f77857949aae47c63c6cd2 | |
| parent | 87a0c6ec6d2e9b2f1a6efc3e16e2509bccb9e8ba (diff) | |
fix glxgears segfault, cause lockupsiris
| -rw-r--r-- | src/mesa/program/prog_to_nir.c | 2 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_glsl_to_nir.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/program/prog_to_nir.c b/src/mesa/program/prog_to_nir.c index cd874e489f3..b13c145c119 100644 --- a/src/mesa/program/prog_to_nir.c +++ b/src/mesa/program/prog_to_nir.c @@ -1002,7 +1002,7 @@ prog_to_nir(const struct gl_program *prog, c->parameters = rzalloc(s, nir_variable); c->parameters->type = glsl_array_type(glsl_vec4_type(), prog->Parameters->NumParameters); - c->parameters->name = "parameters"; + 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); diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp index de906e60c39..ed667f4e97c 100644 --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp @@ -254,7 +254,6 @@ st_nir_lookup_parameter_index(const struct gl_program_parameter_list *params, static void st_nir_assign_uniform_locations(struct gl_context *ctx, struct gl_program *prog, - struct gl_shader_program *shader_program, struct exec_list *uniform_list, unsigned *size) { int max = 0; @@ -804,7 +803,7 @@ st_finalize_nir(struct st_context *st, struct gl_program *prog, NIR_PASS_V(nir, nir_lower_atomics_to_ssbo, st->ctx->Const.Program[nir->info.stage].MaxAtomicBuffers); - st_nir_assign_uniform_locations(st->ctx, prog, shader_program, + st_nir_assign_uniform_locations(st->ctx, prog, &nir->uniforms, &nir->num_uniforms); if (st->ctx->Const.PackedDriverUniformStorage) { |