| ++dfb.h | | ++dfb.h | |
|---|
| | | | |
| skipping to change at line 56 | | skipping to change at line 56 | |
|---|
| #define PPDFB_API __declspec(dllexport) | | #define PPDFB_API __declspec(dllexport) | |
| #else | | #else | |
| #define PPDFB_API __declspec(dllimport) | | #define PPDFB_API __declspec(dllimport) | |
| #endif | | #endif | |
| #else | | #else | |
| #define PPDFB_API | | #define PPDFB_API | |
| #endif | | #endif | |
| | | | |
| #include <iostream> | | #include <iostream> | |
| | | | |
|
| #define IDirectFB IDirectFB_C | | #include "++dfb_mangle.h" | |
| #define IDirectFBScreen IDirectFBScreen_C | | #include <directfb++.h> | |
| #define IDirectFBDisplayLayer IDirectFBDisplayLayer_C | | #include "++dfb_unmangle.h" | |
| #define IDirectFBSurface IDirectFBSurface_C | | | |
| #define IDirectFBPalette IDirectFBPalette_C | | | |
| #define IDirectFBWindow IDirectFBWindow_C | | | |
| #define IDirectFBInputDevice IDirectFBInputDevice_C | | | |
| #define IDirectFBEventBuffer IDirectFBEventBuffer_C | | | |
| #define IDirectFBFont IDirectFBFont_C | | | |
| #define IDirectFBImageProvider IDirectFBImageProvider_C | | | |
| #define IDirectFBVideoProvider IDirectFBVideoProvider_C | | | |
| #define IDirectFBDataBuffer IDirectFBDataBuffer_C | | | |
| | | | |
| #define DFBPoint DFBPoint_C | | | |
| #define DFBDimension DFBDimension_C | | | |
| #define DFBRectangle DFBRectangle_C | | | |
| #define DFBRegion DFBRegion_C | | | |
| | | | |
| #include <directfb.h> | | | |
| #include <directfb_util.h> | | | |
| | | | |
| extern "C" { | | | |
| #include <directfb_strings.h> | | | |
| } | | | |
| | | | |
| #undef IDirectFB | | | |
| #undef IDirectFBScreen | | | |
| #undef IDirectFBDisplayLayer | | | |
| #undef IDirectFBSurface | | | |
| #undef IDirectFBPalette | | | |
| #undef IDirectFBWindow | | | |
| #undef IDirectFBInputDevice | | | |
| #undef IDirectFBEventBuffer | | | |
| #undef IDirectFBFont | | | |
| #undef IDirectFBImageProvider | | | |
| #undef IDirectFBVideoProvider | | | |
| #undef IDirectFBDataBuffer | | | |
| | | | |
| #undef DFBPoint | | | |
| #undef DFBDimension | | | |
| #undef DFBRectangle | | | |
| #undef DFBRegion | | | |
| | | | |
| class DFBPoint : public DFBPoint_C { | | | |
| public: | | | |
| DFBPoint() { | | | |
| x = 0; | | | |
| y = 0; | | | |
| } | | | |
| | | | |
| DFBPoint( const int &_x, const int &_y ) { | | | |
| x = _x; | | | |
| y = _y; | | | |
| } | | | |
| | | | |
| DFBPoint( const DFBPoint_C &point ) { | | | |
| x = point.x; | | | |
| y = point.y; | | | |
| } | | | |
| | | | |
| DFBPoint( const DFBRectangle_C &rectangle ) { | | | |
| x = rectangle.x; | | | |
| y = rectangle.y; | | | |
| } | | | |
| | | | |
| DFBPoint( const DFBRegion_C ®ion ) { | | | |
| x = region.x1; | | | |
| y = region.y1; | | | |
| } | | | |
| | | | |
| bool operator== ( const DFBPoint &ref ) const { | | | |
| return ref.x == x && ref.y == y; | | | |
| } | | | |
| | | | |
| DFBPoint operator +( const DFBPoint &offset ) const { | | | |
| DFBPoint p( *this ); | | | |
| p.x += offset.x; | | | |
| p.y += offset.y; | | | |
| return p; | | | |
| } | | | |
| | | | |
| DFBPoint& operator +=( const DFBPoint& offset ) { | | | |
| x += offset.x; | | | |
| y += offset.y; | | | |
| return *this; | | | |
| } | | | |
| }; | | | |
| | | | |
| class DFBDimension : public DFBDimension_C { | | | |
| public: | | | |
| DFBDimension() { | | | |
| w = 0; | | | |
| h = 0; | | | |
| } | | | |
| | | | |
| DFBDimension( const int &_w, const int &_h ) { | | | |
| w = _w; | | | |
| h = _h; | | | |
| } | | | |
| | | | |
| DFBDimension( const DFBDimension_C &dimension ) { | | | |
| w = dimension.w; | | | |
| h = dimension.h; | | | |
| } | | | |
| | | | |
| DFBDimension( const DFBPoint_C &point ) { | | | |
| w = point.x; | | | |
| h = point.y; | | | |
| } | | | |
| | | | |
| DFBDimension( const DFBRectangle_C &rectangle ) { | | | |
| w = rectangle.w; | | | |
| h = rectangle.h; | | | |
| } | | | |
| | | | |
| DFBDimension( const DFBRegion_C ®ion ) { | | | |
| w = region.x2 - region.x1 + 1; | | | |
| h = region.y2 - region.y1 + 1; | | | |
| } | | | |
| | | | |
| bool operator== ( const DFBDimension &ref ) const { | | | |
| return ref.w == w && ref.h == h; | | | |
| } | | | |
| | | | |
| bool contains( const DFBRegion_C ®ion ) const { | | | |
| if (region.x1 < 0 || region.y1 < 0) | | | |
| return false; | | | |
| | | | |
| if (region.x2 >= w || region.y2 >= h) | | | |
| return false; | | | |
| | | | |
| return true; | | | |
| } | | | |
| }; | | | |
| | | | |
| class DFBRectangle : public DFBRectangle_C { | | | |
| public: | | | |
| DFBRectangle() { | | | |
| x = 0; | | | |
| y = 0; | | | |
| w = 0; | | | |
| h = 0; | | | |
| } | | | |
| | | | |
| DFBRectangle( const int &_x, const int &_y, const int &_w, const int & | | | |
| _h ) { | | | |
| x = _x; | | | |
| y = _y; | | | |
| w = _w; | | | |
| h = _h; | | | |
| } | | | |
| | | | |
| DFBRectangle( const DFBRectangle_C &rectangle ) { | | | |
| x = rectangle.x; | | | |
| y = rectangle.y; | | | |
| w = rectangle.w; | | | |
| h = rectangle.h; | | | |
| } | | | |
| | | | |
| DFBRectangle( const DFBRegion_C ®ion ) { | | | |
| x = region.x1; | | | |
| y = region.y1; | | | |
| w = region.x2 - region.x1 + 1; | | | |
| h = region.y2 - region.y1 + 1; | | | |
| } | | | |
| | | | |
| DFBRectangle( const DFBDimension_C &dimension ) { | | | |
| x = 0; | | | |
| y = 0; | | | |
| w = dimension.w; | | | |
| h = dimension.h; | | | |
| } | | | |
| | | | |
| DFBRectangle( const DFBPoint_C &point, const DFBDimension_C &dimension | | | |
| ) { | | | |
| x = point.x; | | | |
| y = point.y; | | | |
| w = dimension.w; | | | |
| h = dimension.h; | | | |
| } | | | |
| | | | |
| bool operator== ( const DFBRectangle &ref ) const { | | | |
| return ref.x == x && ref.y == y && ref.w == w && ref.h == h; | | | |
| } | | | |
| | | | |
| DFBRectangle& operator-= ( const DFBPoint &sub ) { | | | |
| x -= sub.x; | | | |
| y -= sub.y; | | | |
| | | | |
| return *this; | | | |
| } | | | |
| | | | |
| DFBRectangle operator -( const DFBPoint &sub ) const { | | | |
| return DFBRectangle( x - sub.x, y - sub.y, w, h ); | | | |
| } | | | |
| | | | |
| DFBRectangle operator +( const DFBPoint &offset ) const { | | | |
| DFBRectangle r( *this ); | | | |
| r.x += offset.x; | | | |
| r.y += offset.y; | | | |
| return r; | | | |
| } | | | |
| }; | | | |
| | | | |
| class DFBRegion : public DFBRegion_C { | | | |
| public: | | | |
| DFBRegion() { | | | |
| x1 = 0; | | | |
| y1 = 0; | | | |
| x2 = 0; | | | |
| y2 = 0; | | | |
| } | | | |
| | | | |
| DFBRegion( const int &_x1, const int &_y1, const int &_x2, const int & | | | |
| _y2 ) { | | | |
| x1 = _x1; | | | |
| y1 = _y1; | | | |
| x2 = _x2; | | | |
| y2 = _y2; | | | |
| } | | | |
| | | | |
| DFBRegion( const DFBRegion_C ®ion ) { | | | |
| x1 = region.x1; | | | |
| y1 = region.y1; | | | |
| x2 = region.x2; | | | |
| y2 = region.y2; | | | |
| } | | | |
| | | | |
| DFBRegion( const DFBRectangle_C &rectangle ) { | | | |
| x1 = rectangle.x; | | | |
| y1 = rectangle.y; | | | |
| x2 = x1 + rectangle.w - 1; | | | |
| y2 = y1 + rectangle.h - 1; | | | |
| } | | | |
| | | | |
| DFBRegion( const DFBDimension_C &dimension ) { | | | |
| x1 = 0; | | | |
| y1 = 0; | | | |
| x2 = dimension.w - 1; | | | |
| y2 = dimension.h - 1; | | | |
| } | | | |
| | | | |
| DFBRegion( const DFBPoint_C &point, const DFBDimension_C &dimension ) | | | |
| { | | | |
| x1 = point.x; | | | |
| y1 = point.y; | | | |
| x2 = x1 + dimension.w - 1; | | | |
| y2 = y1 + dimension.h - 1; | | | |
| } | | | |
| | | | |
| bool operator== ( const DFBRegion &ref ) const { | | | |
| return ref.x1 == x1 && ref.y1 == y1 && ref.x2 == x2 && ref.y2 == | | | |
| y2; | | | |
| } | | | |
| | | | |
| DFBRegion& operator-= ( const DFBPoint &sub ) { | | | |
| x1 -= sub.x; | | | |
| y1 -= sub.y; | | | |
| x2 -= sub.x; | | | |
| y2 -= sub.y; | | | |
| | | | |
| return *this; | | | |
| } | | | |
| | | | |
| DFBRegion operator- ( const DFBPoint &sub ) const { | | | |
| return DFBRegion( x1 - sub.x, y1 - sub.y, x2 - sub.x, y2 - sub.y | | | |
| ); | | | |
| } | | | |
| | | | |
| DFBRegion& operator|= ( const DFBRegion &r ) { | | | |
| if (r.x1 < x1) | | | |
| x1 = r.x1; | | | |
| | | | |
| if (r.y1 < y1) | | | |
| y1 = r.y1; | | | |
| | | | |
| if (r.x2 > x2) | | | |
| x2 = r.x2; | | | |
| | | | |
| if (r.y2 > y2) | | | |
| y2 = r.y2; | | | |
| | | | |
| return *this; | | | |
| } | | | |
| | | | |
| void unionWith ( const DFBRegion &r ) { | | | |
| if (r.x1 < x1) | | | |
| x1 = r.x1; | | | |
| | | | |
| if (r.y1 < y1) | | | |
| y1 = r.y1; | | | |
| | | | |
| if (r.x2 > x2) | | | |
| x2 = r.x2; | | | |
| | | | |
| if (r.y2 > y2) | | | |
| y2 = r.y2; | | | |
| } | | | |
| }; | | | |
| | | | |
| class DFBException { | | class DFBException { | |
| public: | | public: | |
| PPDFB_API DFBException (const char *action, DFBResult result_code); | | PPDFB_API DFBException (const char *action, DFBResult result_code); | |
| | | | |
| const char PPDFB_API *GetAction() const; | | const char PPDFB_API *GetAction() const; | |
| const char PPDFB_API *GetResult() const; | | const char PPDFB_API *GetResult() const; | |
| DFBResult PPDFB_API GetResultCode() const; | | DFBResult PPDFB_API GetResultCode() const; | |
| | | | |
| friend std::ostream PPDFB_API &operator << (std::ostream &stream, DFBE
xception *ex); | | friend std::ostream PPDFB_API &operator << (std::ostream &stream, DFBE
xception *ex); | |
| | | | |
| skipping to change at line 418 | | skipping to change at line 128 | |
|---|
| return iface != NULL; | | return iface != NULL; | |
| } | | } | |
| inline IMPLEMENTINGCLASS &operator = (const IMPLEMENTINGCLAS
S &other) { | | inline IMPLEMENTINGCLASS &operator = (const IMPLEMENTINGCLAS
S &other) { | |
| IPPAny_C *old_iface = iface; | | IPPAny_C *old_iface = iface; | |
| IPPAny_C *other_iface = other.iface; | | IPPAny_C *other_iface = other.iface; | |
| if (other_iface) | | if (other_iface) | |
| PPDFB_DFBCHECK( other_iface->AddRef( other_i
face ) ); | | PPDFB_DFBCHECK( other_iface->AddRef( other_i
face ) ); | |
| iface = other_iface; | | iface = other_iface; | |
| if (old_iface) | | if (old_iface) | |
| PPDFB_DFBCHECK( old_iface->Release( old_ifac
e ) ); | | PPDFB_DFBCHECK( old_iface->Release( old_ifac
e ) ); | |
|
| return dynamic_cast<IMPLEMENTINGCLASS&>(*this); | | //return dynamic_cast<IMPLEMENTINGCLASS&>(*this); | |
| | | return reinterpret_cast<IMPLEMENTINGCLASS&>(*this); | |
| } | | } | |
| inline IMPLEMENTINGCLASS &operator = (IPPAny_C *other_iface)
{ | | inline IMPLEMENTINGCLASS &operator = (IPPAny_C *other_iface)
{ | |
| IPPAny_C *old_iface = iface; | | IPPAny_C *old_iface = iface; | |
| if (other_iface) | | if (other_iface) | |
| PPDFB_DFBCHECK( other_iface->AddRef( other_i
face ) ); | | PPDFB_DFBCHECK( other_iface->AddRef( other_i
face ) ); | |
| iface = other_iface; | | iface = other_iface; | |
| if (old_iface) | | if (old_iface) | |
| PPDFB_DFBCHECK( old_iface->Release( old_ifac
e ) ); | | PPDFB_DFBCHECK( old_iface->Release( old_ifac
e ) ); | |
|
| return dynamic_cast<IMPLEMENTINGCLASS&>(*this); | | //return dynamic_cast<IMPLEMENTINGCLASS&>(*this); | |
| | | return reinterpret_cast<IMPLEMENTINGCLASS&>(*this); | |
| } | | } | |
| }; | | }; | |
| | | | |
| class IDirectFB; | | class IDirectFB; | |
| class IDirectFBScreen; | | class IDirectFBScreen; | |
| class IDirectFBDisplayLayer; | | class IDirectFBDisplayLayer; | |
| class IDirectFBSurface; | | class IDirectFBSurface; | |
| class IDirectFBPalette; | | class IDirectFBPalette; | |
| class IDirectFBWindow; | | class IDirectFBWindow; | |
| class IDirectFBInputDevice; | | class IDirectFBInputDevice; | |
| | | | |
| skipping to change at line 457 | | skipping to change at line 169 | |
|---|
| #include "idirectfbsurface.h" | | #include "idirectfbsurface.h" | |
| #include "idirectfbpalette.h" | | #include "idirectfbpalette.h" | |
| #include "idirectfbwindow.h" | | #include "idirectfbwindow.h" | |
| #include "idirectfbinputdevice.h" | | #include "idirectfbinputdevice.h" | |
| #include "idirectfbeventbuffer.h" | | #include "idirectfbeventbuffer.h" | |
| #include "idirectfbfont.h" | | #include "idirectfbfont.h" | |
| #include "idirectfbimageprovider.h" | | #include "idirectfbimageprovider.h" | |
| #include "idirectfbvideoprovider.h" | | #include "idirectfbvideoprovider.h" | |
| #include "idirectfbdatabuffer.h" | | #include "idirectfbdatabuffer.h" | |
| | | | |
|
| #define DFB_ADD_SURFACE_DESC(d,f) (d) = static_cast<DFBSurfaceDescription | | | |
| Flags> ((d) | (f)) | | | |
| #define DFB_ADD_SURFACE_CAPS(c,f) (c) = static_cast<DFBSurfaceCapabilitie | | | |
| s> ((c) | (f)) | | | |
| #define DFB_ADD_DRAWING_FLAG(d,f) (d) = static_cast<DFBSurfaceDrawingFlag | | | |
| s> ((d) | (f)) | | | |
| #define DFB_ADD_BLITTING_FLAG(b,f) (b) = static_cast<DFBSurfaceBlittingFla | | | |
| gs> ((b) | (f)) | | | |
| | | | |
| namespace DirectFB { | | namespace DirectFB { | |
| void PPDFB_API Init (int *argc = NULL, char *(*argv[]) = NULL); | | void PPDFB_API Init (int *argc = NULL, char *(*argv[]) = NULL); | |
| IDirectFB PPDFB_API Create (); | | IDirectFB PPDFB_API Create (); | |
| } | | } | |
| | | | |
| #endif | | #endif | |
| | | | |
| End of changes. 4 change blocks. |
|---|
| 310 lines changed or deleted | | 7 lines changed or added | |
|---|
|
| CoreDFB.h | | CoreDFB.h | |
|---|
| /* | | /* | |
| * This file was automatically generated by fluxcomp; DO NOT EDIT! | | * This file was automatically generated by fluxcomp; DO NOT EDIT! | |
| */ | | */ | |
| /* | | /* | |
|
| (c) Copyright 2001-2011 The world wide DirectFB Open Source Community ( | | (c) Copyright 2012-2013 DirectFB integrated media GmbH | |
| directfb.org) | | (c) Copyright 2001-2013 The world wide DirectFB Open Source Community ( | |
| | | directfb.org) | |
| (c) Copyright 2000-2004 Convergence (integrated media) GmbH | | (c) Copyright 2000-2004 Convergence (integrated media) GmbH | |
| | | | |
| All rights reserved. | | All rights reserved. | |
| | | | |
| Written by Denis Oliver Kropp <dok@directfb.org>, | | Written by Denis Oliver Kropp <dok@directfb.org>, | |
|
| Andreas Hundt <andi@fischlustig.de>, | | Andreas Shimokawa <andi@directfb.org>, | |
| | | Marek Pikarski <mass@directfb.org>, | |
| Sven Neumann <neo@directfb.org>, | | Sven Neumann <neo@directfb.org>, | |
| Ville Syrjälä <syrjala@sci.fi> and | | Ville Syrjälä <syrjala@sci.fi> and | |
| Claudio Ciccani <klan@users.sf.net>. | | Claudio Ciccani <klan@users.sf.net>. | |
| | | | |
| This library is free software; you can redistribute it and/or | | This library is free software; you can redistribute it and/or | |
| modify it under the terms of the GNU Lesser General Public | | modify it under the terms of the GNU Lesser General Public | |
| License as published by the Free Software Foundation; either | | License as published by the Free Software Foundation; either | |
| version 2 of the License, or (at your option) any later version. | | version 2 of the License, or (at your option) any later version. | |
| | | | |
| This library is distributed in the hope that it will be useful, | | This library is distributed in the hope that it will be useful, | |
| | | | |
| End of changes. 2 change blocks. |
|---|
| 3 lines changed or deleted | | 5 lines changed or added | |
|---|
|
| CoreGraphicsState.h | | CoreGraphicsState.h | |
|---|
| /* | | /* | |
| * This file was automatically generated by fluxcomp; DO NOT EDIT! | | * This file was automatically generated by fluxcomp; DO NOT EDIT! | |
| */ | | */ | |
| /* | | /* | |
|
| (c) Copyright 2001-2011 The world wide DirectFB Open Source Community ( | | (c) Copyright 2012-2013 DirectFB integrated media GmbH | |
| directfb.org) | | (c) Copyright 2001-2013 The world wide DirectFB Open Source Community ( | |
| | | directfb.org) | |
| (c) Copyright 2000-2004 Convergence (integrated media) GmbH | | (c) Copyright 2000-2004 Convergence (integrated media) GmbH | |
| | | | |
| All rights reserved. | | All rights reserved. | |
| | | | |
| Written by Denis Oliver Kropp <dok@directfb.org>, | | Written by Denis Oliver Kropp <dok@directfb.org>, | |
|
| Andreas Hundt <andi@fischlustig.de>, | | Andreas Shimokawa <andi@directfb.org>, | |
| | | Marek Pikarski <mass@directfb.org>, | |
| Sven Neumann <neo@directfb.org>, | | Sven Neumann <neo@directfb.org>, | |
| Ville Syrjälä <syrjala@sci.fi> and | | Ville Syrjälä <syrjala@sci.fi> and | |
| Claudio Ciccani <klan@users.sf.net>. | | Claudio Ciccani <klan@users.sf.net>. | |
| | | | |
| This library is free software; you can redistribute it and/or | | This library is free software; you can redistribute it and/or | |
| modify it under the terms of the GNU Lesser General Public | | modify it under the terms of the GNU Lesser General Public | |
| License as published by the Free Software Foundation; either | | License as published by the Free Software Foundation; either | |
| version 2 of the License, or (at your option) any later version. | | version 2 of the License, or (at your option) any later version. | |
| | | | |
| This library is distributed in the hope that it will be useful, | | This library is distributed in the hope that it will be useful, | |
| | | | |
| End of changes. 2 change blocks. |
|---|
| 3 lines changed or deleted | | 5 lines changed or added | |
|---|
|
| CoreInputDevice.h | | CoreInputDevice.h | |
|---|
| /* | | /* | |
| * This file was automatically generated by fluxcomp; DO NOT EDIT! | | * This file was automatically generated by fluxcomp; DO NOT EDIT! | |
| */ | | */ | |
| /* | | /* | |
|
| (c) Copyright 2001-2011 The world wide DirectFB Open Source Community ( | | (c) Copyright 2012-2013 DirectFB integrated media GmbH | |
| directfb.org) | | (c) Copyright 2001-2013 The world wide DirectFB Open Source Community ( | |
| | | directfb.org) | |
| (c) Copyright 2000-2004 Convergence (integrated media) GmbH | | (c) Copyright 2000-2004 Convergence (integrated media) GmbH | |
| | | | |
| All rights reserved. | | All rights reserved. | |
| | | | |
| Written by Denis Oliver Kropp <dok@directfb.org>, | | Written by Denis Oliver Kropp <dok@directfb.org>, | |
|
| Andreas Hundt <andi@fischlustig.de>, | | Andreas Shimokawa <andi@directfb.org>, | |
| | | Marek Pikarski <mass@directfb.org>, | |
| Sven Neumann <neo@directfb.org>, | | Sven Neumann <neo@directfb.org>, | |
| Ville Syrjälä <syrjala@sci.fi> and | | Ville Syrjälä <syrjala@sci.fi> and | |
| Claudio Ciccani <klan@users.sf.net>. | | Claudio Ciccani <klan@users.sf.net>. | |
| | | | |
| This library is free software; you can redistribute it and/or | | This library is free software; you can redistribute it and/or | |
| modify it under the terms of the GNU Lesser General Public | | modify it under the terms of the GNU Lesser General Public | |
| License as published by the Free Software Foundation; either | | License as published by the Free Software Foundation; either | |
| version 2 of the License, or (at your option) any later version. | | version 2 of the License, or (at your option) any later version. | |
| | | | |
| This library is distributed in the hope that it will be useful, | | This library is distributed in the hope that it will be useful, | |
| | | | |
| End of changes. 2 change blocks. |
|---|
| 3 lines changed or deleted | | 5 lines changed or added | |
|---|
|
| CoreLayer.h | | CoreLayer.h | |
|---|
| /* | | /* | |
| * This file was automatically generated by fluxcomp; DO NOT EDIT! | | * This file was automatically generated by fluxcomp; DO NOT EDIT! | |
| */ | | */ | |
| /* | | /* | |
|
| (c) Copyright 2001-2011 The world wide DirectFB Open Source Community ( | | (c) Copyright 2012-2013 DirectFB integrated media GmbH | |
| directfb.org) | | (c) Copyright 2001-2013 The world wide DirectFB Open Source Community ( | |
| | | directfb.org) | |
| (c) Copyright 2000-2004 Convergence (integrated media) GmbH | | (c) Copyright 2000-2004 Convergence (integrated media) GmbH | |
| | | | |
| All rights reserved. | | All rights reserved. | |
| | | | |
| Written by Denis Oliver Kropp <dok@directfb.org>, | | Written by Denis Oliver Kropp <dok@directfb.org>, | |
|
| Andreas Hundt <andi@fischlustig.de>, | | Andreas Shimokawa <andi@directfb.org>, | |
| | | Marek Pikarski <mass@directfb.org>, | |
| Sven Neumann <neo@directfb.org>, | | Sven Neumann <neo@directfb.org>, | |
| Ville Syrjälä <syrjala@sci.fi> and | | Ville Syrjälä <syrjala@sci.fi> and | |
| Claudio Ciccani <klan@users.sf.net>. | | Claudio Ciccani <klan@users.sf.net>. | |
| | | | |
| This library is free software; you can redistribute it and/or | | This library is free software; you can redistribute it and/or | |
| modify it under the terms of the GNU Lesser General Public | | modify it under the terms of the GNU Lesser General Public | |
| License as published by the Free Software Foundation; either | | License as published by the Free Software Foundation; either | |
| version 2 of the License, or (at your option) any later version. | | version 2 of the License, or (at your option) any later version. | |
| | | | |
| This library is distributed in the hope that it will be useful, | | This library is distributed in the hope that it will be useful, | |
| | | | |
| End of changes. 2 change blocks. |
|---|
| 3 lines changed or deleted | | 5 lines changed or added | |
|---|
|
| CoreLayerContext.h | | CoreLayerContext.h | |
|---|
| /* | | /* | |
| * This file was automatically generated by fluxcomp; DO NOT EDIT! | | * This file was automatically generated by fluxcomp; DO NOT EDIT! | |
| */ | | */ | |
| /* | | /* | |
|
| (c) Copyright 2001-2011 The world wide DirectFB Open Source Community ( | | (c) Copyright 2012-2013 DirectFB integrated media GmbH | |
| directfb.org) | | (c) Copyright 2001-2013 The world wide DirectFB Open Source Community ( | |
| | | directfb.org) | |
| (c) Copyright 2000-2004 Convergence (integrated media) GmbH | | (c) Copyright 2000-2004 Convergence (integrated media) GmbH | |
| | | | |
| All rights reserved. | | All rights reserved. | |
| | | | |
| Written by Denis Oliver Kropp <dok@directfb.org>, | | Written by Denis Oliver Kropp <dok@directfb.org>, | |
|
| Andreas Hundt <andi@fischlustig.de>, | | Andreas Shimokawa <andi@directfb.org>, | |
| | | Marek Pikarski <mass@directfb.org>, | |
| Sven Neumann <neo@directfb.org>, | | Sven Neumann <neo@directfb.org>, | |
| Ville Syrjälä <syrjala@sci.fi> and | | Ville Syrjälä <syrjala@sci.fi> and | |
| Claudio Ciccani <klan@users.sf.net>. | | Claudio Ciccani <klan@users.sf.net>. | |
| | | | |
| This library is free software; you can redistribute it and/or | | This library is free software; you can redistribute it and/or | |
| modify it under the terms of the GNU Lesser General Public | | modify it under the terms of the GNU Lesser General Public | |
| License as published by the Free Software Foundation; either | | License as published by the Free Software Foundation; either | |
| version 2 of the License, or (at your option) any later version. | | version 2 of the License, or (at your option) any later version. | |
| | | | |
| This library is distributed in the hope that it will be useful, | | This library is distributed in the hope that it will be useful, | |
| | | | |
| End of changes. 2 change blocks. |
|---|
| 3 lines changed or deleted | | 5 lines changed or added | |
|---|
|
| CoreLayerRegion.h | | CoreLayerRegion.h | |
|---|
| /* | | /* | |
| * This file was automatically generated by fluxcomp; DO NOT EDIT! | | * This file was automatically generated by fluxcomp; DO NOT EDIT! | |
| */ | | */ | |
| /* | | /* | |
|
| (c) Copyright 2001-2011 The world wide DirectFB Open Source Community ( | | (c) Copyright 2012-2013 DirectFB integrated media GmbH | |
| directfb.org) | | (c) Copyright 2001-2013 The world wide DirectFB Open Source Community ( | |
| | | directfb.org) | |
| (c) Copyright 2000-2004 Convergence (integrated media) GmbH | | (c) Copyright 2000-2004 Convergence (integrated media) GmbH | |
| | | | |
| All rights reserved. | | All rights reserved. | |
| | | | |
| Written by Denis Oliver Kropp <dok@directfb.org>, | | Written by Denis Oliver Kropp <dok@directfb.org>, | |
|
| Andreas Hundt <andi@fischlustig.de>, | | Andreas Shimokawa <andi@directfb.org>, | |
| | | Marek Pikarski <mass@directfb.org>, | |
| Sven Neumann <neo@directfb.org>, | | Sven Neumann <neo@directfb.org>, | |
| Ville Syrjälä <syrjala@sci.fi> and | | Ville Syrjälä <syrjala@sci.fi> and | |
| Claudio Ciccani <klan@users.sf.net>. | | Claudio Ciccani <klan@users.sf.net>. | |
| | | | |
| This library is free software; you can redistribute it and/or | | This library is free software; you can redistribute it and/or | |
| modify it under the terms of the GNU Lesser General Public | | modify it under the terms of the GNU Lesser General Public | |
| License as published by the Free Software Foundation; either | | License as published by the Free Software Foundation; either | |
| version 2 of the License, or (at your option) any later version. | | version 2 of the License, or (at your option) any later version. | |
| | | | |
| This library is distributed in the hope that it will be useful, | | This library is distributed in the hope that it will be useful, | |
| | | | |
| End of changes. 2 change blocks. |
|---|
| 3 lines changed or deleted | | 5 lines changed or added | |
|---|
|
| CorePalette.h | | CorePalette.h | |
|---|
| /* | | /* | |
| * This file was automatically generated by fluxcomp; DO NOT EDIT! | | * This file was automatically generated by fluxcomp; DO NOT EDIT! | |
| */ | | */ | |
| /* | | /* | |
|
| (c) Copyright 2001-2011 The world wide DirectFB Open Source Community ( | | (c) Copyright 2012-2013 DirectFB integrated media GmbH | |
| directfb.org) | | (c) Copyright 2001-2013 The world wide DirectFB Open Source Community ( | |
| | | directfb.org) | |
| (c) Copyright 2000-2004 Convergence (integrated media) GmbH | | (c) Copyright 2000-2004 Convergence (integrated media) GmbH | |
| | | | |
| All rights reserved. | | All rights reserved. | |
| | | | |
| Written by Denis Oliver Kropp <dok@directfb.org>, | | Written by Denis Oliver Kropp <dok@directfb.org>, | |
|
| Andreas Hundt <andi@fischlustig.de>, | | Andreas Shimokawa <andi@directfb.org>, | |
| | | Marek Pikarski <mass@directfb.org>, | |
| Sven Neumann <neo@directfb.org>, | | Sven Neumann <neo@directfb.org>, | |
| Ville Syrjälä <syrjala@sci.fi> and | | Ville Syrjälä <syrjala@sci.fi> and | |
| Claudio Ciccani <klan@users.sf.net>. | | Claudio Ciccani <klan@users.sf.net>. | |
| | | | |
| This library is free software; you can redistribute it and/or | | This library is free software; you can redistribute it and/or | |
| modify it under the terms of the GNU Lesser General Public | | modify it under the terms of the GNU Lesser General Public | |
| License as published by the Free Software Foundation; either | | License as published by the Free Software Foundation; either | |
| version 2 of the License, or (at your option) any later version. | | version 2 of the License, or (at your option) any later version. | |
| | | | |
| This library is distributed in the hope that it will be useful, | | This library is distributed in the hope that it will be useful, | |
| | | | |
| End of changes. 2 change blocks. |
|---|
| 3 lines changed or deleted | | 5 lines changed or added | |
|---|
|
| CoreScreen.h | | CoreScreen.h | |
|---|
| /* | | /* | |
| * This file was automatically generated by fluxcomp; DO NOT EDIT! | | * This file was automatically generated by fluxcomp; DO NOT EDIT! | |
| */ | | */ | |
| /* | | /* | |
|
| (c) Copyright 2001-2011 The world wide DirectFB Open Source Community ( | | (c) Copyright 2012-2013 DirectFB integrated media GmbH | |
| directfb.org) | | (c) Copyright 2001-2013 The world wide DirectFB Open Source Community ( | |
| | | directfb.org) | |
| (c) Copyright 2000-2004 Convergence (integrated media) GmbH | | (c) Copyright 2000-2004 Convergence (integrated media) GmbH | |
| | | | |
| All rights reserved. | | All rights reserved. | |
| | | | |
| Written by Denis Oliver Kropp <dok@directfb.org>, | | Written by Denis Oliver Kropp <dok@directfb.org>, | |
|
| Andreas Hundt <andi@fischlustig.de>, | | Andreas Shimokawa <andi@directfb.org>, | |
| | | Marek Pikarski <mass@directfb.org>, | |
| Sven Neumann <neo@directfb.org>, | | Sven Neumann <neo@directfb.org>, | |
| Ville Syrjälä <syrjala@sci.fi> and | | Ville Syrjälä <syrjala@sci.fi> and | |
| Claudio Ciccani <klan@users.sf.net>. | | Claudio Ciccani <klan@users.sf.net>. | |
| | | | |
| This library is free software; you can redistribute it and/or | | This library is free software; you can redistribute it and/or | |
| modify it under the terms of the GNU Lesser General Public | | modify it under the terms of the GNU Lesser General Public | |
| License as published by the Free Software Foundation; either | | License as published by the Free Software Foundation; either | |
| version 2 of the License, or (at your option) any later version. | | version 2 of the License, or (at your option) any later version. | |
| | | | |
| This library is distributed in the hope that it will be useful, | | This library is distributed in the hope that it will be useful, | |
| | | | |
| End of changes. 2 change blocks. |
|---|
| 3 lines changed or deleted | | 5 lines changed or added | |
|---|
|
| CoreSlave.h | | CoreSlave.h | |
|---|
| /* | | /* | |
| * This file was automatically generated by fluxcomp; DO NOT EDIT! | | * This file was automatically generated by fluxcomp; DO NOT EDIT! | |
| */ | | */ | |
| /* | | /* | |
|
| (c) Copyright 2001-2011 The world wide DirectFB Open Source Community ( | | (c) Copyright 2012-2013 DirectFB integrated media GmbH | |
| directfb.org) | | (c) Copyright 2001-2013 The world wide DirectFB Open Source Community ( | |
| | | directfb.org) | |
| (c) Copyright 2000-2004 Convergence (integrated media) GmbH | | (c) Copyright 2000-2004 Convergence (integrated media) GmbH | |
| | | | |
| All rights reserved. | | All rights reserved. | |
| | | | |
| Written by Denis Oliver Kropp <dok@directfb.org>, | | Written by Denis Oliver Kropp <dok@directfb.org>, | |
|
| Andreas Hundt <andi@fischlustig.de>, | | Andreas Shimokawa <andi@directfb.org>, | |
| | | Marek Pikarski <mass@directfb.org>, | |
| Sven Neumann <neo@directfb.org>, | | Sven Neumann <neo@directfb.org>, | |
| Ville Syrjälä <syrjala@sci.fi> and | | Ville Syrjälä <syrjala@sci.fi> and | |
| Claudio Ciccani <klan@users.sf.net>. | | Claudio Ciccani <klan@users.sf.net>. | |
| | | | |
| This library is free software; you can redistribute it and/or | | This library is free software; you can redistribute it and/or | |
| modify it under the terms of the GNU Lesser General Public | | modify it under the terms of the GNU Lesser General Public | |
| License as published by the Free Software Foundation; either | | License as published by the Free Software Foundation; either | |
| version 2 of the License, or (at your option) any later version. | | version 2 of the License, or (at your option) any later version. | |
| | | | |
| This library is distributed in the hope that it will be useful, | | This library is distributed in the hope that it will be useful, | |
| | | | |
| End of changes. 2 change blocks. |
|---|
| 3 lines changed or deleted | | 5 lines changed or added | |
|---|
|
| CoreSurface.h | | CoreSurface.h | |
|---|
| /* | | /* | |
| * This file was automatically generated by fluxcomp; DO NOT EDIT! | | * This file was automatically generated by fluxcomp; DO NOT EDIT! | |
| */ | | */ | |
| /* | | /* | |
|
| (c) Copyright 2001-2011 The world wide DirectFB Open Source Community ( | | (c) Copyright 2012-2013 DirectFB integrated media GmbH | |
| directfb.org) | | (c) Copyright 2001-2013 The world wide DirectFB Open Source Community ( | |
| | | directfb.org) | |
| (c) Copyright 2000-2004 Convergence (integrated media) GmbH | | (c) Copyright 2000-2004 Convergence (integrated media) GmbH | |
| | | | |
| All rights reserved. | | All rights reserved. | |
| | | | |
| Written by Denis Oliver Kropp <dok@directfb.org>, | | Written by Denis Oliver Kropp <dok@directfb.org>, | |
|
| Andreas Hundt <andi@fischlustig.de>, | | Andreas Shimokawa <andi@directfb.org>, | |
| | | Marek Pikarski <mass@directfb.org>, | |
| Sven Neumann <neo@directfb.org>, | | Sven Neumann <neo@directfb.org>, | |
| Ville Syrjälä <syrjala@sci.fi> and | | Ville Syrjälä <syrjala@sci.fi> and | |
| Claudio Ciccani <klan@users.sf.net>. | | Claudio Ciccani <klan@users.sf.net>. | |
| | | | |
| This library is free software; you can redistribute it and/or | | This library is free software; you can redistribute it and/or | |
| modify it under the terms of the GNU Lesser General Public | | modify it under the terms of the GNU Lesser General Public | |
| License as published by the Free Software Foundation; either | | License as published by the Free Software Foundation; either | |
| version 2 of the License, or (at your option) any later version. | | version 2 of the License, or (at your option) any later version. | |
| | | | |
| This library is distributed in the hope that it will be useful, | | This library is distributed in the hope that it will be useful, | |
| | | | |
| End of changes. 2 change blocks. |
|---|
| 3 lines changed or deleted | | 5 lines changed or added | |
|---|
|
| CoreSurfaceClient.h | | CoreSurfaceClient.h | |
|---|
| /* | | /* | |
|
| (c) Copyright 2001-2011 The world wide DirectFB Open Source Community ( | | * This file was automatically generated by fluxcomp; DO NOT EDIT! | |
| directfb.org) | | */ | |
| | | /* | |
| | | (c) Copyright 2012-2013 DirectFB integrated media GmbH | |
| | | (c) Copyright 2001-2013 The world wide DirectFB Open Source Community ( | |
| | | directfb.org) | |
| (c) Copyright 2000-2004 Convergence (integrated media) GmbH | | (c) Copyright 2000-2004 Convergence (integrated media) GmbH | |
| | | | |
| All rights reserved. | | All rights reserved. | |
| | | | |
| Written by Denis Oliver Kropp <dok@directfb.org>, | | Written by Denis Oliver Kropp <dok@directfb.org>, | |
|
| Andreas Hundt <andi@fischlustig.de>, | | Andreas Shimokawa <andi@directfb.org>, | |
| | | Marek Pikarski <mass@directfb.org>, | |
| Sven Neumann <neo@directfb.org>, | | Sven Neumann <neo@directfb.org>, | |
| Ville Syrjälä <syrjala@sci.fi> and | | Ville Syrjälä <syrjala@sci.fi> and | |
| Claudio Ciccani <klan@users.sf.net>. | | Claudio Ciccani <klan@users.sf.net>. | |
| | | | |
| This library is free software; you can redistribute it and/or | | This library is free software; you can redistribute it and/or | |
| modify it under the terms of the GNU Lesser General Public | | modify it under the terms of the GNU Lesser General Public | |
| License as published by the Free Software Foundation; either | | License as published by the Free Software Foundation; either | |
| version 2 of the License, or (at your option) any later version. | | version 2 of the License, or (at your option) any later version. | |
| | | | |
| This library is distributed in the hope that it will be useful, | | This library is distributed in the hope that it will be useful, | |
| | | | |
| End of changes. 2 change blocks. |
|---|
| 3 lines changed or deleted | | 8 lines changed or added | |
|---|
|
| CoreWindow.h | | CoreWindow.h | |
|---|
| /* | | /* | |
| * This file was automatically generated by fluxcomp; DO NOT EDIT! | | * This file was automatically generated by fluxcomp; DO NOT EDIT! | |
| */ | | */ | |
| /* | | /* | |
|
| (c) Copyright 2001-2011 The world wide DirectFB Open Source Community ( | | (c) Copyright 2012-2013 DirectFB integrated media GmbH | |
| directfb.org) | | (c) Copyright 2001-2013 The world wide DirectFB Open Source Community ( | |
| | | directfb.org) | |
| (c) Copyright 2000-2004 Convergence (integrated media) GmbH | | (c) Copyright 2000-2004 Convergence (integrated media) GmbH | |
| | | | |
| All rights reserved. | | All rights reserved. | |
| | | | |
| Written by Denis Oliver Kropp <dok@directfb.org>, | | Written by Denis Oliver Kropp <dok@directfb.org>, | |
|
| Andreas Hundt <andi@fischlustig.de>, | | Andreas Shimokawa <andi@directfb.org>, | |
| | | Marek Pikarski <mass@directfb.org>, | |
| Sven Neumann <neo@directfb.org>, | | Sven Neumann <neo@directfb.org>, | |
| Ville Syrjälä <syrjala@sci.fi> and | | Ville Syrjälä <syrjala@sci.fi> and | |
| Claudio Ciccani <klan@users.sf.net>. | | Claudio Ciccani <klan@users.sf.net>. | |
| | | | |
| This library is free software; you can redistribute it and/or | | This library is free software; you can redistribute it and/or | |
| modify it under the terms of the GNU Lesser General Public | | modify it under the terms of the GNU Lesser General Public | |
| License as published by the Free Software Foundation; either | | License as published by the Free Software Foundation; either | |
| version 2 of the License, or (at your option) any later version. | | version 2 of the License, or (at your option) any later version. | |
| | | | |
| This library is distributed in the hope that it will be useful, | | This library is distributed in the hope that it will be useful, | |
| | | | |
| End of changes. 2 change blocks. |
|---|
| 3 lines changed or deleted | | 5 lines changed or added | |
|---|
|
| CoreWindowStack.h | | CoreWindowStack.h | |
|---|
| /* | | /* | |
| * This file was automatically generated by fluxcomp; DO NOT EDIT! | | * This file was automatically generated by fluxcomp; DO NOT EDIT! | |
| */ | | */ | |
| /* | | /* | |
|
| (c) Copyright 2001-2011 The world wide DirectFB Open Source Community ( | | (c) Copyright 2012-2013 DirectFB integrated media GmbH | |
| directfb.org) | | (c) Copyright 2001-2013 The world wide DirectFB Open Source Community ( | |
| | | directfb.org) | |
| (c) Copyright 2000-2004 Convergence (integrated media) GmbH | | (c) Copyright 2000-2004 Convergence (integrated media) GmbH | |
| | | | |
| All rights reserved. | | All rights reserved. | |
| | | | |
| Written by Denis Oliver Kropp <dok@directfb.org>, | | Written by Denis Oliver Kropp <dok@directfb.org>, | |
|
| Andreas Hundt <andi@fischlustig.de>, | | Andreas Shimokawa <andi@directfb.org>, | |
| | | Marek Pikarski <mass@directfb.org>, | |
| Sven Neumann <neo@directfb.org>, | | Sven Neumann <neo@directfb.org>, | |
| Ville Syrjälä <syrjala@sci.fi> and | | Ville Syrjälä <syrjala@sci.fi> and | |
| Claudio Ciccani <klan@users.sf.net>. | | Claudio Ciccani <klan@users.sf.net>. | |
| | | | |
| This library is free software; you can redistribute it and/or | | This library is free software; you can redistribute it and/or | |
| modify it under the terms of the GNU Lesser General Public | | modify it under the terms of the GNU Lesser General Public | |
| License as published by the Free Software Foundation; either | | License as published by the Free Software Foundation; either | |
| version 2 of the License, or (at your option) any later version. | | version 2 of the License, or (at your option) any later version. | |
| | | | |
| This library is distributed in the hope that it will be useful, | | This library is distributed in the hope that it will be useful, | |
| | | | |
| End of changes. 2 change blocks. |
|---|
| 3 lines changed or deleted | | 5 lines changed or added | |
|---|
|
| String.h | | String.h | |
|---|
| | | | |
| skipping to change at line 35 | | skipping to change at line 35 | |
|---|
| You should have received a copy of the GNU Lesser General Public | | You should have received a copy of the GNU Lesser General Public | |
| License along with this library; if not, write to the | | License along with this library; if not, write to the | |
| Free Software Foundation, Inc., 59 Temple Place - Suite 330, | | Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| Boston, MA 02111-1307, USA. | | Boston, MA 02111-1307, USA. | |
| */ | | */ | |
| | | | |
| #ifndef ___Direct__String__H___ | | #ifndef ___Direct__String__H___ | |
| #define ___Direct__String__H___ | | #define ___Direct__String__H___ | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
|
| | | #include <direct/Types++.h> | |
| | | | |
| extern "C" { | | extern "C" { | |
| #endif | | #endif | |
| | | | |
| #include <direct/compiler.h> | | #include <direct/compiler.h> | |
| #include <direct/log.h> | | #include <direct/log.h> | |
|
| | | #include <direct/log_domain.h> | |
| | | | |
| // C Wrapper | | // C Wrapper | |
| | | | |
| __dfb_no_instrument_function__ | | __dfb_no_instrument_function__ | |
| D_String *D_String_NewEmpty( void ); | | D_String *D_String_NewEmpty( void ); | |
| | | | |
| __dfb_no_instrument_function__ | | __dfb_no_instrument_function__ | |
| size_t D_String_PrintF( D_String *str, const char *format, ... )
D_FORMAT_PRINTF(2); | | size_t D_String_PrintF( D_String *str, const char *format, ... )
D_FORMAT_PRINTF(2); | |
| | | | |
| __dfb_no_instrument_function__ | | __dfb_no_instrument_function__ | |
| | | | |
| End of changes. 2 change blocks. |
|---|
| 0 lines changed or deleted | | 3 lines changed or added | |
|---|
|
| build.h | | build.h | |
|---|
| /* | | /* | |
|
| (c) Copyright 2001-2011 The world wide DirectFB Open Source Community ( | | (c) Copyright 2000-2002 convergence integrated media GmbH. | |
| directfb.org) | | (c) Copyright 2002-2004 convergence GmbH. | |
| (c) Copyright 2000-2004 Convergence (integrated media) GmbH | | | |
| | | | |
| All rights reserved. | | All rights reserved. | |
| | | | |
| Written by Denis Oliver Kropp <dok@directfb.org>, | | Written by Denis Oliver Kropp <dok@directfb.org>, | |
| Andreas Hundt <andi@fischlustig.de>, | | Andreas Hundt <andi@fischlustig.de>, | |
|
| Sven Neumann <neo@directfb.org>, | | Sven Neumann <neo@directfb.org> and | |
| Ville Syrjälä <syrjala@sci.fi> and | | Ville Syrjälä <syrjala@sci.fi>. | |
| Claudio Ciccani <klan@users.sf.net>. | | | |
| | | | |
| This library is free software; you can redistribute it and/or | | This library is free software; you can redistribute it and/or | |
| modify it under the terms of the GNU Lesser General Public | | modify it under the terms of the GNU Lesser General Public | |
| License as published by the Free Software Foundation; either | | License as published by the Free Software Foundation; either | |
| version 2 of the License, or (at your option) any later version. | | version 2 of the License, or (at your option) any later version. | |
| | | | |
| This library is distributed in the hope that it will be useful, | | This library is distributed in the hope that it will be useful, | |
| but WITHOUT ANY WARRANTY; without even the implied warranty of | | but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| Lesser General Public License for more details. | | Lesser General Public License for more details. | |
| | | | |
| You should have received a copy of the GNU Lesser General Public | | You should have received a copy of the GNU Lesser General Public | |
| License along with this library; if not, write to the | | License along with this library; if not, write to the | |
| Free Software Foundation, Inc., 59 Temple Place - Suite 330, | | Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| Boston, MA 02111-1307, USA. | | Boston, MA 02111-1307, USA. | |
| */ | | */ | |
| | | | |
|
| #ifndef __DIRECT__BUILD_H__ | | #ifndef __FUSION__BUILD_H__ | |
| #define __DIRECT__BUILD_H__ | | #define __FUSION__BUILD_H__ | |
| | | | |
|
| #define DIRECT_OS_LINUX_GNU_LIBC (0) | | #define FUSION_BUILD_MULTI (0) | |
| #define DIRECT_OS_LINUX_KERNEL (1) | | #define FUSION_BUILD_KERNEL (1) | |
| #define DIRECT_OS_PSP (2) | | #define FUSION_MESSAGE_SIZE (16384) | |
| #define DIRECT_OS_WIN32 (3) | | | |
| #define DIRECT_OS_FAMOS (4) | | | |
| | | | |
| #define DIRECT_BUILD_DEBUG (0) | | | |
| #define DIRECT_BUILD_DEBUGS (1) | | | |
| #define DIRECT_BUILD_TRACE (0) | | | |
| #define DIRECT_BUILD_TEXT (1) | | | |
| #define DIRECT_BUILD_GETTID (1) | | | |
| #define DIRECT_BUILD_NETWORK (1) | | | |
| #define DIRECT_BUILD_STDBOOL (1) | | | |
| #define DIRECT_BUILD_DYNLOAD (1) | | | |
| #define DIRECT_BUILD_MULTICORE (1) | | | |
| #define DIRECT_BUILD_OSTYPE (DIRECT_OS_LINUX_GNU_LIBC) | | | |
| #define DIRECT_BUILD_GCC_ATOMICS (0) | | | |
| | | | |
| #if !DIRECT_BUILD_DEBUGS | | | |
| #if defined(DIRECT_ENABLE_DEBUG) || defined(DIRECT_FORCE_DEBUG) | | | |
| #define DIRECT_MINI_DEBUG | | | |
| #endif | | | |
| #undef DIRECT_ENABLE_DEBUG | | | |
| #ifdef DIRECT_FORCE_DEBUG | | | |
| #warning DIRECT_FORCE_DEBUG used with 'pure release' library headers. | | | |
| #undef DIRECT_FORCE_DEBUG | | | |
| #endif | | | |
| #endif | | | |
| | | | |
| #endif | | #endif | |
| | | | |
| End of changes. 4 change blocks. |
|---|
| 36 lines changed or deleted | | 9 lines changed or added | |
|---|
|
| conf.h | | conf.h | |
|---|
| | | | |
| skipping to change at line 31 | | skipping to change at line 31 | |
|---|
| but WITHOUT ANY WARRANTY; without even the implied warranty of | | but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| Lesser General Public License for more details. | | Lesser General Public License for more details. | |
| | | | |
| You should have received a copy of the GNU Lesser General Public | | You should have received a copy of the GNU Lesser General Public | |
| License along with this library; if not, write to the | | License along with this library; if not, write to the | |
| Free Software Foundation, Inc., 59 Temple Place - Suite 330, | | Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| Boston, MA 02111-1307, USA. | | Boston, MA 02111-1307, USA. | |
| */ | | */ | |
| | | | |
|
| #ifndef __DIRECT__CONF_H__ | | #ifndef __FUSION__CONF_H__ | |
| #define __DIRECT__CONF_H__ | | #define __FUSION__CONF_H__ | |
| | | | |
|
| #include <direct/log_domain.h> | | #include <fusion/types.h> | |
| | | | |
|
| typedef enum { | | struct __Fusion_FusionConfig { | |
| DCFL_NONE, /* None is fatal. */ | | char *tmpfs; /* location of shm file */ | |
| DCFL_ASSERT, /* ASSERT is fatal. */ | | | |
| DCFL_ASSUME /* ASSERT and ASSUME are fatal. */ | | | |
| } DirectConfigFatalLevel; | | | |
| | | | |
|
| typedef enum { | | bool debugshm; | |
| DCTS_OTHER, | | bool madv_remove; | |
| DCTS_FIFO, | | bool madv_remove_force; | |
| DCTS_RR | | bool force_slave; | |
| } DirectConfigThreadScheduler; | | | |
| | | | |
|
| typedef enum { | | gid_t shmfile_gid; /* group that owns shm file */ | |
| DMT_NONE = 0x00000000, /* No message type. */ | | | |
| | | | |
|
| DMT_BANNER = 0x00000001, /* Startup banner. */ | | bool secure_fusion; | |
| DMT_INFO = 0x00000002, /* Info messages. */ | | | |
| DMT_WARNING = 0x00000004, /* Warnings. */ | | | |
| DMT_ERROR = 0x00000008, /* Error messages: regular, with DFBR | | | |
| esult, bugs, | | | |
| system call errors, dlopen errors | | | |
| */ | | | |
| DMT_UNIMPLEMENTED = 0x00000010, /* Messages notifying unimplemented f | | | |
| unctionality. */ | | | |
| DMT_ONCE = 0x00000020, /* One-shot messages .*/ | | | |
| DMT_UNTESTED = 0x00000040, /* Messages notifying unimplemented f | | | |
| unctionality. */ | | | |
| DMT_BUG = 0x00000080, /* A bug occurred. */ | | | |
| | | | |
|
| DMT_ALL = 0x000000FF /* All types. */ | | bool defer_destructors; | |
| } DirectMessageType; | | | |
| | | | |
|
| struct __D_DirectConfig { | | int trace_ref; | |
| DirectMessageType quiet; | | | |
| | | | |
|
| DirectLogLevel log_level; | | bool fork_handler; | |
| bool log_all; | | | |
| bool log_none; | | | |
| | | | |
|
| bool trace; | | unsigned int call_bin_max_num; | |
| | | unsigned int call_bin_max_data; | |
| char *memcpy; /* Don't probe for me | | pid_t skirmish_warn_on_thread; | |
| mcpy routines to save a lot of | | | |
| startup time. Use | | | |
| this one instead if it's set. */ | | | |
| | | | |
| char **disable_module; /* Never load these m | | | |
| odules. */ | | | |
| char *module_dir; /* module dir overrid | | | |
| e */ | | | |
| | | | |
| bool sighandler; | | | |
| sigset_t dont_catch; /* don't catch these | | | |
| signals */ | | | |
| | | | |
| DirectLog *log; | | | |
| | | | |
| DirectConfigFatalLevel fatal; | | | |
| | | | |
| // @deprecated / FIXME: maybe adapt? | | | |
| bool debug; | | | |
| | | | |
| bool debugmem; | | | |
| | | | |
| bool thread_block_signals; | | | |
| | | | |
| bool fatal_break; /* Should D_BREAK() | | | |
| cause a trap? */ | | | |
| | | | |
| int thread_priority; | | | |
| DirectConfigThreadScheduler thread_scheduler; | | | |
| int thread_stack_size; | | | |
| int thread_priority_scale; | | | |
| | | | |
| char **default_interface_implementation_types; | | | |
| char **default_interface_implementation_names; | | | |
| | | | |
| unsigned int perf_dump_interval; | | | |
| int log_delay_rand_loops; | | | |
| int log_delay_rand_us; | | | |
| int log_delay_min_loops; | | | |
| int log_delay_min_us; | | | |
| | | | |
| DirectMessageType fatal_messages; | | | |
| }; | | }; | |
| | | | |
|
| extern DirectConfig DIRECT_API *direct_config; | | extern FusionConfig FUSION_API *fusion_config; | |
| | | | |
| extern const char DIRECT_API *direct_config_usage; | | | |
| | | | |
| DirectResult DIRECT_API direct_config_set( const char *name, const | | | |
| char *value ); | | | |
| | | | |
| /* Retrieve all values set on option 'name'. */ | | | |
| /* Pass an array of char* pointers and number of pointers in 'num'. */ | | | |
| /* The actual returned number of values gets returned in 'ret_num' */ | | | |
| /* The returned option/values respect directfbrc, cmdline options and DFBAR | | | |
| GS envvar. */ | | | |
| /* The returned pointers are not extra allocated so do not free them! */ | | | |
| DirectResult DIRECT_API direct_config_get( const char *name, char * | | | |
| *values, const int values_len, int *ret_num ); | | | |
| | | | |
|
| /* Return the integer value for the last occurrance of the passed option's | | extern const char FUSION_API *fusion_config_usage; | |
| setting. */ | | | |
| /* Note that 0 is also retuned in case the passed option was not found ot s | | | |
| et. */ | | | |
| long long DIRECT_API direct_config_get_int_value( const char *na | | | |
| me ); | | | |
| | | | |
|
| long long DIRECT_API direct_config_get_int_value_with_default( c | | DirectResult FUSION_API fusion_config_set( const char *name, const | |
| onst char *name, | | char *value ); | |
| l | | | |
| ong long def ); | | | |
| | | | |
|
| void __D_conf_init( void ); | | void __Fusion_conf_init( void ); | |
| void __D_conf_deinit( void ); | | void __Fusion_conf_deinit( void ); | |
| | | | |
| #endif | | #endif | |
| | | | |
| End of changes. 14 change blocks. |
|---|
| 107 lines changed or deleted | | 23 lines changed or added | |
|---|
|
| directfb.h | | directfb.h | |
|---|
| | | | |
| skipping to change at line 2420 | | skipping to change at line 2420 | |
|---|
| DSOR_1600_1200 = 0x00000800, /* 1600x1200 Resolution */ | | DSOR_1600_1200 = 0x00000800, /* 1600x1200 Resolution */ | |
| DSOR_1920_1080 = 0x00001000, /* 1920x1080 Resolution */ | | DSOR_1920_1080 = 0x00001000, /* 1920x1080 Resolution */ | |
| DSOR_960_540 = 0x00002000, /* 960x540 Resolution */ | | DSOR_960_540 = 0x00002000, /* 960x540 Resolution */ | |
| DSOR_1440_540 = 0x00004000, /* 1440x540 Resolution */ | | DSOR_1440_540 = 0x00004000, /* 1440x540 Resolution */ | |
| DSOR_800_480 = 0x00008000, /* 800x480 Resolution */ | | DSOR_800_480 = 0x00008000, /* 800x480 Resolution */ | |
| DSOR_1024_600 = 0x00010000, /* 1024x600 Resolution */ | | DSOR_1024_600 = 0x00010000, /* 1024x600 Resolution */ | |
| DSOR_1366_768 = 0x00020000, /* 1366x768 Resolution */ | | DSOR_1366_768 = 0x00020000, /* 1366x768 Resolution */ | |
| DSOR_1920_1200 = 0x00040000, /* 1920x1200 Resolution */ | | DSOR_1920_1200 = 0x00040000, /* 1920x1200 Resolution */ | |
| DSOR_2560_1440 = 0x00080000, /* 2560x1440 Resolution */ | | DSOR_2560_1440 = 0x00080000, /* 2560x1440 Resolution */ | |
| DSOR_2560_1600 = 0x00100000, /* 2650x1600 Resolution */ | | DSOR_2560_1600 = 0x00100000, /* 2650x1600 Resolution */ | |
|
| DSOR_ALL = 0x001FFFFF /* All Resolutions */ | | DSOR_3840_2160 = 0x00200000, /* 3840x2160 Resolution */ | |
| | | DSOR_4096_2160 = 0x00400000, /* 4096x2160 Resolution */ | |
| | | DSOR_ALL = 0x004FFFFF /* All Resolutions */ | |
| } DFBScreenOutputResolution; | | } DFBScreenOutputResolution; | |
| | | | |
| #define DFB_SCREEN_OUTPUT_DESC_NAME_LENGTH 24 | | #define DFB_SCREEN_OUTPUT_DESC_NAME_LENGTH 24 | |
| | | | |
| /* | | /* | |
| * Description of a screen output. | | * Description of a screen output. | |
| */ | | */ | |
| typedef struct { | | typedef struct { | |
| DFBScreenOutputCapabilities caps; /* Screen capabilities
. */ | | DFBScreenOutputCapabilities caps; /* Screen capabilities
. */ | |
| | | | |
| | | | |
| End of changes. 1 change blocks. |
|---|
| 1 lines changed or deleted | | 3 lines changed or added | |
|---|
|
| directfb_strings.h | | directfb_strings.h | |
|---|
| | | | |
| skipping to change at line 493 | | skipping to change at line 493 | |
|---|
| { DSOR_1600_1200, "1600_1200" }, \ | | { DSOR_1600_1200, "1600_1200" }, \ | |
| { DSOR_1920_1080, "1920_1080" }, \ | | { DSOR_1920_1080, "1920_1080" }, \ | |
| { DSOR_960_540, "960_540" }, \ | | { DSOR_960_540, "960_540" }, \ | |
| { DSOR_1440_540, "1440_540" }, \ | | { DSOR_1440_540, "1440_540" }, \ | |
| { DSOR_800_480, "800_480" }, \ | | { DSOR_800_480, "800_480" }, \ | |
| { DSOR_1024_600, "1024_600" }, \ | | { DSOR_1024_600, "1024_600" }, \ | |
| { DSOR_1366_768, "1366_768" }, \ | | { DSOR_1366_768, "1366_768" }, \ | |
| { DSOR_1920_1200, "1920_1200" }, \ | | { DSOR_1920_1200, "1920_1200" }, \ | |
| { DSOR_2560_1440, "2560_1440" }, \ | | { DSOR_2560_1440, "2560_1440" }, \ | |
| { DSOR_2560_1600, "2560_1600" }, \ | | { DSOR_2560_1600, "2560_1600" }, \ | |
|
| | | { DSOR_3840_2160, "3840_2160" }, \ | |
| | | { DSOR_4096_2160, "4096_2160" }, \ | |
| { DSOR_UNKNOWN, "UNKNOWN" } \ | | { DSOR_UNKNOWN, "UNKNOWN" } \ | |
| }; | | }; | |
| | | | |
| struct DFBScreenMixerCapabilitiesName { | | struct DFBScreenMixerCapabilitiesName { | |
| DFBScreenMixerCapabilities capability; | | DFBScreenMixerCapabilities capability; | |
| const char *name; | | const char *name; | |
| }; | | }; | |
| | | | |
| #define DirectFBScreenMixerCapabilitiesNames(Identifier) struct DFBScreenMi
xerCapabilitiesName Identifier[] = { \ | | #define DirectFBScreenMixerCapabilitiesNames(Identifier) struct DFBScreenMi
xerCapabilitiesName Identifier[] = { \ | |
| { DSMCAPS_FULL, "FULL" }, \ | | { DSMCAPS_FULL, "FULL" }, \ | |
| | | | |
| End of changes. 1 change blocks. |
|---|
| 0 lines changed or deleted | | 2 lines changed or added | |
|---|
|
| drmkms_system.h | | drmkms_system.h | |
|---|
| | | | |
| skipping to change at line 72 | | skipping to change at line 72 | |
|---|
| int plane_index; | | int plane_index; | |
| | | | |
| drmModePlane *plane; | | drmModePlane *plane; | |
| uint32_t colorkey_propid; | | uint32_t colorkey_propid; | |
| uint32_t zpos_propid; | | uint32_t zpos_propid; | |
| uint32_t alpha_propid; | | uint32_t alpha_propid; | |
| | | | |
| int level; | | int level; | |
| | | | |
| CoreLayerRegionConfig *config; | | CoreLayerRegionConfig *config; | |
|
| | | | |
| | | int surfacebuffer_index; | |
| | | CoreSurface *surface; | |
| | | DFB_DisplayTask *prev_task; | |
| | | DFB_DisplayTask *pending_task; | |
| | | bool flip_pending; | |
| | | | |
| | | DirectMutex lock; | |
| | | DirectWaitQueue wq_event; | |
| } DRMKMSLayerData; | | } DRMKMSLayerData; | |
| | | | |
| typedef struct { | | typedef struct { | |
| FusionSHMPoolShared *shmpool; | | FusionSHMPoolShared *shmpool; | |
| | | | |
| CoreSurfacePool *pool; | | CoreSurfacePool *pool; | |
| | | | |
| bool use_prime_fd; | | bool use_prime_fd; | |
| | | | |
| bool mirror_outputs; | | bool mirror_outputs; | |
| | | | |
| skipping to change at line 133 | | skipping to change at line 142 | |
|---|
| | | | |
| drmModeRes *resources; | | drmModeRes *resources; | |
| drmModePlaneRes *plane_resources; | | drmModePlaneRes *plane_resources; | |
| | | | |
| drmModeCrtcPtr saved_crtc; | | drmModeCrtcPtr saved_crtc; | |
| | | | |
| drmEventContext drmeventcontext; | | drmEventContext drmeventcontext; | |
| | | | |
| VirtualTerminal *vt; | | VirtualTerminal *vt; | |
| | | | |
|
| unsigned int flip_pending; | | | |
| unsigned int plane_flip_pending_mask; | | | |
| CoreSurface *surface[16]; | | | |
| int surfacebuffer_index[16]; | | | |
| | | | |
| DFB_DisplayTask *prev_tasks[16]; | | | |
| DFB_DisplayTask *pending_tasks[16]; | | | |
| DirectMutex task_lock; | | | |
| | | | |
| DirectThread *thread; | | DirectThread *thread; | |
|
| DirectMutex lock; | | | |
| DirectWaitQueue wq_event; | | | |
| DirectWaitQueue wq_flip; | | | |
| } DRMKMSData; | | } DRMKMSData; | |
| | | | |
| drmModeModeInfo* | | drmModeModeInfo* | |
| drmkms_find_mode( int encoder, int width, int height, int freq ); | | drmkms_find_mode( int encoder, int width, int height, int freq ); | |
| | | | |
| drmModeModeInfo* | | drmModeModeInfo* | |
| drmkms_dsor_freq_to_mode( int encoder, DFBScreenOutputResolution dsor, DFBS
creenEncoderFrequency freq ); | | drmkms_dsor_freq_to_mode( int encoder, DFBScreenOutputResolution dsor, DFBS
creenEncoderFrequency freq ); | |
| | | | |
| DFBResult | | DFBResult | |
| drmkms_mode_to_dsor_dsef( drmModeModeInfo *videomode, DFBScreenOutputResolu
tion *dso_res, DFBScreenEncoderFrequency *dse_freq ); | | drmkms_mode_to_dsor_dsef( drmModeModeInfo *videomode, DFBScreenOutputResolu
tion *dso_res, DFBScreenEncoderFrequency *dse_freq ); | |
| | | | |
| End of changes. 3 change blocks. |
|---|
| 12 lines changed or deleted | | 9 lines changed or added | |
|---|
|
| surface.h | | surface.h | |
|---|
| | | | |
| skipping to change at line 482 | | skipping to change at line 482 | |
|---|
| FUSION_SKIRMISH_ASSERT( &surface->lock ); | | FUSION_SKIRMISH_ASSERT( &surface->lock ); | |
| | | | |
| D_ASSERT( surface->num_buffers > 0 ); | | D_ASSERT( surface->num_buffers > 0 ); | |
| | | | |
| if (eye == DSSE_LEFT) | | if (eye == DSSE_LEFT) | |
| return surface->left_buffers[ surface->buffer_indices[(flip_count
+ role) % surface->num_buffers] ]; | | return surface->left_buffers[ surface->buffer_indices[(flip_count
+ role) % surface->num_buffers] ]; | |
| | | | |
| return surface->right_buffers[ surface->buffer_indices[(flip_count + r
ole) % surface->num_buffers] ]; | | return surface->right_buffers[ surface->buffer_indices[(flip_count + r
ole) % surface->num_buffers] ]; | |
| } | | } | |
| | | | |
|
| static __inline__ void * | | static __inline__ void | |
| dfb_surface_data_offset( const CoreSurface *surface, | | dfb_surface_get_data_offsets( const CoreSurfaceConfig * const config, | |
| void *data, | | const void * const data, | |
| int pitch, | | int pitch, | |
| int x, | | int x, | |
| int y ) | | int y, | |
| | | unsigned int num, | |
| | | u8 ** const pointers, | |
| | | int * const pitches ) | |
| { | | { | |
|
| D_ASSERT( surface != NULL ); | | D_ASSERT( config != NULL ); | |
| D_ASSERT( data != NULL ); | | D_ASSERT( data != NULL ); | |
| D_ASSERT( pitch > 0 ); | | D_ASSERT( pitch > 0 ); | |
| D_ASSERT( x >= 0 ); | | D_ASSERT( x >= 0 ); | |
|
| D_ASSERT( x < surface->config.size.w ); | | D_ASSERT( x < config->size.w ); | |
| D_ASSERT( y >= 0 ); | | D_ASSERT( y >= 0 ); | |
|
| D_ASSERT( y < surface->config.size.h ); | | D_ASSERT( y < config->size.h ); | |
| | | D_ASSERT( !num | |
| | | || (num && pointers && pitches) ); | |
| | | | |
| | | if (!num) | |
| | | return; | |
| | | | |
| | | switch (config->format) { | |
| | | case DSPF_NV12: | |
| | | case DSPF_NV21: | |
| | | case DSPF_NV16: | |
| | | if (num < 2) | |
| | | return; | |
| | | break; | |
| | | | |
| | | case DSPF_I420: | |
| | | case DSPF_YV12: | |
| | | case DSPF_YV16: | |
| | | case DSPF_YUV444P: | |
| | | if (num < 3) | |
| | | return; | |
| | | break; | |
| | | | |
| | | default: | |
| | | if (num < 1) | |
| | | return; | |
| | | break; | |
| | | } | |
| | | | |
|
| if (surface->config.caps & DSCAPS_SEPARATED) { | | if (config->caps & DSCAPS_SEPARATED) { | |
| if (y & 1) | | if (y & 1) | |
|
| y += surface->config.size.h; | | y += config->size.h; | |
| | | | |
| y >>= 1; | | y >>= 1; | |
| } | | } | |
| | | | |
|
| return (u8*)data + pitch * y + DFB_BYTES_PER_LINE( surface->config.for | | switch (config->format) { | |
| mat, x ); | | case DSPF_NV12: | |
| | | case DSPF_NV21: | |
| | | pitches[1] = pitch; | |
| | | pointers[1] = ( (u8*)data | |
| | | + pitch * config->size.h | |
| | | + pitches[1] * y/2 | |
| | | + DFB_BYTES_PER_LINE( config->format, x/2 ) | |
| | | ); | |
| | | break; | |
| | | | |
| | | case DSPF_NV16: | |
| | | pitches[1] = pitch; | |
| | | pointers[1] = ( (u8*)data | |
| | | + pitch * config->size.h | |
| | | + pitches[1] * y | |
| | | + DFB_BYTES_PER_LINE( config->format, x/2 ) | |
| | | ); | |
| | | break; | |
| | | | |
| | | case DSPF_I420: | |
| | | pitches[1] = pitches[2] = pitch / 2; | |
| | | pointers[1] = ( (u8*)data | |
| | | + pitch * config->size.h | |
| | | + pitches[1] * y/2 | |
| | | + DFB_BYTES_PER_LINE( config->format, x/2 ) | |
| | | ); | |
| | | pointers[2] = ( (u8*)data | |
| | | + pitch * config->size.h | |
| | | + pitches[1] * config->size.h/2 | |
| | | + pitches[2] * y/2 | |
| | | + DFB_BYTES_PER_LINE( config->format, x/2 ) | |
| | | ); | |
| | | break; | |
| | | | |
| | | case DSPF_YV12: | |
| | | pitches[1] = pitches[2] = pitch / 2; | |
| | | pointers[2] = ( (u8*)data | |
| | | + pitch * config->size.h | |
| | | + pitches[2] * y/2 | |
| | | + DFB_BYTES_PER_LINE( config->format, x/2 ) | |
| | | ); | |
| | | pointers[1] = ( (u8*)data | |
| | | + pitch * config->size.h | |
| | | + pitches[2] * config->size.h/2 | |
| | | + pitches[1] * y/2 | |
| | | + DFB_BYTES_PER_LINE( config->format, x/2 ) | |
| | | ); | |
| | | break; | |
| | | | |
| | | case DSPF_YV16: | |
| | | pitches[1] = pitches[2] = pitch / 2; | |
| | | pointers[2] = ( (u8*)data | |
| | | + pitch * config->size.h | |
| | | + pitches[2] * y | |
| | | + DFB_BYTES_PER_LINE( config->format, x/2 ) | |
| | | ); | |
| | | pointers[1] = ( (u8*)data | |
| | | + pitch * config->size.h | |
| | | + pitches[2] * config->size.h | |
| | | + pitches[1] * y | |
| | | + DFB_BYTES_PER_LINE( config->format, x/2 ) | |
| | | ); | |
| | | break; | |
| | | | |
| | | case DSPF_YUV444P: | |
| | | pitches[1] = pitches[2] = pitch; | |
| | | pointers[1] = ( (u8*)data | |
| | | + pitch * config->size.h | |
| | | + pitches[1] * y | |
| | | + DFB_BYTES_PER_LINE( config->format, x ) ); | |
| | | pointers[2] = ( (u8*)data | |
| | | + pitch * config->size.h | |
| | | + pitches[1] * config->size.h | |
| | | + pitches[2] * y | |
| | | + DFB_BYTES_PER_LINE( config->format, x ) ); | |
| | | break; | |
| | | | |
| | | default: | |
| | | break; | |
| | | } | |
| | | | |
| | | pointers[0] = ( (u8*)data | |
| | | + pitch * y | |
| | | + DFB_BYTES_PER_LINE( config->format, x ) ); | |
| | | pitches[0] = pitch; | |
| | | } | |
| | | | |
| | | static __inline__ void * | |
| | | dfb_surface_data_offset( const CoreSurface *surface, | |
| | | void *data, | |
| | | int pitch, | |
| | | int x, | |
| | | int y ) | |
| | | { | |
| | | u8 *pointers[1]; | |
| | | int pitches[1]; | |
| | | | |
| | | dfb_surface_get_data_offsets( &surface->config, data, pitch, x, y, | |
| | | 1, pointers, pitches); | |
| | | | |
| | | return pointers[0]; | |
| } | | } | |
| | | | |
| static __inline__ void | | static __inline__ void | |
| dfb_surface_calc_buffer_size( CoreSurface *surface, | | dfb_surface_calc_buffer_size( CoreSurface *surface, | |
| int byte_align, | | int byte_align, | |
| int pixel_align, | | int pixel_align, | |
| int *ret_pitch, | | int *ret_pitch, | |
| int *ret_size ) | | int *ret_size ) | |
| { | | { | |
| DFBSurfacePixelFormat format; | | DFBSurfacePixelFormat format; | |
| | | | |
| End of changes. 7 change blocks. |
|---|
| 13 lines changed or deleted | | 143 lines changed or added | |
|---|
|