SHA256
1
0
forked from pool/Mesa

- Update to 18.3.0 final release

* The top highlights include:
    + GL_AMD_depth_clamp_separate on r600, radeonsi.
    + GL_AMD_framebuffer_multisample_advanced on radeonsi.
    + GL_AMD_gpu_shader_int64 on i965, nvc0, radeonsi.
    + GL_AMD_multi_draw_indirect on all GL 4.x drivers.
    + GL_AMD_query_buffer_object on i965, nvc0, r600, radeonsi.
    + GL_EXT_disjoint_timer_query on radeonsi and most other Gallium drivers
      (ES extension)
    + GL_EXT_texture_compression_s3tc on all drivers (ES extension)
    + GL_EXT_vertex_attrib_64bit on i965, nvc0, radeonsi.
    + GL_EXT_window_rectangles on radeonsi.
    + GL_KHR_texture_compression_astc_sliced_3d on radeonsi.
    + GL_NV_fragment_shader_interlock on i965.
    + EGL_EXT_device_base for all drivers.
    + EGL_EXT_device_drm for all drivers.
    + EGL_MESA_device_software for all drivers.
  * Additional features:
    ANV
    + VK_EXT_calibrated_timestamps
    + VK_EXT_pci_bus_info
    + VK_EXT_sampler_filter_minmax
    + VK_EXT_vertex_attribute_divisor v3
    + VK_GOOGLE_decorate_string
    + VK_GOOGLE_hlsl_functionality1
    + VK_KHR_driver_properties
    RADV
    + VK_EXT_calibrated_timestamps
    + VK_EXT_conservative_rasterization
    + VK_EXT_pci_bus_info
    + VK_EXT_transform_feedback
    + VK_EXT_vertex_attribute_divisor v3
    + VK_GOOGLE_decorate_string
    + VK_GOOGLE_hlsl_functionality1
    + VK_KHR_driver_properties
- supersedes u_constify-struct-drisw_loader_funcs.patch,
  u_drisw-use-separate-drisw_loader_funcs-for-shm.patch

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=790
This commit is contained in:
Stefan Dirsch 2018-12-07 14:17:31 +00:00 committed by Git OBS Bridge
parent 32ad8fd4af
commit abb4baeb5b
10 changed files with 89 additions and 172 deletions

View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Fri Dec 7 13:57:32 UTC 2018 - sndirsch@suse.com
- Update to 18.3.0 final release
* The top highlights include:
+ GL_AMD_depth_clamp_separate on r600, radeonsi.
+ GL_AMD_framebuffer_multisample_advanced on radeonsi.
+ GL_AMD_gpu_shader_int64 on i965, nvc0, radeonsi.
+ GL_AMD_multi_draw_indirect on all GL 4.x drivers.
+ GL_AMD_query_buffer_object on i965, nvc0, r600, radeonsi.
+ GL_EXT_disjoint_timer_query on radeonsi and most other Gallium drivers
(ES extension)
+ GL_EXT_texture_compression_s3tc on all drivers (ES extension)
+ GL_EXT_vertex_attrib_64bit on i965, nvc0, radeonsi.
+ GL_EXT_window_rectangles on radeonsi.
+ GL_KHR_texture_compression_astc_sliced_3d on radeonsi.
+ GL_NV_fragment_shader_interlock on i965.
+ EGL_EXT_device_base for all drivers.
+ EGL_EXT_device_drm for all drivers.
+ EGL_MESA_device_software for all drivers.
* Additional features:
ANV
+ VK_EXT_calibrated_timestamps
+ VK_EXT_pci_bus_info
+ VK_EXT_sampler_filter_minmax
+ VK_EXT_vertex_attribute_divisor v3
+ VK_GOOGLE_decorate_string
+ VK_GOOGLE_hlsl_functionality1
+ VK_KHR_driver_properties
RADV
+ VK_EXT_calibrated_timestamps
+ VK_EXT_conservative_rasterization
+ VK_EXT_pci_bus_info
+ VK_EXT_transform_feedback
+ VK_EXT_vertex_attribute_divisor v3
+ VK_GOOGLE_decorate_string
+ VK_GOOGLE_hlsl_functionality1
+ VK_KHR_driver_properties
- supersedes u_constify-struct-drisw_loader_funcs.patch,
u_drisw-use-separate-drisw_loader_funcs-for-shm.patch
-------------------------------------------------------------------
Tue Dec 4 11:20:05 UTC 2018 - bjorn.lie@gmail.com

View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@ -42,7 +42,7 @@
%define glamor 1
%define _name_archive mesa
%define _version 18.3.0-rc5
%define _version 18.3.0
%define with_opencl 0
%define with_vulkan 0
%define with_llvm 0
@ -136,8 +136,6 @@ Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch
Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch
Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch
Patch55: u_constify-struct-drisw_loader_funcs.patch
Patch56: u_drisw-use-separate-drisw_loader_funcs-for-shm.patch
Patch57: u_wayland_egl-Ensure-EGL-surface.patch
BuildRequires: autoconf >= 2.60
@ -737,8 +735,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
%endif
%patch54 -p1
%patch55 -p1
%patch56 -p1
%patch57 -p1
# Remove requires to libglvnd/libglvnd-devel from baselibs.conf when

