diff options
| author | Parabola <dev@list.parabolagnulinux.org> | 2011-08-03 04:50:40 +0000 |
|---|---|---|
| committer | Parabola <dev@list.parabolagnulinux.org> | 2011-08-03 04:50:40 +0000 |
| commit | 991d38faccf4e1fb27f31f236ad58ee840103734 (patch) | |
| tree | 38dd960b48df86472b58d3904caa122aaf06da41 /testing/mesa | |
| parent | bf35116f9d203dcafce808a6c7b3dd5a0db8afbc (diff) | |
Wed Aug 3 04:50:40 UTC 2011
Diffstat (limited to 'testing/mesa')
| -rw-r--r-- | testing/mesa/git_fixes.patch | 36 | ||||
| -rw-r--r-- | testing/mesa/linking_fix.patch | 22 |
2 files changed, 0 insertions, 58 deletions
diff --git a/testing/mesa/git_fixes.patch b/testing/mesa/git_fixes.patch deleted file mode 100644 index 22372b328..000000000 --- a/testing/mesa/git_fixes.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 804995807dfea9cbdbd676e52b95d42715101913 Mon Sep 17 00:00:00 2001 -From: Eric Anholt <eric@anholt.net> -Date: Fri, 08 Jul 2011 22:30:48 +0000 -Subject: i965/gen4: Fix GPU hangs since the program streaming change. - -This was tricky. We were doing a use-before-initialize of -grf_reg_count, but the value usually got overwritten anyway -- when we -didn't have to do a relocation (typical), or on gen5 when we didn't -have relocations at all. - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38771 -Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> -(cherry picked from commit d03fdc4cdefdfdc5b59547945704c6037a5061c7) ---- -diff --git a/src/mesa/drivers/dri/i965/brw_vs_state.c b/src/mesa/drivers/dri/i965/brw_vs_state.c -index d5010a2..179ca19 100644 ---- a/src/mesa/drivers/dri/i965/brw_vs_state.c -+++ b/src/mesa/drivers/dri/i965/brw_vs_state.c -@@ -47,6 +47,7 @@ brw_prepare_vs_unit(struct brw_context *brw) - memset(vs, 0, sizeof(*vs)); - - /* BRW_NEW_PROGRAM_CACHE | CACHE_NEW_VS_PROG */ -+ vs->thread0.grf_reg_count = ALIGN(brw->vs.prog_data->total_grf, 16) / 16 - 1; - vs->thread0.kernel_start_pointer = - brw_program_reloc(brw, - brw->vs.state_offset + -@@ -54,7 +55,6 @@ brw_prepare_vs_unit(struct brw_context *brw) - brw->vs.prog_offset + - (vs->thread0.grf_reg_count << 1)) >> 6; - -- vs->thread0.grf_reg_count = ALIGN(brw->vs.prog_data->total_grf, 16) / 16 - 1; - vs->thread1.floating_point_mode = BRW_FLOATING_POINT_NON_IEEE_754; - /* Choosing multiple program flow means that we may get 2-vertex threads, - * which will have the channel mask for dwords 4-7 enabled in the thread, --- -cgit v0.8.3-6-g21f6 diff --git a/testing/mesa/linking_fix.patch b/testing/mesa/linking_fix.patch deleted file mode 100644 index 34ed7902d..000000000 --- a/testing/mesa/linking_fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 5fe5d236c26b3b2428bc7395304e40cf21d3d3e1 Mon Sep 17 00:00:00 2001 -From: Chia-I Wu <olv@lunarg.com> -Date: Wed, 13 Jul 2011 07:25:46 +0000 -Subject: targets/egl-static: fix a linking error - -rbug is always linked in and it needs libpthread. ---- -diff --git a/src/gallium/targets/egl-static/Makefile b/src/gallium/targets/egl-static/Makefile -index 832d7ba..69e7eec 100644 ---- a/src/gallium/targets/egl-static/Makefile -+++ b/src/gallium/targets/egl-static/Makefile -@@ -42,7 +42,7 @@ egl_CPPFLAGS += \ - -I$(TOP)/src/egl/main \ - -D_EGL_MAIN=_eglMain - egl_LIBS += $(TOP)/src/gallium/state_trackers/egl/libegl.a --egl_SYS += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) -lEGL -lm -+egl_SYS += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) -lEGL -lm -lpthread - - # EGL platforms - ifneq ($(findstring x11, $(EGL_PLATFORMS)),) --- -cgit v0.8.3-6-g21f6 |