Accepting request 610642 from home:mimi_vx:branches:X11:XOrg
- Update to 18.1.0 - refreshed archlinux_0001-Fix-linkage-against-shared-glapi.patch - add u_intel_anv-make-scripts-python-2-3-compat.patch for build ANV with python * Vulkan 1.1 support for the ANV and RADV drivers. * RadeonSI and RADV have "Vega M" GPU support for Kabylake G processors * A simple Gallium3D HUD option as an alternative to the advanced heads-up display * There is also now Vega 12 support too. * For new hardware support on the Intel side are the initial bits for Intel Icelake. * The Intel driver stack has meanwhile landed more SPIR-V bits towards OpenGL 4.6. * The Intel ANV driver has received new extensions too as well as enabling features like MSAA fast clears. * VP9 VA-API support for VCN and HEVC Main for VCN - Raven Ridge CPUs. * DRI3 1.1/1.2 support for going with the soon-to-be-out X.Org Server 1.20. * Etnaviv performance counter support when paired with the latest Etnaviv DRM in the mainline kernel. * The last-year-GSoC'ed OpenMAX Tizonia H.264 encoder/decoder. * UVD-based HEVC video encoding. * OpenGL 3.1 ARB_compatibility support for the major Gallium3D drivers. * RadeonSI 32-bit pointers support. * The Intel GLSL shader cache is enabled by default. * Nouveau NVC0 meanwhile finally has ARB_bindless_texture support. * On the old hardware front, R600g is now effectively at OpenGL 4.4 for the Radeon HD 5800/6900 series. - Update to 18.1.0 - refreshed archlinux_0001-Fix-linkage-against-shared-glapi.patch OBS-URL: https://build.opensuse.org/request/show/610642 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=745
This commit is contained in:
parent
67f52a2801
commit
fb75e5d215
@ -1,3 +1,34 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat May 19 17:45:35 UTC 2018 - mimi.vx@gmail.com
|
||||||
|
|
||||||
|
- Update to 18.1.0
|
||||||
|
- refreshed archlinux_0001-Fix-linkage-against-shared-glapi.patch
|
||||||
|
- add u_intel_anv-make-scripts-python-2-3-compat.patch for build ANV
|
||||||
|
with python
|
||||||
|
* Vulkan 1.1 support for the ANV and RADV drivers.
|
||||||
|
* RadeonSI and RADV have "Vega M" GPU support for Kabylake G processors
|
||||||
|
* A simple Gallium3D HUD option as an alternative to the advanced
|
||||||
|
heads-up display
|
||||||
|
* There is also now Vega 12 support too.
|
||||||
|
* For new hardware support on the Intel side are the initial
|
||||||
|
bits for Intel Icelake.
|
||||||
|
* The Intel driver stack has meanwhile landed more SPIR-V
|
||||||
|
bits towards OpenGL 4.6.
|
||||||
|
* The Intel ANV driver has received new extensions too as well as
|
||||||
|
enabling features like MSAA fast clears.
|
||||||
|
* VP9 VA-API support for VCN and HEVC Main for VCN - Raven Ridge CPUs.
|
||||||
|
* DRI3 1.1/1.2 support for going with the soon-to-be-out X.Org Server 1.20.
|
||||||
|
* Etnaviv performance counter support when paired with the latest Etnaviv
|
||||||
|
DRM in the mainline kernel.
|
||||||
|
* The last-year-GSoC'ed OpenMAX Tizonia H.264 encoder/decoder.
|
||||||
|
* UVD-based HEVC video encoding.
|
||||||
|
* OpenGL 3.1 ARB_compatibility support for the major Gallium3D drivers.
|
||||||
|
* RadeonSI 32-bit pointers support.
|
||||||
|
* The Intel GLSL shader cache is enabled by default.
|
||||||
|
* Nouveau NVC0 meanwhile finally has ARB_bindless_texture support.
|
||||||
|
* On the old hardware front, R600g is now effectively at OpenGL 4.4
|
||||||
|
for the Radeon HD 5800/6900 series.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat May 19 14:56:38 UTC 2018 - sndirsch@suse.com
|
Sat May 19 14:56:38 UTC 2018 - sndirsch@suse.com
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
|
|
||||||
%define glamor 1
|
%define glamor 1
|
||||||
%define _name_archive mesa
|
%define _name_archive mesa
|
||||||
%define _version 18.0.4
|
%define _version 18.1.0
|
||||||
%define with_opencl 0
|
%define with_opencl 0
|
||||||
%define with_vulkan 0
|
%define with_vulkan 0
|
||||||
%define with_llvm 0
|
%define with_llvm 0
|
||||||
@ -113,7 +113,7 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: Mesa-drivers
|
Name: Mesa-drivers
|
||||||
Version: 18.0.4
|
Version: 18.1.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: System for rendering 3-D graphics
|
Summary: System for rendering 3-D graphics
|
||||||
License: MIT
|
License: MIT
|
||||||
@ -137,6 +137,7 @@ Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch
|
|||||||
Patch32: archlinux_glvnd-fix-gl-dot-pc.patch
|
Patch32: archlinux_glvnd-fix-gl-dot-pc.patch
|
||||||
# Upstream
|
# Upstream
|
||||||
Patch43: u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch
|
Patch43: u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch
|
||||||
|
Patch44: u_intel_anv-make-scripts-python-2-3-compat.patch
|
||||||
Patch47: u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch
|
Patch47: u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch
|
||||||
|
|
||||||
BuildRequires: autoconf >= 2.60
|
BuildRequires: autoconf >= 2.60
|
||||||
@ -744,6 +745,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%patch43 -p1
|
%patch43 -p1
|
||||||
|
%patch44 -p1
|
||||||
%patch47 -p1
|
%patch47 -p1
|
||||||
|
|
||||||
# Remove requires to libglvnd/libglvnd-devel from baselibs.conf when
|
# Remove requires to libglvnd/libglvnd-devel from baselibs.conf when
|
||||||
|
31
Mesa.changes
31
Mesa.changes
@ -1,3 +1,34 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat May 19 17:45:35 UTC 2018 - mimi.vx@gmail.com
|
||||||
|
|
||||||
|
- Update to 18.1.0
|
||||||
|
- refreshed archlinux_0001-Fix-linkage-against-shared-glapi.patch
|
||||||
|
- add u_intel_anv-make-scripts-python-2-3-compat.patch for build ANV
|
||||||
|
with python
|
||||||
|
* Vulkan 1.1 support for the ANV and RADV drivers.
|
||||||
|
* RadeonSI and RADV have "Vega M" GPU support for Kabylake G processors
|
||||||
|
* A simple Gallium3D HUD option as an alternative to the advanced
|
||||||
|
heads-up display
|
||||||
|
* There is also now Vega 12 support too.
|
||||||
|
* For new hardware support on the Intel side are the initial
|
||||||
|
bits for Intel Icelake.
|
||||||
|
* The Intel driver stack has meanwhile landed more SPIR-V
|
||||||
|
bits towards OpenGL 4.6.
|
||||||
|
* The Intel ANV driver has received new extensions too as well as
|
||||||
|
enabling features like MSAA fast clears.
|
||||||
|
* VP9 VA-API support for VCN and HEVC Main for VCN - Raven Ridge CPUs.
|
||||||
|
* DRI3 1.1/1.2 support for going with the soon-to-be-out X.Org Server 1.20.
|
||||||
|
* Etnaviv performance counter support when paired with the latest Etnaviv
|
||||||
|
DRM in the mainline kernel.
|
||||||
|
* The last-year-GSoC'ed OpenMAX Tizonia H.264 encoder/decoder.
|
||||||
|
* UVD-based HEVC video encoding.
|
||||||
|
* OpenGL 3.1 ARB_compatibility support for the major Gallium3D drivers.
|
||||||
|
* RadeonSI 32-bit pointers support.
|
||||||
|
* The Intel GLSL shader cache is enabled by default.
|
||||||
|
* Nouveau NVC0 meanwhile finally has ARB_bindless_texture support.
|
||||||
|
* On the old hardware front, R600g is now effectively at OpenGL 4.4
|
||||||
|
for the Radeon HD 5800/6900 series.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat May 19 14:56:38 UTC 2018 - sndirsch@suse.com
|
Sat May 19 14:56:38 UTC 2018 - sndirsch@suse.com
|
||||||
|
|
||||||
|
5341
Mesa.keyring
5341
Mesa.keyring
File diff suppressed because it is too large
Load Diff
@ -42,7 +42,7 @@
|
|||||||
|
|
||||||
%define glamor 1
|
%define glamor 1
|
||||||
%define _name_archive mesa
|
%define _name_archive mesa
|
||||||
%define _version 18.0.4
|
%define _version 18.1.0
|
||||||
%define with_opencl 0
|
%define with_opencl 0
|
||||||
%define with_vulkan 0
|
%define with_vulkan 0
|
||||||
%define with_llvm 0
|
%define with_llvm 0
|
||||||
@ -112,7 +112,7 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: Mesa
|
Name: Mesa
|
||||||
Version: 18.0.4
|
Version: 18.1.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: System for rendering 3-D graphics
|
Summary: System for rendering 3-D graphics
|
||||||
License: MIT
|
License: MIT
|
||||||
@ -136,6 +136,7 @@ Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch
|
|||||||
Patch32: archlinux_glvnd-fix-gl-dot-pc.patch
|
Patch32: archlinux_glvnd-fix-gl-dot-pc.patch
|
||||||
# Upstream
|
# Upstream
|
||||||
Patch43: u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch
|
Patch43: u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch
|
||||||
|
Patch44: u_intel_anv-make-scripts-python-2-3-compat.patch
|
||||||
Patch47: u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch
|
Patch47: u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch
|
||||||
|
|
||||||
BuildRequires: autoconf >= 2.60
|
BuildRequires: autoconf >= 2.60
|
||||||
@ -743,6 +744,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%patch43 -p1
|
%patch43 -p1
|
||||||
|
%patch44 -p1
|
||||||
%patch47 -p1
|
%patch47 -p1
|
||||||
|
|
||||||
# Remove requires to libglvnd/libglvnd-devel from baselibs.conf when
|
# Remove requires to libglvnd/libglvnd-devel from baselibs.conf when
|
||||||
|
@ -8,12 +8,12 @@ Signed-off-by: Adam Jackson <ajax@redhat.com>
|
|||||||
src/gallium/targets/osmesa/Makefile.am | 2 +-
|
src/gallium/targets/osmesa/Makefile.am | 2 +-
|
||||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||||
|
|
||||||
Index: mesa-17.2.0/src/gallium/targets/osmesa/Makefile.am
|
Index: mesa-18.1.0/src/gallium/targets/osmesa/Makefile.am
|
||||||
===================================================================
|
===================================================================
|
||||||
--- mesa-17.2.0.orig/src/gallium/targets/osmesa/Makefile.am
|
--- mesa-18.1.0.orig/src/gallium/targets/osmesa/Makefile.am
|
||||||
+++ mesa-17.2.0/src/gallium/targets/osmesa/Makefile.am
|
+++ mesa-18.1.0/src/gallium/targets/osmesa/Makefile.am
|
||||||
@@ -63,7 +63,7 @@ lib@OSMESA_LIB@_la_LIBADD = \
|
@@ -61,7 +61,7 @@ lib@OSMESA_LIB@_la_LIBADD = \
|
||||||
$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
|
$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
|
||||||
$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
|
$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
|
||||||
$(top_builddir)/src/gallium/state_trackers/osmesa/libosmesa.la \
|
$(top_builddir)/src/gallium/state_trackers/osmesa/libosmesa.la \
|
||||||
- $(top_builddir)/src/mapi/glapi/libglapi.la \
|
- $(top_builddir)/src/mapi/glapi/libglapi.la \
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:1f3bcfe7cef0a5c20dae2b41df5d7e0a985e06be0183fa4d43b6068fcba2920f
|
|
||||||
size 10939356
|
|
Binary file not shown.
3
mesa-18.1.0.tar.xz
Normal file
3
mesa-18.1.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:c855c5b67ef993b7621f76d8b120769ec0415f1c3616eaff44ef7f7f300aceba
|
||||||
|
size 11118776
|
BIN
mesa-18.1.0.tar.xz.sig
Normal file
BIN
mesa-18.1.0.tar.xz.sig
Normal file
Binary file not shown.
@ -12,11 +12,11 @@ Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
|
|||||||
src/gallium/targets/xvmc/Makefile.am | 2 +-
|
src/gallium/targets/xvmc/Makefile.am | 2 +-
|
||||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am
|
Index: mesa-18.1.0/src/gallium/targets/vdpau/Makefile.am
|
||||||
index d388f8b..c9cc534 100644
|
===================================================================
|
||||||
--- a/src/gallium/targets/vdpau/Makefile.am
|
--- mesa-18.1.0.orig/src/gallium/targets/vdpau/Makefile.am
|
||||||
+++ b/src/gallium/targets/vdpau/Makefile.am
|
+++ mesa-18.1.0/src/gallium/targets/vdpau/Makefile.am
|
||||||
@@ -86,7 +86,7 @@ all-local: $(vdpau_LTLIBRARIES)
|
@@ -91,7 +91,7 @@ all-local: $(vdpau_LTLIBRARIES)
|
||||||
j=libvdpau_gallium.$(LIB_EXT); \
|
j=libvdpau_gallium.$(LIB_EXT); \
|
||||||
k=libvdpau_$${i}.$(LIB_EXT); \
|
k=libvdpau_$${i}.$(LIB_EXT); \
|
||||||
l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0; \
|
l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0; \
|
||||||
@ -25,7 +25,7 @@ index d388f8b..c9cc534 100644
|
|||||||
$${link_dir}/$${l}; \
|
$${link_dir}/$${l}; \
|
||||||
ln -sf $${l} \
|
ln -sf $${l} \
|
||||||
$${link_dir}/$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR); \
|
$${link_dir}/$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR); \
|
||||||
@@ -111,7 +111,7 @@ install-data-hook:
|
@@ -116,7 +116,7 @@ install-data-hook:
|
||||||
j=libvdpau_gallium.$(LIB_EXT); \
|
j=libvdpau_gallium.$(LIB_EXT); \
|
||||||
k=libvdpau_$${i}.$(LIB_EXT); \
|
k=libvdpau_$${i}.$(LIB_EXT); \
|
||||||
l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0; \
|
l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0; \
|
||||||
@ -34,11 +34,11 @@ index d388f8b..c9cc534 100644
|
|||||||
$${dest_dir}/$${l}; \
|
$${dest_dir}/$${l}; \
|
||||||
ln -sf $${l} \
|
ln -sf $${l} \
|
||||||
$${dest_dir}/$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR); \
|
$${dest_dir}/$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR); \
|
||||||
diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am
|
Index: mesa-18.1.0/src/gallium/targets/xvmc/Makefile.am
|
||||||
index fdc5f4b..93ef230 100644
|
===================================================================
|
||||||
--- a/src/gallium/targets/xvmc/Makefile.am
|
--- mesa-18.1.0.orig/src/gallium/targets/xvmc/Makefile.am
|
||||||
+++ b/src/gallium/targets/xvmc/Makefile.am
|
+++ mesa-18.1.0/src/gallium/targets/xvmc/Makefile.am
|
||||||
@@ -73,7 +73,7 @@ install-data-hook:
|
@@ -75,7 +75,7 @@ install-data-hook:
|
||||||
j=libXvMCgallium.$(LIB_EXT); \
|
j=libXvMCgallium.$(LIB_EXT); \
|
||||||
k=libXvMC$${i}.$(LIB_EXT); \
|
k=libXvMC$${i}.$(LIB_EXT); \
|
||||||
l=$${k}.$(XVMC_MAJOR).$(XVMC_MINOR).0; \
|
l=$${k}.$(XVMC_MAJOR).$(XVMC_MINOR).0; \
|
||||||
@ -47,6 +47,3 @@ index fdc5f4b..93ef230 100644
|
|||||||
$${dest_dir}/$${l}; \
|
$${dest_dir}/$${l}; \
|
||||||
ln -sf $${l} \
|
ln -sf $${l} \
|
||||||
$${dest_dir}/$${k}.$(XVMC_MAJOR).$(XVMC_MINOR); \
|
$${dest_dir}/$${k}.$(XVMC_MAJOR).$(XVMC_MINOR); \
|
||||||
--
|
|
||||||
2.6.2
|
|
||||||
|
|
||||||
|
138
u_intel_anv-make-scripts-python-2-3-compat.patch
Normal file
138
u_intel_anv-make-scripts-python-2-3-compat.patch
Normal file
@ -0,0 +1,138 @@
|
|||||||
|
Index: mesa-18.1.0-rc1/src/intel/vulkan/anv_extensions.py
|
||||||
|
===================================================================
|
||||||
|
--- mesa-18.1.0-rc1.orig/src/intel/vulkan/anv_extensions.py
|
||||||
|
+++ mesa-18.1.0-rc1/src/intel/vulkan/anv_extensions.py
|
||||||
|
@@ -29,13 +29,15 @@ import copy
|
||||||
|
import re
|
||||||
|
import xml.etree.cElementTree as et
|
||||||
|
|
||||||
|
+
|
||||||
|
def _bool_to_c_expr(b):
|
||||||
|
if b is True:
|
||||||
|
- return 'true';
|
||||||
|
+ return 'true'
|
||||||
|
elif b is False:
|
||||||
|
- return 'false';
|
||||||
|
+ return 'false'
|
||||||
|
else:
|
||||||
|
- return b;
|
||||||
|
+ return b
|
||||||
|
+
|
||||||
|
|
||||||
|
class Extension:
|
||||||
|
def __init__(self, name, ext_version, enable):
|
||||||
|
@@ -43,11 +45,13 @@ class Extension:
|
||||||
|
self.ext_version = int(ext_version)
|
||||||
|
self.enable = _bool_to_c_expr(enable)
|
||||||
|
|
||||||
|
+
|
||||||
|
class ApiVersion:
|
||||||
|
def __init__(self, max_patch_version, enable):
|
||||||
|
self.max_patch_version = max_patch_version
|
||||||
|
self.enable = _bool_to_c_expr(enable)
|
||||||
|
|
||||||
|
+
|
||||||
|
# Supported API versions. Each one is the maximum patch version for the given
|
||||||
|
# version. Version come in increasing order and each version is available if
|
||||||
|
# it's provided "enable" condition is true and all previous versions are
|
||||||
|
@@ -60,7 +64,7 @@ API_VERSIONS = [
|
||||||
|
ApiVersion('1.1.0', 'device->has_syncobj_wait'),
|
||||||
|
]
|
||||||
|
|
||||||
|
-MAX_API_VERSION = None # Computed later
|
||||||
|
+MAX_API_VERSION = None # Computed later
|
||||||
|
|
||||||
|
# On Android, we disable all surface and swapchain extensions. Android's Vulkan
|
||||||
|
# loader implements VK_KHR_surface and VK_KHR_swapchain, and applications
|
||||||
|
@@ -113,6 +117,7 @@ EXTENSIONS = [
|
||||||
|
'device->has_context_priority'),
|
||||||
|
]
|
||||||
|
|
||||||
|
+
|
||||||
|
class VkVersion:
|
||||||
|
def __init__(self, string):
|
||||||
|
split = string.split('.')
|
||||||
|
@@ -146,14 +151,59 @@ 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 __eq__(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() == other.__int_ver()
|
||||||
|
+
|
||||||
|
+ def __ne__(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() != other.__int_ver()
|
||||||
|
+
|
||||||
|
+ def __lt__(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() < other.__int_ver()
|
||||||
|
+
|
||||||
|
+ def __le__(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() <= other.__int_ver()
|
||||||
|
+
|
||||||
|
+ def __ge__(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() >= other.__int_ver()
|
||||||
|
+
|
||||||
|
+ 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()
|
||||||
|
|
||||||
|
|
||||||
|
MAX_API_VERSION = VkVersion('0.0.0')
|
||||||
|
Index: mesa-18.1.0-rc1/src/intel/vulkan/anv_entrypoints_gen.py
|
||||||
|
===================================================================
|
||||||
|
--- mesa-18.1.0-rc1.orig/src/intel/vulkan/anv_entrypoints_gen.py
|
||||||
|
+++ mesa-18.1.0-rc1/src/intel/vulkan/anv_entrypoints_gen.py
|
||||||
|
@@ -145,7 +145,7 @@ static const struct string_map_entry str
|
||||||
|
/* Hash table stats:
|
||||||
|
* size ${len(strmap.sorted_strings)} entries
|
||||||
|
* collisions entries:
|
||||||
|
-% for i in xrange(10):
|
||||||
|
+% for i in range(10):
|
||||||
|
* ${i}${'+' if i == 9 else ' '} ${strmap.collisions[i]}
|
||||||
|
% endfor
|
||||||
|
*/
|
||||||
|
@@ -507,7 +507,7 @@ def get_entrypoints(doc, entrypoints_to_
|
||||||
|
assert e.core_version is None
|
||||||
|
e.extensions.append(ext)
|
||||||
|
|
||||||
|
- return [e for e in entrypoints.itervalues() if e.enabled]
|
||||||
|
+ return [e for e in entrypoints.values() if e.enabled]
|
||||||
|
|
||||||
|
|
||||||
|
def get_entrypoints_defines(doc):
|
Loading…
Reference in New Issue
Block a user