wok annotate mesa-wayland/stuff/nouveau-fix-header.patch @ rev 18869

shellinabox: add init script
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Feb 03 17:03:06 2016 +0100 (2016-02-03)
parents
children
rev   line source
pankso@16172 1 From 5c102dd94f435e97507213fbd128e50dd15f5f54 Mon Sep 17 00:00:00 2001
pankso@16172 2 From: Ben Skeggs <bskeggs@redhat.com>
pankso@16172 3 Date: Mon, 20 Dec 2010 03:39:36 +0000
pankso@16172 4 Subject: nouveau: fix includes for latest libdrm
pankso@16172 5
pankso@16172 6 Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
pankso@16172 7 ---
pankso@16172 8 diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h
pankso@16172 9 index ab480ca..747b084 100644
pankso@16172 10 --- a/src/gallium/drivers/nouveau/nouveau_winsys.h
pankso@16172 11 +++ b/src/gallium/drivers/nouveau/nouveau_winsys.h
pankso@16172 12 @@ -10,7 +10,7 @@
pankso@16172 13 #include "nouveau/nouveau_grobj.h"
pankso@16172 14 #include "nouveau/nouveau_notifier.h"
pankso@16172 15 #include "nouveau/nouveau_resource.h"
pankso@16172 16 -#include "nouveau/nouveau_pushbuf.h"
pankso@16172 17 +#include "nouveau/nv04_pushbuf.h"
pankso@16172 18
pankso@16172 19 #ifndef NV04_PFIFO_MAX_PACKET_LEN
pankso@16172 20 #define NV04_PFIFO_MAX_PACKET_LEN 2047
pankso@16172 21 diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c
pankso@16172 22 index ce48022..a99df76 100644
pankso@16172 23 --- a/src/gallium/drivers/nv50/nv50_surface.c
pankso@16172 24 +++ b/src/gallium/drivers/nv50/nv50_surface.c
pankso@16172 25 @@ -22,7 +22,7 @@
pankso@16172 26
pankso@16172 27 #define __NOUVEAU_PUSH_H__
pankso@16172 28 #include <stdint.h>
pankso@16172 29 -#include "nouveau/nouveau_pushbuf.h"
pankso@16172 30 +#include "nouveau/nv04_pushbuf.h"
pankso@16172 31 #include "nv50_context.h"
pankso@16172 32 #include "nv50_resource.h"
pankso@16172 33 #include "pipe/p_defines.h"
pankso@16172 34 diff --git a/src/gallium/drivers/nvfx/nv04_2d.c b/src/gallium/drivers/nvfx/nv04_2d.c
pankso@16172 35 index e0e65e7..e2fadd3 100644
pankso@16172 36 --- a/src/gallium/drivers/nvfx/nv04_2d.c
pankso@16172 37 +++ b/src/gallium/drivers/nvfx/nv04_2d.c
pankso@16172 38 @@ -34,11 +34,11 @@
pankso@16172 39 #include <stdio.h>
pankso@16172 40 #include <stdint.h>
pankso@16172 41 #include <nouveau/nouveau_device.h>
pankso@16172 42 -#include <nouveau/nouveau_pushbuf.h>
pankso@16172 43 #include <nouveau/nouveau_channel.h>
pankso@16172 44 #include <nouveau/nouveau_bo.h>
pankso@16172 45 #include <nouveau/nouveau_notifier.h>
pankso@16172 46 #include <nouveau/nouveau_grobj.h>
pankso@16172 47 +#include <nouveau/nv04_pushbuf.h>
pankso@16172 48 #include "nv04_2d.h"
pankso@16172 49
pankso@16172 50 #include "nouveau/nv_object.xml.h"
pankso@16172 51 diff --git a/src/gallium/drivers/nvfx/nvfx_vbo.c b/src/gallium/drivers/nvfx/nvfx_vbo.c
pankso@16172 52 index 597664e..339b317 100644
pankso@16172 53 --- a/src/gallium/drivers/nvfx/nvfx_vbo.c
pankso@16172 54 +++ b/src/gallium/drivers/nvfx/nvfx_vbo.c
pankso@16172 55 @@ -9,8 +9,7 @@
pankso@16172 56 #include "nvfx_resource.h"
pankso@16172 57
pankso@16172 58 #include "nouveau/nouveau_channel.h"
pankso@16172 59 -
pankso@16172 60 -#include "nouveau/nouveau_pushbuf.h"
pankso@16172 61 +#include "nouveau/nv04_pushbuf.h"
pankso@16172 62
pankso@16172 63 static inline unsigned
pankso@16172 64 util_guess_unique_indices_count(unsigned mode, unsigned indices)
pankso@16172 65 diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
pankso@16172 66 index 8036b18..c5ac128 100644
pankso@16172 67 --- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h
pankso@16172 68 +++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
pankso@16172 69 @@ -38,7 +38,6 @@
pankso@16172 70 #include <assert.h>
pankso@16172 71
pankso@16172 72 #include "nouveau_device.h"
pankso@16172 73 -#include "nouveau_pushbuf.h"
pankso@16172 74 #include "nouveau_grobj.h"
pankso@16172 75 #include "nouveau_channel.h"
pankso@16172 76 #include "nouveau_bo.h"
pankso@16172 77 @@ -46,6 +45,7 @@
pankso@16172 78 #include "nouveau_screen.h"
pankso@16172 79 #include "nouveau_state.h"
pankso@16172 80 #include "nouveau_surface.h"
pankso@16172 81 +#include "nv04_pushbuf.h"
pankso@16172 82
pankso@16172 83 #define DRIVER_DATE "20091015"
pankso@16172 84 #define DRIVER_AUTHOR "Nouveau"
pankso@16172 85 --
pankso@16172 86 cgit v0.8.3-6-g21f6