[arch-commits] Commit in xf86-video-intel/repos (12 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Fri Aug 10 18:33:15 UTC 2012


    Date: Friday, August 10, 2012 @ 14:33:15
  Author: andyrtr
Revision: 165096

db-move: moved xf86-video-intel from [testing] to [extra] (i686, x86_64)

Added:
  xf86-video-intel/repos/extra-i686/PKGBUILD
    (from rev 165095, xf86-video-intel/repos/testing-i686/PKGBUILD)
  xf86-video-intel/repos/extra-i686/xf86-video-intel.install
    (from rev 165095, xf86-video-intel/repos/testing-i686/xf86-video-intel.install)
  xf86-video-intel/repos/extra-x86_64/PKGBUILD
    (from rev 165095, xf86-video-intel/repos/testing-x86_64/PKGBUILD)
  xf86-video-intel/repos/extra-x86_64/xf86-video-intel.install
    (from rev 165095, xf86-video-intel/repos/testing-x86_64/xf86-video-intel.install)
Deleted:
  xf86-video-intel/repos/extra-i686/PKGBUILD
  xf86-video-intel/repos/extra-i686/fix_gen4.diff
  xf86-video-intel/repos/extra-i686/xf86-video-intel.install
  xf86-video-intel/repos/extra-x86_64/PKGBUILD
  xf86-video-intel/repos/extra-x86_64/fix_gen4.diff
  xf86-video-intel/repos/extra-x86_64/xf86-video-intel.install
  xf86-video-intel/repos/testing-i686/
  xf86-video-intel/repos/testing-x86_64/

---------------------------------------+
 extra-i686/PKGBUILD                   |   73 +++++++---------
 extra-i686/fix_gen4.diff              |  142 --------------------------------
 extra-i686/xf86-video-intel.install   |   16 +--
 extra-x86_64/PKGBUILD                 |   73 +++++++---------
 extra-x86_64/fix_gen4.diff            |  142 --------------------------------
 extra-x86_64/xf86-video-intel.install |   16 +--
 6 files changed, 86 insertions(+), 376 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-08-10 13:32:19 UTC (rev 165095)
+++ extra-i686/PKGBUILD	2012-08-10 18:33:15 UTC (rev 165096)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-intel
-pkgver=2.20.2
-pkgrel=2
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-install=$pkgname.install
-pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
-depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.9' 'libxfixes' 'systemd-tools')
-makedepends=('xorg-server-devel>=1.12.0' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender')
-replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-conflicts=('xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        fix_gen4.diff)
-sha256sums=('4c30cce0b5f7b427d76898c439f2c9fd31a8b45babd8ef82ec4c0004ae0a26a9'
-            '0c5b98e4980c8108aee12b1e46a78c23029034439dcd277f8ae1264ca3fff8a4')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/fix_gen4.diff
-  ./configure --prefix=/usr \
-    --enable-dri
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}

Copied: xf86-video-intel/repos/extra-i686/PKGBUILD (from rev 165095, xf86-video-intel/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-08-10 18:33:15 UTC (rev 165096)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-intel
+pkgver=2.20.3
+pkgrel=1
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+install=$pkgname.install
+pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
+depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.9' 'libxfixes' 'systemd-tools')
+makedepends=('xorg-server-devel>=1.12.0' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender')
+replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
+provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
+conflicts=('xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('effca1382e595cc071b109818150db229ffb54f92769e4758398abbe69acb92c')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+    --enable-dri
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}

Deleted: extra-i686/fix_gen4.diff
===================================================================
--- extra-i686/fix_gen4.diff	2012-08-10 13:32:19 UTC (rev 165095)
+++ extra-i686/fix_gen4.diff	2012-08-10 18:33:15 UTC (rev 165096)
@@ -1,142 +0,0 @@
-From 73ddd8b0decee444a57f10a11f05deebba686649 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Fri, 27 Jul 2012 11:43:00 +0000
-Subject: sna/gen4: Further refinement to the GT allocation
-
-Still hunting for why gen4 fails utterly.
-
-Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
----
-diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
-index 25229e1..1a860bd 100644
---- a/src/sna/gen4_render.c
-+++ b/src/sna/gen4_render.c
-@@ -79,8 +79,8 @@
- #define URB_CS_ENTRY_SIZE     1
- #define URB_CS_ENTRIES	      0
- 
--#define URB_VS_ENTRY_SIZE     1	// each 512-bit row
--#define URB_VS_ENTRIES	      32	// we needs at least 8 entries
-+#define URB_VS_ENTRY_SIZE     1
-+#define URB_VS_ENTRIES	      32
- 
- #define URB_GS_ENTRY_SIZE     0
- #define URB_GS_ENTRIES	      0
-@@ -89,25 +89,24 @@
- #define URB_CLIP_ENTRIES      0
- 
- #define URB_SF_ENTRY_SIZE     2
--#define URB_SF_ENTRIES	      8
-+#define URB_SF_ENTRIES	      64
- 
- /*
-  * this program computes dA/dx and dA/dy for the texture coordinates along
-  * with the base texture coordinate. It was extracted from the Mesa driver
-  */
- 
--#define SF_KERNEL_NUM_GRF  16
--
--#define PS_KERNEL_NUM_GRF   32
-+#define SF_KERNEL_NUM_GRF 16
-+#define PS_KERNEL_NUM_GRF 32
- 
- static const struct gt_info {
- 	uint32_t max_sf_threads;
- 	uint32_t max_wm_threads;
- 	uint32_t urb_size;
- } gen4_gt_info = {
--	16, 32, 256,
-+	24, 32, 256,
- }, g4x_gt_info = {
--	32, 50, 384,
-+	24, 50, 384,
- };
- 
- static const uint32_t sf_kernel[][4] = {
-@@ -1455,10 +1454,10 @@ gen4_emit_state(struct sna *sna,
- 		const struct sna_composite_op *op,
- 		uint16_t wm_binding_table)
- {
-+	gen4_emit_drawing_rectangle(sna, op);
- 	gen4_emit_binding_table(sna, wm_binding_table);
- 	gen4_emit_pipelined_pointers(sna, op, op->op, op->u.gen4.wm_kernel);
- 	gen4_emit_vertex_elements(sna, op);
--	gen4_emit_drawing_rectangle(sna, op);
- 
- 	if (kgem_bo_is_dirty(op->src.bo) || kgem_bo_is_dirty(op->mask.bo)) {
- 		DBG(("%s: flushing dirty (%d, %d)\n", __FUNCTION__,
---
-cgit v0.9.0.2-2-gbebe
-From fb385745a2347f8966765567e78229d67ddc8d60 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Fri, 27 Jul 2012 12:24:04 +0000
-Subject: sna/gen4: Move the common vertex_offset==0 check into the flush()
-
-Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
----
-diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
-index 1a860bd..58d4422 100644
---- a/src/sna/gen4_render.c
-+++ b/src/sna/gen4_render.c
-@@ -338,7 +338,8 @@ static void gen4_magic_ca_pass(struct sna *sna,
- 
- static void gen4_vertex_flush(struct sna *sna)
- {
--	assert(sna->render_state.gen4.vertex_offset);
-+	if (sna->render_state.gen4.vertex_offset == 0)
-+		return;
- 
- 	DBG(("%s[%x] = %d\n", __FUNCTION__,
- 	     4*sna->render_state.gen4.vertex_offset,
-@@ -359,8 +360,7 @@ static int gen4_vertex_finish(struct sna *sna)
- 
- 	bo = sna->render.vbo;
- 	if (bo) {
--		if (sna->render_state.gen4.vertex_offset)
--			gen4_vertex_flush(sna);
-+		gen4_vertex_flush(sna);
- 
- 		for (i = 0; i < ARRAY_SIZE(sna->render.vertex_reloc); i++) {
- 			if (sna->render.vertex_reloc[i]) {
-@@ -1783,8 +1783,7 @@ gen4_render_video(struct sna *sna,
- 	}
- 	priv->clear = false;
- 
--	if (sna->render_state.gen4.vertex_offset)
--		gen4_vertex_flush(sna);
-+	gen4_vertex_flush(sna);
- 	return true;
- }
- 
-@@ -2693,8 +2692,7 @@ fastcall static void
- gen4_render_composite_spans_done(struct sna *sna,
- 				 const struct sna_composite_spans_op *op)
- {
--	if (sna->render_state.gen4.vertex_offset)
--		gen4_vertex_flush(sna);
-+	gen4_vertex_flush(sna);
- 
- 	DBG(("%s()\n", __FUNCTION__));
- 
-@@ -3072,8 +3070,7 @@ gen4_render_copy_blt(struct sna *sna,
- static void
- gen4_render_copy_done(struct sna *sna, const struct sna_copy_op *op)
- {
--	if (sna->render_state.gen4.vertex_offset)
--		gen4_vertex_flush(sna);
-+	gen4_vertex_flush(sna);
- }
- 
- static bool
-@@ -3366,8 +3363,7 @@ gen4_render_fill_op_boxes(struct sna *sna,
- static void
- gen4_render_fill_op_done(struct sna *sna, const struct sna_fill_op *op)
- {
--	if (sna->render_state.gen4.vertex_offset)
--		gen4_vertex_flush(sna);
-+	gen4_vertex_flush(sna);
- 	kgem_bo_destroy(&sna->kgem, op->base.src.bo);
- }
- 
---
-cgit v0.9.0.2-2-gbebe

Deleted: extra-i686/xf86-video-intel.install
===================================================================
--- extra-i686/xf86-video-intel.install	2012-08-10 13:32:19 UTC (rev 165095)
+++ extra-i686/xf86-video-intel.install	2012-08-10 18:33:15 UTC (rev 165096)
@@ -1,8 +0,0 @@
-post_install() {
-  echo ">>> This driver now allows to switch"
-  echo ">>> between several acceleration methods."
-  echo ">>> Add to the device section in /etc/X11/xorg.conf"
-  echo ">>>   Option \"AccelMethod\" \"sna\""
-  echo ">>> use uxa/xaa method if you run into trouble with sna."
-}
-

Copied: xf86-video-intel/repos/extra-i686/xf86-video-intel.install (from rev 165095, xf86-video-intel/repos/testing-i686/xf86-video-intel.install)
===================================================================
--- extra-i686/xf86-video-intel.install	                        (rev 0)
+++ extra-i686/xf86-video-intel.install	2012-08-10 18:33:15 UTC (rev 165096)
@@ -0,0 +1,8 @@
+post_install() {
+  echo ">>> This driver now allows to switch"
+  echo ">>> between several acceleration methods."
+  echo ">>> Add to the device section in /etc/X11/xorg.conf"
+  echo ">>>   Option \"AccelMethod\" \"sna\""
+  echo ">>> use uxa/xaa method if you run into trouble with sna."
+}
+

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-08-10 13:32:19 UTC (rev 165095)
+++ extra-x86_64/PKGBUILD	2012-08-10 18:33:15 UTC (rev 165096)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-intel
-pkgver=2.20.2
-pkgrel=2
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-install=$pkgname.install
-pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
-depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.9' 'libxfixes' 'systemd-tools')
-makedepends=('xorg-server-devel>=1.12.0' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender')
-replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-conflicts=('xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        fix_gen4.diff)
-sha256sums=('4c30cce0b5f7b427d76898c439f2c9fd31a8b45babd8ef82ec4c0004ae0a26a9'
-            '0c5b98e4980c8108aee12b1e46a78c23029034439dcd277f8ae1264ca3fff8a4')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/fix_gen4.diff
-  ./configure --prefix=/usr \
-    --enable-dri
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}

Copied: xf86-video-intel/repos/extra-x86_64/PKGBUILD (from rev 165095, xf86-video-intel/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-08-10 18:33:15 UTC (rev 165096)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-intel
+pkgver=2.20.3
+pkgrel=1
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+install=$pkgname.install
+pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
+depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.9' 'libxfixes' 'systemd-tools')
+makedepends=('xorg-server-devel>=1.12.0' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender')
+replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
+provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
+conflicts=('xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('effca1382e595cc071b109818150db229ffb54f92769e4758398abbe69acb92c')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+    --enable-dri
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}

Deleted: extra-x86_64/fix_gen4.diff
===================================================================
--- extra-x86_64/fix_gen4.diff	2012-08-10 13:32:19 UTC (rev 165095)
+++ extra-x86_64/fix_gen4.diff	2012-08-10 18:33:15 UTC (rev 165096)
@@ -1,142 +0,0 @@
-From 73ddd8b0decee444a57f10a11f05deebba686649 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Fri, 27 Jul 2012 11:43:00 +0000
-Subject: sna/gen4: Further refinement to the GT allocation
-
-Still hunting for why gen4 fails utterly.
-
-Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
----
-diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
-index 25229e1..1a860bd 100644
---- a/src/sna/gen4_render.c
-+++ b/src/sna/gen4_render.c
-@@ -79,8 +79,8 @@
- #define URB_CS_ENTRY_SIZE     1
- #define URB_CS_ENTRIES	      0
- 
--#define URB_VS_ENTRY_SIZE     1	// each 512-bit row
--#define URB_VS_ENTRIES	      32	// we needs at least 8 entries
-+#define URB_VS_ENTRY_SIZE     1
-+#define URB_VS_ENTRIES	      32
- 
- #define URB_GS_ENTRY_SIZE     0
- #define URB_GS_ENTRIES	      0
-@@ -89,25 +89,24 @@
- #define URB_CLIP_ENTRIES      0
- 
- #define URB_SF_ENTRY_SIZE     2
--#define URB_SF_ENTRIES	      8
-+#define URB_SF_ENTRIES	      64
- 
- /*
-  * this program computes dA/dx and dA/dy for the texture coordinates along
-  * with the base texture coordinate. It was extracted from the Mesa driver
-  */
- 
--#define SF_KERNEL_NUM_GRF  16
--
--#define PS_KERNEL_NUM_GRF   32
-+#define SF_KERNEL_NUM_GRF 16
-+#define PS_KERNEL_NUM_GRF 32
- 
- static const struct gt_info {
- 	uint32_t max_sf_threads;
- 	uint32_t max_wm_threads;
- 	uint32_t urb_size;
- } gen4_gt_info = {
--	16, 32, 256,
-+	24, 32, 256,
- }, g4x_gt_info = {
--	32, 50, 384,
-+	24, 50, 384,
- };
- 
- static const uint32_t sf_kernel[][4] = {
-@@ -1455,10 +1454,10 @@ gen4_emit_state(struct sna *sna,
- 		const struct sna_composite_op *op,
- 		uint16_t wm_binding_table)
- {
-+	gen4_emit_drawing_rectangle(sna, op);
- 	gen4_emit_binding_table(sna, wm_binding_table);
- 	gen4_emit_pipelined_pointers(sna, op, op->op, op->u.gen4.wm_kernel);
- 	gen4_emit_vertex_elements(sna, op);
--	gen4_emit_drawing_rectangle(sna, op);
- 
- 	if (kgem_bo_is_dirty(op->src.bo) || kgem_bo_is_dirty(op->mask.bo)) {
- 		DBG(("%s: flushing dirty (%d, %d)\n", __FUNCTION__,
---
-cgit v0.9.0.2-2-gbebe
-From fb385745a2347f8966765567e78229d67ddc8d60 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Fri, 27 Jul 2012 12:24:04 +0000
-Subject: sna/gen4: Move the common vertex_offset==0 check into the flush()
-
-Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
----
-diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
-index 1a860bd..58d4422 100644
---- a/src/sna/gen4_render.c
-+++ b/src/sna/gen4_render.c
-@@ -338,7 +338,8 @@ static void gen4_magic_ca_pass(struct sna *sna,
- 
- static void gen4_vertex_flush(struct sna *sna)
- {
--	assert(sna->render_state.gen4.vertex_offset);
-+	if (sna->render_state.gen4.vertex_offset == 0)
-+		return;
- 
- 	DBG(("%s[%x] = %d\n", __FUNCTION__,
- 	     4*sna->render_state.gen4.vertex_offset,
-@@ -359,8 +360,7 @@ static int gen4_vertex_finish(struct sna *sna)
- 
- 	bo = sna->render.vbo;
- 	if (bo) {
--		if (sna->render_state.gen4.vertex_offset)
--			gen4_vertex_flush(sna);
-+		gen4_vertex_flush(sna);
- 
- 		for (i = 0; i < ARRAY_SIZE(sna->render.vertex_reloc); i++) {
- 			if (sna->render.vertex_reloc[i]) {
-@@ -1783,8 +1783,7 @@ gen4_render_video(struct sna *sna,
- 	}
- 	priv->clear = false;
- 
--	if (sna->render_state.gen4.vertex_offset)
--		gen4_vertex_flush(sna);
-+	gen4_vertex_flush(sna);
- 	return true;
- }
- 
-@@ -2693,8 +2692,7 @@ fastcall static void
- gen4_render_composite_spans_done(struct sna *sna,
- 				 const struct sna_composite_spans_op *op)
- {
--	if (sna->render_state.gen4.vertex_offset)
--		gen4_vertex_flush(sna);
-+	gen4_vertex_flush(sna);
- 
- 	DBG(("%s()\n", __FUNCTION__));
- 
-@@ -3072,8 +3070,7 @@ gen4_render_copy_blt(struct sna *sna,
- static void
- gen4_render_copy_done(struct sna *sna, const struct sna_copy_op *op)
- {
--	if (sna->render_state.gen4.vertex_offset)
--		gen4_vertex_flush(sna);
-+	gen4_vertex_flush(sna);
- }
- 
- static bool
-@@ -3366,8 +3363,7 @@ gen4_render_fill_op_boxes(struct sna *sna,
- static void
- gen4_render_fill_op_done(struct sna *sna, const struct sna_fill_op *op)
- {
--	if (sna->render_state.gen4.vertex_offset)
--		gen4_vertex_flush(sna);
-+	gen4_vertex_flush(sna);
- 	kgem_bo_destroy(&sna->kgem, op->base.src.bo);
- }
- 
---
-cgit v0.9.0.2-2-gbebe

Deleted: extra-x86_64/xf86-video-intel.install
===================================================================
--- extra-x86_64/xf86-video-intel.install	2012-08-10 13:32:19 UTC (rev 165095)
+++ extra-x86_64/xf86-video-intel.install	2012-08-10 18:33:15 UTC (rev 165096)
@@ -1,8 +0,0 @@
-post_install() {
-  echo ">>> This driver now allows to switch"
-  echo ">>> between several acceleration methods."
-  echo ">>> Add to the device section in /etc/X11/xorg.conf"
-  echo ">>>   Option \"AccelMethod\" \"sna\""
-  echo ">>> use uxa/xaa method if you run into trouble with sna."
-}
-

Copied: xf86-video-intel/repos/extra-x86_64/xf86-video-intel.install (from rev 165095, xf86-video-intel/repos/testing-x86_64/xf86-video-intel.install)
===================================================================
--- extra-x86_64/xf86-video-intel.install	                        (rev 0)
+++ extra-x86_64/xf86-video-intel.install	2012-08-10 18:33:15 UTC (rev 165096)
@@ -0,0 +1,8 @@
+post_install() {
+  echo ">>> This driver now allows to switch"
+  echo ">>> between several acceleration methods."
+  echo ">>> Add to the device section in /etc/X11/xorg.conf"
+  echo ">>>   Option \"AccelMethod\" \"sna\""
+  echo ">>> use uxa/xaa method if you run into trouble with sna."
+}
+




More information about the arch-commits mailing list