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

[Lionel Landwerlin]

Thanks, I didn't pull -r :)

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>

On 03/01/17 11:44, Timothy Arceri wrote:
> On Tue, 2017-01-03 at 11:39 +0000, Lionel Landwerlin wrote:
>> 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 ?
> This patch should really have been squashed with this one I pushed
> today [1]. I only just noticed after I pushed it that a had a separate
> one for cs.
>
> [1] https://cgit.freedesktop.org/mesa/mesa/commit/?id=b880281f0bb3f4cd6
> 5d38ae13a0db2dba6d7a5ed
>
>>
>> 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);
>>
>> _______________________________________________
>> mesa-dev mailing list
>> mesa-dev at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev