From: Alejandro PiƱeiro Date: Sat, 15 Sep 2018 14:42:58 +0000 (+0200) Subject: i965: use GLboolean for all brw_link_shader returns X-Git-Tag: upstream/19.3.0~4942 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=678140e195fe1e58edc888e7ea2b6ce3a4d61935;p=platform%2Fupstream%2Fmesa.git i965: use GLboolean for all brw_link_shader returns The function had a mix of true/GL_TRUE and false/GL_FALSE returns. Using GL_TRUE/GL_FALSE as the function returns a GLboolean. Reviewed-by: Timothy Arceri --- diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp index 8d718f3..1c2025f 100644 --- a/src/mesa/drivers/dri/i965/brw_link.cpp +++ b/src/mesa/drivers/dri/i965/brw_link.cpp @@ -270,7 +270,7 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg) /* SPIR-V programs use a NIR linker */ if (shProg->data->spirv) { if (!gl_nir_link_uniforms(ctx, shProg)) - return false; + return GL_FALSE; gl_nir_link_assign_atomic_counter_resources(ctx, shProg); gl_nir_link_assign_xfb_resources(ctx, shProg); @@ -380,7 +380,7 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg) } if (brw->precompile && !brw_shader_precompile(ctx, shProg)) - return false; + return GL_FALSE; /* SPIR-V programs build its resource list from linked NIR shaders. */ if (!shProg->data->spirv) @@ -398,5 +398,5 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg) shader->ir = NULL; } - return true; + return GL_TRUE; }