From: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue, 1 Jul 2014 00:55:32 +0000 (-0700)
Subject: meta: Call glObjectLabel before linking.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e3b16294cb56bc0f3ee4a68a525884db0ce6806d;p=mesa.git

meta: Call glObjectLabel before linking.

i965 precompiles shaders at link time, and prints a disassembly if
INTEL_DEBUG=vs,gs,fs, including the shader name.  However, blit shaders
were showing up as "unnamed" since we hadn't set a name prior to
linking.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index f1f57297c02..89d7a157ce4 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -217,6 +217,7 @@ _mesa_meta_compile_and_link_program(struct gl_context *ctx,
                                                     fs_source);
 
    *program = _mesa_CreateProgram();
+   _mesa_ObjectLabel(GL_PROGRAM, *program, -1, name);
    _mesa_AttachShader(*program, fs);
    _mesa_DeleteShader(fs);
    _mesa_AttachShader(*program, vs);
@@ -224,7 +225,6 @@ _mesa_meta_compile_and_link_program(struct gl_context *ctx,
    _mesa_BindAttribLocation(*program, 0, "position");
    _mesa_BindAttribLocation(*program, 1, "texcoords");
    _mesa_meta_link_program_with_debug(ctx, *program);
-   _mesa_ObjectLabel(GL_PROGRAM, *program, -1, name);
 
    _mesa_UseProgram(*program);
 }