libglvnd: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1vexn9-000801...@vasks.debian.org
libglvnd: Changes to 'debian-unstable'
New branch 'debian-unstable' available with the following commits:
commit bb44b4b18bf594df930b58fdce145757485f0ba0
Author: Brian Nguyen
Date: Mon Aug 12 13:12:10 2013 -0700
Add README
This gives a brief overview of the code and instructions on building the
prototype and running unit tests.
This is based off of Andy Ritger's README in the original libGLX
prototype library.
commit c8f664587d884b22a84bb912d14119b11f3fc408
Author: Brian Nguyen
Date: Mon Aug 12 13:12:10 2013 -0700
[GLX_dummy] Implement selected dummy functions
Implement a fake glXChooseVisual() and glXCreateContext() function for
use with the makecurrent tests. Likewise, implement
glMakeCurrentTestResults(), glBegin(), and glEnd().
Implement a fake glXGetClientString() for use with the getclientstr
test.
commit e906738529991a110e1c74b926e46a31fb62f89f
Author: Brian Nguyen
Date: Mon Aug 12 13:12:10 2013 -0700
[GLX_dummy] Implement an example extension function and its dispatcher
To test that vendor-implemented dispatching works in the getprocaddress
test, implement glXExampleExtensionFunction and its vendor-neutral
dispatcher in GLX_dummy, and plug each respectively into the
getProcAddress and getDispatchAddress callback functions.
commit c11bd25282a7e88c9b88da2770d77185b1aadc78
Author: Brian Nguyen
Date: Mon Aug 12 13:12:10 2013 -0700
[GLX_dummy] Implement glMakeCurrentTestResults()
This fake GL extension function is used by the glxnscreens and
makecurrent tests. This plugs the function prototype spec into
GLX_dummy's getDispatchProto() callback and adds an entry into the table
used by its getProcAddress() callback.
commit d3b38da75d7d674d74d52087d85dd3cbd1f65874
Author: Brian Nguyen
Date: Mon Aug 12 13:12:10 2013 -0700
[GLX_dummy] Implement the getProcAddress() callback
commit 01ea1d2e410770bf28f3d16f7c8689703e27c570
Author: Brian Nguyen
Date: Mon Aug 12 13:12:10 2013 -0700
[GLX_dummy] Define glMakeCurrentTestResults()
This fake GL extension function will be responsible for performing
various queries on the vendor library for the purposes of testing,
and also serves as a useful test of the API driver's handling of
dynamic GL entrypoints.
commit 402e5a8a4ce4aa90c67b4cfbe2179694808e2a90
Author: Brian Nguyen
Date: Mon Aug 12 13:12:10 2013 -0700
[tests] Add testx11glvndproto and testglxnscreens subtests
testx11glvndproto tests specifically the GLVendor X extension, which is
used to lookup XID -> screen and screen -> vendor mappings in the
prototype.
testglxnscreens tests that the API library successfully dispatches GL
calls to the right vendor based on this lookup.
commit 9eec93a6f8365dd71cff4697a6879787dfccf8c3
Author: Brian Nguyen
Date: Mon Aug 12 13:12:10 2013 -0700
[tests] Add testglxqueryversion subtest
This verifies that the GLX API library's hand-coded implementation
of glXQueryVersion() works as expected.
commit f3c6f65d367baf47e4ad03f1e940fc731c063d05
Author: Brian Nguyen
Date: Mon Aug 12 13:12:10 2013 -0700
[tests] Add testglxgetclientstr subtest
This subtest verifies that the GLX API library's implementation of
glXGetClientString() (which takes the "union" (concatenation) of each
vendor's client string) works as expected.
commit 67f04602e64ed11a4a00b565bcabcda270ccdaf6
Author: Brian Nguyen
Date: Mon Aug 12 13:12:10 2013 -0700
[tests] Add testglxmcoldlink subtest
This is a variant of the testglxmakecurrent subtest which links against
the libGL filter library instead of libOpenGL + libGLX. This verifies
the ELF symbol filtering works as expected.
commit 808706d3a2fd84a6876cc722a0058cbb21988f5c
Author: Brian Nguyen
Date: Mon Aug 12 13:12:10 2013 -0700
[tests] Add make current subtests
This implements a test app, testglxmakecurrent, which verifies the
correctness of the API library's GL dispatching when a vendor's context
is current in one or more threads.
This test spawns a given number of threads each with their own separate
context and window, and has each thread make current to its given
context. The thread then calls some core GL functions and
(to-be-implemented) a GL extension function, glMakeCurrentTestResults(),
which returns the number of times each core GL function was called.
The test then compares glMakeCurrentTestResults()'s result (which should
match up with the vendor library's call count) to the application's call
count and fails if there is a mismatch.
The test is designed to only require pthreads if multiple threads are
used. This verifies that the API library's single-threaded fake pthread
wrapper functions work properly.
Add testglxmc{basic,late,loop,threads}.sh scripts, which run the
testglxmakecurrent test with different arguments for ordering of
glamor-egl: Changes to 'debian-unstable'
configure.ac |2 +- debian/changelog |2 +- src/Makefile.am | 10 -- 3 files changed, 10 insertions(+), 4 deletions(-) New commits: commit 10c589483f603934d0e16336dcbca3a5e54ce9a5 Author: Timo Aaltonen Date: Thu Aug 29 08:03:04 2013 +0300 clarify the version diff --git a/debian/changelog b/debian/changelog index bd00331..5cf97a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ glamor-egl (0.5.0-1) UNRELEASED; urgency=low * Initial release. (Closes: #XX) - * Pull from upstream 81aadb8ae. + * Merged from tagged 0.5.1. -- Timo Aaltonen Wed, 03 Apr 2013 10:35:26 +0300 commit d3d166779e1a1698e017de9c4f4496bf3c5bbc0e Author: Zhigang Gong Date: Mon Aug 26 15:03:51 2013 +0800 Bump to 0.5.1. The change in this version is only about bug fix and package build fix. Signed-off-by: Zhigang Gong diff --git a/configure.ac b/configure.ac index 5ff6ae1..acde38f 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ # Initialize Autoconf AC_PREREQ([2.63]) AC_INIT([glamor-egl], -[0.5.0], +[0.5.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=glamor], [glamor-egl]) commit 0777a81fb3551b8d06c40c81bcd0ccd69dfcd836 Author: Christian König Date: Mon Aug 26 14:57:47 2013 +0800 Use GBM_LIBS and GBM_CFLAGS Signed-off-by: Christian König Reviewed-by: Michel Dänzer diff --git a/src/Makefile.am b/src/Makefile.am index 4beb559..c1759c6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -64,9 +64,15 @@ LIBGLAMOREGL = libglamoregl.la module_LTLIBRARIES = $(LIBGLAMOREGL) libglamoregl_la_DEPENDENCIES = libglamor.la libglamoregl_la_LDFLAGS = -avoid-version -module -libglamoregl_la_LIBADD = $(EGL_LIBS) $(GLX_SYS_LIBS) libglamor.la +libglamoregl_la_LIBADD = $(EGL_LIBS) $(GLX_SYS_LIBS) $(GBM_LIBS) libglamor.la libglamoregl_la_SOURCES = glamor_eglmodule.c $(top_srcdir)/src/glamor_egl.c -libglamoregl_la_CFLAGS = $(AM_CFLAGS) $(GLX_DEFINES) -I$(top_srcdir)/src $(LIBDRM_CFLAGS) $(EGL_CFLAGS) +libglamoregl_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(GLX_DEFINES) \ + -I$(top_srcdir)/src \ + $(LIBDRM_CFLAGS) \ + $(EGL_CFLAGS) \ + $(GBM_CFLAGS) endif -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1vezgh-0005ls...@vasks.debian.org
glamor-egl: Changes to 'ubuntu'
New branch 'ubuntu' available with the following commits: commit 047d9a068adf5f9f3520524f7d19be5cddc96b69 Author: Timo Aaltonen Date: Thu Aug 29 13:15:10 2013 +0300 push to saucy -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1vezgl-0005mb...@vasks.debian.org
glamor-egl: Changes to 'upstream-unstable'
configure.ac|2 +- src/Makefile.am | 10 -- 2 files changed, 9 insertions(+), 3 deletions(-) New commits: commit d3d166779e1a1698e017de9c4f4496bf3c5bbc0e Author: Zhigang Gong Date: Mon Aug 26 15:03:51 2013 +0800 Bump to 0.5.1. The change in this version is only about bug fix and package build fix. Signed-off-by: Zhigang Gong diff --git a/configure.ac b/configure.ac index 5ff6ae1..acde38f 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ # Initialize Autoconf AC_PREREQ([2.63]) AC_INIT([glamor-egl], -[0.5.0], +[0.5.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=glamor], [glamor-egl]) commit 0777a81fb3551b8d06c40c81bcd0ccd69dfcd836 Author: Christian König Date: Mon Aug 26 14:57:47 2013 +0800 Use GBM_LIBS and GBM_CFLAGS Signed-off-by: Christian König Reviewed-by: Michel Dänzer diff --git a/src/Makefile.am b/src/Makefile.am index 4beb559..c1759c6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -64,9 +64,15 @@ LIBGLAMOREGL = libglamoregl.la module_LTLIBRARIES = $(LIBGLAMOREGL) libglamoregl_la_DEPENDENCIES = libglamor.la libglamoregl_la_LDFLAGS = -avoid-version -module -libglamoregl_la_LIBADD = $(EGL_LIBS) $(GLX_SYS_LIBS) libglamor.la +libglamoregl_la_LIBADD = $(EGL_LIBS) $(GLX_SYS_LIBS) $(GBM_LIBS) libglamor.la libglamoregl_la_SOURCES = glamor_eglmodule.c $(top_srcdir)/src/glamor_egl.c -libglamoregl_la_CFLAGS = $(AM_CFLAGS) $(GLX_DEFINES) -I$(top_srcdir)/src $(LIBDRM_CFLAGS) $(EGL_CFLAGS) +libglamoregl_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(GLX_DEFINES) \ + -I$(top_srcdir)/src \ + $(LIBDRM_CFLAGS) \ + $(EGL_CFLAGS) \ + $(GBM_CFLAGS) endif -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1vezgi-0005m8...@vasks.debian.org
mesa: Changes to 'ubuntu'
Android.common.mk |2
SConstruct |2
configure.ac |2
debian/changelog |8 +-
docs/relnotes/9.2.html | 154 +++--
5 files changed, 157 insertions(+), 11 deletions(-)
New commits:
commit e8a04c5d55cc8767dc56490a109a21131a0640da
Author: Maarten Lankhorst
Date: Wed Aug 28 14:07:03 2013 +0200
release to saucy
diff --git a/debian/changelog b/debian/changelog
index 0a877dc..a8170cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-mesa (9.2-1ubuntu1) UNRELEASED; urgency=low
+mesa (9.2-1ubuntu1) saucy; urgency=low
* Merge from debian-experimental, remaining changes:
- Add support for aarch64.
- Build libgallium and libmesagallium shared.
- Enable mir support.
- -- Maarten Lankhorst Tue, 20 Aug 2013
18:51:03 +0200
+ -- Maarten Lankhorst Wed, 28 Aug 2013
14:02:08 +0200
mesa (9.2-1) experimental; urgency=low
commit fc3dad91c3b1d17ede058e087e80245957cdaa0a
Author: Maarten Lankhorst
Date: Wed Aug 28 10:28:32 2013 +0200
release to experimental
diff --git a/debian/changelog b/debian/changelog
index 617b0ad..ecc4e58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (9.2-1) UNRELEASED; urgency=low
+mesa (9.2-1) experimental; urgency=low
[ Jon Severinsson ]
* control: Recommend libtxc-dxtn-s2tc0 | libtxc-dxtn0, not just the virtual
libtxc-dxtn0.
@@ -18,7 +18,7 @@ mesa (9.2-1) UNRELEASED; urgency=low
* Refresh 02_gbm_no_undefined.diff.
* Drop 12_fix_glapi_gen.diff, upstreamed.
- -- Jon Severinsson Tue, 20 Aug 2013 18:00:00 +0200
+ -- Maarten Lankhorst Wed, 28 Aug 2013
10:28:20 +0200
mesa (9.2~rc1-1) experimental; urgency=low
commit 01c8df645aca054c6c4c16ce9778423231acd7b0
Author: Maarten Lankhorst
Date: Wed Aug 28 08:51:35 2013 +0200
New upstream release.
diff --git a/debian/changelog b/debian/changelog
index f1349e8..617b0ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (9.2~rc2-1) UNRELEASED; urgency=low
+mesa (9.2-1) UNRELEASED; urgency=low
[ Jon Severinsson ]
* control: Recommend libtxc-dxtn-s2tc0 | libtxc-dxtn0, not just the virtual
libtxc-dxtn0.
commit 2377205bcb3bb0b5db48772224f5f80f2cf9abf7
Author: Brian Paul
Date: Tue Aug 27 18:57:35 2013 -0600
docs: minor fixes for 9.2 release notes
Fix incorrect tag, fix language.
diff --git a/docs/relnotes/9.2.html b/docs/relnotes/9.2.html
index 1bbb699..9e1c015 100644
--- a/docs/relnotes/9.2.html
+++ b/docs/relnotes/9.2.html
@@ -51,8 +51,8 @@ Note: some of the new features are only available with
certain drivers.
GL_ARB_texture_multisample
GL_ARB_texture_storage_multisample
GL_ARB_texture_query_lod
-Enable GL_ARB_texture_storage on radeon, r200, and nouveau
-GL_EXT_discard_framebuffer in all OpenGL ES (all versions) drivers
+GL_ARB_texture_storage on radeon, r200, and nouveau
+GL_EXT_discard_framebuffer in all OpenGL ES (all versions) drivers
GL_EXT_framebuffer_multisample_blit_scaled on i965
Added new freedreno gallium driver
OSMesa interface for gallium llvmpipe/softpipe drivers
commit 8218eebc80ff597a4ff27190dceca8c88c3adce3
Author: Ian Romanick
Date: Tue Aug 27 16:33:48 2013 -0700
docs: Add 9.2 release md5sums
Signed-off-by: Ian Romanick
diff --git a/docs/relnotes/9.2.html b/docs/relnotes/9.2.html
index bf2fd66..1bbb699 100644
--- a/docs/relnotes/9.2.html
+++ b/docs/relnotes/9.2.html
@@ -33,7 +33,9 @@ because GL_ARB_compatibility is not supported.
MD5 checksums
-tbd
+4f93c6475ec656fc1f7b93aeffc9b6c4 MesaLib-9.2.0.tar.gz
+4185b6aae890bc62a964f4b24cc1aca8 MesaLib-9.2.0.tar.bz2
+3bc5339bc98b9c3ffd14e3a8eca4 MesaLib-9.2.0.zip
commit 46273ba25641e652f83bfa08b3d2bd55a57e55e8
Author: Ian Romanick
Date: Tue Aug 27 15:48:55 2013 -0700
mesa: Bump version to 9.2 (final)
Signed-off-by: Ian Romanick
diff --git a/Android.common.mk b/Android.common.mk
index 905d1a9..e6b3b44 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -35,7 +35,7 @@ LOCAL_C_INCLUDES += \
# define ANDROID_VERSION (e.g., 4.0.x => 0x0400)
LOCAL_CFLAGS += \
- -DPACKAGE_VERSION=\"9.2.0-rc2\" \
+ -DPACKAGE_VERSION=\"9.2.0\" \
-DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\";
\
-DANDROID_VERSION=0x0$(MESA_ANDROID_MAJOR_VERSION)0$(MESA_ANDROID_MINOR_VERSION)
diff --git a/SConstruct b/SConstruct
index 622ff36..b40a468 100644
--- a/SConstruct
+++ b/SConstruct
@@ -70,7 +70,7 @@ if env['gles']:
# Environment setup
env.Append(CPPDEFINES = [
-('PACKAGE_VERSION', '\\"9.2.0-rc2\\"'),
+('PACKAGE_VERSION', '\\"9.2.0\\"'),
('PACKAGE_BUGREPORT',
'\\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\\";'),
])
diff --git a/configure.ac b/configure.ac
index 11a711f..10d5ad8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl Tell the user about autoconf.html in the --help ou
xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog |6
debian/control|2
debian/patches/xmir.patch | 379 ++
3 files changed, 384 insertions(+), 3 deletions(-)
New commits:
commit 74831788f4aba5e82118760a320064127a1e9ec9
Author: Christopher James Halse Rogers
Date: Thu Aug 29 20:08:51 2013 +1000
Update for new XMir API
diff --git a/debian/changelog b/debian/changelog
index 01f9bc2..408b179 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-xserver-xorg-video-intel (2:2.21.14-4ubuntu3) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.21.14-4ubuntu3) saucy; urgency=low
* Fix valgrind-enabling check
+ * Update for new XMir API
+ * Bump build-depend on xserver-xorg-dev to ensure new XMir API
- -- Christopher James Halse Rogers Mon, 26 Aug 2013
18:54:40 +1000
+ -- Christopher James Halse Rogers Thu, 29 Aug 2013
20:08:05 +1000
xserver-xorg-video-intel (2:2.21.14-4ubuntu2) saucy; urgency=low
diff --git a/debian/control b/debian/control
index ced4c6c..7ed1f5e 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
dh-autoreconf,
pkg-config,
# Depend on latest server to ensure XMir support
- xserver-xorg-dev (>= 2:1.14.2-0ubuntu4~),
+ xserver-xorg-dev (>= 2:1.14.2.901-2ubuntu4~),
x11proto-core-dev,
x11proto-fonts-dev,
x11proto-xinerama-dev,
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 454882e..05155a6 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -767,3 +767,382 @@ index 000..a7c882d
+}
+
+#endif
+commit 5c4c1309ed043cce920c97633c5d5228d60308b8
+Author: Christopher James Halse Rogers
+Date: Thu Aug 22 11:17:04 2013 +1000
+
+Update to new XMir API
+
+diff --git a/src/sna/sna_xmir.c b/src/sna/sna_xmir.c
+index a7c882d..4ecdad9 100644
+--- a/src/sna/sna_xmir.c
b/src/sna/sna_xmir.c
+@@ -50,9 +50,9 @@
+ #define FORCE_FULL_REDRAW 0
+
+ static void
+-sna_xmir_copy_to_mir(WindowPtr win, RegionPtr region)
++sna_xmir_copy_to_mir(xmir_window *xmir_win, RegionPtr region)
+ {
+- PixmapPtr src = get_window_pixmap(win);
++ PixmapPtr src = get_window_pixmap(xmir_window_to_windowptr(xmir_win));
+ struct sna *sna = to_sna_from_pixmap(src);
+ struct sna_pixmap *priv;
+ struct kgem_bo *bo;
+@@ -70,7 +70,7 @@ sna_xmir_copy_to_mir(WindowPtr win, RegionPtr region)
+ /* XXX size and pitch are bogus, but only used for sanity checks */
+
+ bo = kgem_create_for_prime(&sna->kgem,
+- xmir_prime_fd_for_window(win),
++ xmir_window_get_fd(xmir_win),
+ priv->gpu_bo->pitch * src->drawable.height);
+ if (bo == NULL)
+ return;
+@@ -94,32 +94,15 @@ sna_xmir_copy_to_mir(WindowPtr win, RegionPtr region)
+ src, bo, 0, 0,
+ boxes, nbox, COPY_LAST)) {
+ kgem_submit(&sna->kgem);
+- xmir_submit_rendering_for_window(win, region);
++ xmir_submit_rendering_for_window(xmir_win, region);
+ }
+
+ kgem_bo_destroy(&sna->kgem, bo);
+ }
+
+-static void
+-sna_xmir_buffer_available(WindowPtr win)
+-{
+- RegionPtr region = xmir_window_get_dirty(win);
+- if (RegionNotEmpty(region))
+- sna_xmir_copy_to_mir(win, region);
+-}
+-
+-static void
+-sna_xmir_submit_dirty_window(WindowPtr win)
+-{
+- if (!xmir_window_has_free_buffer(win))
+- return;
+-
+- sna_xmir_copy_to_mir(win, xmir_window_get_dirty(win));
+-}
+-
+ static const xmir_driver sna_xmir_driver = {
+ XMIR_DRIVER_VERSION,
+- sna_xmir_buffer_available
++ sna_xmir_copy_to_mir
+ };
+
+ bool sna_xmir_create(struct sna *sna)
+@@ -157,7 +140,7 @@ void sna_xmir_post_damage(struct sna *sna)
+ return;
+
+ xmir_screen_for_each_damaged_window(sna->xmir,
+- sna_xmir_submit_dirty_window);
++ sna_xmir_copy_to_mir);
+ }
+
+ #endif
+commit 1edd7a1d8e54daf628df1317e65c96c903c72f85
+Author: Christopher James Halse Rogers
+Date: Fri Aug 23 10:20:49 2013 +1000
+
+Don't call sna_mode_update when SNA_IS_HOSTED
+
+diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
+index 6fe49c9..7870a47 100644
+--- a/src/sna/sna_driver.c
b/src/sna/sna_driver.c
+@@ -207,7 +207,8 @@ static Bool sna_become_master(struct sna *sna)
+ sna_set_fallback_mode(scrn);
+ }
+
+- sna_mode_update(sna);
++ if (!(sna->flags & SNA_IS_HOSTED))
++ sna_mode_update(sna);
+ return TRUE;
+ }
+
+commit 0c51dfcf7f2ef610fd3dc80bce71fc8c0a6f47cc
+Author: Christopher James Halse Rogers
+Date: Fri Aug 23 14:36:48 2013 +1000
+
+Fix rendering when copying from xmir_win that only partially covers the
drawable
+
+diff --git a/src/sna/sna_xmir.c b/src/sna/sna_xmir.c
+index
xserver-xorg-video-nouveau: Changes to 'ubuntu'
ChangeLog |17250 ++
configure.ac |5
debian/changelog | 50
debian/control| 10
debian/patches/xmir.patch | 189
debian/rules |4
src/Makefile.am | 20
src/drmmode_display.c | 52
src/nouveau_xv.c | 38
src/nv_driver.c |2
src/nvc0_accel.c | 33
src/shader/Makefile | 15
src/shader/exac8nvf0.fp | 42
src/shader/exac8nvf0.fpc | 28
src/shader/exacanvf0.fp | 43
src/shader/exacanvf0.fpc | 30
src/shader/exacmnvf0.fp | 43
src/shader/exacmnvf0.fpc | 30
src/shader/exas8nvf0.fp | 38
src/shader/exas8nvf0.fpc | 20
src/shader/exasanvf0.fp | 43
src/shader/exasanvf0.fpc | 30
src/shader/exascnvf0.fp | 35
src/shader/exascnvf0.fpc | 14
src/shader/videonvf0.fp | 47
src/shader/videonvf0.fpc | 38
src/shader/xfrm2nvf0.vp | 82
src/shader/xfrm2nvf0.vpc | 90
28 files changed, 18194 insertions(+), 127 deletions(-)
New commits:
commit 63b75449ff7d5e810c03a18ccf66e309cea385d4
Author: Christopher James Halse Rogers
Date: Thu Aug 29 21:34:30 2013 +1000
Fix xserver build-dep version
diff --git a/debian/control b/debian/control
index cf706e6..91a555e 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
debhelper (>= 8),
dh-autoreconf,
pkg-config,
- xserver-xorg-dev (>= 2:1.14.2.901-2ubuntu2+xmirMM14~),
+ xserver-xorg-dev (>= 2:1.14.2.901-2ubuntu4~),
x11proto-video-dev,
x11proto-core-dev,
x11proto-fonts-dev,
commit bcd598c2d7d3b22496514312d3b0801f6d2e7e81
Author: Christopher James Halse Rogers
Date: Mon Aug 26 17:29:29 2013 +1000
Update for new XMir API
diff --git a/debian/changelog b/debian/changelog
index a14fe33..306bbb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nouveau (1:1.0.8-0ubuntu4) saucy; urgency=low
+
+ * Update for new XMir API
+
+ -- Christopher James Halse Rogers Thu, 22 Aug 2013
14:42:58 +1000
+
xserver-xorg-video-nouveau (1:1.0.8-0ubuntu3) saucy; urgency=low
* Fix build against servers without XMir support
diff --git a/debian/control b/debian/control
index 70ce991..9c347e0 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
debhelper (>= 8),
dh-autoreconf,
pkg-config,
- xserver-xorg-dev (>= 2:1.14.2-0ubuntu4~),
+ xserver-xorg-dev (>= 2:1.14.2.901-2ubuntu2+xmirMM14~),
x11proto-video-dev,
x11proto-core-dev,
x11proto-fonts-dev,
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index ae77249..45324eb 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -6,10 +6,8 @@ Date: Mon Jul 22 17:46:58 2013 +1000
Signed-off-by: Christopher James Halse Rogers
-Index: xf86-video-nouveau/src/nouveau_dri2.c
-===
xf86-video-nouveau.orig/src/nouveau_dri2.c 2013-08-06 12:40:27.802943906
+1000
-+++ xf86-video-nouveau/src/nouveau_dri2.c 2013-08-06 12:40:27.798943906
+1000
+--- a/src/nouveau_dri2.c
b/src/nouveau_dri2.c
@@ -267,7 +267,7 @@
NVPtr pNv = NVPTR(scrn);
int i;
@@ -60,10 +58,8 @@ Index: xf86-video-nouveau/src/nouveau_dri2.c
#if DRI2INFOREC_VERSION >= 9
dri2.version = 9;
dri2.CreateBuffer2 = nouveau_dri2_create_buffer2;
-Index: xf86-video-nouveau/src/nv_driver.c
-===
xf86-video-nouveau.orig/src/nv_driver.c2013-08-06 12:40:27.802943906
+1000
-+++ xf86-video-nouveau/src/nv_driver.c 2013-08-06 12:44:47.126932579 +1000
+--- a/src/nv_driver.c
b/src/nv_driver.c
@@ -226,6 +226,8 @@
case GET_REQUIRED_HW_INTERFACES:
flag = (CARD32 *)data;
@@ -117,7 +113,17 @@ Index: xf86-video-nouveau/src/nv_driver.c
if (!NVHasKMS(dev->pdev))
return FALSE;
-@@ -424,9 +449,11 @@
+@@ -406,7 +431,8 @@
+ NVAdjustFrame(ADJUST_FRAME_ARGS_DECL)
+ {
+ SCRN_INFO_PTR(arg);
+- drmmode_adjust_frame(pScrn, x, y);
++ if (!xorgMir)
++ drmmode_adjust_frame(pScrn, x, y);
+ }
+
+ /*
+@@ -424,9 +450,11 @@
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NVEnterVT is called.\n");
@@ -132,7 +138,7 @@ Index: xf86-video-nouveau/src/nv_driver.c
if (XF86_CRTC_CONFIG_PTR(pScrn)->num_crtc &&
!xf86SetDesiredModes(pScrn))
return FALSE;
-@@ -452,6 +479,9 @@
+@@ -452,6 +480,9 @@
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NVLeaveVT is called.\n");
@@ -142,106 +148,89 @@ Index: xf86-video-nouveau/src/nv_driver.c
ret = drmDropMaster(pNv->dev->fd);
if (ret && errno != EIO && errno != ENODEV)
ErrorF("Error dropping master: %i(%m)\n", -errno);
-@@ -501,6 +531,86 @@
+@@ -501,6 +532,50 @@
}
#endif
+#ifdef XMIR
+static void
-+nouveau_xmir_copy_pixmap_to_mir(PixmapPtr src, i
xserver-xorg-video-ati: Changes to 'ubuntu'
debian/changelog |6 +
debian/control|2
debian/patches/xmir.patch | 239 ++
3 files changed, 126 insertions(+), 121 deletions(-)
New commits:
commit 6511e8fb24c331b029cd0400dc88a70ff3d60a6f
Author: Christopher James Halse Rogers
Date: Sun Aug 25 21:16:37 2013 +1000
Update to new XMir MM API
diff --git a/debian/changelog b/debian/changelog
index 896c006..8bfb6e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ati (1:7.2.0-0ubuntu4) saucy; urgency=low
+
+ * Update for new XMir API
+
+ -- Christopher James Halse Rogers Thu, 29 Aug 2013
20:18:26 +1000
+
xserver-xorg-video-ati (1:7.2.0-0ubuntu3) saucy; urgency=low
* xmir.patch: Also support 1D tiling. (LP: #1195425)
diff --git a/debian/control b/debian/control
index 32fcf15..678e43f 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
dh-autoreconf,
quilt,
pkg-config,
- xserver-xorg-dev (>= 2:1.14.2-0ubuntu4~),
+ xserver-xorg-dev (>= 2:1.14.2.901-2ubuntu4~),
x11proto-gl-dev,
x11proto-xext-dev,
x11proto-core-dev,
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 8e81f76..4fdbbf8 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -6,10 +6,8 @@ Date: Mon Jul 22 17:02:17 2013 +1000
Signed-off-by: Christopher James Halse Rogers
-Index: xf86-video-ati/src/drmmode_display.c
-===
xf86-video-ati.orig/src/drmmode_display.c 2013-08-15 09:44:05.626352176
+1000
-+++ xf86-video-ati/src/drmmode_display.c 2013-08-15 09:44:05.622352176
+1000
+--- a/src/drmmode_display.c
b/src/drmmode_display.c
@@ -1941,7 +1941,7 @@
if (!miCreateDefColormap(pScreen))
return FALSE;
@@ -19,10 +17,8 @@ Index: xf86-video-ati/src/drmmode_display.c
drmmode_load_palette, NULL,
CMAP_PALETTED_TRUECOLOR
#if 0 /* This option messes up text mode! (e...@suse.de) */
-Index: xf86-video-ati/src/radeon.h
-===
xf86-video-ati.orig/src/radeon.h 2013-08-15 09:44:05.626352176 +1000
-+++ xf86-video-ati/src/radeon.h2013-08-15 09:44:05.622352176 +1000
+--- a/src/radeon.h
b/src/radeon.h
@@ -87,6 +87,14 @@
#include "picturestr.h"
#endif
@@ -51,10 +47,8 @@ Index: xf86-video-ati/src/radeon.h
} RADEONInfoRec, *RADEONInfoPtr;
/* radeon_accel.c */
-Index: xf86-video-ati/src/radeon_bo_helper.c
-===
xf86-video-ati.orig/src/radeon_bo_helper.c 2013-08-15 09:44:05.626352176
+1000
-+++ xf86-video-ati/src/radeon_bo_helper.c 2013-08-15 10:00:04.206385137
+1000
+--- a/src/radeon_bo_helper.c
b/src/radeon_bo_helper.c
@@ -201,19 +201,25 @@
}
@@ -114,10 +108,8 @@ Index: xf86-video-ati/src/radeon_bo_helper.c
}
radeon_set_pixmap_bo(ppix, bo);
-Index: xf86-video-ati/src/radeon_bo_helper.h
-===
xf86-video-ati.orig/src/radeon_bo_helper.h 2013-08-15 09:44:05.626352176
+1000
-+++ xf86-video-ati/src/radeon_bo_helper.h 2013-08-15 09:44:05.622352176
+1000
+--- a/src/radeon_bo_helper.h
b/src/radeon_bo_helper.h
@@ -33,6 +33,7 @@
extern Bool
@@ -127,10 +119,8 @@ Index: xf86-video-ati/src/radeon_bo_helper.h
+ uint32_t *tiling_flags, uint32_t *pitch);
#endif /* RADEON_BO_HELPER_H */
-Index: xf86-video-ati/src/radeon_dri2.c
-===
xf86-video-ati.orig/src/radeon_dri2.c 2013-08-15 09:44:05.626352176
+1000
-+++ xf86-video-ati/src/radeon_dri2.c 2013-08-15 09:44:05.622352176 +1000
+--- a/src/radeon_dri2.c
b/src/radeon_dri2.c
@@ -1535,6 +1535,18 @@
#endif /* USE_DRI2_SCHEDULING */
@@ -171,10 +161,8 @@ Index: xf86-video-ati/src/radeon_dri2.c
#if DRI2INFOREC_VERSION >= 9
dri2_info.version = 9;
dri2_info.CreateBuffer2 = radeon_dri2_create_buffer2;
-Index: xf86-video-ati/src/radeon_exa.c
-===
xf86-video-ati.orig/src/radeon_exa.c 2013-08-15 09:44:05.626352176
+1000
-+++ xf86-video-ati/src/radeon_exa.c2013-08-15 09:44:05.622352176 +1000
+--- a/src/radeon_exa.c
b/src/radeon_exa.c
@@ -326,12 +326,12 @@
Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *fd_handle)
{
@@ -190,10 +178,8 @@ Index: xf86-video-ati/src/radeon_exa.c
return TRUE;
}
#endif
-Index: xf86-video-ati/src/radeon_glamor.c
-===
xf86-video-ati.orig/src/radeon_glamor.c2013-08-15 09:44:05.626352176
+1000
-+++ xf86-video-ati/src/radeon_glamor.c 2013-08-15 09:44:05.622352176 +1000
+--- a/src/radeon_glamor.c
b/src/rade
xorg-server: Changes to 'ubuntu'
debian/changelog |7
debian/patches/xmir.patch | 1047 --
debian/serverminver |2
3 files changed, 739 insertions(+), 317 deletions(-)
New commits:
commit 1b6eccb015856b1e0c3b9219fa22f7c61b74491d
Author: Christopher James Halse Rogers
Date: Thu Aug 29 19:47:40 2013 +1000
Add XMir RANDR support
diff --git a/debian/changelog b/debian/changelog
index 79bdfde..7b907ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.14.2.901-2ubuntu4) saucy; urgency=low
+
+ * xmir.patch: Add XRandR support
+ * Bump serverminver for XMir API changes
+
+ -- Christopher James Halse Rogers Thu, 29 Aug 2013
19:42:41 +1000
+
xorg-server (2:1.14.2.901-2ubuntu3) saucy; urgency=low
* xmir.patch: Use the API we have, not the API we've documented
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 6e5dab8..746fba3 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -1,8 +1,8 @@
-Index: xserver/configure.ac
-===
xserver.orig/configure.ac 2013-08-22 15:18:34.437916132 +1000
-+++ xserver/configure.ac 2013-08-22 15:18:34.425916132 +1000
-@@ -639,6 +639,7 @@
+diff --git a/configure.ac b/configure.ac
+index c6ecba4..cbba229 100644
+--- a/configure.ac
b/configure.ac
+@@ -635,6 +635,7 @@ AC_ARG_ENABLE(windowswm,
AS_HELP_STRING([--enable-windowswm], [Build XWin w
AC_ARG_ENABLE(libdrm, AS_HELP_STRING([--enable-libdrm], [Build Xorg
with libdrm support (default: enabled)]), [DRM=$enableval],[DRM=yes])
AC_ARG_ENABLE(clientids, AS_HELP_STRING([--disable-clientids], [Build
Xorg with client ID tracking (default: enabled)]), [CLIENTIDS=$enableval],
[CLIENTIDS=yes])
AC_ARG_ENABLE(pciaccess, AS_HELP_STRING([--enable-pciaccess], [Build Xorg
with pciaccess library (default: enabled)]), [PCI=$enableval], [PCI=yes])
@@ -10,7 +10,7 @@ Index: xserver/configure.ac
dnl DDXes.
AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build
Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
-@@ -1152,6 +1153,15 @@
+@@ -1148,6 +1149,15 @@ if test "x$XINERAMA" = xyes; then
SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $XINERAMAPROTO"
fi
@@ -26,7 +26,7 @@ Index: xserver/configure.ac
AM_CONDITIONAL(XACE, [test "x$XACE" = xyes])
if test "x$XACE" = xyes; then
AC_DEFINE(XACE, 1, [Build X-ACE extension])
-@@ -2300,6 +2310,7 @@
+@@ -2299,6 +2309,7 @@ hw/xfree86/utils/Makefile
hw/xfree86/utils/man/Makefile
hw/xfree86/utils/cvt/Makefile
hw/xfree86/utils/gtf/Makefile
@@ -34,11 +34,11 @@ Index: xserver/configure.ac
hw/dmx/config/Makefile
hw/dmx/config/man/Makefile
hw/dmx/doc/Makefile
-Index: xserver/hw/xfree86/Makefile.am
-===
xserver.orig/hw/xfree86/Makefile.am2013-08-22 15:18:34.437916132
+1000
-+++ xserver/hw/xfree86/Makefile.am 2013-08-22 15:18:34.425916132 +1000
-@@ -25,15 +25,20 @@
+diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
+index c3899b5..6821198 100644
+--- a/hw/xfree86/Makefile.am
b/hw/xfree86/Makefile.am
+@@ -25,15 +25,20 @@ if INT10MODULE
INT10_SUBDIR = int10
endif
@@ -61,11 +61,11 @@ Index: xserver/hw/xfree86/Makefile.am
bin_PROGRAMS = Xorg
nodist_Xorg_SOURCES = sdksyms.c
-Index: xserver/hw/xfree86/common/xf86Config.c
-===
xserver.orig/hw/xfree86/common/xf86Config.c2013-08-22
15:18:34.437916132 +1000
-+++ xserver/hw/xfree86/common/xf86Config.c 2013-08-22 15:18:34.429916132
+1000
-@@ -117,6 +117,7 @@
+diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
+index 74d5ed3..538ba4b 100644
+--- a/hw/xfree86/common/xf86Config.c
b/hw/xfree86/common/xf86Config.c
+@@ -118,6 +118,7 @@ static ModuleDefault ModuleDefaults[] = {
{.name = "fb",.toLoad = TRUE,.load_opt = NULL},
{.name = "shadow",.toLoad = TRUE,.load_opt = NULL},
#endif
@@ -73,7 +73,7 @@ Index: xserver/hw/xfree86/common/xf86Config.c
{.name = NULL,.toLoad = FALSE,.load_opt = NULL}
};
-@@ -259,6 +260,17 @@
+@@ -260,6 +261,17 @@ xf86ModulelistFromConfig(pointer **optlist)
return NULL;
}
@@ -91,22 +91,42 @@ Index: xserver/hw/xfree86/common/xf86Config.c
if (xf86configptr->conf_modules) {
/* Walk the disable list and let people know what we've parsed to
* not be loaded
-Index: xserver/hw/xfree86/common/xf86Globals.c
-===
xserver.orig/hw/xfree86/common/xf86Globals.c 2013-08-22
15:18:34.437916132 +1000
-+++ xserver/hw/xfree86/common/xf86Globals.c2013-08-22 15:18:34.429916132
+1000
-@@ -206,3 +206,6 @@
+diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
+index 7df7a80..17ed7c6 10
glamor-egl: Changes to 'debian-unstable'
debian/changelog |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 40dc6c88ae0e7a25d69c7b95a87024407cc920eb Author: Timo Aaltonen Date: Thu Aug 29 13:19:42 2013 +0300 tarball available, bump the version diff --git a/debian/changelog b/debian/changelog index 5cf97a9..2e138ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,5 @@ -glamor-egl (0.5.0-1) UNRELEASED; urgency=low +glamor-egl (0.5.1-1) UNRELEASED; urgency=low * Initial release. (Closes: #XX) - * Merged from tagged 0.5.1. -- Timo Aaltonen Wed, 03 Apr 2013 10:35:26 +0300 -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1vf1mk-0001cc...@vasks.debian.org
