summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2015-10-08 18:36:27 -0700
committerJason Ekstrand <[email protected]>2015-10-15 07:31:09 -0700
commitb705005584730cff75f5bbe057832d8b1106124a (patch)
tree34b8b974d23a0694cb82c9f67fe14ed05efead4c
parenteb893c220c8af9e7400973ce3eca41246379889b (diff)
nir/glsl: Use shader_prog->Name for naming the NIR shader
This has the better name to use. Aparently, sh->Name is usually 0. Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Neil Roberts <[email protected]>
-rw-r--r--src/glsl/nir/glsl_to_nir.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/nir/glsl_to_nir.cpp b/src/glsl/nir/glsl_to_nir.cpp
index 0e4289b32eb..5aba8f80b6b 100644
--- a/src/glsl/nir/glsl_to_nir.cpp
+++ b/src/glsl/nir/glsl_to_nir.cpp
@@ -150,7 +150,7 @@ glsl_to_nir(const struct gl_shader_program *shader_prog,
if (sh->Program->SamplersUsed & (1 << i))
num_textures = i;
- shader->info.name = ralloc_asprintf(shader, "GLSL%d", sh->Name);
+ shader->info.name = ralloc_asprintf(shader, "GLSL%d", shader_prog->Name);
shader->info.num_textures = num_textures;
shader->info.num_ubos = sh->NumBufferInterfaceBlocks;
shader->info.num_abos = shader_prog->NumAtomicBuffers;