1 --- DirectFB-1.6.0/wm/unique/uniquewm.c.orig 2012-06-14 18:00:08.000000000 +0200
2 +++ DirectFB-1.6.0/wm/unique/uniquewm.c 2012-06-17 13:44:30.032201512 +0200
4 #include <core/surface.h>
5 #include <core/surface_buffer.h>
7 +#include <fusion/fusion.h>
9 #include <unique/context.h>
10 #include <unique/decoration.h>
11 #include <unique/internal.h>
13 D_MAGIC_ASSERT( wm_shared, WMShared );
14 D_ASSERT( wm_shared->context_pool != NULL );
16 - return (UniqueContext*) fusion_object_create( wm_shared->context_pool, wm_data->world );
17 + return (UniqueContext*) fusion_object_create( wm_shared->context_pool, wm_data->world, fusion_id(wm_data->world) );
22 D_MAGIC_ASSERT( wm_shared, WMShared );
23 D_ASSERT( wm_shared->decoration_pool != NULL );
25 - return (UniqueDecoration*) fusion_object_create( wm_shared->decoration_pool, wm_data->world );
26 + return (UniqueDecoration*) fusion_object_create( wm_shared->decoration_pool, wm_data->world, fusion_id(wm_data->world) );
31 D_MAGIC_ASSERT( wm_shared, WMShared );
32 D_ASSERT( wm_shared->window_pool != NULL );
34 - return (UniqueWindow*) fusion_object_create( wm_shared->window_pool, wm_data->world );
35 + return (UniqueWindow*) fusion_object_create( wm_shared->window_pool, wm_data->world, fusion_id(wm_data->world) );
38 /**************************************************************************************************/
39 --- DirectFB-1.7.0/wm/unique/test_foo.c.orig 2013-07-09 00:23:17.000000000 +0200
40 +++ DirectFB-1.7.0/wm/unique/test_foo.c 2013-07-14 11:21:12.167080126 +0200
42 shared = context->shared;
43 D_MAGIC_ASSERT( shared, WMShared );
45 - dfb_layer_context_lock( region->context );
46 + dfb_layer_region_lock( region ); // ???
48 switch (event->type) {
54 - dfb_layer_context_unlock( region->context );
55 + dfb_layer_region_unlock( region );
59 --- DirectFB-1.6.0/gfxdrivers/cle266/uc_primary.c.orig 2012-06-14 18:00:08.000000000 +0200
60 +++ DirectFB-1.6.0/gfxdrivers/cle266/uc_primary.c 2012-06-17 21:53:26.644303701 +0200
62 CoreLayerRegionConfigFlags updated,
65 - CoreSurfaceBufferLock *lock )
66 + CoreSurfaceBufferLock *left_lock,
67 + CoreSurfaceBufferLock *right_lock)
70 UcDriverData *ucdrv = (UcDriverData*) driver_data;
72 ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData,
73 layer_data, region_data,
74 config, updated, surface,
76 + palette, left_lock, right_lock );
80 --- DirectFB-1.7.0/gfxdrivers/cle266/uc_overlay.c.orig 2013-01-12 06:06:23.000000000 +0100
81 +++ DirectFB-1.7.0/gfxdrivers/cle266/uc_overlay.c 2013-07-14 13:35:19.513409077 +0200
83 dfb_surface_flip(surface, false);
87 + ucovl->lock = left_lock;
89 ret = uc_ovl_update(ucdrv, ucovl, UC_OVL_FLIP, surface, left_lock);
91 --- DirectFB-1.6.0/gfxdrivers/cyber5k/cyber5k.c.orig 2012-06-14 18:00:08.000000000 +0200
92 +++ DirectFB-1.6.0/gfxdrivers/cyber5k/cyber5k.c 2012-06-18 18:24:36.821203665 +0200
94 CoreLayerRegionConfigFlags updated,
97 - CoreSurfaceBufferLock *lock )
98 + CoreSurfaceBufferLock *left_lock,
99 + CoreSurfaceBufferLock *right_lock )
104 ret = oldPrimaryFuncs.SetRegion( layer, oldPrimaryDriverData,
105 layer_data, region_data,
106 config, updated, surface,
108 + palette, left_lock, right_lock );
112 --- DirectFB-1.6.0/gfxdrivers/radeon/radeon_crtc1.c.orig 2012-06-14 18:00:08.000000000 +0200
113 +++ DirectFB-1.6.0/gfxdrivers/radeon/radeon_crtc1.c 2012-06-18 18:37:26.694504689 +0200
114 @@ -147,14 +147,15 @@
115 CoreLayerRegionConfigFlags updated,
116 CoreSurface *surface,
117 CorePalette *palette,
118 - CoreSurfaceBufferLock *lock )
119 + CoreSurfaceBufferLock *left_lock,
120 + CoreSurfaceBufferLock *right_lock)
123 if (updated & ~CLRCF_OPTIONS) {
124 return OldPrimaryLayerFuncs.SetRegion( layer,
125 OldPrimaryLayerDriverData,
126 layer_data, region_data,
127 - config, updated, surface, palette, lock );
128 + config, updated, surface, palette, left_lock, right_lock );
132 --- DirectFB-1.7.0/gfxdrivers/savage/savage_streams_old.c.orig 2013-07-09 00:23:17.000000000 +0200
133 +++ DirectFB-1.7.0/gfxdrivers/savage/savage_streams_old.c 2013-07-14 14:25:41.743282243 +0200
135 CoreLayerRegionConfigFlags updated,
136 CoreSurface *surface,
137 CorePalette *palette,
138 - CoreSurfaceBufferLock *lock )
139 + CoreSurfaceBufferLock *lock,
140 + CoreSurfaceBufferLock *right_lock )
142 SavageDriverData *sdrv = (SavageDriverData*) driver_data;
143 SavageSecondaryLayerData *slay = (SavageSecondaryLayerData*) layer_data;
145 CoreLayerRegionConfigFlags updated,
146 CoreSurface *surface,
147 CorePalette *palette,
148 - CoreSurfaceBufferLock *lock )
149 + CoreSurfaceBufferLock *lock,
150 + CoreSurfaceBufferLock *right_lock )
152 SavageDriverData *sdrv = (SavageDriverData*) driver_data;
153 SavagePrimaryLayerData *play = (SavagePrimaryLayerData*) layer_data;
155 DFB_BYTES_PER_PIXEL(config->format) * 8);
157 ret = savage_pfuncs.SetRegion(layer, driver_data, layer_data, region_data,
158 - config, updated, surface, palette, lock);
159 + config, updated, surface, palette, lock, right_lock);
163 --- DirectFB-1.7.0/gfxdrivers/unichrome/uc_primary.c.orig 2013-07-09 00:23:17.000000000 +0200
164 +++ DirectFB-1.7.0/gfxdrivers/unichrome/uc_primary.c 2013-07-14 15:06:06.646513815 +0200
166 CoreLayerRegionConfigFlags updated,
167 CoreSurface *surface,
168 CorePalette *palette,
169 - CoreSurfaceBufferLock *lock )
170 + CoreSurfaceBufferLock *lock,
171 + CoreSurfaceBufferLock *right_lock )
174 UcDriverData *ucdrv = (UcDriverData*) driver_data;
176 ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData,
177 layer_data, region_data,
178 config, updated, surface,
180 + palette, lock, right_lock );
184 --- DirectFB-1.7.0/gfxdrivers/unichrome/uc_spic.c.orig 2011-08-11 13:29:49.000000000 +0200
185 +++ DirectFB-1.7.0/gfxdrivers/unichrome/uc_spic.c 2013-07-14 15:14:06.013160364 +0200
187 CoreLayerRegionConfigFlags updated,
188 CoreSurface *surface,
189 CorePalette *palette,
190 - CoreSurfaceBufferLock *lock )
191 + CoreSurfaceBufferLock *lock,
192 + CoreSurfaceBufferLock *right_lock )
194 UcDriverData* ucdrv = (UcDriverData*) driver_data;
198 CoreSurface *surface,
199 DFBSurfaceFlipFlags flags,
200 - CoreSurfaceBufferLock *lock )
201 + const DFBRegion *left_update,
202 + CoreSurfaceBufferLock *lock,
203 + const DFBRegion *right_update,
204 + CoreSurfaceBufferLock *right_lock )
206 UcDriverData* ucdrv = (UcDriverData*) driver_data;