Rebased ref, commits from common ancestor:
commit 0f306c4b1c1b280798413aba62e186874994cf86
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Mon Jul 18 10:17:13 2016 +0300
release to yakkety
diff --git a/debian/changelog b/debian/changelog
index 27590aa..6e2cbb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-mesa (12.0.1-1ubuntu1) UNRELEASED; urgency=medium
+mesa (12.0.1-1ubuntu1) yakkety; urgency=medium
* Merge from debian experimental.
* Rebase Mir egl platform patch.
+ * Re-enable llvm on ppc64el to see if unity tests work.
- -- Timo Aaltonen <tjaal...@debian.org> Mon, 18 Jul 2016 08:07:33 +0300
+ -- Timo Aaltonen <tjaal...@debian.org> Mon, 18 Jul 2016 08:37:54 +0300
mesa (12.0.1-1) experimental; urgency=medium
commit 7db9b4c49c1cc978c5392fad255c5b97c058c107
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Mon Jul 18 08:37:44 2016 +0300
rebase Mir egl patch
diff --git a/debian/changelog b/debian/changelog
index 7cc0678..27590aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (12.0.1-1ubuntu1) UNRELEASED; urgency=medium
+
+ * Merge from debian experimental.
+ * Rebase Mir egl platform patch.
+
+ -- Timo Aaltonen <tjaal...@debian.org> Mon, 18 Jul 2016 08:07:33 +0300
+
mesa (12.0.1-1) experimental; urgency=medium
* New upstream release candidate.
diff --git a/debian/patches/egl-platform-mir.patch
b/debian/patches/egl-platform-mir.patch
index 4955db0..fd459f4 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -1,10 +1,8 @@
-Index: mesa/configure.ac
-===================================================================
---- mesa.orig/configure.ac
-+++ mesa/configure.ac
-@@ -1824,7 +1824,9 @@ for plat in $egl_platforms; do
- test "x$have_libdrm" != xyes &&
- AC_MSG_ERROR([EGL platform surfaceless requires libdrm
>= $LIBDRM_REQUIRED])
+--- a/configure.ac
++++ b/configure.ac
+@@ -2037,7 +2037,9 @@ for plat in $egl_platforms; do
+
+ android)
;;
-
+ mir)
@@ -13,18 +11,16 @@ Index: mesa/configure.ac
*)
AC_MSG_ERROR([EGL platform '$plat' does not exist])
;;
-@@ -1850,6 +1852,7 @@ AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND
+@@ -2063,6 +2065,7 @@ AM_CONDITIONAL(HAVE_PLATFORM_WAYLAND, ec
AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo "$egl_platforms" | grep -q 'drm')
AM_CONDITIONAL(HAVE_EGL_PLATFORM_SURFACELESS, echo "$egl_platforms" | grep -q
'surfaceless')
- AM_CONDITIONAL(HAVE_EGL_PLATFORM_NULL, echo "$egl_platforms" | grep -q 'null')
+ AM_CONDITIONAL(HAVE_EGL_PLATFORM_ANDROID, echo "$egl_platforms" | grep -q
'android')
+AM_CONDITIONAL(HAVE_EGL_PLATFORM_MIR, echo "$egl_platforms" | grep -q 'mir')
AM_CONDITIONAL(HAVE_EGL_DRIVER_DRI2, test "x$HAVE_EGL_DRIVER_DRI2" != "x")
-Index: mesa/include/EGL/eglplatform.h
-===================================================================
---- mesa.orig/include/EGL/eglplatform.h
-+++ mesa/include/EGL/eglplatform.h
+--- a/include/EGL/eglplatform.h
++++ b/include/EGL/eglplatform.h
@@ -105,6 +105,13 @@ typedef struct ANativeWindow*
typedef struct egl_native_pixmap_t* EGLNativePixmapType;
typedef void* EGLNativeDisplayType;
@@ -39,11 +35,9 @@ Index: mesa/include/EGL/eglplatform.h
#elif defined(__unix__) || defined(__APPLE__)
#if defined(MESA_EGL_NO_X11_HEADERS)
-Index: mesa/include/GL/internal/dri_interface.h
-===================================================================
---- mesa.orig/include/GL/internal/dri_interface.h
-+++ mesa/include/GL/internal/dri_interface.h
-@@ -895,10 +895,12 @@ struct __DRIbufferRec {
+--- a/include/GL/internal/dri_interface.h
++++ b/include/GL/internal/dri_interface.h
+@@ -921,10 +921,12 @@ struct __DRIbufferRec {
unsigned int pitch;
unsigned int cpp;
unsigned int flags;
@@ -57,11 +51,9 @@ Index: mesa/include/GL/internal/dri_interface.h
struct __DRIdri2LoaderExtensionRec {
__DRIextension base;
-Index: mesa/src/egl/drivers/dri2/egl_dri2.c
-===================================================================
---- mesa.orig/src/egl/drivers/dri2/egl_dri2.c
-+++ mesa/src/egl/drivers/dri2/egl_dri2.c
-@@ -783,6 +783,12 @@ dri2_initialize(_EGLDriver *drv, _EGLDis
+--- a/src/egl/drivers/dri2/egl_dri2.c
++++ b/src/egl/drivers/dri2/egl_dri2.c
+@@ -792,6 +792,12 @@ dri2_initialize(_EGLDriver *drv, _EGLDis
return EGL_TRUE;
return dri2_initialize_wayland(drv, disp);
#endif
@@ -74,7 +66,7 @@ Index: mesa/src/egl/drivers/dri2/egl_dri2.c
#ifdef HAVE_ANDROID_PLATFORM
case _EGL_PLATFORM_ANDROID:
if (disp->Options.TestOnly)
-@@ -832,6 +838,13 @@ dri2_terminate(_EGLDriver *drv, _EGLDisp
+@@ -841,6 +847,13 @@ dri2_terminate(_EGLDriver *drv, _EGLDisp
}
break;
#endif
@@ -88,7 +80,7 @@ Index: mesa/src/egl/drivers/dri2/egl_dri2.c
#ifdef HAVE_WAYLAND_PLATFORM
case _EGL_PLATFORM_WAYLAND:
if (dri2_dpy->wl_drm)
-@@ -853,7 +866,8 @@ dri2_terminate(_EGLDriver *drv, _EGLDisp
+@@ -862,7 +875,8 @@ dri2_terminate(_EGLDriver *drv, _EGLDisp
* the ones from the gbm device. As such the gbm itself is responsible
* for the cleanup.
*/
@@ -98,10 +90,8 @@ Index: mesa/src/egl/drivers/dri2/egl_dri2.c
for (i = 0; dri2_dpy->driver_configs[i]; i++)
free((__DRIconfig *) dri2_dpy->driver_configs[i]);
free(dri2_dpy->driver_configs);
-Index: mesa/src/egl/drivers/dri2/egl_dri2.h
-===================================================================
---- mesa.orig/src/egl/drivers/dri2/egl_dri2.h
-+++ mesa/src/egl/drivers/dri2/egl_dri2.h
+--- a/src/egl/drivers/dri2/egl_dri2.h
++++ b/src/egl/drivers/dri2/egl_dri2.h
@@ -70,6 +70,10 @@
#endif /* HAVE_ANDROID_PLATFORM */
@@ -113,9 +103,9 @@ Index: mesa/src/egl/drivers/dri2/egl_dri2.h
#include "eglconfig.h"
#include "eglcontext.h"
#include "egldisplay.h"
-@@ -216,6 +220,10 @@ struct dri2_egl_display
- #endif
+@@ -217,6 +221,10 @@ struct dri2_egl_display
+ int is_render_node;
int is_different_gpu;
+
+#ifdef HAVE_MIR_PLATFORM
@@ -124,7 +114,7 @@ Index: mesa/src/egl/drivers/dri2/egl_dri2.h
};
struct dri2_egl_context
-@@ -262,7 +270,7 @@ struct dri2_egl_surface
+@@ -263,7 +271,7 @@ struct dri2_egl_surface
struct gbm_dri_surface *gbm_surf;
#endif
@@ -133,7 +123,7 @@ Index: mesa/src/egl/drivers/dri2/egl_dri2.h
__DRIbuffer *dri_buffers[__DRI_BUFFER_COUNT];
struct {
#ifdef HAVE_WAYLAND_PLATFORM
-@@ -274,9 +282,13 @@ struct dri2_egl_surface
+@@ -275,9 +283,13 @@ struct dri2_egl_surface
void *data;
int data_size;
#endif
@@ -148,7 +138,7 @@ Index: mesa/src/egl/drivers/dri2/egl_dri2.h
int locked;
int age;
} color_buffers[4], *back, *current;
-@@ -289,6 +301,10 @@ struct dri2_egl_surface
+@@ -291,6 +303,10 @@ struct dri2_egl_surface
/* EGL-owned buffers */
__DRIbuffer *local_buffers[__DRI_BUFFER_COUNT];
#endif
@@ -159,7 +149,7 @@ Index: mesa/src/egl/drivers/dri2/egl_dri2.h
};
-@@ -379,4 +395,7 @@ const __DRIconfig *
+@@ -387,4 +403,7 @@ const __DRIconfig *
dri2_get_dri_config(struct dri2_egl_config *conf, EGLint surface_type,
EGLenum colorspace);
@@ -167,10 +157,8 @@ Index: mesa/src/egl/drivers/dri2/egl_dri2.h
+dri2_initialize_mir(_EGLDriver *drv, _EGLDisplay *disp);
+
#endif /* EGL_DRI2_INCLUDED */
-Index: mesa/src/egl/drivers/dri2/platform_mir.c
-===================================================================
--- /dev/null
-+++ mesa/src/egl/drivers/dri2/platform_mir.c
++++ b/src/egl/drivers/dri2/platform_mir.c
@@ -0,0 +1,637 @@
+/*
+ * Copyright © 2012 Canonical, Inc
@@ -809,10 +797,8 @@ Index: mesa/src/egl/drivers/dri2/platform_mir.c
+
+ return EGL_FALSE;
+}
-Index: mesa/src/egl/main/egldisplay.c
-===================================================================
---- mesa.orig/src/egl/main/egldisplay.c
-+++ mesa/src/egl/main/egldisplay.c
+--- a/src/egl/main/egldisplay.c
++++ b/src/egl/main/egldisplay.c
@@ -56,7 +56,10 @@
#ifdef HAVE_DRM_PLATFORM
#include <gbm.h>
@@ -902,10 +888,8 @@ Index: mesa/src/egl/main/egldisplay.c
char *detection_method = NULL;
if (native_platform == _EGL_INVALID_PLATFORM) {
-Index: mesa/src/egl/main/egldisplay.h
-===================================================================
---- mesa.orig/src/egl/main/egldisplay.h
-+++ mesa/src/egl/main/egldisplay.h
+--- a/src/egl/main/egldisplay.h
++++ b/src/egl/main/egldisplay.h
@@ -50,6 +50,7 @@ enum _egl_platform_type {
_EGL_PLATFORM_ANDROID,
_EGL_PLATFORM_HAIKU,
@@ -914,16 +898,15 @@ Index: mesa/src/egl/main/egldisplay.h
_EGL_NUM_PLATFORMS,
_EGL_INVALID_PLATFORM = -1
-Index: mesa/src/gallium/state_trackers/dri/dri2.c
-===================================================================
---- mesa.orig/src/gallium/state_trackers/dri/dri2.c
-+++ mesa/src/gallium/state_trackers/dri/dri2.c
-@@ -531,12 +531,20 @@ dri2_allocate_textures(struct dri_contex
+--- a/src/gallium/state_trackers/dri/dri2.c
++++ b/src/gallium/state_trackers/dri/dri2.c
+@@ -582,13 +582,21 @@ dri2_allocate_textures(struct dri_contex
templ.height0 = dri_drawable->h;
templ.format = format;
templ.bind = bind;
- whandle.handle = buf->name;
whandle.stride = buf->pitch;
+ whandle.offset = 0;
- if (screen->can_share_buffer)
- whandle.type = DRM_API_HANDLE_TYPE_SHARED;
- else
@@ -942,12 +925,10 @@ Index: mesa/src/gallium/state_trackers/dri/dri2.c
+
drawable->textures[statt] =
screen->base.screen->resource_from_handle(screen->base.screen,
- &templ, &whandle);
-Index: mesa/src/gbm/backends/dri/gbm_dri.c
-===================================================================
---- mesa.orig/src/gbm/backends/dri/gbm_dri.c
-+++ mesa/src/gbm/backends/dri/gbm_dri.c
-@@ -202,7 +202,7 @@ static const __DRIimageLookupExtension i
+ &templ, &whandle,
+--- a/src/gbm/backends/dri/gbm_dri.c
++++ b/src/gbm/backends/dri/gbm_dri.c
+@@ -203,7 +203,7 @@ static const __DRIimageLookupExtension i
};
static const __DRIdri2LoaderExtension dri2_loader_extension = {
@@ -956,11 +937,7 @@ Index: mesa/src/gbm/backends/dri/gbm_dri.c
.getBuffers = dri_get_buffers,
.flushFrontBuffer = dri_flush_front_buffer,
-@@ -536,9 +536,11 @@ gbm_dri_is_format_supported(struct gbm_d
- switch (format) {
- case GBM_BO_FORMAT_XRGB8888:
- case GBM_FORMAT_XRGB8888:
-+ case GBM_FORMAT_XBGR8888:
+@@ -550,6 +550,7 @@ gbm_dri_is_format_supported(struct gbm_d
break;
case GBM_BO_FORMAT_ARGB8888:
case GBM_FORMAT_ARGB8888:
@@ -968,17 +945,7 @@ Index: mesa/src/gbm/backends/dri/gbm_dri.c
if (usage & GBM_BO_USE_SCANOUT)
return 0;
break;
-@@ -620,6 +622,9 @@ gbm_dri_to_gbm_format(uint32_t dri_forma
- case __DRI_IMAGE_FORMAT_ABGR8888:
- ret = GBM_FORMAT_ABGR8888;
- break;
-+ case __DRI_IMAGE_FORMAT_XBGR8888:
-+ ret = GBM_FORMAT_XBGR8888;
-+ break;
- default:
- ret = 0;
- break;
-@@ -628,6 +633,41 @@ gbm_dri_to_gbm_format(uint32_t dri_forma
+@@ -642,6 +643,43 @@ gbm_dri_to_gbm_format(uint32_t dri_forma
return ret;
}
@@ -1002,16 +969,18 @@ Index: mesa/src/gbm/backends/dri/gbm_dri.c
+ case GBM_FORMAT_ABGR8888:
+ dri_format = __DRI_IMAGE_FORMAT_ABGR8888;
+ break;
++ case GBM_FORMAT_XBGR8888:
++ dri_format = __DRI_IMAGE_FORMAT_XBGR8888;
++ break;
+ case GBM_FORMAT_ARGB2101010:
+ dri_format = __DRI_IMAGE_FORMAT_ARGB2101010;
+ break;
+ case GBM_FORMAT_XRGB2101010:
+ dri_format = __DRI_IMAGE_FORMAT_XRGB2101010;
-+ case GBM_FORMAT_XBGR8888:
-+ dri_format = __DRI_IMAGE_FORMAT_XBGR8888;
+ break;
+ default:
+ dri_format = __DRI_IMAGE_FORMAT_NONE;
++ break;
+ }
+
+ return dri_format;
@@ -1020,7 +989,7 @@ Index: mesa/src/gbm/backends/dri/gbm_dri.c
static struct gbm_bo *
gbm_dri_bo_import(struct gbm_device *gbm,
uint32_t type, void *buffer, uint32_t usage)
-@@ -852,31 +892,7 @@ gbm_dri_bo_create(struct gbm_device *gbm
+@@ -866,34 +904,7 @@ gbm_dri_bo_create(struct gbm_device *gbm
bo->base.base.height = height;
bo->base.base.format = format;
@@ -1039,6 +1008,9 @@ Index: mesa/src/gbm/backends/dri/gbm_dri.c
- case GBM_FORMAT_ABGR8888:
- dri_format = __DRI_IMAGE_FORMAT_ABGR8888;
- break;
+- case GBM_FORMAT_XBGR8888:
+- dri_format = __DRI_IMAGE_FORMAT_XBGR8888;
+- break;
- case GBM_FORMAT_ARGB2101010:
- dri_format = __DRI_IMAGE_FORMAT_ARGB2101010;
- break;
@@ -1053,12 +1025,10 @@ Index: mesa/src/gbm/backends/dri/gbm_dri.c
if (usage & GBM_BO_USE_SCANOUT)
dri_use |= __DRI_IMAGE_USE_SCANOUT;
-Index: mesa/src/egl/Makefile.am
-===================================================================
---- mesa.orig/src/egl/Makefile.am
-+++ mesa/src/egl/Makefile.am
-@@ -84,6 +84,12 @@ AM_CFLAGS += -DHAVE_SURFACELESS_PLATFORM
- dri2_backend_FILES += drivers/dri2/platform_surfaceless.c
+--- a/src/egl/Makefile.am
++++ b/src/egl/Makefile.am
+@@ -89,6 +89,12 @@ AM_CFLAGS += -DHAVE_ANDROID_PLATFORM
+ dri2_backend_FILES += drivers/dri2/platform_android.c
endif
+if HAVE_EGL_PLATFORM_MIR
