From 8792abff9de8a6767fdd97bd4b5d0c3a1ef1b1e2 Mon Sep 17 00:00:00 2001 From: Antia Puentes Date: Wed, 8 Aug 2018 17:52:04 +0200 Subject: [PATCH] mesa/uniforms: Fix GetUniformLocation (ARB_gl_spirv) From the ARB_gl_spirv specification, glGetUniformLocation should return -1 when no name reflection is available. Reviewed-by: Caio Marcelo de Oliveira Filho --- src/mesa/main/uniforms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c index 3b7249aabb5..116fab21cb9 100644 --- a/src/mesa/main/uniforms.c +++ b/src/mesa/main/uniforms.c @@ -1007,7 +1007,7 @@ _mesa_GetUniformLocation(GLuint programObj, const GLcharARB *name) shProg = _mesa_lookup_shader_program_err(ctx, programObj, "glGetUniformLocation"); - if (!shProg) + if (!shProg || !name) return -1; /* Page 80 (page 94 of the PDF) of the OpenGL 2.1 spec says: -- 2.30.2