1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
|
From 23d87c92b7211cc5249eefe4ab3a2c7f370e279e Mon Sep 17 00:00:00 2001
From: Zack Rusin <zackr@vmware.com>
Date: Thu, 14 Feb 2013 22:33:01 +0000
Subject: Kill mibstore
It was a noop for at least 5 years and it has been removed.
Signed-off-by: Zack Rusin <zackr@vmware.com>
---
diff --git a/saa/saa_priv.h b/saa/saa_priv.h
index 6652054..5d81453 100644
--- a/saa/saa_priv.h
+++ b/saa/saa_priv.h
@@ -48,7 +48,6 @@
#include "pixmapstr.h"
#include "windowstr.h"
#include "servermd.h"
-#include "mibstore.h"
#include "colormapst.h"
#include "gcstruct.h"
#include "input.h"
diff --git a/src/vmware.c b/src/vmware.c
index 41201f1..6b74e14 100644
--- a/src/vmware.c
+++ b/src/vmware.c
@@ -23,7 +23,6 @@ char rcsId_vmware[] =
#include "xf86Pci.h" /* pci */
#include "mipointer.h" /* sw cursor */
-#include "mibstore.h" /* backing store */
#include "micmap.h" /* mi color map */
#include "vgaHW.h" /* VGA hardware */
#include "fb.h"
@@ -1483,7 +1482,6 @@ VMWAREScreenInit(SCREEN_INIT_ARGS_DECL)
* If backing store is to be supported (as is usually the case),
* initialise it.
*/
- miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
xf86SetSilkenMouse(pScreen);
diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
index 9959ffb..7863ba2 100644
--- a/vmwgfx/vmwgfx_driver.c
+++ b/vmwgfx/vmwgfx_driver.c
@@ -1036,7 +1036,6 @@ drv_screen_init(SCREEN_INIT_ARGS_DECL)
(ms->only_hw_presents) ? "enabled" : "disabled");
}
- miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
xf86SetSilkenMouse(pScreen);
miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
--
cgit v0.9.0.2-2-gbebe
From d13a6334fe76f4e869b2cb8c0a6a13c185b1bedd Mon Sep 17 00:00:00 2001
From: Loïc Yhuel <loic.yhuel@gmail.com>
Date: Thu, 11 Apr 2013 09:29:10 +0000
Subject: vmwgfx: Use myGlyphs to fix crashes
Tested-by: Christian Hesse <mail@eworm.de>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Loïc Yhuel <loic.yhuel@gmail.com>
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
---
diff --git a/saa/saa_render.c b/saa/saa_render.c
index c69f2c9..c6ce68c 100644
--- a/saa/saa_render.c
+++ b/saa/saa_render.c
@@ -406,6 +406,8 @@ saa_render_setup(ScreenPtr pScreen)
saa_wrap(sscreen, ps, Trapezoids, saa_trapezoids);
saa_wrap(sscreen, ps, Triangles, saa_triangles);
saa_wrap(sscreen, ps, Composite, saa_composite);
+ saa_wrap(sscreen, ps, Glyphs, miGlyphs);
+ saa_wrap(sscreen, ps, UnrealizeGlyph, miUnrealizeGlyph);
}
}
@@ -419,6 +421,8 @@ saa_render_takedown(ScreenPtr pScreen)
saa_unwrap(sscreen, ps, Trapezoids);
saa_unwrap(sscreen, ps, Triangles);
saa_unwrap(sscreen, ps, Composite);
+ saa_unwrap(sscreen, ps, Glyphs);
+ saa_unwrap(sscreen, ps, UnrealizeGlyph);
}
}
#endif
--
cgit v0.9.0.2-2-gbebe
|
