diff options
| author | James Meyer <james.meyer@operamail.com> | 2012-08-07 17:36:25 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2012-08-07 17:36:25 (GMT) |
| commit | d264db1fb0644ab00dce02733e33ed5601d2edd3 (patch) | |
| tree | f329e40718ee6fb8817552c757b15ee332392980 /abs/core/mesa/nouveau-fix-header.patch | |
| parent | 9bf6461124e215b2cbff57dd0f514dac5dfc0174 (diff) | |
| download | linhes_pkgbuild-d264db1fb0644ab00dce02733e33ed5601d2edd3.zip linhes_pkgbuild-d264db1fb0644ab00dce02733e33ed5601d2edd3.tar.gz linhes_pkgbuild-d264db1fb0644ab00dce02733e33ed5601d2edd3.tar.bz2 | |
mesa git 20111031
Diffstat (limited to 'abs/core/mesa/nouveau-fix-header.patch')
| -rw-r--r-- | abs/core/mesa/nouveau-fix-header.patch | 86 |
1 files changed, 0 insertions, 86 deletions
diff --git a/abs/core/mesa/nouveau-fix-header.patch b/abs/core/mesa/nouveau-fix-header.patch deleted file mode 100644 index 38aa996..0000000 --- a/abs/core/mesa/nouveau-fix-header.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 5c102dd94f435e97507213fbd128e50dd15f5f54 Mon Sep 17 00:00:00 2001 -From: Ben Skeggs <bskeggs@redhat.com> -Date: Mon, 20 Dec 2010 03:39:36 +0000 -Subject: nouveau: fix includes for latest libdrm - -Signed-off-by: Ben Skeggs <bskeggs@redhat.com> ---- -diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h -index ab480ca..747b084 100644 ---- a/src/gallium/drivers/nouveau/nouveau_winsys.h -+++ b/src/gallium/drivers/nouveau/nouveau_winsys.h -@@ -10,7 +10,7 @@ - #include "nouveau/nouveau_grobj.h" - #include "nouveau/nouveau_notifier.h" - #include "nouveau/nouveau_resource.h" --#include "nouveau/nouveau_pushbuf.h" -+#include "nouveau/nv04_pushbuf.h" - - #ifndef NV04_PFIFO_MAX_PACKET_LEN - #define NV04_PFIFO_MAX_PACKET_LEN 2047 -diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c -index ce48022..a99df76 100644 ---- a/src/gallium/drivers/nv50/nv50_surface.c -+++ b/src/gallium/drivers/nv50/nv50_surface.c -@@ -22,7 +22,7 @@ - - #define __NOUVEAU_PUSH_H__ - #include <stdint.h> --#include "nouveau/nouveau_pushbuf.h" -+#include "nouveau/nv04_pushbuf.h" - #include "nv50_context.h" - #include "nv50_resource.h" - #include "pipe/p_defines.h" -diff --git a/src/gallium/drivers/nvfx/nv04_2d.c b/src/gallium/drivers/nvfx/nv04_2d.c -index e0e65e7..e2fadd3 100644 ---- a/src/gallium/drivers/nvfx/nv04_2d.c -+++ b/src/gallium/drivers/nvfx/nv04_2d.c -@@ -34,11 +34,11 @@ - #include <stdio.h> - #include <stdint.h> - #include <nouveau/nouveau_device.h> --#include <nouveau/nouveau_pushbuf.h> - #include <nouveau/nouveau_channel.h> - #include <nouveau/nouveau_bo.h> - #include <nouveau/nouveau_notifier.h> - #include <nouveau/nouveau_grobj.h> -+#include <nouveau/nv04_pushbuf.h> - #include "nv04_2d.h" - - #include "nouveau/nv_object.xml.h" -diff --git a/src/gallium/drivers/nvfx/nvfx_vbo.c b/src/gallium/drivers/nvfx/nvfx_vbo.c -index 597664e..339b317 100644 ---- a/src/gallium/drivers/nvfx/nvfx_vbo.c -+++ b/src/gallium/drivers/nvfx/nvfx_vbo.c -@@ -9,8 +9,7 @@ - #include "nvfx_resource.h" - - #include "nouveau/nouveau_channel.h" -- --#include "nouveau/nouveau_pushbuf.h" -+#include "nouveau/nv04_pushbuf.h" - - static inline unsigned - util_guess_unique_indices_count(unsigned mode, unsigned indices) -diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h -index 8036b18..c5ac128 100644 ---- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h -+++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h -@@ -38,7 +38,6 @@ - #include <assert.h> - - #include "nouveau_device.h" --#include "nouveau_pushbuf.h" - #include "nouveau_grobj.h" - #include "nouveau_channel.h" - #include "nouveau_bo.h" -@@ -46,6 +45,7 @@ - #include "nouveau_screen.h" - #include "nouveau_state.h" - #include "nouveau_surface.h" -+#include "nv04_pushbuf.h" - - #define DRIVER_DATE "20091015" - #define DRIVER_AUTHOR "Nouveau" --- -cgit v0.8.3-6-g21f6 |