summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Gnatenko <i.gnatenko.brain@gmail.com>2015-07-07 12:54:05 +0300
committerIgor Gnatenko <i.gnatenko.brain@gmail.com>2015-07-07 12:54:05 +0300
commit248914a5b658f97036c642ba1791b5ee0214c6de (patch)
tree0251d786fae2235a74e748d5d928a5c0f4a9d424
parent2218366edd5f0192b5c4d11dfb361eccbcde4749 (diff)
downloadmesa-248914a5b658f97036c642ba1791b5ee0214c6de.tar.gz
mesa-248914a5b658f97036c642ba1791b5ee0214c6de.tar.xz
mesa-248914a5b658f97036c642ba1791b5ee0214c6de.zip
drop unused patches
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
-rw-r--r--mesa-10.0-nv50-fix-build.patch12
-rw-r--r--mesa-8.0-llvmpipe-shmget.patch156
-rw-r--r--mesa-8.0.1-fix-16bpp.patch13
-rw-r--r--mesa.spec15
4 files changed, 0 insertions, 196 deletions
diff --git a/mesa-10.0-nv50-fix-build.patch b/mesa-10.0-nv50-fix-build.patch
deleted file mode 100644
index 51d3160..0000000
--- a/mesa-10.0-nv50-fix-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr mesa-20131201.orig/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp mesa-20131201/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
---- mesa-20131201.orig/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp 2013-12-01 11:29:21.000000000 +0400
-+++ mesa-20131201/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp 2013-12-01 16:05:06.488417551 +0400
-@@ -739,7 +739,7 @@
- if (!i)
- i = new_Instruction(pol.context(), op, dType);
- #ifndef NDEBUG // non-conformant assert, so this is required
-- assert(typeid(*i) == typeid(*this));
-+ //assert(typeid(*i) == typeid(*this));
- #endif
-
- pol.set<Instruction>(this, i);
diff --git a/mesa-8.0-llvmpipe-shmget.patch b/mesa-8.0-llvmpipe-shmget.patch
deleted file mode 100644
index 347ad16..0000000
--- a/mesa-8.0-llvmpipe-shmget.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-diff -up mesa-20120424/src/gallium/state_trackers/dri/sw/drisw.c.jx mesa-20120424/src/gallium/state_trackers/dri/sw/drisw.c
---- mesa-20120424/src/gallium/state_trackers/dri/sw/drisw.c.jx 2012-04-24 07:37:03.000000000 -0400
-+++ mesa-20120424/src/gallium/state_trackers/dri/sw/drisw.c 2012-05-16 13:30:36.596312047 -0400
-@@ -252,8 +252,6 @@ drisw_update_tex_buffer(struct dri_drawa
- struct pipe_transfer *transfer;
- char *map;
- int x, y, w, h;
-- int ximage_stride, line;
-- int cpp = util_format_get_blocksize(res->format);
-
- get_drawable_info(dPriv, &x, &y, &w, &h);
-
-@@ -266,14 +264,6 @@ drisw_update_tex_buffer(struct dri_drawa
- /* Copy the Drawable content to the mapped texture buffer */
- get_image(dPriv, x, y, w, h, map);
-
-- /* The pipe transfer has a pitch rounded up to the nearest 64 pixels. */
-- ximage_stride = w * cpp;
-- for (line = h-1; line; --line) {
-- memmove(&map[line * transfer->stride],
-- &map[line * ximage_stride],
-- ximage_stride);
-- }
--
- pipe_transfer_unmap(pipe, transfer);
- pipe_transfer_destroy(pipe, transfer);
- }
-diff -up mesa-20120424/src/glx/drisw_glx.c.jx mesa-20120424/src/glx/drisw_glx.c
---- mesa-20120424/src/glx/drisw_glx.c.jx 2012-04-24 07:37:03.000000000 -0400
-+++ mesa-20120424/src/glx/drisw_glx.c 2012-05-16 13:29:25.087965268 -0400
-@@ -24,6 +24,9 @@
- #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
-
- #include <X11/Xlib.h>
-+#include <sys/ipc.h>
-+#include <sys/shm.h>
-+#include <X11/extensions/XShm.h>
- #include "glxclient.h"
- #include <dlfcn.h>
- #include "dri_common.h"
-@@ -206,6 +209,96 @@ swrastPutImage(__DRIdrawable * draw, int
- ximage->data = NULL;
- }
-
-+static int shm_error;
-+
-+static int
-+shm_handler(Display *d, XErrorEvent *e)
-+{
-+ shm_error = 1;
-+ return 0;
-+}
-+
-+static int
-+align(int value, int alignment)
-+{
-+ return (value + alignment - 1) & ~(alignment - 1);
-+}
-+
-+/*
-+ * Slight fast path. Short of changing how texture memory is allocated, we
-+ * have two options for getting the pixels out. GetImage is clamped by the
-+ * server's write buffer size, so you end up doing lots of relatively small
-+ * requests (128k each or so), with two memcpys: down into the kernel, and
-+ * then back up. ShmGetImage is one big blit into the shm segment (which
-+ * could be GPU DMA, in principle) and then another one here.
-+ */
-+static Bool
-+swrastShmGetImage(__DRIdrawable *read, char *data, struct drisw_drawable *prp)
-+{
-+ __GLXDRIdrawable *pread = &(prp->base);
-+ Display *dpy = pread->psc->dpy;
-+ XImage *ximage = prp->ximage;
-+ unsigned long image_size = ximage->height * ximage->bytes_per_line;
-+ Bool ret = 0;
-+ XShmSegmentInfo seg = { 0, -1, (void *)-1, 0 };
-+ int (*old_handler)(Display *, XErrorEvent *);
-+
-+ if (!XShmQueryExtension(dpy))
-+ goto out;
-+
-+ /* image setup */
-+ seg.shmid = shmget(IPC_PRIVATE, image_size, IPC_CREAT | 0777);
-+ if (seg.shmid < 0)
-+ goto out;
-+
-+ seg.shmaddr = shmat(seg.shmid, NULL, 0);
-+ if (seg.shmaddr == (void *)-1)
-+ goto out;
-+
-+ XSync(dpy, 0);
-+ old_handler = XSetErrorHandler(shm_handler);
-+ XShmAttach(dpy, &seg);
-+ XSync(dpy, 0);
-+ XSetErrorHandler(old_handler);
-+ if (shm_error)
-+ goto out;
-+
-+ ximage->data = seg.shmaddr;
-+ ximage->obdata = &seg;
-+ if (!XShmGetImage(dpy, pread->xDrawable, ximage, 0, 0, -1))
-+ goto out;
-+
-+ /*
-+ * ShmGetImage doesn't actually pay attention to ->bytes_per_line.
-+ * We have to compensate for this somewhere since llvmpipe's natural
-+ * tile width is 64. Do it here so we don't have to undo it with a
-+ * bunch of memmove in the driver.
-+ */
-+ do {
-+ int i;
-+ char *src = ximage->data;
-+ int dst_width = align(ximage->width * ximage->bits_per_pixel / 8, 256);
-+
-+ for (i = 0; i < ximage->height; i++) {
-+ memcpy(data, src, ximage->bytes_per_line);
-+ data += dst_width;
-+ src += ximage->bytes_per_line;
-+ }
-+ } while (0);
-+ ret = 1;
-+
-+out:
-+ ximage->obdata = NULL;
-+ ximage->data = NULL;
-+ shm_error = 0;
-+ XShmDetach(dpy, &seg);
-+ if (seg.shmaddr != (void *)-1)
-+ shmdt(seg.shmaddr);
-+ if (seg.shmid > -1)
-+ shmctl(seg.shmid, IPC_RMID, NULL);
-+ return ret;
-+}
-+
- static void
- swrastGetImage(__DRIdrawable * read,
- int x, int y, int w, int h,
-@@ -220,11 +313,17 @@ swrastGetImage(__DRIdrawable * read,
- readable = pread->xDrawable;
-
- ximage = prp->ximage;
-- ximage->data = data;
- ximage->width = w;
- ximage->height = h;
- ximage->bytes_per_line = bytes_per_line(w * ximage->bits_per_pixel, 32);
-
-+ /* XXX check dimensions, if any caller ever sub-images */
-+ if (swrastShmGetImage(read, data, prp))
-+ return;
-+
-+ /* shm failed, fall back to protocol */
-+ ximage->data = data;
-+
- XGetSubImage(dpy, readable, x, y, w, h, ~0L, ZPixmap, ximage, 0, 0);
-
- ximage->data = NULL;
diff --git a/mesa-8.0.1-fix-16bpp.patch b/mesa-8.0.1-fix-16bpp.patch
deleted file mode 100644
index 0b8e68a..0000000
--- a/mesa-8.0.1-fix-16bpp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up Mesa-8.0.1/src/mesa/state_tracker/st_manager.c.jx Mesa-8.0.1/src/mesa/state_tracker/st_manager.c
---- Mesa-8.0.1/src/mesa/state_tracker/st_manager.c.jx 2012-02-14 18:44:00.000000000 -0500
-+++ Mesa-8.0.1/src/mesa/state_tracker/st_manager.c 2012-04-02 12:02:14.613964417 -0400
-@@ -528,6 +528,9 @@ st_context_teximage(struct st_context_if
- if (util_format_get_component_bits(internal_format,
- UTIL_FORMAT_COLORSPACE_RGB, 3) > 0)
- internalFormat = GL_RGBA;
-+ else if (util_format_get_component_bits(internal_format,
-+ UTIL_FORMAT_COLORSPACE_RGB, 0) == 5)
-+ internalFormat = GL_RGB5;
- else
- internalFormat = GL_RGB;
-
diff --git a/mesa.spec b/mesa.spec
index 21c273a..a2b4f86 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -70,9 +70,6 @@ Source3: vl_mpeg12_decoder.c
# Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD.
Source4: Mesa-MLAA-License-Clarification-Email.txt
-Patch1: mesa-10.0-nv50-fix-build.patch
-Patch9: mesa-8.0-llvmpipe-shmget.patch
-Patch12: mesa-8.0.1-fix-16bpp.patch
Patch15: mesa-9.2-hardware-float.patch
Patch20: mesa-10.2-evergreen-big-endian.patch
Patch30: mesa-10.3-bigendian-assert.patch
@@ -349,18 +346,6 @@ Mesa Direct3D9 state tracker development package
#setup -q -n Mesa-%{version}%{?snapshot}
%setup -q -n mesa-%{git}
grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1
-%patch1 -p1 -b .nv50rtti
-
-# this fastpath is:
-# - broken with swrast classic
-# - broken on 24bpp
-# - not a huge win anyway
-# - ABI-broken wrt upstream
-# - eventually obsoleted by vgem
-#
-# dear ajax: fix this one way or the other
-#patch9 -p1 -b .shmget
-#patch12 -p1 -b .16bpp
%patch15 -p1 -b .hwfloat
%patch20 -p1 -b .egbe