Hi Emil,
On Thu, Jan 18, 2018 at 3:22 PM, Emil Velikov <emil.l.veli...@gmail.com> wrote:
> On 18 January 2018 at 11:33, <maxin.j...@gmail.com> wrote:
>> From: "Maxin B. John" <maxin.j...@intel.com>
>>
>> Sort the output to ensure build reproducibility
>>
>> Signed-off-by: Maxin B. John <maxin.j...@intel.com>
>> ---
>> src/intel/vulkan/anv_icd.py | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/src/intel/vulkan/anv_icd.py b/src/intel/vulkan/anv_icd.py
>> index 4ed01fa..31bb068 100644
>> --- a/src/intel/vulkan/anv_icd.py
>> +++ b/src/intel/vulkan/anv_icd.py
>> @@ -44,4 +44,4 @@ if __name__ == '__main__':
>> }
>>
>> with open(args.out, 'w') as f:
>> - json.dump(json_data, f, indent = 4)
>> + json.dump(json_data, f, indent = 4, sort_keys=True)
>
> I'm slightly confused what exactly causes the issue.
> Please shed some light so we can add it to the commit message.
Without this patch, contents of intel_icd.i586.json was different for
each build.
ie: varying from:
{
"ICD": {
"api_version": "1.0.57",
"library_path": "/usr/lib/libvulkan_intel.so"
},
"file_format_version": "1.0.0"
}
to:
{
"ICD": {
"library_path": "/usr/lib/libvulkan_intel.so",
"api_version": "1.0.57"
},
"file_format_version": "1.0.0"
}
Sorting this dictionary helps in resolving the binary differences when
mesa-vulkan-drivers
are built several times.
Links:
https://bugzilla.yoctoproject.org/attachment.cgi?id=4174
https://bugzilla.yoctoproject.org/show_bug.cgi?id=12479
> Regardless, the patch seems correct and is
> Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
> Fixes: 0ab04ba979b ("anv: Use python to generate ICD json files")
Thanks a lot !
> -Emil
Best Regards,
Maxin
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
