diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2015-06-17 23:00:44 -0400 |
|---|---|---|
| committer | Ilia Mirkin <imirkin@alum.mit.edu> | 2015-06-18 13:21:44 -0400 |
| commit | 770f141866654dab969302f720228497f0fb35fd (patch) | |
| tree | 058f4f73da4a19cd5e24d7eaaa0064fe34d87233 /src/mesa/main/objectlabel.c | |
| parent | b6e238023c4f8af2328dc3bcab1d73a3e19f4fbb (diff) | |
| download | external_mesa3d-770f141866654dab969302f720228497f0fb35fd.zip external_mesa3d-770f141866654dab969302f720228497f0fb35fd.tar.gz external_mesa3d-770f141866654dab969302f720228497f0fb35fd.tar.bz2 | |
mesa: add GL_PROGRAM_PIPELINE support in KHR_debug calls
This was apparently missed when ARB_sso support was added.
Add label support to pipeline objects just like all the other
debug-related objects.
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Timothy Arceri <t_arceri@yahoo.com.au>
Cc: "10.5 10.6" <mesa-stable@lists.freedesktop.org>
Diffstat (limited to 'src/mesa/main/objectlabel.c')
| -rw-r--r-- | src/mesa/main/objectlabel.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/mesa/main/objectlabel.c b/src/mesa/main/objectlabel.c index aecb5b1..5626054 100644 --- a/src/mesa/main/objectlabel.c +++ b/src/mesa/main/objectlabel.c @@ -30,6 +30,7 @@ #include "enums.h" #include "fbobject.h" #include "objectlabel.h" +#include "pipelineobj.h" #include "queryobj.h" #include "samplerobj.h" #include "shaderobj.h" @@ -214,8 +215,13 @@ get_label_pointer(struct gl_context *ctx, GLenum identifier, GLuint name, } break; case GL_PROGRAM_PIPELINE: - /* requires GL 4.2 */ - goto invalid_enum; + { + struct gl_pipeline_object *pipe = + _mesa_lookup_pipeline_object(ctx, name); + if (pipe) + labelPtr = &pipe->Label; + } + break; default: goto invalid_enum; } |