From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Fri, 9 Oct 2015 01:36:27 +0000 (-0700)
Subject: nir/glsl: Use shader_prog->Name for naming the NIR shader
X-Git-Tag: upstream/17.1.0~15342
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b705005584730cff75f5bbe057832d8b1106124a;p=platform%2Fupstream%2Fmesa.git

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 <kenneth@whitecape.org>
Reviewed-by: Neil Roberts <neil@linux.intel.com>
---

diff --git a/src/glsl/nir/glsl_to_nir.cpp b/src/glsl/nir/glsl_to_nir.cpp
index 0e4289b..5aba8f8 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;