make indent
--HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402345
This commit is contained in:
parent
25541b2329
commit
554147b6c7
18 changed files with 142 additions and 122 deletions
|
@ -1300,9 +1300,9 @@ extern DECLSPEC void SDLCALL SDL_DestroyRenderer(SDL_WindowID windowID);
|
||||||
/*
|
/*
|
||||||
* Maps an RGB triple to an opaque pixel value for a given pixel format
|
* Maps an RGB triple to an opaque pixel value for a given pixel format
|
||||||
*/
|
*/
|
||||||
extern DECLSPEC Uint32 SDLCALL SDL_MapRGB(const SDL_PixelFormat * const format,
|
extern DECLSPEC Uint32 SDLCALL SDL_MapRGB(const SDL_PixelFormat *
|
||||||
const Uint8 r, const Uint8 g,
|
const format, const Uint8 r,
|
||||||
const Uint8 b);
|
const Uint8 g, const Uint8 b);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Maps an RGBA quadruple to a pixel value for a given pixel format
|
* Maps an RGBA quadruple to a pixel value for a given pixel format
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
/* *INDENT-OFF* */
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
* @APPLE_LICENSE_HEADER_START@
|
* @APPLE_LICENSE_HEADER_START@
|
||||||
|
|
|
@ -49,7 +49,8 @@ SDL_LoadFunction(void *handle, const char *name)
|
||||||
{
|
{
|
||||||
void *sym = NULL;
|
void *sym = NULL;
|
||||||
image_id library_id = (image_id) handle;
|
image_id library_id = (image_id) handle;
|
||||||
status_t rc = get_image_symbol(library_id, name, B_SYMBOL_TYPE_TEXT, &sym);
|
status_t rc =
|
||||||
|
get_image_symbol(library_id, name, B_SYMBOL_TYPE_TEXT, &sym);
|
||||||
if (rc != B_NO_ERROR) {
|
if (rc != B_NO_ERROR) {
|
||||||
SDL_SetError(strerror(rc));
|
SDL_SetError(strerror(rc));
|
||||||
}
|
}
|
||||||
|
@ -69,4 +70,3 @@ SDL_UnloadObject(void *handle)
|
||||||
#endif /* SDL_LOADSO_BEOS */
|
#endif /* SDL_LOADSO_BEOS */
|
||||||
|
|
||||||
/* vi: set ts=4 sw=4 expandtab: */
|
/* vi: set ts=4 sw=4 expandtab: */
|
||||||
|
|
||||||
|
|
|
@ -872,7 +872,8 @@ SDL_sscanf(const char *text, const char *fmt, ...)
|
||||||
++index;
|
++index;
|
||||||
}
|
}
|
||||||
if (text[index] == '0') {
|
if (text[index] == '0') {
|
||||||
if (SDL_tolower((unsigned char) text[index + 1]) == 'x') {
|
if (SDL_tolower((unsigned char) text[index + 1])
|
||||||
|
== 'x') {
|
||||||
radix = 16;
|
radix = 16;
|
||||||
} else {
|
} else {
|
||||||
radix = 8;
|
radix = 8;
|
||||||
|
|
|
@ -387,9 +387,11 @@ BlitRGBtoRGBPixelAlphaMMX(SDL_BlitInfo * info)
|
||||||
packsswb_r2r(mm6, mm3); /* 0000FFFF -> mm3 */
|
packsswb_r2r(mm6, mm3); /* 0000FFFF -> mm3 */
|
||||||
pxor_r2r(mm0, mm3); /* 0000F000 -> mm3 (~channel mask) */
|
pxor_r2r(mm0, mm3); /* 0000F000 -> mm3 (~channel mask) */
|
||||||
/* get alpha channel shift */
|
/* get alpha channel shift */
|
||||||
|
/* *INDENT-OFF* */
|
||||||
__asm__ __volatile__ (
|
__asm__ __volatile__ (
|
||||||
"movd %0, %%mm5"
|
"movd %0, %%mm5"
|
||||||
: : "rm" ((Uint32) sf->Ashift) ); /* Ashift -> mm5 */
|
: : "rm" ((Uint32) sf->Ashift) ); /* Ashift -> mm5 */
|
||||||
|
/* *INDENT-ON* */
|
||||||
|
|
||||||
while (height--) {
|
while (height--) {
|
||||||
/* *INDENT-OFF* */
|
/* *INDENT-OFF* */
|
||||||
|
|
|
@ -551,8 +551,8 @@ SDL_MapRGB(const SDL_PixelFormat * const format, const Uint8 r, const Uint8 g,
|
||||||
|
|
||||||
/* Find the pixel value corresponding to an RGBA quadruple */
|
/* Find the pixel value corresponding to an RGBA quadruple */
|
||||||
Uint32
|
Uint32
|
||||||
SDL_MapRGBA(const SDL_PixelFormat * const format, const Uint8 r, const Uint8 g,
|
SDL_MapRGBA(const SDL_PixelFormat * const format, const Uint8 r,
|
||||||
const Uint8 b, const Uint8 a)
|
const Uint8 g, const Uint8 b, const Uint8 a)
|
||||||
{
|
{
|
||||||
if (format->palette == NULL) {
|
if (format->palette == NULL) {
|
||||||
return (r >> format->Rloss) << format->Rshift
|
return (r >> format->Rloss) << format->Rshift
|
||||||
|
|
|
@ -385,7 +385,8 @@ extern "C"
|
||||||
/* still looking */
|
/* still looking */
|
||||||
}
|
}
|
||||||
if (!modes[i] || (modes[i]->w < width) || (modes[i]->h < height)) {
|
if (!modes[i] || (modes[i]->w < width) || (modes[i]->h < height)) {
|
||||||
--i; /* We went too far */
|
/* We went too far */
|
||||||
|
--i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
width = modes[i]->w;
|
width = modes[i]->w;
|
||||||
|
|
|
@ -119,7 +119,8 @@ CreateYUVSurface(_THIS, struct private_yuvhwdata *hwdata,
|
||||||
/* Need to set coop level or newer DirectFB versions will fail here. */
|
/* Need to set coop level or newer DirectFB versions will fail here. */
|
||||||
ret = layer->SetCooperativeLevel(layer, DLSCL_ADMINISTRATIVE);
|
ret = layer->SetCooperativeLevel(layer, DLSCL_ADMINISTRATIVE);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
SetDirectFBError("IDirectFBDisplayLayer::SetCooperativeLevel() failed", ret);
|
SetDirectFBError
|
||||||
|
("IDirectFBDisplayLayer::SetCooperativeLevel() failed", ret);
|
||||||
layer->Release(layer);
|
layer->Release(layer);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
|
@ -181,7 +181,8 @@ static void FB_SavePalette(_THIS, struct fb_fix_screeninfo *finfo,
|
||||||
struct fb_var_screeninfo *vinfo);
|
struct fb_var_screeninfo *vinfo);
|
||||||
static void FB_RestorePalette(_THIS);
|
static void FB_RestorePalette(_THIS);
|
||||||
|
|
||||||
static int SDL_getpagesize(void)
|
static int
|
||||||
|
SDL_getpagesize(void)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_GETPAGESIZE
|
#ifdef HAVE_GETPAGESIZE
|
||||||
return getpagesize();
|
return getpagesize();
|
||||||
|
@ -189,7 +190,8 @@ static int SDL_getpagesize(void)
|
||||||
return PAGE_SIZE;
|
return PAGE_SIZE;
|
||||||
#else
|
#else
|
||||||
#error Can not determine system page size.
|
#error Can not determine system page size.
|
||||||
return 4096; /* this is what it USED to be in Linux... */
|
/* this is what it USED to be in Linux... */
|
||||||
|
return 4096;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -812,7 +812,9 @@ GEM_SetVideoMode(_THIS, SDL_Surface * current,
|
||||||
} else {
|
} else {
|
||||||
/* Resize window to fit asked video mode */
|
/* Resize window to fit asked video mode */
|
||||||
wind_get(GEM_handle, WF_WORKXYWH, &x2, &y2, &w2, &h2);
|
wind_get(GEM_handle, WF_WORKXYWH, &x2, &y2, &w2, &h2);
|
||||||
if (wind_calc(WC_BORDER, GEM_win_type, x2,y2,width,height, &x2,&y2,&w2,&h2)) {
|
if (wind_calc
|
||||||
|
(WC_BORDER, GEM_win_type, x2, y2, width, height, &x2, &y2,
|
||||||
|
&w2, &h2)) {
|
||||||
wind_set(GEM_handle, WF_CURRXYWH, x2, y2, w2, h2);
|
wind_set(GEM_handle, WF_CURRXYWH, x2, y2, w2, h2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -167,10 +167,12 @@ SDL_X11_LoadSymbols(void)
|
||||||
X11_GetSym("XCreateIC", &SDL_X11_HAVE_UTF8, (void **) &pXCreateIC);
|
X11_GetSym("XCreateIC", &SDL_X11_HAVE_UTF8, (void **) &pXCreateIC);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (SDL_X11_HAVE_BASEXLIB) { /* all required symbols loaded. */
|
if (SDL_X11_HAVE_BASEXLIB) {
|
||||||
|
/* all required symbols loaded. */
|
||||||
SDL_ClearError();
|
SDL_ClearError();
|
||||||
} else {
|
} else {
|
||||||
SDL_X11_UnloadSymbols(); /* in case something got loaded... */
|
/* in case something got loaded... */
|
||||||
|
SDL_X11_UnloadSymbols();
|
||||||
rc = 0;
|
rc = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,7 +28,8 @@
|
||||||
#include "SDL_xbiosmodes.h"
|
#include "SDL_xbiosmodes.h"
|
||||||
|
|
||||||
|
|
||||||
typedef struct {
|
typedef struct
|
||||||
|
{
|
||||||
int width, height, bpp;
|
int width, height, bpp;
|
||||||
int modecode;
|
int modecode;
|
||||||
int doubleline;
|
int doubleline;
|
||||||
|
@ -270,17 +271,25 @@ SDL_XBIOS_InitModes(_THIS)
|
||||||
break;
|
break;
|
||||||
case MONITOR_RGB:
|
case MONITOR_RGB:
|
||||||
case MONITOR_TV:
|
case MONITOR_TV:
|
||||||
for (i=0; i<sizeof(falcon_rgb_modes)/sizeof(xbios_mode_t); i++) {
|
for (i = 0;
|
||||||
|
i < sizeof(falcon_rgb_modes) / sizeof(xbios_mode_t);
|
||||||
|
i++) {
|
||||||
SDL_XBIOS_AddMode(_this, falcon_rgb_modes[i].width,
|
SDL_XBIOS_AddMode(_this, falcon_rgb_modes[i].width,
|
||||||
falcon_rgb_modes[i].height, falcon_rgb_modes[i].bpp,
|
falcon_rgb_modes[i].height,
|
||||||
falcon_rgb_modes[i].modecode & modecodemask, SDL_FALSE);
|
falcon_rgb_modes[i].bpp,
|
||||||
|
falcon_rgb_modes[i].
|
||||||
|
modecode & modecodemask, SDL_FALSE);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case MONITOR_VGA:
|
case MONITOR_VGA:
|
||||||
for (i=0; i<sizeof(falcon_vga_modes)/sizeof(xbios_mode_t); i++) {
|
for (i = 0;
|
||||||
|
i < sizeof(falcon_vga_modes) / sizeof(xbios_mode_t);
|
||||||
|
i++) {
|
||||||
SDL_XBIOS_AddMode(_this, falcon_vga_modes[i].width,
|
SDL_XBIOS_AddMode(_this, falcon_vga_modes[i].width,
|
||||||
falcon_vga_modes[i].height, falcon_vga_modes[i].bpp,
|
falcon_vga_modes[i].height,
|
||||||
falcon_vga_modes[i].modecode & modecodemask, SDL_FALSE);
|
falcon_vga_modes[i].bpp,
|
||||||
|
falcon_vga_modes[i].
|
||||||
|
modecode & modecodemask, SDL_FALSE);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,8 @@
|
||||||
|
|
||||||
typedef int (*fntype) (const char *);
|
typedef int (*fntype) (const char *);
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
int
|
||||||
|
main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
int retval = 0;
|
int retval = 0;
|
||||||
int hello = 0;
|
int hello = 0;
|
||||||
|
@ -67,5 +68,3 @@ int main(int argc, char *argv[])
|
||||||
SDL_Quit();
|
SDL_Quit();
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue