From 9ea8fa3222d079305085e43ba2e20eb2cdbc7b0a Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 17 May 2012 13:47:33 -0400 Subject: [PATCH] mesa-8.0-llvmpipe-shmget.patch: Rediff for 8.1. --- mesa-8.0-llvmpipe-shmget.patch | 26 +++++++++++++------------- mesa.spec | 7 +++++-- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/mesa-8.0-llvmpipe-shmget.patch b/mesa-8.0-llvmpipe-shmget.patch index d58518b..347ad16 100644 --- a/mesa-8.0-llvmpipe-shmget.patch +++ b/mesa-8.0-llvmpipe-shmget.patch @@ -1,21 +1,21 @@ -diff -up Mesa-8.0.1/src/gallium/state_trackers/dri/sw/drisw.c.shmget Mesa-8.0.1/src/gallium/state_trackers/dri/sw/drisw.c ---- Mesa-8.0.1/src/gallium/state_trackers/dri/sw/drisw.c.shmget 2012-02-14 18:44:00.000000000 -0500 -+++ Mesa-8.0.1/src/gallium/state_trackers/dri/sw/drisw.c 2012-03-15 06:35:44.989221196 -0400 -@@ -252,7 +252,6 @@ drisw_update_tex_buffer(struct dri_drawa +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); -@@ -265,15 +264,6 @@ drisw_update_tex_buffer(struct dri_drawa +@@ -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. -- We assume 32 bit pixels. */ -- ximage_stride = w * 4; +- /* 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], @@ -25,9 +25,9 @@ diff -up Mesa-8.0.1/src/gallium/state_trackers/dri/sw/drisw.c.shmget Mesa-8.0.1/ pipe_transfer_unmap(pipe, transfer); pipe_transfer_destroy(pipe, transfer); } -diff -up Mesa-8.0.1/src/glx/drisw_glx.c.shmget Mesa-8.0.1/src/glx/drisw_glx.c ---- Mesa-8.0.1/src/glx/drisw_glx.c.shmget 2012-02-14 18:44:00.000000000 -0500 -+++ Mesa-8.0.1/src/glx/drisw_glx.c 2012-03-14 11:25:04.708341441 -0400 +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) @@ -38,7 +38,7 @@ diff -up Mesa-8.0.1/src/glx/drisw_glx.c.shmget Mesa-8.0.1/src/glx/drisw_glx.c #include "glxclient.h" #include #include "dri_common.h" -@@ -203,6 +206,96 @@ swrastPutImage(__DRIdrawable * draw, int +@@ -206,6 +209,96 @@ swrastPutImage(__DRIdrawable * draw, int ximage->data = NULL; } @@ -135,7 +135,7 @@ diff -up Mesa-8.0.1/src/glx/drisw_glx.c.shmget Mesa-8.0.1/src/glx/drisw_glx.c static void swrastGetImage(__DRIdrawable * read, int x, int y, int w, int h, -@@ -217,11 +310,17 @@ swrastGetImage(__DRIdrawable * read, +@@ -220,11 +313,17 @@ swrastGetImage(__DRIdrawable * read, readable = pread->xDrawable; ximage = prp->ximage; diff --git a/mesa.spec b/mesa.spec index fa51708..a78ddfb 100644 --- a/mesa.spec +++ b/mesa.spec @@ -36,7 +36,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 8.1 -Release: 0.4%{?dist} +Release: 0.5%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -289,7 +289,7 @@ Mesa shared glapi #% setup -q -n Mesa-%{version}%{?snapshot} -b2 %setup -q -n mesa-%{gitdate} -b2 #patch7 -p1 -b .dricore -#%patch9 -p1 -b .shmget +%patch9 -p1 -b .shmget %patch11 -p1 -b .nouveau %patch12 -p1 -b .16bpp @@ -572,6 +572,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu May 17 2012 Adam Jackson 8.1-0.5 +- mesa-8.0-llvmpipe-shmget.patch: Rediff for 8.1. + * Thu May 10 2012 Karsten Hopp 8.1-0.4 - revert disabling of hardware drivers, disable only llvm on PPC* (#819060)