mesa: Changes to 'ubuntu+1'
Rebased ref, commits from common ancestor:
commit 6a2a8869c558d762cb57dcb0bcd046c4d90ecc9d
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Mon Jul 6 13:58:50 2015 +0300
update the changelog
diff --git a/debian/changelog b/debian/changelog
index 8843677..6c165f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (10.6.1-0ubuntu1) UNRELEASED; urgency=medium
+
+ * Merge from debian-experimental git.
+ * Drop skl-*, i965-* patches, upstream.
+ * egl-platform-mir.patch: Updated.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Thu, 18 Jun 2015 15:31:27 +0300
+
mesa (10.6.1-1) UNRELEASED; urgency=medium
* New upstream release.
@@ -7,14 +15,6 @@ mesa (10.6.1-1) UNRELEASED; urgency=medium
-- Timo Aaltonen <tjaalton@debian.org> Mon, 27 Apr 2015 10:43:45 +0300
-mesa (10.6.0-0ubuntu1) UNRELEASED; urgency=medium
-
- * Merge from debian-experimental git.
- * Drop skl-* patches, upstream.
- * egl-platform-mir.patch: Updated.
-
- -- Timo Aaltonen <tjaalton@debian.org> Thu, 18 Jun 2015 15:31:27 +0300
-
mesa (10.5.9-1ubuntu1) wily; urgency=medium
* Merge from Debian unstable.
commit e83b9a9bacf706a2916a9db09bfe03bc20efb05d
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Mon Jun 22 22:43:12 2015 +0300
egl-platform-mir.patch: Updated.
diff --git a/debian/changelog b/debian/changelog
index 5ea7053..4b4a508 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mesa (10.6.0-0ubuntu1) UNRELEASED; urgency=medium
* Merge from debian-experimental git.
* Drop skl-* patches, upstream.
+ * egl-platform-mir.patch: Updated.
-- Timo Aaltonen <tjaalton@debian.org> Thu, 18 Jun 2015 15:31:27 +0300
diff --git a/debian/patches/egl-platform-mir.patch b/debian/patches/egl-platform-mir.patch
index 9b91700..fea1f21 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -1,8 +1,8 @@
--- a/configure.ac
+++ b/configure.ac
-@@ -1636,7 +1636,9 @@ for plat in $egl_platforms; do
+@@ -1779,7 +1779,9 @@ for plat in $egl_platforms; do
- android|fbdev|gdi|null)
+ android|gdi|null)
;;
-
+ mir)
@@ -11,9 +11,9 @@
*)
AC_MSG_ERROR([EGL platform '$plat' does not exist])
;;
-@@ -1665,6 +1667,7 @@ AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND
+@@ -1807,6 +1809,7 @@ AM_CONDITIONAL(HAVE_EGL_PLATFORM_X11, ec
+ AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND, echo "$egl_platforms" | grep -q 'wayland')
AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo "$egl_platforms" | grep -q 'drm')
- AM_CONDITIONAL(HAVE_EGL_PLATFORM_FBDEV, echo "$egl_platforms" | grep -q 'fbdev')
AM_CONDITIONAL(HAVE_EGL_PLATFORM_NULL, echo "$egl_platforms" | grep -q 'null')
+AM_CONDITIONAL(HAVE_EGL_PLATFORM_MIR, echo "$egl_platforms" | grep -q 'mir')
@@ -37,7 +37,7 @@
#if defined(MESA_EGL_NO_X11_HEADERS)
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
-@@ -833,10 +833,12 @@ struct __DRIbufferRec {
+@@ -893,10 +893,12 @@ struct __DRIbufferRec {
unsigned int pitch;
unsigned int cpp;
unsigned int flags;
@@ -66,7 +66,7 @@
EXTRA_DIST = SConscript
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
-@@ -651,6 +651,12 @@ dri2_initialize(_EGLDriver *drv, _EGLDis
+@@ -677,6 +677,12 @@ dri2_initialize(_EGLDriver *drv, _EGLDis
return EGL_TRUE;
return dri2_initialize_wayland(drv, disp);
#endif
@@ -79,7 +79,7 @@
#ifdef HAVE_ANDROID_PLATFORM
case _EGL_PLATFORM_ANDROID:
if (disp->Options.TestOnly)
-@@ -700,6 +706,13 @@ dri2_terminate(_EGLDriver *drv, _EGLDisp
+@@ -726,6 +732,13 @@ dri2_terminate(_EGLDriver *drv, _EGLDisp
}
break;
#endif
@@ -92,8 +92,8 @@
+#endif
#ifdef HAVE_WAYLAND_PLATFORM
case _EGL_PLATFORM_WAYLAND:
- wl_drm_destroy(dri2_dpy->wl_drm);
-@@ -716,7 +729,8 @@ dri2_terminate(_EGLDriver *drv, _EGLDisp
+ if (dri2_dpy->wl_drm)
+@@ -747,7 +760,8 @@ dri2_terminate(_EGLDriver *drv, _EGLDisp
* the ones from the gbm device. As such the gbm itself is responsible
* for the cleanup.
*/
@@ -105,7 +105,7 @@
free(dri2_dpy->driver_configs);
--- a/src/egl/drivers/dri2/egl_dri2.h
+++ b/src/egl/drivers/dri2/egl_dri2.h
-@@ -64,6 +64,10 @@
+@@ -66,6 +66,10 @@
#endif /* HAVE_ANDROID_PLATFORM */
@@ -116,9 +116,9 @@
#include "eglconfig.h"
#include "eglcontext.h"
#include "egldisplay.h"
-@@ -197,6 +201,10 @@ struct dri2_egl_display
- int formats;
- uint32_t capabilities;
+@@ -204,6 +208,10 @@ struct dri2_egl_display
+ int is_render_node;
+ int is_different_gpu;
#endif
+
+#ifdef HAVE_MIR_PLATFORM
@@ -127,22 +127,21 @@
};
struct dri2_egl_context
-@@ -243,16 +251,21 @@ struct dri2_egl_surface
+@@ -250,7 +258,7 @@ struct dri2_egl_surface
struct gbm_dri_surface *gbm_surf;
#endif
-#if defined(HAVE_WAYLAND_PLATFORM) || defined(HAVE_DRM_PLATFORM)
-+#if defined(HAVE_WAYLAND_PLATFORM) \
-+ || defined(HAVE_DRM_PLATFORM) \
-+ || defined(HAVE_MIR_PLATFORM)
++#if defined(HAVE_WAYLAND_PLATFORM) || defined(HAVE_DRM_PLATFORM) || defined(HAVE_MIR_PLATFORM)
__DRIbuffer *dri_buffers[__DRI_BUFFER_COUNT];
struct {
#ifdef HAVE_WAYLAND_PLATFORM
- struct wl_buffer *wl_buffer;
- __DRIimage *dri_image;
+@@ -262,9 +270,12 @@ struct dri2_egl_surface
+ void *data;
+ int data_size;
#endif
-#ifdef HAVE_DRM_PLATFORM
-+#if defined(HAVE_DRM_PLATFORM) || defined(HAVE_MIR_PLATFORM)
++#if HAVE_DRM_PLATFORM || defined(HAVE_MIR_PLATFORM)
struct gbm_bo *bo;
#endif
+#ifdef HAVE_MIR_PLATFORM
@@ -151,7 +150,7 @@
int locked;
int age;
} color_buffers[4], *back, *current;
-@@ -265,6 +278,10 @@ struct dri2_egl_surface
+@@ -277,6 +288,10 @@ struct dri2_egl_surface
/* EGL-owned buffers */
__DRIbuffer *local_buffers[__DRI_BUFFER_COUNT];
#endif
@@ -162,7 +161,7 @@
};
-@@ -335,4 +352,7 @@ dri2_initialize_android(_EGLDriver *drv,
+@@ -354,4 +369,7 @@ dri2_initialize_android(_EGLDriver *drv,
void
dri2_flush_drawable_for_swapbuffers(_EGLDisplay *disp, _EGLSurface *draw);
@@ -794,7 +793,7 @@
+}
--- a/src/egl/main/Makefile.am
+++ b/src/egl/main/Makefile.am
-@@ -72,6 +72,11 @@ if HAVE_EGL_PLATFORM_NULL
+@@ -68,6 +68,11 @@ if HAVE_EGL_PLATFORM_NULL
AM_CFLAGS += -DHAVE_NULL_PLATFORM
endif
@@ -808,9 +807,9 @@
AM_CFLAGS += -DHAVE_XCB_DRI2
--- a/src/egl/main/egldisplay.c
+++ b/src/egl/main/egldisplay.c
-@@ -60,7 +60,10 @@
- #include <sys/types.h>
- #include <sys/stat.h>
+@@ -56,7 +56,10 @@
+ #ifdef HAVE_DRM_PLATFORM
+ #include <gbm.h>
#endif
-
+#ifdef HAVE_MIR_PLATFORM
@@ -820,8 +819,8 @@
/**
* Map --with-egl-platforms names to platform types.
-@@ -76,7 +79,8 @@ static const struct {
- { _EGL_PLATFORM_FBDEV, "fbdev" },
+@@ -71,7 +74,8 @@ static const struct {
+ { _EGL_PLATFORM_DRM, "drm" },
{ _EGL_PLATFORM_NULL, "null" },
{ _EGL_PLATFORM_ANDROID, "android" },
- { _EGL_PLATFORM_HAIKU, "haiku" }
@@ -830,7 +829,7 @@
};
-@@ -136,6 +140,47 @@ _eglPointerIsDereferencable(void *p)
+@@ -131,6 +135,47 @@ _eglPointerIsDereferencable(void *p)
#endif
}
@@ -878,9 +877,9 @@
/**
* Try detecting native platform with the help of native display characteristcs.
-@@ -156,6 +201,11 @@ _eglNativePlatformDetectNativeDisplay(vo
- return _EGL_PLATFORM_FBDEV;
- #endif
+@@ -141,6 +186,11 @@ _eglNativePlatformDetectNativeDisplay(vo
+ if (nativeDisplay == EGL_DEFAULT_DISPLAY)
+ return _EGL_INVALID_PLATFORM;
+#ifdef HAVE_MIR_PLATFORM
+ if (_mir_display_is_valid(nativeDisplay))
@@ -890,7 +889,7 @@
if (_eglPointerIsDereferencable(nativeDisplay)) {
void *first_pointer = *(void **) nativeDisplay;
-@@ -194,7 +244,7 @@ _eglNativePlatformDetectNativeDisplay(vo
+@@ -179,7 +229,7 @@ _eglNativePlatformDetectNativeDisplay(vo
_EGLPlatformType
_eglGetNativePlatform(void *nativeDisplay)
{
@@ -901,7 +900,7 @@
if (native_platform == _EGL_INVALID_PLATFORM) {
--- a/src/egl/main/egldisplay.h
+++ b/src/egl/main/egldisplay.h
-@@ -47,6 +47,7 @@ enum _egl_platform_type {
+@@ -51,6 +51,7 @@ enum _egl_platform_type {
_EGL_PLATFORM_NULL,
_EGL_PLATFORM_ANDROID,
_EGL_PLATFORM_HAIKU,
@@ -909,148 +908,9 @@
_EGL_NUM_PLATFORMS,
_EGL_INVALID_PLATFORM = -1
---- a/src/egl/main/egldriver.c
-+++ b/src/egl/main/egldriver.c
-@@ -60,7 +60,7 @@ typedef struct _egl_module {
- char *Path;
- _EGLMain_t BuiltIn;
- void *Handle;
-- _EGLDriver *Driver;
-+ _EGLDriver *Driver[_EGL_NUM_PLATFORMS];
- } _EGLModule;
-
- static _EGLMutex _eglModuleMutex = _EGL_MUTEX_INITIALIZER;
-@@ -137,7 +137,6 @@ library_suffix(void)
-
- #endif
-
--
- /**
- * Open the named driver and find its bootstrap function: _eglMain().
- */
-@@ -150,8 +149,12 @@ _eglOpenLibrary(const char *driverPath,
-
- assert(driverPath);
-
-- _eglLog(_EGL_DEBUG, "dlopen(%s)", driverPath);
-- lib = open_library(driverPath);
-+ if (*handle) {
-+ lib = *handle;
-+ } else {
-+ _eglLog(_EGL_DEBUG, "dlopen(%s)", driverPath);
-+ lib = open_library(driverPath);
-+ }
-
- #if defined(_EGL_OS_WINDOWS)
- /* XXX untested */
-@@ -197,13 +200,13 @@ _eglOpenLibrary(const char *driverPath,
- * Load a module and create the driver object.
- */
- static EGLBoolean
--_eglLoadModule(_EGLModule *mod)
-+_eglLoadModule(_EGLModule *mod, _EGLPlatformType plat)
- {
- _EGLMain_t mainFunc;
-- lib_handle lib;
-+ lib_handle lib = (lib_handle) mod->Handle;
- _EGLDriver *drv;
-
-- if (mod->Driver)
-+ if (mod->Driver[plat])
- return EGL_TRUE;
-
- if (mod->BuiltIn) {
-@@ -229,7 +232,7 @@ _eglLoadModule(_EGLModule *mod)
- }
-
- mod->Handle = (void *) lib;
-- mod->Driver = drv;
-+ mod->Driver[plat] = drv;
-
- return EGL_TRUE;
- }
-@@ -243,8 +246,10 @@ _eglUnloadModule(_EGLModule *mod)
- {
- #if defined(_EGL_OS_UNIX)
- /* destroy the driver */
-- if (mod->Driver && mod->Driver->Unload)
-- mod->Driver->Unload(mod->Driver);
-+ for (int plat = 0; plat < _EGL_NUM_PLATFORMS; ++plat) {
-+ if (mod->Driver[plat] && mod->Driver[plat]->Unload)
-+ mod->Driver[plat]->Unload(mod->Driver[plat]);
-+ }
-
- /*
- * XXX At this point (atexit), the module might be the last reference to
-@@ -258,7 +263,9 @@ _eglUnloadModule(_EGLModule *mod)
- /* XXX Windows unloads DLLs before atexit */
- #endif
-
-- mod->Driver = NULL;
-+ for (int plat = 0; plat < _EGL_NUM_PLATFORMS; ++plat) {
-+ mod->Driver[plat] = NULL;
-+ }
- mod->Handle = NULL;
- }
-
-@@ -588,17 +595,17 @@ _eglMatchAndInitialize(_EGLDisplay *dpy)
- while (i < _eglModules->Size) {
- _EGLModule *mod = (_EGLModule *) _eglModules->Elements[i];
-
-- if (!_eglLoadModule(mod)) {
-+ if (!_eglLoadModule(mod, dpy->Platform)) {
- /* remove invalid modules */
- _eglEraseArray(_eglModules, i, _eglFreeModule);
- continue;
- }
-
-- if (mod->Driver->API.Initialize(mod->Driver, dpy)) {
-- drv = mod->Driver;
-+ drv = mod->Driver[dpy->Platform];
-+ if (drv->API.Initialize(drv, dpy))
- break;
-- }
- else {
-+ drv = NULL;
- i++;
- }
- }
-@@ -650,7 +657,6 @@ __eglMustCastToProperFunctionPointerType
- _eglGetDriverProc(const char *procname)
- {
- EGLint i;
-- _EGLProc proc = NULL;
-
- if (!_eglModules) {
- /* load the driver for the default display */
-@@ -662,15 +668,18 @@ _eglGetDriverProc(const char *procname)
-
- for (i = 0; i < _eglModules->Size; i++) {
- _EGLModule *mod = (_EGLModule *) _eglModules->Elements[i];
-+ _EGLProc proc;
-
-- if (!mod->Driver)
-- break;
-- proc = mod->Driver->API.GetProcAddress(mod->Driver, procname);
-- if (proc)
-- break;
-+ for (_EGLPlatformType plat = 0; plat < _EGL_NUM_PLATFORMS; ++plat) {
-+ if (!mod->Driver[plat])
-+ continue;
-+ proc = mod->Driver[plat]->API.GetProcAddress(mod->Driver[plat], procname);
-+ if (proc)
-+ return proc;
-+ }
- }
-
-- return proc;
-+ return NULL;
- }
-
-
--- a/src/gallium/state_trackers/dri/dri2.c
+++ b/src/gallium/state_trackers/dri/dri2.c
-@@ -506,12 +506,20 @@ dri2_allocate_textures(struct dri_contex
+@@ -531,12 +531,20 @@ dri2_allocate_textures(struct dri_contex
templ.height0 = dri_drawable->h;
templ.format = format;
templ.bind = bind;
diff --git a/debian/rules b/debian/rules
index 7b7fe98..0bc62d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,7 +78,7 @@ else
# Mir isn't built on AArch64 and PPC
ifeq (,$(filter $(DEB_HOST_ARCH),arm64 powerpc ppc64 ppc64el))
- EGL_DISPLAYS += mir
+# EGL_DISPLAYS += mir
endif
ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
commit ae428a34ebb86588e679117149f9a365f2d92493
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Mon Jul 6 11:09:21 2015 +0300
update the changelog
diff --git a/debian/changelog b/debian/changelog
index 2aacee1..17e706e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-mesa (10.6.0-1) UNRELEASED; urgency=medium
+mesa (10.6.1-1) UNRELEASED; urgency=medium
- * New upstream release candidate.
+ * New upstream release.
* libegl1-mesa.symbols: Updated.
* not-installed: Dropped wmesa.h which is gone.
* libgles{1,2}-mesa.symbols: Updated.
commit 3e686e07151bd9435d3f51f7c2ecc4cf7c7a8663
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Mon Jul 6 10:04:29 2015 +0300
release to wily
diff --git a/debian/changelog b/debian/changelog
index 8c84365..6b27de8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-mesa (10.5.9-1ubuntu1) UNRELEASED; urgency=medium
+mesa (10.5.9-1ubuntu1) wily; urgency=medium
* Merge from Debian unstable.
* skl-use-1-register-for-uniform-pull.diff dropped, upstream.
- -- Timo Aaltonen <tjaalton@debian.org> Mon, 06 Jul 2015 09:58:49 +0300
+ -- Timo Aaltonen <tjaalton@debian.org> Mon, 06 Jul 2015 10:03:58 +0300
mesa (10.5.9-1) unstable; urgency=medium
commit 01dcf32bddbdb79a757b3db7dce961f21434de0d
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Mon Jul 6 10:01:30 2015 +0300
drop skl-use-1-register-for-uniform-pull.diff
diff --git a/debian/changelog b/debian/changelog
index 90740da..8c84365 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.5.9-1ubuntu1) UNRELEASED; urgency=medium
+
+ * Merge from Debian unstable.
+ * skl-use-1-register-for-uniform-pull.diff dropped, upstream.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Mon, 06 Jul 2015 09:58:49 +0300
+
mesa (10.5.9-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/patches/series b/debian/patches/series
index d016a02..2f4fa08 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@
# Ubuntu patches.
egl-platform-mir.patch
i915-dont-default-to-2.1.patch
-skl-use-1-register-for-uniform-pull.diff
skl-use-vec4-datatypes-for-message-header.diff
# LP: 1471213
diff --git a/debian/patches/skl-use-1-register-for-uniform-pull.diff b/debian/patches/skl-use-1-register-for-uniform-pull.diff
deleted file mode 100644
index a89cbc4..0000000
--- a/debian/patches/skl-use-1-register-for-uniform-pull.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-From 5255e1a9e6599942b10724fe5e573979f123b7e0 Mon Sep 17 00:00:00 2001
-From: Ben Widawsky <benjamin.widawsky@intel.com>
-Date: Thu, 19 Feb 2015 15:49:34 -0800
-Subject: [PATCH] i965/skl: Use 1 register for uniform pull constant payload
-
-When under dispatch_width=16 the previous code would allocate 2 registers for
-the payload when only one is needed. This manifested itself through bugs on SKL
-which needs to mess with this instruction.
-
-Ken says this might have some positive impact on shader-db.
-
-Cc: Kenneth Graunke <kenneth@whitecape.org>
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89118
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=88999
-Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
----
- src/mesa/drivers/dri/i965/brw_fs.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
-index a562b8a..bb647bd 100644
---- a/src/mesa/drivers/dri/i965/brw_fs.cpp
-+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
-@@ -3062,7 +3062,7 @@ fs_visitor::lower_uniform_pull_constant_loads()
- assert(const_offset_reg.file == IMM &&
- const_offset_reg.type == BRW_REGISTER_TYPE_UD);
- const_offset_reg.fixed_hw_reg.dw1.ud /= 4;
-- fs_reg payload = vgrf(glsl_type::uint_type);
-+ fs_reg payload = fs_reg(GRF, virtual_grf_alloc(1));
-
- /* We have to use a message header on Skylake to get SIMD4x2 mode.
- * Reserve space for the register.
---
-2.3.0
-
commit a091fb2578b13b6a7a9bd48f4dd579298964fe24
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Mon Jul 6 09:05:57 2015 +0300
release to sid
diff --git a/debian/changelog b/debian/changelog
index c57b973..080d6f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-mesa (10.5.9-1) UNRELEASED; urgency=medium
+mesa (10.5.9-1) unstable; urgency=medium
* New upstream release.
- -- Timo Aaltonen <tjaalton@debian.org> Mon, 06 Jul 2015 08:50:52 +0300
+ -- Timo Aaltonen <tjaalton@debian.org> Mon, 06 Jul 2015 08:56:26 +0300
mesa (10.5.8-1) unstable; urgency=medium
commit 2f716eb0df15ac66f73109772ea892b720ecf64c
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Mon Jul 6 08:56:13 2015 +0300
New upstream release.
diff --git a/debian/changelog b/debian/changelog
index 7d9ad4b..c57b973 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.5.9-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Mon, 06 Jul 2015 08:50:52 +0300
+
mesa (10.5.8-1) unstable; urgency=medium
* New upstream release.
commit 7f40d083748f3a8276e08a2fa0ae7149269ea379
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sat Jul 4 12:09:10 2015 +0100
Add release notes for the 10.5.9 release
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
diff --git a/docs/relnotes/10.5.9.html b/docs/relnotes/10.5.9.html
new file mode 100644
index 0000000..dd71fed
--- /dev/null
+++ b/docs/relnotes/10.5.9.html
@@ -0,0 +1,139 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";>
+<html lang="en">
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <title>Mesa Release Notes</title>
+ <link rel="stylesheet" type="text/css" href="../mesa.css">
+</head>
+<body>
+
+<div class="header">
+ <h1>The Mesa 3D Graphics Library</h1>
+</div>
+
+<iframe src="../contents.html"></iframe>
+<div class="content">
+
+<h1>Mesa 10.5.9 Release Notes / July 04, 2015</h1>
+
+<p>
+Mesa 10.5.9 is a bug fix release which fixes bugs found since the 10.5.8 release.
+</p>
+<p>
+Mesa 10.5.9 implements the OpenGL 3.3 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 3.3. OpenGL
+3.3 is <strong>only</strong> available if requested at context creation
+because compatibility contexts are not supported.
+</p>
+
+
+<h2>SHA256 checksums</h2>
+<pre>
+TBD
+</pre>
+
+
+<h2>New features</h2>
+<p>None</p>
+
+<h2>Bug fixes</h2>
+
+<p>This list is likely incomplete.</p>
+
+<ul>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=84225";>Bug 84225</a> - Allow constant-index-expression sampler array indexing with GLSL-ES < 300</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88999";>Bug 88999</a> - [SKL] Compiz crashes after opening unity dash</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=89118";>Bug 89118</a> - [SKL Bisected]many Ogles3conform cases core dumped</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90537";>Bug 90537</a> - radeonsi bo/va conflict on RADEON_GEM_VA (rscreen->ws->buffer_from_handle returns NULL)</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90839";>Bug 90839</a> - [10.5.5/10.6 regression, bisected] PBO glDrawPixels no longer using blit fastpath</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90873";>Bug 90873</a> - Kernel hang, TearFree On, Mate desktop environment</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91056";>Bug 91056</a> - The Bard's Tale (2005, native) has rendering issues</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91117";>Bug 91117</a> - Nimbus (running in wine) has rendering issues, objects are semi-transparent</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91124";>Bug 91124</a> - Civilization V (in Wine) has rendering issues: text missing, menu bar corrupted</li>
+
+</ul>
+
+
+<h2>Changes</h2>
+
+<p>Ben Widawsky (2):</p>
+<ul>
+ <li>i965/gen9: Implement Push Constant Buffer workaround</li>
+ <li>i965/skl: Use 1 register for uniform pull constant payload</li>
+</ul>
+
+<p>Boyan Ding (1):</p>
+<ul>
+ <li>egl/x11: Remove duplicate call to dri2_x11_add_configs_for_visuals</li>
+</ul>
+
+<p>Chris Wilson (3):</p>
+<ul>
+ <li>i965: Fix HW blitter pitch limits</li>
+ <li>i915: Blit RGBX<->RGBA drawpixels</li>
+ <li>i965: Export format comparison for blitting between miptrees</li>
+</ul>
+
+<p>Emil Velikov (6):</p>
+<ul>
+ <li>docs: Add sha256sums for the 10.5.8 release</li>
+ <li>configure: warn about shared_glapi & xlib-glx only when both are set</li>
+ <li>configure: error out when building backend-less libEGL</li>
+ <li>configure: error out when building libEGL without shared-glapi</li>
+ <li>gbm: do not (over)link against libglapi.so</li>
+ <li>Update version to 10.5.9</li>
+</ul>
+
+<p>Frank Henigman (1):</p>
+<ul>
+ <li>gbm: dlopen libglapi so gbm_create_device works</li>
+</ul>
+
+<p>Ilia Mirkin (8):</p>
+<ul>
+ <li>glsl: add version checks to conditionals for builtin variable enablement</li>
+ <li>mesa: add GL_PROGRAM_PIPELINE support in KHR_debug calls</li>
+ <li>glsl: binding point is a texture unit, which is a combined space</li>
+ <li>nvc0: always put all tfb bufs into bufctx</li>
+ <li>nv50,nvc0: make sure to pushbuf_refn before putting bo into pushbuf_data</li>
+ <li>nv50/ir: propagate modifier to right arg when const-folding mad</li>
+ <li>nv50/ir: fix emission of address reg in 3rd source</li>
+ <li>nv50/ir: copy joinAt when splitting both before and after</li>
+</ul>
+
+<p>Mario Kleiner (2):</p>
+<ul>
+ <li>nouveau: Use dup fd as key in drm-winsys hash table to fix ZaphodHeads.</li>
+ <li>winsys/radeon: Use dup fd as key in drm-winsys hash table to fix ZaphodHeads.</li>
+</ul>
+
+<p>Michel Dänzer (1):</p>
+<ul>
+ <li>winsys/radeon: Unmap GPU VM address range when destroying BO</li>
+</ul>
+
+<p>Tapani Pälli (6):</p>
+<ul>
+ <li>glsl: Allow dynamic sampler array indexing with GLSL ES < 3.00</li>
+ <li>mesa/glsl: new compiler option EmitNoIndirectSampler</li>
+ <li>i915: use EmitNoIndirectSampler</li>
+ <li>mesa/st: use EmitNoIndirectSampler if !ARB_gpu_shader5</li>
+ <li>i965: use EmitNoIndirectSampler for gen < 7</li>
+ <li>glsl: validate sampler array indexing for 'constant-index-expression'</li>
+</ul>
+
+
+</div>
+</body>
+</html>
commit 8c8006099f859cc11c2882f2f3361428c45e64ac
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sat Jul 4 12:04:06 2015 +0100
Update version to 10.5.9
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
diff --git a/VERSION b/VERSION
index 0b09579..bd81dd8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.5.8
+10.5.9
commit 81a0920c3a1600d45a7a315de3ef654116bbbce0
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Sun Jun 28 03:02:31 2015 +0200
winsys/radeon: Use dup fd as key in drm-winsys hash table to fix ZaphodHeads.
Same problem and fix as for nouveau's ZaphodHeads trouble.
See patch ...
"nouveau: Use dup fd as key in drm-winsys hash table to fix ZaphodHeads."
... for reference.
Cc: "10.3 10.4 10.5 10.6" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
(cherry picked from commit 28dda47ae4d974e3e032d60e8e0965c8c068c6d8)
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
index 12c351d..674c60a 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
@@ -465,6 +465,10 @@ static void radeon_winsys_destroy(struct radeon_winsys *rws)
if (ws->gen >= DRV_R600) {
radeon_surface_manager_free(ws->surf_man);
}
+
+ if (ws->fd)
+ close(ws->fd);
+
FREE(rws);
}
@@ -666,7 +670,7 @@ radeon_drm_winsys_create(int fd, radeon_screen_create_t screen_create)
return NULL;
}
- ws->fd = fd;
+ ws->fd = dup(fd);
if (!do_winsys_init(ws))
goto fail;
@@ -682,7 +686,7 @@ radeon_drm_winsys_create(int fd, radeon_screen_create_t screen_create)
goto fail;
if (ws->gen >= DRV_R600) {
- ws->surf_man = radeon_surface_manager_new(fd);
+ ws->surf_man = radeon_surface_manager_new(ws->fd);
if (!ws->surf_man)
goto fail;
}
@@ -723,7 +727,7 @@ radeon_drm_winsys_create(int fd, radeon_screen_create_t screen_create)
return NULL;
}
- util_hash_table_set(fd_tab, intptr_to_pointer(fd), ws);
+ util_hash_table_set(fd_tab, intptr_to_pointer(ws->fd), ws);
/* We must unlock the mutex once the winsys is fully initialized, so that
* other threads attempting to create the winsys from the same fd will
@@ -740,6 +744,9 @@ fail:
ws->kman->destroy(ws->kman);
if (ws->surf_man)
radeon_surface_manager_free(ws->surf_man);
+ if (ws->fd)
+ close(ws->fd);
+
FREE(ws);
return NULL;
}
commit cd4a127f51f5dc608f1bc07c38b5f1e0afaf20c5
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Fri Jul 3 15:14:25 2015 +0300
patches for SKL, release to wily
diff --git a/debian/changelog b/debian/changelog
index d7ee818..1c8cc97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mesa (10.5.8-1ubuntu2) wily; urgency=medium
+
+ * i965-store-the-gpu-revision.diff,
+ i965-refactor-simd16-to-2xsimd8-checks.diff,
+ i965-define-i915-param-revision.diff,
+ skl-break-down-simd16-3-source-instructions.diff:
+ Fix noise in Unity, torcs et al. (LP: #1471213)
+
+ -- Timo Aaltonen <tjaalton@debian.org> Fri, 03 Jul 2015 15:08:26 +0300
+
mesa (10.5.8-1ubuntu1) wily; urgency=medium
* Merge from Debian unstable.
diff --git a/debian/patches/i965-define-i915-param-revision.diff b/debian/patches/i965-define-i915-param-revision.diff
new file mode 100644
index 0000000..1d0c831
--- /dev/null
+++ b/debian/patches/i965-define-i915-param-revision.diff
@@ -0,0 +1,27 @@
+commit 484f9f4fcd53fcaa768e63934a5f74346bfb46a9
+Author: Dave Airlie <airlied@redhat.com>
+Date: Mon Mar 23 09:54:52 2015 +1000
+
+ i965: define I915_PARAM_REVISION
+
+ we are broken against the libdrm 2.4.60 minimum specified,
+ so fix it for now.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
+index 0d3af2c..a39443a 100644
+--- a/src/mesa/drivers/dri/i965/brw_context.c
++++ b/src/mesa/drivers/dri/i965/brw_context.c
+@@ -658,6 +658,11 @@ brw_process_driconf_options(struct brw_context *brw)
+ driQueryOptionb(options, "allow_glsl_extension_directive_midshader");
+ }
+
++/* drop when libdrm 2.4.61 is released */
++#ifndef I915_PARAM_REVISION
++#define I915_PARAM_REVISION 32
++#endif
++
+ static int
+ brw_get_revision(int fd)
+ {
diff --git a/debian/patches/i965-refactor-simd16-to-2xsimd8-checks.diff b/debian/patches/i965-refactor-simd16-to-2xsimd8-checks.diff
new file mode 100644
index 0000000..c595ea2
--- /dev/null
+++ b/debian/patches/i965-refactor-simd16-to-2xsimd8-checks.diff
@@ -0,0 +1,72 @@
+commit bc4b18d2977a94a6fb513bf5955236a0e92298ca
+Author: Neil Roberts <neil@linux.intel.com>
+Date: Thu Mar 19 18:18:49 2015 +0000
+
+ i965: Refactor SIMD16-to-2xSIMD8 checks.
+
+ The places that were checking whether 3-source instructions are
+ supported have now been combined into a small helper function. This
+ will be used in the next patch to add an additonal restriction.
+
+ Based on a patch by Kenneth Graunke.
+
+ Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
+ Reviewed-by: Matt Turner <mattst88@gmail.com>
+
+diff --git a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
+index 05a2db4..6eebee1 100644
+--- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
++++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
+@@ -1553,6 +1553,15 @@ fs_generator::enable_debug(const char *shader_name)
+ this->shader_name = shader_name;
+ }
+
++/**
++ * Some hardware doesn't support SIMD16 instructions with 3 sources.
++ */
++static bool
++brw_supports_simd16_3src(const struct brw_context *brw)
++{
++ return brw->is_haswell || brw->gen >= 8;
++}
++
+ int
+ fs_generator::generate_code(const cfg_t *cfg, int dispatch_width)
+ {
+@@ -1646,7 +1655,7 @@ fs_generator::generate_code(const cfg_t *cfg, int dispatch_width)
+ case BRW_OPCODE_MAD:
+ assert(brw->gen >= 6);
+ brw_set_default_access_mode(p, BRW_ALIGN_16);
+- if (dispatch_width == 16 && brw->gen < 8 && !brw->is_haswell) {
++ if (dispatch_width == 16 && !brw_supports_simd16_3src(brw)) {
+ brw_set_default_compression_control(p, BRW_COMPRESSION_NONE);
+ brw_inst *f = brw_MAD(p, firsthalf(dst), firsthalf(src[0]), firsthalf(src[1]), firsthalf(src[2]));
+ brw_set_default_compression_control(p, BRW_COMPRESSION_2NDHALF);
+@@ -1667,7 +1676,7 @@ fs_generator::generate_code(const cfg_t *cfg, int dispatch_width)
+ case BRW_OPCODE_LRP:
+ assert(brw->gen >= 6);
+ brw_set_default_access_mode(p, BRW_ALIGN_16);
+- if (dispatch_width == 16 && brw->gen < 8 && !brw->is_haswell) {
++ if (dispatch_width == 16 && !brw_supports_simd16_3src(brw)) {
+ brw_set_default_compression_control(p, BRW_COMPRESSION_NONE);
+ brw_inst *f = brw_LRP(p, firsthalf(dst), firsthalf(src[0]), firsthalf(src[1]), firsthalf(src[2]));
+ brw_set_default_compression_control(p, BRW_COMPRESSION_2NDHALF);
+@@ -1804,7 +1813,7 @@ fs_generator::generate_code(const cfg_t *cfg, int dispatch_width)
+ case BRW_OPCODE_BFE:
+ assert(brw->gen >= 7);
+ brw_set_default_access_mode(p, BRW_ALIGN_16);
+- if (dispatch_width == 16 && brw->gen < 8 && !brw->is_haswell) {
++ if (dispatch_width == 16 && !brw_supports_simd16_3src(brw)) {
+ brw_set_default_compression_control(p, BRW_COMPRESSION_NONE);
+ brw_BFE(p, firsthalf(dst), firsthalf(src[0]), firsthalf(src[1]), firsthalf(src[2]));
+ brw_set_default_compression_control(p, BRW_COMPRESSION_2NDHALF);
+@@ -1844,7 +1853,8 @@ fs_generator::generate_code(const cfg_t *cfg, int dispatch_width)
+ * Otherwise we would be able to emit compressed instructions like we
+ * do for the other three-source instructions.
+ */
+- if (dispatch_width == 16 && brw->gen < 8) {
++ if (dispatch_width == 16 &&
++ (brw->is_haswell || !brw_supports_simd16_3src(brw))) {
+ brw_set_default_compression_control(p, BRW_COMPRESSION_NONE);
+ brw_BFI2(p, firsthalf(dst), firsthalf(src[0]), firsthalf(src[1]), firsthalf(src[2]));
+ brw_set_default_compression_control(p, BRW_COMPRESSION_2NDHALF);
diff --git a/debian/patches/i965-store-the-gpu-revision.diff b/debian/patches/i965-store-the-gpu-revision.diff
new file mode 100644
index 0000000..94d8554
--- /dev/null
+++ b/debian/patches/i965-store-the-gpu-revision.diff
@@ -0,0 +1,80 @@
+commit c02c4b567ce001f6605c46e71e089692b837bf26
+Author: Neil Roberts <neil@linux.intel.com>
+Date: Wed Mar 4 14:13:40 2015 +0000
+
+ i965: Store the GPU revision number in brw_context
+
+ brwContextInit now queries the GPU revision number via a new parameter
+ for DRM_I915_GETPARAM. This new parameter requires a kernel patch and
+ a patch to libdrm. If the kernel doesn't support it then it will
+ continue but set the revision number to -1. The intention is to use
+ this to implement workarounds that are only needed on certain
+ steppings of the GPU.
+
+ Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
+
+diff --git a/configure.ac b/configure.ac
+index 8c90b41..d864350 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -61,7 +61,7 @@ AC_SUBST([OSMESA_VERSION])
+ dnl Versions for external dependencies
+ LIBDRM_REQUIRED=2.4.38
+ LIBDRM_RADEON_REQUIRED=2.4.56
+-LIBDRM_INTEL_REQUIRED=2.4.52
++LIBDRM_INTEL_REQUIRED=2.4.60
+ LIBDRM_NVVIEUX_REQUIRED=2.4.33
+ LIBDRM_NOUVEAU_REQUIRED="2.4.33 libdrm >= 2.4.41"
+ LIBDRM_FREEDRENO_REQUIRED=2.4.57
Reply to: