From 8839882ad45e20056788e29792e556b7f4ec6eb1 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 25 Jan 2010 22:59:20 +0100 Subject: [PATCH] Mesa-master: - remove some unneeded patches --- .../patches/101_ubuntu_hidden_glname.patch | 12 --------- .../Mesa-master/patches/108_big_endian.patch | 18 ------------- ...fix_relocation_delta_for_wm_surfaces.patch | 26 ------------------- .../patches/mesa-7.6-hush-vblank-warning.diff | 12 --------- 4 files changed, 68 deletions(-) delete mode 100644 packages/graphics/Mesa-master/patches/101_ubuntu_hidden_glname.patch delete mode 100644 packages/graphics/Mesa-master/patches/108_big_endian.patch delete mode 100644 packages/graphics/Mesa-master/patches/109_fix_relocation_delta_for_wm_surfaces.patch delete mode 100644 packages/graphics/Mesa-master/patches/mesa-7.6-hush-vblank-warning.diff diff --git a/packages/graphics/Mesa-master/patches/101_ubuntu_hidden_glname.patch b/packages/graphics/Mesa-master/patches/101_ubuntu_hidden_glname.patch deleted file mode 100644 index a04106c4b0..0000000000 --- a/packages/graphics/Mesa-master/patches/101_ubuntu_hidden_glname.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: mesa/src/mesa/x86/glapi_x86.S -=================================================================== ---- mesa.orig/src/mesa/x86/glapi_x86.S 2009-06-29 14:43:07.000000000 +0300 -+++ mesa/src/mesa/x86/glapi_x86.S 2009-06-29 14:45:38.000000000 +0300 -@@ -148,7 +148,6 @@ - - ALIGNTEXT16 - GLOBL GLNAME(gl_dispatch_functions_start) -- HIDDEN(GLNAME(gl_dispatch_functions_start)) - GLNAME(gl_dispatch_functions_start): - - GL_STUB(NewList, _gloffset_NewList, NewList@8) diff --git a/packages/graphics/Mesa-master/patches/108_big_endian.patch b/packages/graphics/Mesa-master/patches/108_big_endian.patch deleted file mode 100644 index 7341119082..0000000000 --- a/packages/graphics/Mesa-master/patches/108_big_endian.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Nurp mesa-7.6.0~git20090817.7c422387/src/mesa/drivers/dri/r300/r300_draw.c mesa-7.6.0~git20090817.7c422387-working/src/mesa/drivers/dri/r300/r300_draw.c ---- mesa-7.6.0~git20090817.7c422387/src/mesa/drivers/dri/r300/r300_draw.c 2009-08-17 07:30:14.000000000 -0700 -+++ mesa-7.6.0~git20090817.7c422387-working/src/mesa/drivers/dri/r300/r300_draw.c 2009-08-26 13:38:46.000000000 -0700 -@@ -108,12 +108,13 @@ static void r300FixupIndexBuffer(GLconte - - #if MESA_BIG_ENDIAN - } else { /* if (mesa_ind_buf->type == GL_UNSIGNED_SHORT) */ -+ GLuint size; - GLushort *in = (GLushort *)src_ptr; - size = sizeof(GLushort) * ((mesa_ind_buf->count + 1) & ~1); - - radeonAllocDmaRegion(&r300->radeon, &r300->ind_buf.bo, &r300->ind_buf.bo_offet, size, 4); - -- assert(r300->ind_buf.bo->ptr != NULL) -+ assert(r300->ind_buf.bo->ptr != NULL); - out = (GLuint *)ADD_POINTERS(r300->ind_buf.bo->ptr, r300->ind_buf.bo_offset); - - for (i = 0; i + 1 < mesa_ind_buf->count; i += 2) { diff --git a/packages/graphics/Mesa-master/patches/109_fix_relocation_delta_for_wm_surfaces.patch b/packages/graphics/Mesa-master/patches/109_fix_relocation_delta_for_wm_surfaces.patch deleted file mode 100644 index 34279dda97..0000000000 --- a/packages/graphics/Mesa-master/patches/109_fix_relocation_delta_for_wm_surfaces.patch +++ /dev/null @@ -1,26 +0,0 @@ -From acfea5c705f383692e661d37c5cd7da2f3db559b Mon Sep 17 00:00:00 2001 -From: Eric Anholt -Date: Wed, 09 Sep 2009 19:35:30 +0000 -Subject: i965: Fix relocation delta for WM surfaces. - -This was a regression in 0f328c90dbc893e15005f2ab441d309c1c176245. - -Bug #23688 -Bug #23254 -(cherry picked from commit 5604b27b9326ac542069a49ed9650c4b0d3e939a) ---- -diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c -index 096f743..3dcc592 100644 ---- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c -+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c -@@ -629,7 +629,7 @@ brw_update_renderbuffer_surface(struct brw_context *brw, - drm_intel_bo_emit_reloc(brw->wm.surf_bo[unit], - offsetof(struct brw_surface_state, ss1), - region_bo, -- surf.ss1.base_addr, -+ surf.ss1.base_addr - region_bo->offset, - I915_GEM_DOMAIN_RENDER, - I915_GEM_DOMAIN_RENDER); - } --- -cgit v0.8.2 diff --git a/packages/graphics/Mesa-master/patches/mesa-7.6-hush-vblank-warning.diff b/packages/graphics/Mesa-master/patches/mesa-7.6-hush-vblank-warning.diff deleted file mode 100644 index 8ef007b111..0000000000 --- a/packages/graphics/Mesa-master/patches/mesa-7.6-hush-vblank-warning.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -up mesa-20090813/src/mesa/drivers/dri/common/vblank.c.jx mesa-20090813/src/mesa/drivers/dri/common/vblank.c ---- mesa-20090813/src/mesa/drivers/dri/common/vblank.c.jx 2009-08-13 09:28:01.000000000 -0400 -+++ mesa-20090813/src/mesa/drivers/dri/common/vblank.c 2009-09-08 14:07:51.000000000 -0400 -@@ -256,7 +256,7 @@ static int do_wait( drmVBlank * vbl, GLu - if ( ret != 0 ) { - static GLboolean first_time = GL_TRUE; - -- if ( first_time ) { -+ if (0) { - fprintf(stderr, - "%s: drmWaitVBlank returned %d, IRQs don't seem to be" - " working correctly.\nTry adjusting the vblank_mode"