wok-current annotate mesa/stuff/nouveau-fix-header.patch @ rev 22943

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