[Mesa-dev] [PATCH 01/10] i965: Fix brw_link_shader to return false rather than NULL.

Kenneth Graunke kenneth at whitecape.org
Fri Aug 24 03:05:54 PDT 2012


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 <kenneth at whitecape.org>
---
 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 86426e0..77e9392 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,
-- 
1.7.11.4



More information about the mesa-dev mailing list