[Mesa-dev] [PATCH 04/53] i965: get InfoLog and LinkStatus via the pointer in gl_program

[Lionel Landwerlin]

Did you left out accesses to prog-> and shader_prog-> on purpose in :
brw_tcs.c
brw_tes.c
brw_vs.c
brw_wm.c ?


On 03/01/17 02:43, Timothy Arceri wrote:
> ---
>   src/mesa/drivers/dri/i965/brw_cs.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_cs.c b/src/mesa/drivers/dri/i965/brw_cs.c
> index 522ddb9..f220846 100644
> --- a/src/mesa/drivers/dri/i965/brw_cs.c
> +++ b/src/mesa/drivers/dri/i965/brw_cs.c
> @@ -69,10 +69,10 @@ brw_codegen_cs_prog(struct brw_context *brw,
>      memset(&prog_data, 0, sizeof(prog_data));
>   
>      if (cp->program.info.cs.shared_size > 64 * 1024) {
> -      prog->data->LinkStatus = false;
> +      cp->program.sh.data->LinkStatus = false;
>         const char *error_str =
>            "Compute shader used more than 64KB of shared variables";
> -      ralloc_strcat(&prog->data->InfoLog, error_str);
> +      ralloc_strcat(&cp->program.sh.data->InfoLog, error_str);
>         _mesa_problem(NULL, "Failed to link compute shader: %s\n", error_str);
>   
>         ralloc_free(mem_ctx);
> @@ -122,8 +122,8 @@ brw_codegen_cs_prog(struct brw_context *brw,
>                               &prog_data, cp->program.nir, st_index,
>                               &program_size, &error_str);
>      if (program == NULL) {
> -      prog->data->LinkStatus = false;
> -      ralloc_strcat(&prog->data->InfoLog, error_str);
> +      cp->program.sh.data->LinkStatus = false;
> +      ralloc_strcat(&cp->program.sh.data->InfoLog, error_str);
>         _mesa_problem(NULL, "Failed to compile compute shader: %s\n", error_str);
>   
>         ralloc_free(mem_ctx);