Signed-off-by: Jean-Christophe DUBOIS <[email protected]>
---
gfxdrivers/unichrome/uc_overlay.c | 22 +++++++++++++---------
gfxdrivers/unichrome/uc_ovl_hwset.c | 6 +++---
gfxdrivers/unichrome/uc_primary.c | 5 +++--
gfxdrivers/unichrome/uc_spic.c | 12 ++++++++----
4 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/gfxdrivers/unichrome/uc_overlay.c
b/gfxdrivers/unichrome/uc_overlay.c
index 4402cb3..b9a47d5 100644
--- a/gfxdrivers/unichrome/uc_overlay.c
+++ b/gfxdrivers/unichrome/uc_overlay.c
@@ -123,7 +123,8 @@ uc_ovl_set_region( CoreLayer *layer,
CoreLayerRegionConfigFlags updated,
CoreSurface *surface,
CorePalette *palette,
- CoreSurfaceBufferLock *lock )
+ CoreSurfaceBufferLock *left_lock,
+ CoreSurfaceBufferLock *right_lock )
{
UcDriverData* ucdrv = (UcDriverData*) driver_data;
UcOverlayData* ucovl = (UcOverlayData*) layer_data;
@@ -160,7 +161,7 @@ uc_ovl_set_region( CoreLayer *layer,
ucovl->deinterlace = config->options & DLOP_DEINTERLACING;
ucovl->surface = surface;
- ucovl->lock = lock;
+ ucovl->lock = left_lock;
if (ucdrv->canfliponvsync) {
FBDev *dfb_fbdev = dfb_system_data();
@@ -168,7 +169,7 @@ uc_ovl_set_region( CoreLayer *layer,
ioctl(dfb_fbdev->fd, FBIO_WAITFORVSYNC, &field_option);
}
- return uc_ovl_update(ucdrv, ucovl, UC_OVL_CHANGE, surface, lock);
+ return uc_ovl_update(ucdrv, ucovl, UC_OVL_CHANGE, surface, left_lock);
}
@@ -266,7 +267,10 @@ uc_ovl_flip_region( CoreLayer *layer,
void *region_data,
CoreSurface *surface,
DFBSurfaceFlipFlags flags,
- CoreSurfaceBufferLock *lock )
+ const DFBRegion *left_update,
+ CoreSurfaceBufferLock *left_lock,
+ const DFBRegion *right_update,
+ CoreSurfaceBufferLock *right_lock )
{
//printf("Entering %s ... \n", __PRETTY_FUNCTION__);
@@ -278,7 +282,7 @@ uc_ovl_flip_region( CoreLayer *layer,
dfb_surface_flip(surface, false);
ucovl->field = 0;
- ucovl->lock = lock;
+ ucovl->lock = left_lock;
if (ucdrv->canfliponvsync)
{
@@ -295,16 +299,16 @@ uc_ovl_flip_region( CoreLayer *layer,
flip.count = 0; // until we implement this
uc_ovl_map_buffer(surface->config.format,
- lock->offset,
+ left_lock->offset,
ucovl->v1.ox, ucovl->v1.oy, surface->config.size.w,
surface->config.size.h,
- lock->pitch, 0,
+ left_lock->pitch, 0,
&flip.offset[0], &flip.offset[1], &flip.offset[2]);
ioctl(dfb_fbdev->fd, FBIO_FLIPONVSYNC, &flip);
}
else
{
- ret = uc_ovl_update(ucdrv, ucovl, UC_OVL_FLIP, surface, lock);
+ ret = uc_ovl_update(ucdrv, ucovl, UC_OVL_FLIP, surface, left_lock);
if (ret)
return ret;
}
@@ -326,7 +330,7 @@ uc_ovl_flip_region( CoreLayer *layer,
usleep(2500);
}
- ret = uc_ovl_update(ucdrv, ucovl, UC_OVL_FLIP, surface, lock);
+ ret = uc_ovl_update(ucdrv, ucovl, UC_OVL_FLIP, surface, left_lock);
if (ret)
return ret;
}
diff --git a/gfxdrivers/unichrome/uc_ovl_hwset.c
b/gfxdrivers/unichrome/uc_ovl_hwset.c
index f601408..7139c28 100644
--- a/gfxdrivers/unichrome/uc_ovl_hwset.c
+++ b/gfxdrivers/unichrome/uc_ovl_hwset.c
@@ -87,7 +87,7 @@ DFBResult uc_ovl_update(UcDriverData* ucdrv,
CoreSurfaceBufferLock* lock)
{
int sw, sh, sp, sfmt; // Source width, height, pitch and format
- int dx, dy; // Destination position
+ //int dx, dy; // Destination position
int dw, dh; // Destination width and height
int pfetch; // Source pixels required for one line
VideoMode *videomode;
@@ -148,8 +148,8 @@ DFBResult uc_ovl_update(UcDriverData* ucdrv,
return DFB_INVAREA;
}
- dx = ucovl->v1.win.x;
- dy = ucovl->v1.win.y;
+ //dx = ucovl->v1.win.x;
+ //dy = ucovl->v1.win.y;
dw = ucovl->v1.win.w;
dh = ucovl->v1.win.h;
diff --git a/gfxdrivers/unichrome/uc_primary.c
b/gfxdrivers/unichrome/uc_primary.c
index 921d0ce..b65616e 100644
--- a/gfxdrivers/unichrome/uc_primary.c
+++ b/gfxdrivers/unichrome/uc_primary.c
@@ -139,7 +139,8 @@ osdSetRegion( CoreLayer *layer,
CoreLayerRegionConfigFlags updated,
CoreSurface *surface,
CorePalette *palette,
- CoreSurfaceBufferLock *lock )
+ CoreSurfaceBufferLock *left_lock,
+ CoreSurfaceBufferLock *right_lock )
{
DFBResult ret;
UcDriverData *ucdrv = (UcDriverData*) driver_data;
@@ -148,7 +149,7 @@ osdSetRegion( CoreLayer *layer,
ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData,
layer_data, region_data,
config, updated, surface,
- palette, lock );
+ palette, left_lock, right_lock );
if (ret)
return ret;
diff --git a/gfxdrivers/unichrome/uc_spic.c b/gfxdrivers/unichrome/uc_spic.c
index b7665b3..6499930 100644
--- a/gfxdrivers/unichrome/uc_spic.c
+++ b/gfxdrivers/unichrome/uc_spic.c
@@ -143,12 +143,13 @@ uc_spic_set_region( CoreLayer *layer,
CoreLayerRegionConfigFlags updated,
CoreSurface *surface,
CorePalette *palette,
- CoreSurfaceBufferLock *lock )
+ CoreSurfaceBufferLock *left_lock,
+ CoreSurfaceBufferLock *right_lock )
{
UcDriverData* ucdrv = (UcDriverData*) driver_data;
uc_spic_set_palette(ucdrv->hwregs, palette);
- uc_spic_set_buffer(ucdrv->hwregs, lock);
+ uc_spic_set_buffer(ucdrv->hwregs, left_lock);
uc_spic_enable(ucdrv->hwregs, (config->opacity > 0));
return DFB_OK;
@@ -173,12 +174,15 @@ uc_spic_flip_region( CoreLayer *layer,
void *region_data,
CoreSurface *surface,
DFBSurfaceFlipFlags flags,
- CoreSurfaceBufferLock *lock )
+ const DFBRegion *left_update,
+ CoreSurfaceBufferLock *left_lock,
+ const DFBRegion *right_update,
+ CoreSurfaceBufferLock *right_lock )
{
UcDriverData* ucdrv = (UcDriverData*) driver_data;
dfb_surface_flip(surface, false);
- uc_spic_set_buffer(ucdrv->hwregs, lock);
+ uc_spic_set_buffer(ucdrv->hwregs, left_lock);
return DFB_OK;
}
--
1.9.1
_______________________________________________
directfb-dev mailing list
[email protected]
http://mail.directfb.org/cgi-bin/mailman/listinfo/directfb-dev
