b3ed051f81
- Place khrplatform.h into new package Mesa-KHR-devel. It is now
required by all devel packages that need it. (bsc#1117365)
- Remove n_drisw-Do-not-use-drisw_put_image_shm.patch,
add u_constify-struct-drisw_loader_funcs.patch
and u_drisw-use-separate-drisw_loader_funcs-for-shm.patch.
* Replace workaround with proper fix for crash in VLC and
possibly other applications. (boo#1113533)
OBS-URL: https://build.opensuse.org/request/show/652135
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=786
77 lines
2.8 KiB
Diff
77 lines
2.8 KiB
Diff
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
|
|
|