[Mesa-dev] [PATCH 3/4] anv: Use central api generation scripts.

Bas Nieuwenhuizen bas at basnieuwenhuizen.nl
Wed Aug 8 10:44:10 UTC 2018


On Wed, Aug 8, 2018 at 12:39 PM, Eric Engestrom
<eric.engestrom at intel.com> wrote:
> On Wednesday, 2018-08-08 11:31:09 +0100, Emil Velikov wrote:
>> On 8 August 2018 at 00:14, Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl> wrote:
>> > This became kind of messy as python imports cannot really look up
>> > parent/sibling directories. I saw some scripts use sys.path but
>> > that became even more messy due to import locations.
>> >
>> > I also move the selections of the dispatch table out of the
>> > generation script because it is not easily shared, and generating
>> > it did not really win anything anyway.
>> > ---
>> >  src/intel/Android.vulkan.mk             |   9 +
>> >  src/intel/Makefile.vulkan.am            |  25 +-
>>
>> The Android/Makefile/meson changes seem OK. Admittedly we have better
>> meson experts ;-)
>> For those:
>> Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
>>
>>
>> > diff --git a/src/vulkan/util/vk_extensions.py b/src/vulkan/util/vk_extensions.py
>> > index 4f6667fe86c..79ae3af02ea 100644
>> > --- a/src/vulkan/util/vk_extensions.py
>> > +++ b/src/vulkan/util/vk_extensions.py
>> > @@ -82,11 +82,12 @@ class VkVersion:
>> >          patch = self.patch if self.patch is not None else 0
>> >          return (self.major << 22) | (self.minor << 12) | patch
>> >
>> > -    def __cmp__(self, other):
>> > +    def __gt__(self, other):
>> >          # If only one of them has a patch version, "ignore" it by making
>> >          # other's patch version match self.
>> >          if (self.patch is None) != (other.patch is None):
>> >              other = copy.copy(other)
>> >              other.patch = self.patch
>> >
>> > -        return self.__int_ver().__cmp__(other.__int_ver())
>> > +        return self.__int_ver() > other.__int_ver()
>> > +
>>
>> Another hunk that should have been part of patch 1/4?
>
> I think it's actually part of Mathieu Bridon's python3 series, but it
> definitely doesn't belong in this patch, and not in this series unless
> I'm missing something :)

Rebase error. This patch complained because it was removing the
changed code, and then I added it in the new file, not realizing I
needed to do that in an earlier patch.

>
>>
>> Thanks
>> Emil
>> _______________________________________________
>> mesa-dev mailing list
>> mesa-dev at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/mesa-dev


More information about the mesa-dev mailing list