View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Fri Dec 7 13:57:32 UTC 2018 - sndirsch@suse.com
- Update to 18.3.0 final release
* The top highlights include:
+ GL_AMD_depth_clamp_separate on r600, radeonsi.
+ GL_AMD_framebuffer_multisample_advanced on radeonsi.
+ GL_AMD_gpu_shader_int64 on i965, nvc0, radeonsi.
+ GL_AMD_multi_draw_indirect on all GL 4.x drivers.
+ GL_AMD_query_buffer_object on i965, nvc0, r600, radeonsi.
+ GL_EXT_disjoint_timer_query on radeonsi and most other Gallium drivers
(ES extension)
+ GL_EXT_texture_compression_s3tc on all drivers (ES extension)
+ GL_EXT_vertex_attrib_64bit on i965, nvc0, radeonsi.
+ GL_EXT_window_rectangles on radeonsi.
+ GL_KHR_texture_compression_astc_sliced_3d on radeonsi.
+ GL_NV_fragment_shader_interlock on i965.
+ EGL_EXT_device_base for all drivers.
+ EGL_EXT_device_drm for all drivers.
+ EGL_MESA_device_software for all drivers.
* Additional features:
ANV
+ VK_EXT_calibrated_timestamps
+ VK_EXT_pci_bus_info
+ VK_EXT_sampler_filter_minmax
+ VK_EXT_vertex_attribute_divisor v3
+ VK_GOOGLE_decorate_string
+ VK_GOOGLE_hlsl_functionality1
+ VK_KHR_driver_properties
RADV
+ VK_EXT_calibrated_timestamps
+ VK_EXT_conservative_rasterization
+ VK_EXT_pci_bus_info
+ VK_EXT_transform_feedback
+ VK_EXT_vertex_attribute_divisor v3
+ VK_GOOGLE_decorate_string
+ VK_GOOGLE_hlsl_functionality1
+ VK_KHR_driver_properties
- supersedes u_constify-struct-drisw_loader_funcs.patch,
u_drisw-use-separate-drisw_loader_funcs-for-shm.patch
-------------------------------------------------------------------
Tue Dec 4 11:20:05 UTC 2018 - bjorn.lie@gmail.com

View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@ -41,7 +41,7 @@
%define glamor 1
%define _name_archive mesa
%define _version 18.3.0-rc5
%define _version 18.3.0
%define with_opencl 0
%define with_vulkan 0
%define with_llvm 0
@ -135,8 +135,6 @@ Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch
Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch
Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch
Patch55: u_constify-struct-drisw_loader_funcs.patch
Patch56: u_drisw-use-separate-drisw_loader_funcs-for-shm.patch
Patch57: u_wayland_egl-Ensure-EGL-surface.patch
BuildRequires: autoconf >= 2.60
@ -736,8 +734,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
%endif
%patch54 -p1
%patch55 -p1
%patch56 -p1
%patch57 -p1
# Remove requires to libglvnd/libglvnd-devel from baselibs.conf when

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d8a2c19719a7b14ae3725ef33d11d640ebfff5afb793e92c0a5740f0a2dd548a
size 11863792

Binary file not shown.

3
mesa-18.3.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b63f947e735d6ef3dfaa30c789a9adfbae18aea671191eaacde95a18c17fc38a
size 11865356

BIN
mesa-18.3.0.tar.xz.sig Normal file

Binary file not shown.

View File

