summaryrefslogtreecommitdiffstats
path: root/testing/source/mesa/patches
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2012-09-26 01:10:42 +0000
committer Eric Hameleers <alien@slackware.com>2018-05-31 22:51:55 +0200
commit9664bee729d487bcc0a0bc35859f8e13d5421c75 (patch)
treeb428a16618e36ed864a8d76ea3435e19a452bf90 /testing/source/mesa/patches
parent75a4a592e5ccda30715f93563d741b83e0dcf39e (diff)
downloadcurrent-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.gz
current-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.xz
Slackware 14.0slackware-14.0
Wed Sep 26 01:10:42 UTC 2012 Slackware 14.0 x86_64 stable is released! We're perfectionists here at Slackware, so this release has been a long time a-brewing. But we think you'll agree that it was worth the wait. Slackware 14.0 combines modern components, ease of use, and flexible configuration... our "KISS" philosophy demands it. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Thanks to everyone who helped make this happen. The Slackware team, the upstream developers, and (of course) the awesome Slackware user community. Have fun! :-)
Diffstat (limited to 'testing/source/mesa/patches')
-rw-r--r--testing/source/mesa/patches/i915_fragment_shader_disable.patch26
-rw-r--r--testing/source/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch89
2 files changed, 0 insertions, 115 deletions
diff --git a/testing/source/mesa/patches/i915_fragment_shader_disable.patch b/testing/source/mesa/patches/i915_fragment_shader_disable.patch
deleted file mode 100644
index d2aee8e73..000000000
--- a/testing/source/mesa/patches/i915_fragment_shader_disable.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e5a4106be7c8b87821f6b5d21fec99a402825740 Mon Sep 17 00:00:00 2001
-From: Robert Hooker <sarvatt@ubuntu.com>
-Date: Wed, 8 Sep 2010 12:33:09 -0400
-Subject: [PATCH] Revert "i915: Enable ARB_fragment_shader by default."
-
-This reverts commit a58514cc9c5cc5867f9140700462c5ac5749550d.
----
- src/mesa/drivers/dri/intel/intel_screen.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
-index 0a542a7..8ae2cd2 100644
---- a/src/mesa/drivers/dri/intel/intel_screen.c
-+++ b/src/mesa/drivers/dri/intel/intel_screen.c
-@@ -70,7 +70,7 @@ PUBLIC const char __driConfigOptions[] =
- DRI_CONF_DESC(en, "Enable early Z in classic mode (unstable, 945-only).")
- DRI_CONF_OPT_END
-
-- DRI_CONF_OPT_BEGIN(fragment_shader, bool, true)
-+ DRI_CONF_OPT_BEGIN(fragment_shader, bool, false)
- DRI_CONF_DESC(en, "Enable limited ARB_fragment_shader support on 915/945.")
- DRI_CONF_OPT_END
-
---
-1.7.2
-
diff --git a/testing/source/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch b/testing/source/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch
deleted file mode 100644
index d0ce04d26..000000000
--- a/testing/source/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -ur a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c
---- a/src/gallium/drivers/nouveau/nouveau_screen.c 2010-10-02 00:51:28.000000000 +0200
-+++ b/src/gallium/drivers/nouveau/nouveau_screen.c 2010-12-11 18:18:20.527000045 +0100
-@@ -236,7 +236,7 @@
- int ret;
-
- ret = nouveau_channel_alloc(dev, 0xbeef0201, 0xbeef0202,
-- &screen->channel);
-+ 512*1024, &screen->channel);
- if (ret)
- return ret;
- screen->device = dev;
-diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
---- a/src/mesa/drivers/dri/nouveau/nouveau_context.c 2010-10-05 03:58:00.000000000 +0200
-+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c 2010-12-11 18:18:20.528000045 +0100
-@@ -129,7 +129,7 @@
-
- /* Allocate a hardware channel. */
- ret = nouveau_channel_alloc(context_dev(ctx), 0xbeef0201, 0xbeef0202,
-- &nctx->hw.chan);
-+ 512*1024, &nctx->hw.chan);
- if (ret) {
- nouveau_error("Error initializing the FIFO.\n");
- return GL_FALSE;
-Nur in b/src/mesa/drivers/dri/nouveau: nouveau_context.c.orig.
-diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_surface.c b/src/mesa/drivers/dri/nouveau/nouveau_surface.c
---- a/src/mesa/drivers/dri/nouveau/nouveau_surface.c 2010-04-27 23:41:21.000000000 +0200
-+++ b/src/mesa/drivers/dri/nouveau/nouveau_surface.c 2010-12-11 18:09:19.750000046 +0100
-@@ -34,8 +34,8 @@
- unsigned flags, unsigned format,
- unsigned width, unsigned height)
- {
-- unsigned tile_mode, cpp = _mesa_get_format_bytes(format);
-- int ret;
-+ unsigned tile_mode = 0, tile_flags = 0;
-+ int ret, cpp = _mesa_get_format_bytes(format);
-
- nouveau_bo_ref(NULL, &s->bo);
-
-@@ -51,13 +51,21 @@
- if (layout == TILED) {
- s->pitch = align(s->pitch, 256);
- tile_mode = s->pitch;
-+
-+ if (cpp == 4)
-+ tile_flags = NOUVEAU_BO_TILE_32BPP;
-+ else if (cpp == 2)
-+ tile_flags = NOUVEAU_BO_TILE_16BPP;
-+
-+ if (_mesa_get_format_bits(format, GL_DEPTH_BITS))
-+ tile_flags |= NOUVEAU_BO_TILE_ZETA;
-+
- } else {
- s->pitch = align(s->pitch, 64);
-- tile_mode = 0;
- }
-
- ret = nouveau_bo_new_tile(context_dev(ctx), flags, 0, s->pitch * height,
-- tile_mode, 0, &s->bo);
-+ tile_mode, tile_flags, &s->bo);
- assert(!ret);
- }
-
-diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c
---- a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c 2010-10-05 03:58:00.000000000 +0200
-+++ b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c 2010-12-11 18:18:20.528000045 +0100
-@@ -32,7 +32,7 @@
-
- /* Arbitrary pushbuf length we can assume we can get with a single
- * WAIT_RING. */
--#define PUSHBUF_DWORDS 2048
-+#define PUSHBUF_DWORDS 65536
-
- /* Functions to set up struct nouveau_array_state from something like
- * a GL array or index buffer. */
-diff -ur a/src/mesa/drivers/dri/nouveau/nv10_state_fb.c b/src/mesa/drivers/dri/nouveau/nv10_state_fb.c
---- a/src/mesa/drivers/dri/nouveau/nv10_state_fb.c 2010-10-05 03:58:00.000000000 +0200
-+++ b/src/mesa/drivers/dri/nouveau/nv10_state_fb.c 2010-12-11 18:15:17.756000046 +0100
-@@ -64,8 +64,8 @@
-
- if (!nfb->lma_bo || nfb->lma_bo->size != size) {
- nouveau_bo_ref(NULL, &nfb->lma_bo);
-- nouveau_bo_new(context_dev(ctx), NOUVEAU_BO_VRAM, 0, size,
-- &nfb->lma_bo);
-+ nouveau_bo_new_tile(context_dev(ctx), NOUVEAU_BO_VRAM, 0, size,
-+ 0, NOUVEAU_BO_TILE_ZETA, &nfb->lma_bo);
- }
-
- nouveau_bo_markl(bctx, celsius, NV17TCL_LMA_DEPTH_BUFFER_OFFSET,