directfb.h | directfb.h | |||
---|---|---|---|---|
skipping to change at line 2376 | skipping to change at line 2376 | |||
DSETV_PAL = 0x00000001, /* PAL */ | DSETV_PAL = 0x00000001, /* PAL */ | |||
DSETV_NTSC = 0x00000002, /* NTSC */ | DSETV_NTSC = 0x00000002, /* NTSC */ | |||
DSETV_SECAM = 0x00000004, /* SECAM */ | DSETV_SECAM = 0x00000004, /* SECAM */ | |||
DSETV_PAL_60 = 0x00000008, /* PAL-60 */ | DSETV_PAL_60 = 0x00000008, /* PAL-60 */ | |||
DSETV_PAL_BG = 0x00000010, /* PAL BG support (specific) */ | DSETV_PAL_BG = 0x00000010, /* PAL BG support (specific) */ | |||
DSETV_PAL_I = 0x00000020, /* PAL I support (specific) */ | DSETV_PAL_I = 0x00000020, /* PAL I support (specific) */ | |||
DSETV_PAL_M = 0x00000040, /* PAL M support (specific) */ | DSETV_PAL_M = 0x00000040, /* PAL M support (specific) */ | |||
DSETV_PAL_N = 0x00000080, /* PAL N support (specific) */ | DSETV_PAL_N = 0x00000080, /* PAL N support (specific) */ | |||
DSETV_PAL_NC = 0x00000100, /* PAL NC support (specific) */ | DSETV_PAL_NC = 0x00000100, /* PAL NC support (specific) */ | |||
DSETV_NTSC_M_JPN = 0x00000200, /* NTSC_JPN support */ | DSETV_NTSC_M_JPN = 0x00000200, /* NTSC_JPN support */ | |||
DSETV_NTSC_443 = 0x00000800, /* NTSC with 4.43MHz colour carrier */ | ||||
DSETV_DIGITAL = 0x00000400, /* TV standards from the digital do main. specify resolution, scantype, frequency.*/ | DSETV_DIGITAL = 0x00000400, /* TV standards from the digital do main. specify resolution, scantype, frequency.*/ | |||
DSETV_NTSC_443 = 0x00000800, /* NTSC with 4.43MHz colour carrier */ | ||||
DSETV_ALL = 0x00000FFF /* All TV Standards*/ | DSETV_ALL = 0x00000FFF /* All TV Standards*/ | |||
} DFBScreenEncoderTVStandards; | } DFBScreenEncoderTVStandards; | |||
/* | /* | |||
* Scan modes. | * Scan modes. | |||
*/ | */ | |||
typedef enum { | typedef enum { | |||
DSESM_UNKNOWN = 0x00000000, /* Unknown mode */ | DSESM_UNKNOWN = 0x00000000, /* Unknown mode */ | |||
DSESM_INTERLACED = 0x00000001, /* Interlaced scan mode */ | DSESM_INTERLACED = 0x00000001, /* Interlaced scan mode */ | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added | |||
directfb_strings.h | directfb_strings.h | |||
---|---|---|---|---|
skipping to change at line 302 | skipping to change at line 302 | |||
{ DSETV_PAL, "PAL" }, \ | { DSETV_PAL, "PAL" }, \ | |||
{ DSETV_NTSC, "NTSC" }, \ | { DSETV_NTSC, "NTSC" }, \ | |||
{ DSETV_SECAM, "SECAM" }, \ | { DSETV_SECAM, "SECAM" }, \ | |||
{ DSETV_PAL_60, "PAL_60" }, \ | { DSETV_PAL_60, "PAL_60" }, \ | |||
{ DSETV_PAL_BG, "PAL_BG" }, \ | { DSETV_PAL_BG, "PAL_BG" }, \ | |||
{ DSETV_PAL_I, "PAL_I" }, \ | { DSETV_PAL_I, "PAL_I" }, \ | |||
{ DSETV_PAL_M, "PAL_M" }, \ | { DSETV_PAL_M, "PAL_M" }, \ | |||
{ DSETV_PAL_N, "PAL_N" }, \ | { DSETV_PAL_N, "PAL_N" }, \ | |||
{ DSETV_PAL_NC, "PAL_NC" }, \ | { DSETV_PAL_NC, "PAL_NC" }, \ | |||
{ DSETV_NTSC_M_JPN, "NTSC_M_JPN" }, \ | { DSETV_NTSC_M_JPN, "NTSC_M_JPN" }, \ | |||
{ DSETV_NTSC_443, "NTSC_443" }, \ | ||||
{ DSETV_DIGITAL, "DIGITAL" }, \ | { DSETV_DIGITAL, "DIGITAL" }, \ | |||
{ DSETV_NTSC_443, "NTSC_443" }, \ | ||||
{ DSETV_UNKNOWN, "UNKNOWN" } \ | { DSETV_UNKNOWN, "UNKNOWN" } \ | |||
}; | }; | |||
struct DFBScreenOutputCapabilitiesName { | struct DFBScreenOutputCapabilitiesName { | |||
DFBScreenOutputCapabilities capability; | DFBScreenOutputCapabilities capability; | |||
const char *name; | const char *name; | |||
}; | }; | |||
#define DirectFBScreenOutputCapabilitiesNames(Identifier) struct DFBScreenO utputCapabilitiesName Identifier[] = { \ | #define DirectFBScreenOutputCapabilitiesNames(Identifier) struct DFBScreenO utputCapabilitiesName Identifier[] = { \ | |||
{ DSOCAPS_CONNECTORS, "CONNECTORS" }, \ | { DSOCAPS_CONNECTORS, "CONNECTORS" }, \ | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added | |||
directfb_version.h | directfb_version.h | |||
---|---|---|---|---|
skipping to change at line 34 | skipping to change at line 34 | |||
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 __DIRECTFB_VERSION_H__ | #ifndef __DIRECTFB_VERSION_H__ | |||
#define __DIRECTFB_VERSION_H__ | #define __DIRECTFB_VERSION_H__ | |||
#define DIRECTFB_MAJOR_VERSION (1) | #define DIRECTFB_MAJOR_VERSION (1) | |||
#define DIRECTFB_MINOR_VERSION (4) | #define DIRECTFB_MINOR_VERSION (4) | |||
#define DIRECTFB_MICRO_VERSION (12) | #define DIRECTFB_MICRO_VERSION (13) | |||
#define DIRECTFB_BINARY_AGE (7) | #define DIRECTFB_BINARY_AGE (8) | |||
#define DIRECTFB_INTERFACE_AGE (7) | #define DIRECTFB_INTERFACE_AGE (8) | |||
#endif /* __DIRECTFB_VERSION_H__ */ | #endif /* __DIRECTFB_VERSION_H__ */ | |||
End of changes. 1 change blocks. | ||||
3 lines changed or deleted | 3 lines changed or added | |||
generic.h | generic.h | |||
---|---|---|---|---|
skipping to change at line 114 | skipping to change at line 114 | |||
u8 YCop; | u8 YCop; | |||
u8 CbCop; | u8 CbCop; | |||
u8 CrCop; | u8 CrCop; | |||
int Aop_field; | int Aop_field; | |||
int Bop_field; | int Bop_field; | |||
int AopY; | int AopY; | |||
int BopY; | int BopY; | |||
int s; | ||||
int t; | ||||
/* | /* | |||
* color keys | * color keys | |||
*/ | */ | |||
u32 Dkey; | u32 Dkey; | |||
u32 Skey; | u32 Skey; | |||
/* | /* | |||
* color lookup tables | * color lookup tables | |||
*/ | */ | |||
CorePalette *Alut; | CorePalette *Alut; | |||
skipping to change at line 150 | skipping to change at line 153 | |||
GenefxAccumulator *Xacc; /* writing pointer for blending */ | GenefxAccumulator *Xacc; /* writing pointer for blending */ | |||
GenefxAccumulator *Yacc; /* input pointer for blending */ | GenefxAccumulator *Yacc; /* input pointer for blending */ | |||
GenefxAccumulator *Dacc; | GenefxAccumulator *Dacc; | |||
GenefxAccumulator *Sacc; | GenefxAccumulator *Sacc; | |||
void **Sop; | void **Sop; | |||
CorePalette *Slut; | CorePalette *Slut; | |||
int Ostep; /* controls horizontal blitting direction */ | int Ostep; /* controls horizontal blitting direction */ | |||
int SperD; /* for scaled routines only */ | int SperD; /* for scaled/texture routines only */ | |||
int TperD; /* for texture routines only */ | ||||
int Xphase; /* initial value for fractional steps (zero if not clip ped) */ | int Xphase; /* initial value for fractional steps (zero if not clip ped) */ | |||
bool need_accumulator; | bool need_accumulator; | |||
int *trans; | int *trans; | |||
int num_trans; | int num_trans; | |||
}; | }; | |||
/************************************************************************** | ||||
********************************************/ | ||||
typedef struct { | ||||
int x; | ||||
int y; | ||||
int s; | ||||
int t; | ||||
} GenefxVertexAffine; | ||||
/************************************************************************** | ||||
********************************************/ | ||||
void gGetDriverInfo( GraphicsDriverInfo *info ); | void gGetDriverInfo( GraphicsDriverInfo *info ); | |||
void gGetDeviceInfo( GraphicsDeviceInfo *info ); | void gGetDeviceInfo( GraphicsDeviceInfo *info ); | |||
bool gAcquire ( CardState *state, DFBAccelerationMask accel ); | bool gAcquire ( CardState *state, DFBAccelerationMask accel ); | |||
void gRelease ( CardState *state ); | void gRelease ( CardState *state ); | |||
void gFillRectangle ( CardState *state, DFBRectangle *rect ); | void gFillRectangle ( CardState *state, DFBRectangle *rect ); | |||
void gDrawLine ( CardState *state, DFBRegion *line ); | void gDrawLine ( CardState *state, DFBRegion *line ); | |||
void gBlit ( CardState *state, DFBRectangle *rect, int dx, int dy ); | void gBlit ( CardState *state, DFBRectangle *rect, int dx, int dy ); | |||
void gStretchBlit ( CardState *state, DFBRectangle *srect, DFBRectangle * drect ); | void gStretchBlit ( CardState *state, DFBRectangle *srect, DFBRectangle * drect ); | |||
void Genefx_TextureTriangles( CardState *state, | ||||
DFBVertex *vertices, | ||||
int num, | ||||
DFBTriangleFormation formation, | ||||
const DFBRegion *clip ); | ||||
void Genefx_TextureTrianglesAffine( CardState *state, | ||||
GenefxVertexAffine *vertices, | ||||
int num, | ||||
DFBTriangleFormation formation, | ||||
const DFBRegion *clip ); | ||||
/************************************************************************** | ||||
********************************************/ | ||||
/************************************************************************** | ||||
********************************************/ | ||||
void Genefx_TextureTriangleAffine( GenefxState *gfxs, | ||||
GenefxVertexAffine *v0, | ||||
GenefxVertexAffine *v1, | ||||
GenefxVertexAffine *v2, | ||||
const DFBRegion *clip ); | ||||
/************************************************************************** | ||||
********************************************/ | ||||
/************************************************************************** | ||||
********************************************/ | ||||
#define CHECK_PIPELINE() | ||||
\ | ||||
{ | ||||
\ | ||||
if (!gfxs->funcs[0]) | ||||
\ | ||||
return; | ||||
\ | ||||
\ | ||||
if (dfb_config->software_trace) { | ||||
\ | ||||
int i; | ||||
\ | ||||
GenefxFunc *funcs = gfxs->funcs; | ||||
\ | ||||
\ | ||||
direct_log_lock( NULL ); | ||||
\ | ||||
direct_log_printf( NULL, " Software Fallback Pipeline:\n" ) | ||||
; \ | ||||
\ | ||||
for (i=0; funcs[i]; ++i) | ||||
\ | ||||
direct_log_printf( NULL, " [%2d] %s\n", i, | ||||
\ | ||||
direct_trace_lookup_symbol_at( funcs | ||||
[i] ) ); \ | ||||
\ | ||||
direct_log_printf( NULL, "\n" ); | ||||
\ | ||||
direct_log_unlock( NULL ); | ||||
\ | ||||
} | ||||
\ | ||||
} | ||||
#define RUN_PIPELINE() \ | ||||
{ \ | ||||
int i; \ | ||||
GenefxFunc *funcs = gfxs->funcs; \ | ||||
\ | ||||
for (i=0; funcs[i]; ++i) \ | ||||
funcs[i]( gfxs ); \ | ||||
} | ||||
/************************************************************************** | ||||
********************************************/ | ||||
typedef void (*XopAdvanceFunc)( GenefxState *gfxs ); | ||||
void Genefx_Aop_xy( GenefxState *gfxs, int x, int y ); | ||||
void Genefx_Aop_crab( GenefxState *gfxs ); | ||||
void Genefx_Aop_next( GenefxState *gfxs ); | ||||
void Genefx_Aop_prev( GenefxState *gfxs ); | ||||
void Genefx_Bop_xy( GenefxState *gfxs, int x, int y ); | ||||
void Genefx_Bop_next( GenefxState *gfxs ); | ||||
void Genefx_Bop_prev( GenefxState *gfxs ); | ||||
/************************************************************************** | ||||
********************************************/ | ||||
bool Genefx_ABacc_prepare( GenefxState *gfxs, int width ); | ||||
void Genefx_ABacc_flush( GenefxState *gfxs ); | ||||
#endif | #endif | |||
End of changes. 4 change blocks. | ||||
1 lines changed or deleted | 121 lines changed or added | |||