|
 |
e47e58 |
From 4b2d21ff03ed389138fcb9bca778aec02bafcadb Mon Sep 17 00:00:00 2001
|
|
|
e47e58 |
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
|
|
|
e47e58 |
Date: Fri, 2 Feb 2018 14:34:50 +0800
|
|
|
e47e58 |
Subject: [PATCH] renderer/x11: Enable GPU memory purge error extension if
|
|
|
e47e58 |
available
|
|
|
e47e58 |
|
|
|
e47e58 |
This was done by the clutter X11 backend before prior to introducing
|
|
|
e47e58 |
MetaRenderer, but during that work, enabling of said extension was lost.
|
|
|
e47e58 |
Let's turn it on again.
|
|
|
e47e58 |
|
|
|
e47e58 |
https://bugzilla.gnome.org/show_bug.cgi?id=739178
|
|
|
e47e58 |
---
|
|
|
e47e58 |
src/backends/x11/meta-backend-x11.c | 2 --
|
|
|
e47e58 |
src/backends/x11/meta-renderer-x11.c | 1 +
|
|
|
e47e58 |
2 files changed, 1 insertion(+), 2 deletions(-)
|
|
|
e47e58 |
|
|
|
e47e58 |
diff --git a/src/backends/x11/meta-backend-x11.c b/src/backends/x11/meta-backend-x11.c
|
|
|
e47e58 |
index 233532435..c7602cc70 100644
|
|
|
e47e58 |
--- a/src/backends/x11/meta-backend-x11.c
|
|
|
e47e58 |
+++ b/src/backends/x11/meta-backend-x11.c
|
|
|
e47e58 |
@@ -705,8 +705,6 @@ meta_backend_x11_init (MetaBackendX11 *x11)
|
|
|
e47e58 |
*/
|
|
|
e47e58 |
XInitThreads();
|
|
|
e47e58 |
|
|
|
e47e58 |
- clutter_x11_request_reset_on_video_memory_purge ();
|
|
|
e47e58 |
-
|
|
|
e47e58 |
/* We do X11 event retrieval ourselves */
|
|
|
e47e58 |
clutter_x11_disable_event_retrieval ();
|
|
|
e47e58 |
}
|
|
|
e47e58 |
diff --git a/src/backends/x11/meta-renderer-x11.c b/src/backends/x11/meta-renderer-x11.c
|
|
|
e47e58 |
index 90924e038..003211d85 100644
|
|
|
e47e58 |
--- a/src/backends/x11/meta-renderer-x11.c
|
|
|
e47e58 |
+++ b/src/backends/x11/meta-renderer-x11.c
|
|
|
e47e58 |
@@ -73,6 +73,7 @@ meta_renderer_x11_create_cogl_renderer (MetaRenderer *renderer)
|
|
|
e47e58 |
cogl_renderer = cogl_renderer_new ();
|
|
|
e47e58 |
cogl_renderer_set_custom_winsys (cogl_renderer, get_x11_cogl_winsys_vtable);
|
|
|
e47e58 |
cogl_xlib_renderer_set_foreign_display (cogl_renderer, xdisplay);
|
|
|
e47e58 |
+ cogl_xlib_renderer_request_reset_on_video_memory_purge (cogl_renderer, TRUE);
|
|
|
e47e58 |
|
|
|
e47e58 |
/* Set up things so that if the INTEL_swap_event extension is not present,
|
|
|
e47e58 |
* but the driver is known to have good thread support, we use an extra
|
|
|
e47e58 |
--
|
|
|
e47e58 |
2.14.3
|
|
|
e47e58 |
|