mesa: Changes to 'ubuntu+1'
debian/patches/egl-platform-mir.patch | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 14d2fe4742f414145e8c563502f064caa17687e0
Author: Christopher James Halse Rogers <raof@ubuntu.com>
Date: Mon Dec 21 14:39:00 2015 +1100
Update Mir patch for dri2_get_dri_config change
diff --git a/debian/patches/egl-platform-mir.patch b/debian/patches/egl-platform-mir.patch
index 13f6759..4955db0 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -171,7 +171,7 @@ Index: mesa/src/egl/drivers/dri2/platform_mir.c
===================================================================
--- /dev/null
+++ mesa/src/egl/drivers/dri2/platform_mir.c
-@@ -0,0 +1,633 @@
+@@ -0,0 +1,637 @@
+/*
+ * Copyright © 2012 Canonical, Inc
+ *
@@ -497,6 +497,7 @@ Index: mesa/src/egl/drivers/dri2/platform_mir.c
+ struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
+ struct dri2_egl_config *dri2_conf = dri2_egl_config(conf);
+ struct dri2_egl_surface *dri2_surf;
++ const __DRIconfig *config;
+ MirSurfaceParameters surf_params;
+
+ (void) drv;
@@ -532,6 +533,9 @@ Index: mesa/src/egl/drivers/dri2/platform_mir.c
+ if(!mir_advance_colour_buffer(dri2_surf))
+ goto cleanup_surf;
+
++ config = dri2_get_dri_config(dri2_conf, EGL_WINDOW_BIT,
++ dri2_surf->base.GLColorspace);
++
+ if (dri2_dpy->gbm_dri) {
+ struct gbm_dri_surface *surf = malloc(sizeof *surf);
+
@@ -545,13 +549,13 @@ Index: mesa/src/egl/drivers/dri2/platform_mir.c
+
+ dri2_surf->dri_drawable =
+ (*dri2_dpy->dri2->createNewDrawable) (dri2_dpy->dri_screen,
-+ dri2_conf->dri_double_config,
++ config,
+ dri2_surf->gbm_surf);
+ }
+ else {
+ dri2_surf->dri_drawable =
+ (*dri2_dpy->dri2->createNewDrawable) (dri2_dpy->dri_screen,
-+ dri2_conf->dri_double_config,
++ config,
+ dri2_surf);
+ }
+
Reply to: