This patch is on top of the previous patch for Davinci.
Signed-off-by: Jean-Christophe DUBOIS <[email protected]>
---
gfxdrivers/davinci/davinci_2d.c | 6 +++---
gfxdrivers/davinci/davinci_osd.c | 25 +++++++++++++------------
gfxdrivers/davinci/davinci_video.c | 29 +++++++++++++++--------------
3 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/gfxdrivers/davinci/davinci_2d.c b/gfxdrivers/davinci/davinci_2d.c
index 7b97fb7..bfc16f1 100644
--- a/gfxdrivers/davinci/davinci_2d.c
+++ b/gfxdrivers/davinci/davinci_2d.c
@@ -136,7 +136,7 @@ static bool davinciBlitBlend32 ( void
*drv,
static inline int
get_blit_blend_sub_function( const CardState *state )
{
- DFBSurfaceBlittingFlags flags = state->blittingflags & ~DSBLIT_COLORIZE;
+ unsigned int flags = state->blittingflags & ~DSBLIT_COLORIZE;
if (state->dst_blend == DSBF_INVSRCALPHA) {
switch (state->src_blend) {
@@ -175,7 +175,7 @@ get_blit_blend_sub_function( const CardState *state )
static inline int
get_draw_blend_sub_function( const CardState *state )
{
- DFBSurfaceDrawingFlags flags = state->drawingflags;
+ unsigned int flags = state->drawingflags;
if (state->dst_blend == DSBF_INVSRCALPHA) {
switch (state->src_blend) {
@@ -446,7 +446,7 @@ void
davinciFlushTextureCache( void *drv, void *dev )
{
DavinciDriverData *ddrv = drv;
- DavinciDeviceData *ddev = dev;
+ //DavinciDeviceData *ddev = dev;
D_DEBUG_AT( Davinci_2D, "%s()\n", __FUNCTION__ );
diff --git a/gfxdrivers/davinci/davinci_osd.c b/gfxdrivers/davinci/davinci_osd.c
index aba2b06..4b355df 100644
--- a/gfxdrivers/davinci/davinci_osd.c
+++ b/gfxdrivers/davinci/davinci_osd.c
@@ -183,7 +183,8 @@ osdSetRegion( CoreLayer *layer,
CoreLayerRegionConfigFlags updated,
CoreSurface *surface,
CorePalette *palette,
- CoreSurfaceBufferLock *lock )
+ CoreSurfaceBufferLock *left_lock,
+ CoreSurfaceBufferLock *right_lock )
{
int ret;
DavinciDriverData *ddrv = driver_data;
@@ -311,7 +312,7 @@ osdSetRegion( CoreLayer *layer,
}
davincifb_pan_display( &ddrv->fb[OSD0], &dosd->var0,
- (config->format == DSPF_RGB16) ? lock : NULL,
DSFLIP_NONE, 0, 0 );
+ (config->format == DSPF_RGB16) ? left_lock : NULL,
DSFLIP_NONE, 0, 0 );
ret = ioctl( ddrv->fb[OSD0].fd, FBIOGET_FSCREENINFO, &ddev->fix[OSD0] );
if (ret)
@@ -600,10 +601,10 @@ osdFlipRegion( CoreLayer *layer,
void *region_data,
CoreSurface *surface,
DFBSurfaceFlipFlags flags,
- const DFBRegion * left_update,
- CoreSurfaceBufferLock * left_lock,
- const DFBRegion * right_update,
- CoreSurfaceBufferLock * right_lock )
+ const DFBRegion *left_update,
+ CoreSurfaceBufferLock *left_lock,
+ const DFBRegion *right_update,
+ CoreSurfaceBufferLock *right_lock )
{
CoreSurfaceBuffer *buffer;
DavinciDriverData *ddrv = driver_data;
@@ -622,9 +623,9 @@ osdFlipRegion( CoreLayer *layer,
if (buffer->format != DSPF_RGB16) {
if (DFB_PIXELFORMAT_HAS_ALPHA( buffer->format ))
- update_buffers( ddrv, ddev, surface, left_lock, NULL );
+ update_buffers( ddrv, ddev, surface, left_lock, left_update );
else
- update_rgb( ddrv, ddev, surface, left_lock, NULL );
+ update_rgb( ddrv, ddev, surface, left_lock, left_update );
}
else
davincifb_pan_display( &ddrv->fb[OSD0], &dosd->var0, left_lock,
flags, 0, 0 );
@@ -642,10 +643,10 @@ osdUpdateRegion( CoreLayer *layer,
void *layer_data,
void *region_data,
CoreSurface *surface,
- const DFBRegion * left_update,
- CoreSurfaceBufferLock * left_lock,
- const DFBRegion * right_update,
- CoreSurfaceBufferLock * right_lock )
+ const DFBRegion *left_update,
+ CoreSurfaceBufferLock *left_lock,
+ const DFBRegion *right_update,
+ CoreSurfaceBufferLock *right_lock )
{
CoreSurfaceBuffer *buffer;
DavinciDriverData *ddrv = driver_data;
diff --git a/gfxdrivers/davinci/davinci_video.c
b/gfxdrivers/davinci/davinci_video.c
index ba53737..4a06c23 100644
--- a/gfxdrivers/davinci/davinci_video.c
+++ b/gfxdrivers/davinci/davinci_video.c
@@ -193,7 +193,8 @@ videoSetRegion( CoreLayer *layer,
CoreLayerRegionConfigFlags updated,
CoreSurface *surface,
CorePalette *palette,
- CoreSurfaceBufferLock *lock )
+ CoreSurfaceBufferLock *left_lock,
+ CoreSurfaceBufferLock *right_lock )
{
int ret;
DavinciDriverData *ddrv = driver_data;
@@ -236,7 +237,7 @@ videoSetRegion( CoreLayer *layer,
dvid->var.xres = config->dest.w;
dvid->var.yres = config->dest.h;
- dvid->var.yres_virtual = ddrv->fb[VID1].size / lock->pitch;
+ dvid->var.yres_virtual = ddrv->fb[VID1].size / left_lock->pitch;
ret = ioctl( ddrv->fb[VID1].fd, FBIOPUT_VSCREENINFO, &dvid->var );
if (ret)
@@ -343,10 +344,10 @@ videoFlipRegion( CoreLayer *layer,
void *region_data,
CoreSurface *surface,
DFBSurfaceFlipFlags flags,
- const DFBRegion * left_update,
- CoreSurfaceBufferLock * left_lock,
- const DFBRegion * right_update,
- CoreSurfaceBufferLock * right_lock )
+ const DFBRegion *left_update,
+ CoreSurfaceBufferLock *left_lock,
+ const DFBRegion *right_update,
+ CoreSurfaceBufferLock *right_lock )
{
DFBResult ret;
DavinciDriverData *ddrv = driver_data;
@@ -375,10 +376,10 @@ videoUpdateRegion( CoreLayer *layer,
void *layer_data,
void *region_data,
CoreSurface *surface,
- const DFBRegion * left_update,
- CoreSurfaceBufferLock * left_lock,
- const DFBRegion * right_update,
- CoreSurfaceBufferLock * right_lock )
+ const DFBRegion *left_update,
+ CoreSurfaceBufferLock *left_lock,
+ const DFBRegion *right_update,
+ CoreSurfaceBufferLock *right_lock )
{
DavinciDriverData *ddrv = driver_data;
DavinciVideoLayerData *dvid = layer_data;
@@ -518,10 +519,10 @@ ShowBuffer( DavinciDriverData *ddrv,
static int
limitInput(int rsz,int inSize,int outSize,int* pInSize)
{
- int phases;
+ //int phases;
int phaseShift;
int taps;
- int phaseMask;
+ //int phaseMask;
int coarseShift;
int halfCoarse;
int tmp;
@@ -537,8 +538,8 @@ limitInput(int rsz,int inSize,int outSize,int* pInSize)
phaseShift = 2;
taps = 7;
}
- phases = 1<<phaseShift;
- phaseMask = phases-1;
+ //phases = 1<<phaseShift;
+ //phaseMask = phases-1;
coarseShift = (8-phaseShift);
halfCoarse = (1<<(coarseShift-1));
tmp = (((outSize-1)* rsz + halfCoarse)>>8) + taps;
--
1.9.1
_______________________________________________
directfb-dev mailing list
[email protected]
http://mail.directfb.org/cgi-bin/mailman/listinfo/directfb-dev
