Mesa (master): i965: Fix brw_link_shader to return false rather than NULL.
Kenneth Graunke
kwg at kemper.freedesktop.org
Sun Aug 26 05:57:06 UTC 2012
Module: Mesa
Branch: master
Commit: d1447f5bc92e6bcbc9180e606cdfef9540678918
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d1447f5bc92e6bcbc9180e606cdfef9540678918
Author: Kenneth Graunke <kenneth at whitecape.org>
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 <kenneth at whitecape.org>
Reviewed-with-great-enthusiasm-by: Paul Berry <stereotype441 at gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by Eric Anholt <eric at anholt.net>
---
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,
More information about the mesa-commit
mailing list