@ -1,76 +0,0 @@
Git-commit: 9c3582dda880ef2a5ae6c55d2f457afbf6a5496d
Author: Michal Srb <msrb@suse.com>
Subject: Constify struct drisw_loader_funcs.
Patch-Mainline: To be upstreamed
References: boo#1113533
---
src/gallium/auxiliary/pipe-loader/pipe_loader.h | 2 +-
src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c | 2 +-
src/gallium/winsys/sw/dri/dri_sw_winsys.c | 4 ++--
src/gallium/winsys/sw/dri/dri_sw_winsys.h | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader.h b/src/gallium/auxiliary/pipe-loader/pipe_loader.h
index 05be94cae3..9b26414534 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader.h
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader.h
@@ -142,7 +142,7 @@ pipe_loader_release(struct pipe_loader_device **devs, int ndev);
*/
bool
pipe_loader_sw_probe_dri(struct pipe_loader_device **devs,
- struct drisw_loader_funcs *drisw_lf);
+ const struct drisw_loader_funcs *drisw_lf);
/**
* Initialize a kms backed sw device given an fd.
diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
index d387ce90d3..587b6f8567 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
@@ -132,7 +132,7 @@ pipe_loader_sw_probe_teardown_common(struct pipe_loader_sw_device *sdev)
#ifdef HAVE_PIPE_LOADER_DRI
bool
-pipe_loader_sw_probe_dri(struct pipe_loader_device **devs, struct drisw_loader_funcs *drisw_lf)
+pipe_loader_sw_probe_dri(struct pipe_loader_device **devs, const struct drisw_loader_funcs *drisw_lf)
{
struct pipe_loader_sw_device *sdev = CALLOC_STRUCT(pipe_loader_sw_device);
int i;
diff --git a/src/gallium/winsys/sw/dri/dri_sw_winsys.c b/src/gallium/winsys/sw/dri/dri_sw_winsys.c
index d519bcfedd..cd44b036c6 100644
--- a/src/gallium/winsys/sw/dri/dri_sw_winsys.c
+++ b/src/gallium/winsys/sw/dri/dri_sw_winsys.c
@@ -62,7 +62,7 @@ struct dri_sw_winsys
{
struct sw_winsys base;
- struct drisw_loader_funcs *lf;
+ const struct drisw_loader_funcs *lf;
};
static inline struct dri_sw_displaytarget *
@@ -282,7 +282,7 @@ dri_destroy_sw_winsys(struct sw_winsys *winsys)
}
struct sw_winsys *
-dri_create_sw_winsys(struct drisw_loader_funcs *lf)
+dri_create_sw_winsys(const struct drisw_loader_funcs *lf)
{
struct dri_sw_winsys *ws;
diff --git a/src/gallium/winsys/sw/dri/dri_sw_winsys.h b/src/gallium/winsys/sw/dri/dri_sw_winsys.h
index 329ac06a05..47e3777d4c 100644
--- a/src/gallium/winsys/sw/dri/dri_sw_winsys.h
+++ b/src/gallium/winsys/sw/dri/dri_sw_winsys.h
@@ -33,6 +33,6 @@
struct sw_winsys;
-struct sw_winsys *dri_create_sw_winsys(struct drisw_loader_funcs *lf);
+struct sw_winsys *dri_create_sw_winsys(const struct drisw_loader_funcs *lf);
#endif
--
2.16.4

View File

@ -1,81 +0,0 @@
Git-commit: ed4e414267994331730f48cfa8d8bf6dce586969
Author: Michal Srb <msrb@suse.com>
Subject: drisw: Use separate drisw_loader_funcs for shm
Patch-Mainline: To be upstreamed
References: boo#1113533
The original code was modifying the global drisw_lf variable, which is bad
when there are multiple contexts in single process, each initialized with
different loader. One may support put_image_shm and the other not.
Since there are currently only two possible combinations, lets create two
global tables, one for each. Lets make them const, since we won't change them
and they can be shared.
This fixes crash in VLC. It used two GL contexts (each in different thread), one
was initialized by its Qt GUI, the other by its video output plugin. The first
one set the put_image_shm=drisw_put_image_shm, the second did not, but
since the same structure was used, the drisw_put_image_shm was used too. Then
it crashed because the second loader did not have putImageShm set.
Downstream bug:
https://bugzilla.opensuse.org/show_bug.cgi?id=1113533
v2: Added Fixes and described the VLC bug.
Fixes: 63c427fa71a ("drisw: use putImageShm if available")
Signed-off-by: Michal Srb <msrb@suse.com>
---
src/gallium/state_trackers/dri/drisw.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/gallium/state_trackers/dri/drisw.c b/src/gallium/state_trackers/dri/drisw.c
index 886f94dc02..5a0d2e1354 100644
--- a/src/gallium/state_trackers/dri/drisw.c
+++ b/src/gallium/state_trackers/dri/drisw.c
@@ -421,12 +421,19 @@ static const __DRIextension *drisw_screen_extensions[] = {
NULL
};
-static struct drisw_loader_funcs drisw_lf = {
+static const struct drisw_loader_funcs drisw_lf = {
.get_image = drisw_get_image,
.put_image = drisw_put_image,
.put_image2 = drisw_put_image2
};
+static const struct drisw_loader_funcs drisw_shm_lf = {
+ .get_image = drisw_get_image,
+ .put_image = drisw_put_image,
+ .put_image2 = drisw_put_image2,
+ .put_image_shm = drisw_put_image_shm
+};
+
static const __DRIconfig **
drisw_init_screen(__DRIscreen * sPriv)
{
@@ -434,6 +441,7 @@ drisw_init_screen(__DRIscreen * sPriv)
const __DRIconfig **configs;
struct dri_screen *screen;
struct pipe_screen *pscreen = NULL;
+ const struct drisw_loader_funcs *lf = &drisw_lf;
screen = CALLOC_STRUCT(dri_screen);
if (!screen)
@@ -448,10 +456,10 @@ drisw_init_screen(__DRIscreen * sPriv)
sPriv->extensions = drisw_screen_extensions;
if (loader->base.version >= 4) {
if (loader->putImageShm)
- drisw_lf.put_image_shm = drisw_put_image_shm;
+ lf = &drisw_shm_lf;
}
- if (pipe_loader_sw_probe_dri(&screen->dev, &drisw_lf)) {
+ if (pipe_loader_sw_probe_dri(&screen->dev, lf)) {
dri_init_options(screen);
pscreen = pipe_loader_create_screen(screen->dev);
--
2.16.4