Contents of /trunk/mesa/patches/mesa-7.10.2-nouveau-missing-headers.patch
Parent Directory | Revision Log
Revision 1333 -
(show annotations)
(download)
Mon May 30 16:48:47 2011 UTC (13 years, 4 months ago) by niro
File size: 2882 byte(s)
Mon May 30 16:48:47 2011 UTC (13 years, 4 months ago) by niro
File size: 2882 byte(s)
fix missing headers
1 | From 5c102dd94f435e97507213fbd128e50dd15f5f54 Mon Sep 17 00:00:00 2001 |
2 | From: Ben Skeggs <bskeggs@redhat.com> |
3 | Date: Mon, 20 Dec 2010 03:39:36 +0000 |
4 | Subject: nouveau: fix includes for latest libdrm |
5 | |
6 | Signed-off-by: Ben Skeggs <bskeggs@redhat.com> |
7 | --- |
8 | diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h |
9 | index ab480ca..747b084 100644 |
10 | --- a/src/gallium/drivers/nouveau/nouveau_winsys.h |
11 | +++ b/src/gallium/drivers/nouveau/nouveau_winsys.h |
12 | @@ -10,7 +10,7 @@ |
13 | #include "nouveau/nouveau_grobj.h" |
14 | #include "nouveau/nouveau_notifier.h" |
15 | #include "nouveau/nouveau_resource.h" |
16 | -#include "nouveau/nouveau_pushbuf.h" |
17 | +#include "nouveau/nv04_pushbuf.h" |
18 | |
19 | #ifndef NV04_PFIFO_MAX_PACKET_LEN |
20 | #define NV04_PFIFO_MAX_PACKET_LEN 2047 |
21 | diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c |
22 | index ce48022..a99df76 100644 |
23 | --- a/src/gallium/drivers/nv50/nv50_surface.c |
24 | +++ b/src/gallium/drivers/nv50/nv50_surface.c |
25 | @@ -22,7 +22,7 @@ |
26 | |
27 | #define __NOUVEAU_PUSH_H__ |
28 | #include <stdint.h> |
29 | -#include "nouveau/nouveau_pushbuf.h" |
30 | +#include "nouveau/nv04_pushbuf.h" |
31 | #include "nv50_context.h" |
32 | #include "nv50_resource.h" |
33 | #include "pipe/p_defines.h" |
34 | diff --git a/src/gallium/drivers/nvfx/nv04_2d.c b/src/gallium/drivers/nvfx/nv04_2d.c |
35 | index e0e65e7..e2fadd3 100644 |
36 | --- a/src/gallium/drivers/nvfx/nv04_2d.c |
37 | +++ b/src/gallium/drivers/nvfx/nv04_2d.c |
38 | @@ -34,11 +34,11 @@ |
39 | #include <stdio.h> |
40 | #include <stdint.h> |
41 | #include <nouveau/nouveau_device.h> |
42 | -#include <nouveau/nouveau_pushbuf.h> |
43 | #include <nouveau/nouveau_channel.h> |
44 | #include <nouveau/nouveau_bo.h> |
45 | #include <nouveau/nouveau_notifier.h> |
46 | #include <nouveau/nouveau_grobj.h> |
47 | +#include <nouveau/nv04_pushbuf.h> |
48 | #include "nv04_2d.h" |
49 | |
50 | #include "nouveau/nv_object.xml.h" |
51 | diff --git a/src/gallium/drivers/nvfx/nvfx_vbo.c b/src/gallium/drivers/nvfx/nvfx_vbo.c |
52 | index 597664e..339b317 100644 |
53 | --- a/src/gallium/drivers/nvfx/nvfx_vbo.c |
54 | +++ b/src/gallium/drivers/nvfx/nvfx_vbo.c |
55 | @@ -9,8 +9,7 @@ |
56 | #include "nvfx_resource.h" |
57 | |
58 | #include "nouveau/nouveau_channel.h" |
59 | - |
60 | -#include "nouveau/nouveau_pushbuf.h" |
61 | +#include "nouveau/nv04_pushbuf.h" |
62 | |
63 | static inline unsigned |
64 | util_guess_unique_indices_count(unsigned mode, unsigned indices) |
65 | diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h |
66 | index 8036b18..c5ac128 100644 |
67 | --- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h |
68 | +++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h |
69 | @@ -38,7 +38,6 @@ |
70 | #include <assert.h> |
71 | |
72 | #include "nouveau_device.h" |
73 | -#include "nouveau_pushbuf.h" |
74 | #include "nouveau_grobj.h" |
75 | #include "nouveau_channel.h" |
76 | #include "nouveau_bo.h" |
77 | @@ -46,6 +45,7 @@ |
78 | #include "nouveau_screen.h" |
79 | #include "nouveau_state.h" |
80 | #include "nouveau_surface.h" |
81 | +#include "nv04_pushbuf.h" |
82 | |
83 | #define DRIVER_DATE "20091015" |
84 | #define DRIVER_AUTHOR "Nouveau" |
85 | -- |
86 | cgit v0.8.3-6-g21f6 |