From d1447f5bc92e6bcbc9180e606cdfef9540678918 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Tue, 21 Aug 2012 11:39:49 -0700 Subject: [PATCH] i965: Fix brw_link_shader to return false rather than NULL. Fixes brw_shader.cpp:101:9: warning: converting to non-pointer type 'GLboolean {aka unsigned char}' from NULL [-Wconversion-null] Signed-off-by: Kenneth Graunke Reviewed-with-great-enthusiasm-by: Paul Berry Reviewed-by: Ian Romanick Reviewed-by Eric Anholt --- src/mesa/drivers/dri/i965/brw_shader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp index 86426e0cfea..77e93920713 100644 --- a/src/mesa/drivers/dri/i965/brw_shader.cpp +++ b/src/mesa/drivers/dri/i965/brw_shader.cpp @@ -98,7 +98,7 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg) struct gl_program *prog = ctx->Driver.NewProgram(ctx, targets[stage], shader->base.Name); if (!prog) - return NULL; + return false; prog->Parameters = _mesa_new_parameter_list(); _mesa_generate_parameters_list_for_uniforms(shProg, &shader->base, -- 2.30.2