mirror of
https://github.com/encounter/SDL.git
synced 2025-12-10 22:17:59 +00:00
OCD fixes: Adds a space after /* (glory to regular expressions!)
This commit is contained in:
@@ -958,10 +958,10 @@ SDL_SW_SetupYUVDisplay(SDL_SW_YUVTexture * swdata, Uint32 target_format)
|
||||
if (SDL_HasMMX() && (Rmask == 0xF800) &&
|
||||
(Gmask == 0x07E0) && (Bmask == 0x001F)
|
||||
&& (swdata->w & 15) == 0) {
|
||||
/*printf("Using MMX 16-bit 565 dither\n"); */
|
||||
/* printf("Using MMX 16-bit 565 dither\n"); */
|
||||
swdata->Display1X = Color565DitherYV12MMX1X;
|
||||
} else {
|
||||
/*printf("Using C 16-bit dither\n"); */
|
||||
/* printf("Using C 16-bit dither\n"); */
|
||||
swdata->Display1X = Color16DitherYV12Mod1X;
|
||||
}
|
||||
#else
|
||||
@@ -979,10 +979,10 @@ SDL_SW_SetupYUVDisplay(SDL_SW_YUVTexture * swdata, Uint32 target_format)
|
||||
if (SDL_HasMMX() && (Rmask == 0x00FF0000) &&
|
||||
(Gmask == 0x0000FF00) &&
|
||||
(Bmask == 0x000000FF) && (swdata->w & 15) == 0) {
|
||||
/*printf("Using MMX 32-bit dither\n"); */
|
||||
/* printf("Using MMX 32-bit dither\n"); */
|
||||
swdata->Display1X = ColorRGBDitherYV12MMX1X;
|
||||
} else {
|
||||
/*printf("Using C 32-bit dither\n"); */
|
||||
/* printf("Using C 32-bit dither\n"); */
|
||||
swdata->Display1X = Color32DitherYV12Mod1X;
|
||||
}
|
||||
#else
|
||||
|
||||
@@ -874,7 +874,7 @@ GetScaleQuality(void)
|
||||
|
||||
if (!hint || *hint == '0' || SDL_strcasecmp(hint, "nearest") == 0) {
|
||||
return D3DTEXF_POINT;
|
||||
} else /*if (*hint == '1' || SDL_strcasecmp(hint, "linear") == 0) */ {
|
||||
} else /* if (*hint == '1' || SDL_strcasecmp(hint, "linear") == 0) */ {
|
||||
return D3DTEXF_LINEAR;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -310,7 +310,7 @@ GL_ResetState(SDL_Renderer *renderer)
|
||||
data->glDisable(GL_DEPTH_TEST);
|
||||
data->glDisable(GL_CULL_FACE);
|
||||
/* This ended up causing video discrepancies between OpenGL and Direct3D */
|
||||
/*data->glEnable(GL_LINE_SMOOTH); */
|
||||
/* data->glEnable(GL_LINE_SMOOTH); */
|
||||
|
||||
data->glMatrixMode(GL_MODELVIEW);
|
||||
data->glLoadIdentity();
|
||||
@@ -638,7 +638,7 @@ GL_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
|
||||
return -1;
|
||||
}
|
||||
if ((renderdata->GL_ARB_texture_rectangle_supported)
|
||||
/*&& texture->access != SDL_TEXTUREACCESS_TARGET */){
|
||||
/* && texture->access != SDL_TEXTUREACCESS_TARGET */){
|
||||
data->type = GL_TEXTURE_RECTANGLE_ARB;
|
||||
texture_w = texture->w;
|
||||
texture_h = texture->h;
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
|
||||
/* OpenGL shader implementation */
|
||||
|
||||
/*#define DEBUG_SHADERS */
|
||||
/* #define DEBUG_SHADERS */
|
||||
|
||||
typedef struct
|
||||
{
|
||||
|
||||
@@ -42,7 +42,7 @@ Andreas Schiffler -- aschiffler at ferzkopp dot net
|
||||
|
||||
/* ---- Internally used structures */
|
||||
|
||||
/*!
|
||||
/* !
|
||||
\brief A 32 bit RGBA pixel.
|
||||
*/
|
||||
typedef struct tColorRGBA {
|
||||
@@ -52,19 +52,19 @@ typedef struct tColorRGBA {
|
||||
Uint8 a;
|
||||
} tColorRGBA;
|
||||
|
||||
/*!
|
||||
/* !
|
||||
\brief A 8bit Y/palette pixel.
|
||||
*/
|
||||
typedef struct tColorY {
|
||||
Uint8 y;
|
||||
} tColorY;
|
||||
|
||||
/*!
|
||||
/* !
|
||||
\brief Returns maximum of two numbers a and b.
|
||||
*/
|
||||
#define MAX(a,b) (((a) > (b)) ? (a) : (b))
|
||||
|
||||
/*!
|
||||
/* !
|
||||
\brief Number of guard rows added to destination surfaces.
|
||||
|
||||
This is a simple but effective workaround for observed issues.
|
||||
@@ -76,12 +76,12 @@ to a situation where the program can segfault.
|
||||
*/
|
||||
#define GUARD_ROWS (2)
|
||||
|
||||
/*!
|
||||
/* !
|
||||
\brief Lower limit of absolute zoom factor or rotation degrees.
|
||||
*/
|
||||
#define VALUE_LIMIT 0.001
|
||||
|
||||
/*!
|
||||
/* !
|
||||
\brief Returns colorkey info for a surface
|
||||
*/
|
||||
Uint32 _colorkey(SDL_Surface *src)
|
||||
@@ -92,7 +92,7 @@ Uint32 _colorkey(SDL_Surface *src)
|
||||
}
|
||||
|
||||
|
||||
/*!
|
||||
/* !
|
||||
\brief Internal target surface sizing function for rotations with trig result return.
|
||||
|
||||
\param width The source surface width.
|
||||
@@ -134,7 +134,7 @@ void _rotozoomSurfaceSizeTrig(int width, int height, double angle,
|
||||
}
|
||||
|
||||
|
||||
/*!
|
||||
/* !
|
||||
\brief Internal 32 bit rotozoomer with optional anti-aliasing.
|
||||
|
||||
Rotates and zooms 32 bit RGBA/ABGR 'src' surface to 'dst' surface based on the control
|
||||
@@ -252,7 +252,7 @@ void _transformSurfaceRGBA(SDL_Surface * src, SDL_Surface * dst, int cx, int cy,
|
||||
}
|
||||
}
|
||||
|
||||
/*!
|
||||
/* !
|
||||
|
||||
\brief Rotates and zooms 8 bit palette/Y 'src' surface to 'dst' surface without smoothing.
|
||||
|
||||
@@ -317,7 +317,7 @@ void transformSurfaceY(SDL_Surface * src, SDL_Surface * dst, int cx, int cy, int
|
||||
|
||||
|
||||
|
||||
/*!
|
||||
/* !
|
||||
\brief Rotates and zooms a surface with different horizontal and vertival scaling factors and optional anti-aliasing.
|
||||
|
||||
Rotates a 32bit or 8bit 'src' surface to newly created 'dst' surface.
|
||||
@@ -357,7 +357,7 @@ SDL_Surface *_rotateSurface(SDL_Surface * src, double angle, int centerx, int ce
|
||||
if (src == NULL)
|
||||
return (NULL);
|
||||
|
||||
if (src->flags & SDL_TRUE/*SDL_SRCCOLORKEY */)
|
||||
if (src->flags & SDL_TRUE/* SDL_SRCCOLORKEY */)
|
||||
{
|
||||
colorkey = _colorkey(src);
|
||||
SDL_GetRGB(colorkey, src->format, &r, &g, &b);
|
||||
@@ -391,14 +391,14 @@ SDL_Surface *_rotateSurface(SDL_Surface * src, double angle, int centerx, int ce
|
||||
SDL_BlitSurface(src, NULL, rz_src, NULL);
|
||||
|
||||
if(colorKeyAvailable)
|
||||
SDL_SetColorKey(src, SDL_TRUE /*SDL_SRCCOLORKEY */, colorkey);
|
||||
SDL_SetColorKey(src, SDL_TRUE /* SDL_SRCCOLORKEY */, colorkey);
|
||||
src_converted = 1;
|
||||
is32bit = 1;
|
||||
}
|
||||
|
||||
|
||||
/* Determine target size */
|
||||
/*_rotozoomSurfaceSizeTrig(rz_src->w, rz_src->h, angle, &dstwidth, &dstheight, &cangle, &sangle); */
|
||||
/* _rotozoomSurfaceSizeTrig(rz_src->w, rz_src->h, angle, &dstwidth, &dstheight, &cangle, &sangle); */
|
||||
|
||||
/*
|
||||
* Calculate target factors from sin/cos and zoom
|
||||
@@ -459,8 +459,8 @@ SDL_Surface *_rotateSurface(SDL_Surface * src, double angle, int centerx, int ce
|
||||
/*
|
||||
* Turn on source-alpha support
|
||||
*/
|
||||
/*SDL_SetAlpha(rz_dst, SDL_SRCALPHA, 255); */
|
||||
SDL_SetColorKey(rz_dst, /*SDL_SRCCOLORKEY */ SDL_TRUE | SDL_RLEACCEL, _colorkey(rz_src));
|
||||
/* SDL_SetAlpha(rz_dst, SDL_SRCALPHA, 255); */
|
||||
SDL_SetColorKey(rz_dst, /* SDL_SRCCOLORKEY */ SDL_TRUE | SDL_RLEACCEL, _colorkey(rz_src));
|
||||
} else {
|
||||
/*
|
||||
* Copy palette and colorkey info
|
||||
@@ -475,7 +475,7 @@ SDL_Surface *_rotateSurface(SDL_Surface * src, double angle, int centerx, int ce
|
||||
transformSurfaceY(rz_src, rz_dst, centerx, centery,
|
||||
(int) (sangleinv), (int) (cangleinv),
|
||||
flipx, flipy);
|
||||
SDL_SetColorKey(rz_dst, /*SDL_SRCCOLORKEY */ SDL_TRUE | SDL_RLEACCEL, _colorkey(rz_src));
|
||||
SDL_SetColorKey(rz_dst, /* SDL_SRCCOLORKEY */ SDL_TRUE | SDL_RLEACCEL, _colorkey(rz_src));
|
||||
}
|
||||
/*
|
||||
* Unlock source surface
|
||||
|
||||
Reference in New Issue
Block a user