Module: Mesa Branch: master Commit: d1447f5bc92e6bcbc9180e606cdfef9540678918 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d1447f5bc92e6bcbc9180e606cdfef9540678918
Author: Kenneth Graunke <[email protected]> Date: Tue Aug 21 11:39:49 2012 -0700 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 <[email protected]> Reviewed-with-great-enthusiasm-by: Paul Berry <[email protected]> Reviewed-by: Ian Romanick <[email protected]> Reviewed-by Eric Anholt <[email protected]> --- src/mesa/drivers/dri/i965/brw_shader.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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, _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
