diff options
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r-- | meta/recipes-graphics/mesa/mesa/0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch | 41 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.3_fix_for_x32.patch | 30 |
2 files changed, 0 insertions, 71 deletions
diff --git a/meta/recipes-graphics/mesa/mesa/0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch b/meta/recipes-graphics/mesa/mesa/0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch deleted file mode 100644 index d86421b767..0000000000 --- a/meta/recipes-graphics/mesa/mesa/0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 33098ef45e6035f3348040a25641f95c95266103 Mon Sep 17 00:00:00 2001 -From: Brian Paul <brianp@vmware.com> -Date: Wed, 6 Mar 2013 16:57:20 -0700 -Subject: [PATCH 5/5] llvmpipe: remove the power of two sizeof(struct - cmd_block) assertion -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It fails on 32-bit systems (I only tested on 64-bit). Power of two -size isn't required, so just remove the assertion. - -Reviewed-by: José Fonseca <jfonseca@vmware.com> - -Upstream-Status: Backport -http://cgit.freedesktop.org/mesa/mesa/commit/?id=9915636fb8afe75ee2e8e013e4f495a4cb937afb ---- - src/gallium/drivers/llvmpipe/lp_scene.c | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/src/gallium/drivers/llvmpipe/lp_scene.c b/src/gallium/drivers/llvmpipe/lp_scene.c -index e145391..c88bc95 100644 ---- a/src/gallium/drivers/llvmpipe/lp_scene.c -+++ b/src/gallium/drivers/llvmpipe/lp_scene.c -@@ -76,13 +76,6 @@ lp_scene_create( struct pipe_context *pipe ) - assert(maxCommandBytes < LP_SCENE_MAX_SIZE); - /* We'll also need space for at least one other data block */ - assert(maxCommandPlusData <= LP_SCENE_MAX_SIZE); -- -- /* Ideally, the size of a cmd_block object will be a power of two -- * in order to avoid wasting space when we allocation them from -- * data blocks (which are power of two also). -- */ -- assert(sizeof(struct cmd_block) == -- util_next_power_of_two(sizeof(struct cmd_block))); - } - #endif - --- -1.8.2.1 - diff --git a/meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.3_fix_for_x32.patch b/meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.3_fix_for_x32.patch deleted file mode 100644 index 4a0c682554..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.3_fix_for_x32.patch +++ /dev/null @@ -1,30 +0,0 @@ -Upstream-Status: pending - -Fix type conversion for x32. For x32 the off_t is 64bit and pointers are 32bit. -so the conversion of pointer to off_t was resulting into this error: - -| XF86DGA2.c:931:24: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] -| cc1: some warnings being treated as errors -| -| make[2]: *** [XF86DGA2.lo] Error 1 - -Fixed it by typecasting pointer into unsigned long 1st and then again typecasting -unsigned long to off_t. - -Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com> -2012/01/04 - - -Index: libXxf86dga-1.1.3/src/XF86DGA2.c -=================================================================== ---- libXxf86dga-1.1.3.orig/src/XF86DGA2.c -+++ libXxf86dga-1.1.3/src/XF86DGA2.c -@@ -928,7 +928,7 @@ DGAMapPhysical( - if ((pMap->fd = open(name, O_RDWR)) < 0) - return False; - pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE, -- MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base); -+ MAP_FILE | MAP_SHARED, pMap->fd, (off_t)(unsigned long)base); - if (pMap->virtual == (void *)-1) - return False; - mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE); |