swrast: reindent s_texfetch_temp.h, remove trailing whitespace

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Brian Paul 2014-04-05 09:53:02 -06:00
parent a19d60faef
commit d3ef6f5427
1 changed files with 261 additions and 182 deletions

View File

@ -69,7 +69,8 @@
#endif
static void FETCH(Z_UNORM32)( const struct swrast_texture_image *texImage,
static void
FETCH(Z_UNORM32)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLuint *src = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
@ -77,7 +78,8 @@ static void FETCH(Z_UNORM32)( const struct swrast_texture_image *texImage,
}
static void FETCH(Z_UNORM16)(const struct swrast_texture_image *texImage,
static void
FETCH(Z_UNORM16)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
@ -85,7 +87,8 @@ static void FETCH(Z_UNORM16)(const struct swrast_texture_image *texImage,
}
static void FETCH(RGBA_FLOAT32)( const struct swrast_texture_image *texImage,
static void
FETCH(RGBA_FLOAT32)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 4);
@ -96,7 +99,8 @@ static void FETCH(RGBA_FLOAT32)( const struct swrast_texture_image *texImage,
}
static void FETCH(RGBA_FLOAT16)( const struct swrast_texture_image *texImage,
static void
FETCH(RGBA_FLOAT16)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 4);
@ -107,7 +111,8 @@ static void FETCH(RGBA_FLOAT16)( const struct swrast_texture_image *texImage,
}
static void FETCH(RGB_FLOAT32)( const struct swrast_texture_image *texImage,
static void
FETCH(RGB_FLOAT32)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 3);
@ -118,7 +123,8 @@ static void FETCH(RGB_FLOAT32)( const struct swrast_texture_image *texImage,
}
static void FETCH(RGB_FLOAT16)( const struct swrast_texture_image *texImage,
static void
FETCH(RGB_FLOAT16)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 3);
@ -129,7 +135,8 @@ static void FETCH(RGB_FLOAT16)( const struct swrast_texture_image *texImage,
}
static void FETCH(A_FLOAT32)( const struct swrast_texture_image *texImage,
static void
FETCH(A_FLOAT32)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1);
@ -140,7 +147,8 @@ static void FETCH(A_FLOAT32)( const struct swrast_texture_image *texImage,
}
static void FETCH(A_FLOAT16)( const struct swrast_texture_image *texImage,
static void
FETCH(A_FLOAT16)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1);
@ -151,7 +159,8 @@ static void FETCH(A_FLOAT16)( const struct swrast_texture_image *texImage,
}
static void FETCH(L_FLOAT32)( const struct swrast_texture_image *texImage,
static void
FETCH(L_FLOAT32)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1);
@ -162,7 +171,8 @@ static void FETCH(L_FLOAT32)( const struct swrast_texture_image *texImage,
}
static void FETCH(L_FLOAT16)( const struct swrast_texture_image *texImage,
static void
FETCH(L_FLOAT16)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1);
@ -173,7 +183,8 @@ static void FETCH(L_FLOAT16)( const struct swrast_texture_image *texImage,
}
static void FETCH(LA_FLOAT32)( const struct swrast_texture_image *texImage,
static void
FETCH(LA_FLOAT32)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 2);
@ -184,7 +195,8 @@ static void FETCH(LA_FLOAT32)( const struct swrast_texture_image *texImage,
}
static void FETCH(LA_FLOAT16)( const struct swrast_texture_image *texImage,
static void
FETCH(LA_FLOAT16)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 2);
@ -195,7 +207,8 @@ static void FETCH(LA_FLOAT16)( const struct swrast_texture_image *texImage,
}
static void FETCH(I_FLOAT32)( const struct swrast_texture_image *texImage,
static void
FETCH(I_FLOAT32)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1);
@ -206,7 +219,8 @@ static void FETCH(I_FLOAT32)( const struct swrast_texture_image *texImage,
}
static void FETCH(I_FLOAT16)( const struct swrast_texture_image *texImage,
static void
FETCH(I_FLOAT16)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1);
@ -217,7 +231,8 @@ static void FETCH(I_FLOAT16)( const struct swrast_texture_image *texImage,
}
static void FETCH(R_FLOAT32)( const struct swrast_texture_image *texImage,
static void
FETCH(R_FLOAT32)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1);
@ -228,7 +243,8 @@ static void FETCH(R_FLOAT32)( const struct swrast_texture_image *texImage,
}
static void FETCH(R_FLOAT16)( const struct swrast_texture_image *texImage,
static void
FETCH(R_FLOAT16)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1);
@ -239,7 +255,8 @@ static void FETCH(R_FLOAT16)( const struct swrast_texture_image *texImage,
}
static void FETCH(RG_FLOAT32)( const struct swrast_texture_image *texImage,
static void
FETCH(RG_FLOAT32)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 2);
@ -250,7 +267,8 @@ static void FETCH(RG_FLOAT32)( const struct swrast_texture_image *texImage,
}
static void FETCH(RG_FLOAT16)( const struct swrast_texture_image *texImage,
static void
FETCH(RG_FLOAT16)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 2);
@ -261,7 +279,8 @@ static void FETCH(RG_FLOAT16)( const struct swrast_texture_image *texImage,
}
static void FETCH(A8B8G8R8_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(A8B8G8R8_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
@ -272,7 +291,8 @@ static void FETCH(A8B8G8R8_UNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(R8G8B8A_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(R8G8B8A_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
@ -283,7 +303,8 @@ static void FETCH(R8G8B8A_UNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(B8G8R8A8_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(B8G8R8A8_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
@ -294,7 +315,8 @@ static void FETCH(B8G8R8A8_UNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(A8R8G8B8_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(A8R8G8B8_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
@ -305,7 +327,8 @@ static void FETCH(A8R8G8B8_UNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(X8B8G8R8_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(X8B8G8R8_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
@ -316,7 +339,8 @@ static void FETCH(X8B8G8R8_UNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(R8G8B8X8_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(R8G8B8X8_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
@ -327,7 +351,8 @@ static void FETCH(R8G8B8X8_UNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(B8G8R8X8_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(B8G8R8X8_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
@ -338,7 +363,8 @@ static void FETCH(B8G8R8X8_UNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(X8R8G8B8_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(X8R8G8B8_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
@ -349,7 +375,8 @@ static void FETCH(X8R8G8B8_UNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(BGR_UNORM8)( const struct swrast_texture_image *texImage,
static void
FETCH(BGR_UNORM8)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3);
@ -360,7 +387,8 @@ static void FETCH(BGR_UNORM8)( const struct swrast_texture_image *texImage,
}
static void FETCH(RGB_UNORM8)( const struct swrast_texture_image *texImage,
static void
FETCH(RGB_UNORM8)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3);
@ -371,7 +399,8 @@ static void FETCH(RGB_UNORM8)( const struct swrast_texture_image *texImage,
}
static void FETCH(B5G6R5_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(B5G6R5_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
@ -383,7 +412,8 @@ static void FETCH(B5G6R5_UNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(R5G6B5_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(R5G6B5_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
@ -395,7 +425,8 @@ static void FETCH(R5G6B5_UNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(B4G4R4A4_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(B4G4R4A4_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
@ -407,7 +438,8 @@ static void FETCH(B4G4R4A4_UNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(A4R4G4B4_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(A4R4G4B4_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
@ -418,7 +450,8 @@ static void FETCH(A4R4G4B4_UNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(A1B5G5R5_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(A1B5G5R5_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
@ -430,7 +463,8 @@ static void FETCH(A1B5G5R5_UNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(B5G5R5A1_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(B5G5R5A1_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
@ -442,7 +476,8 @@ static void FETCH(B5G5R5A1_UNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(A1R5G5B5_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(A1R5G5B5_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
@ -454,7 +489,8 @@ static void FETCH(A1R5G5B5_UNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(B10G10R10A2_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(B10G10R10A2_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLuint *src = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
@ -466,7 +502,8 @@ static void FETCH(B10G10R10A2_UNORM)( const struct swrast_texture_image *texImag
}
static void FETCH(R8G8_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(R8G8_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
@ -477,7 +514,8 @@ static void FETCH(R8G8_UNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(G8R8_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(G8R8_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
@ -488,7 +526,8 @@ static void FETCH(G8R8_UNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(L4A4_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(L4A4_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLubyte s = *TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
@ -499,7 +538,8 @@ static void FETCH(L4A4_UNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(L8A8_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(L8A8_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
@ -510,7 +550,8 @@ static void FETCH(L8A8_UNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(R_UNORM8)(const struct swrast_texture_image *texImage,
static void
FETCH(R_UNORM8)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLubyte s = *TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
@ -521,7 +562,8 @@ static void FETCH(R_UNORM8)(const struct swrast_texture_image *texImage,
}
static void FETCH(R_UNORM16)(const struct swrast_texture_image *texImage,
static void
FETCH(R_UNORM16)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
@ -532,7 +574,8 @@ static void FETCH(R_UNORM16)(const struct swrast_texture_image *texImage,
}
static void FETCH(A8L8_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(A8L8_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
@ -543,7 +586,8 @@ static void FETCH(A8L8_UNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(R16G16_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(R16G16_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
@ -554,7 +598,8 @@ static void FETCH(R16G16_UNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(G16R16_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(G16R16_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
@ -565,7 +610,8 @@ static void FETCH(G16R16_UNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(L16A16_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(L16A16_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
@ -576,7 +622,8 @@ static void FETCH(L16A16_UNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(A16L16_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(A16L16_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
@ -587,7 +634,8 @@ static void FETCH(A16L16_UNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(B2G3R3_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(B2G3R3_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
@ -599,7 +647,8 @@ static void FETCH(B2G3R3_UNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(A_UNORM8)( const struct swrast_texture_image *texImage,
static void
FETCH(A_UNORM8)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
@ -610,7 +659,8 @@ static void FETCH(A_UNORM8)( const struct swrast_texture_image *texImage,
}
static void FETCH(A_UNORM16)( const struct swrast_texture_image *texImage,
static void
FETCH(A_UNORM16)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
@ -621,7 +671,8 @@ static void FETCH(A_UNORM16)( const struct swrast_texture_image *texImage,
}
static void FETCH(L_UNORM8)( const struct swrast_texture_image *texImage,
static void
FETCH(L_UNORM8)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
@ -632,7 +683,8 @@ static void FETCH(L_UNORM8)( const struct swrast_texture_image *texImage,
}
static void FETCH(L_UNORM16)( const struct swrast_texture_image *texImage,
static void
FETCH(L_UNORM16)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
@ -643,7 +695,8 @@ static void FETCH(L_UNORM16)( const struct swrast_texture_image *texImage,
}
static void FETCH(I_UNORM8)( const struct swrast_texture_image *texImage,
static void
FETCH(I_UNORM8)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
@ -654,7 +707,8 @@ static void FETCH(I_UNORM8)( const struct swrast_texture_image *texImage,
}
static void FETCH(I_UNORM16)( const struct swrast_texture_image *texImage,
static void
FETCH(I_UNORM16)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
@ -665,7 +719,8 @@ static void FETCH(I_UNORM16)( const struct swrast_texture_image *texImage,
}
static void FETCH(BGR_SRGB8)(const struct swrast_texture_image *texImage,
static void
FETCH(BGR_SRGB8)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3);
@ -676,7 +731,8 @@ static void FETCH(BGR_SRGB8)(const struct swrast_texture_image *texImage,
}
static void FETCH(A8B8G8R8_SRGB)(const struct swrast_texture_image *texImage,
static void
FETCH(A8B8G8R8_SRGB)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
@ -687,7 +743,8 @@ static void FETCH(A8B8G8R8_SRGB)(const struct swrast_texture_image *texImage,
}
static void FETCH(B8G8R8A8_SRGB)(const struct swrast_texture_image *texImage,
static void
FETCH(B8G8R8A8_SRGB)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
@ -698,7 +755,8 @@ static void FETCH(B8G8R8A8_SRGB)(const struct swrast_texture_image *texImage,
}
static void FETCH(R8G8B8A8_SRGB)(const struct swrast_texture_image *texImage,
static void
FETCH(R8G8B8A8_SRGB)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
@ -709,7 +767,8 @@ static void FETCH(R8G8B8A8_SRGB)(const struct swrast_texture_image *texImage,
}
static void FETCH(R8G8B8X8_SRGB)(const struct swrast_texture_image *texImage,
static void
FETCH(R8G8B8X8_SRGB)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
@ -720,7 +779,8 @@ static void FETCH(R8G8B8X8_SRGB)(const struct swrast_texture_image *texImage,
}
static void FETCH(L_SRGB8)(const struct swrast_texture_image *texImage,
static void
FETCH(L_SRGB8)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
@ -731,7 +791,8 @@ static void FETCH(L_SRGB8)(const struct swrast_texture_image *texImage,
}
static void FETCH(L8A8_SRGB)(const struct swrast_texture_image *texImage,
static void
FETCH(L8A8_SRGB)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 2);
@ -818,7 +879,8 @@ FETCH(rgba_uint32)(const struct swrast_texture_image *texImage,
* This format by definition produces 0,0,0,1 as rgba values,
* however we'll return the dudv values as rg and fix up elsewhere.
*/
static void FETCH(DUDV8)(const struct swrast_texture_image *texImage,
static void
FETCH(DUDV8)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLbyte *src = TEXEL_ADDR(GLbyte, texImage, i, j, k, 2);
@ -829,7 +891,8 @@ static void FETCH(DUDV8)(const struct swrast_texture_image *texImage,
}
static void FETCH(R_SNORM8)( const struct swrast_texture_image *texImage,
static void
FETCH(R_SNORM8)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLbyte s = *TEXEL_ADDR(GLbyte, texImage, i, j, k, 1);
@ -840,7 +903,8 @@ static void FETCH(R_SNORM8)( const struct swrast_texture_image *texImage,
}
static void FETCH(A_SNORM8)( const struct swrast_texture_image *texImage,
static void
FETCH(A_SNORM8)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLbyte s = *TEXEL_ADDR(GLbyte, texImage, i, j, k, 1);
@ -851,7 +915,8 @@ static void FETCH(A_SNORM8)( const struct swrast_texture_image *texImage,
}
static void FETCH(L_SNORM8)( const struct swrast_texture_image *texImage,
static void
FETCH(L_SNORM8)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLbyte s = *TEXEL_ADDR(GLbyte, texImage, i, j, k, 1);
@ -862,7 +927,8 @@ static void FETCH(L_SNORM8)( const struct swrast_texture_image *texImage,
}
static void FETCH(I_SNORM8)( const struct swrast_texture_image *texImage,
static void
FETCH(I_SNORM8)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLbyte s = *TEXEL_ADDR(GLbyte, texImage, i, j, k, 1);
@ -873,7 +939,8 @@ static void FETCH(I_SNORM8)( const struct swrast_texture_image *texImage,
}
static void FETCH(R8G8_SNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(R8G8_SNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLushort s = *TEXEL_ADDR(GLshort, texImage, i, j, k, 1);
@ -884,7 +951,8 @@ static void FETCH(R8G8_SNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(L8A8_SNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(L8A8_SNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLushort s = *TEXEL_ADDR(GLshort, texImage, i, j, k, 1);
@ -895,7 +963,8 @@ static void FETCH(L8A8_SNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(X8B8G8R8_SNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(X8B8G8R8_SNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
@ -906,7 +975,8 @@ static void FETCH(X8B8G8R8_SNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(A8B8G8R8_SNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(A8B8G8R8_SNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
@ -917,7 +987,8 @@ static void FETCH(A8B8G8R8_SNORM)( const struct swrast_texture_image *texImage,
}
static void FETCH(R8G8B8A8_SNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(R8G8B8A8_SNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
@ -1001,6 +1072,7 @@ FETCH(LA_SNORM16)(const struct swrast_texture_image *texImage,
static void
FETCH(RGB_SNORM16)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
@ -1075,7 +1147,8 @@ FETCH(RGBX_FLOAT32)(const struct swrast_texture_image *texImage,
/**
* Fetch texel from 1D, 2D or 3D ycbcr texture, returning RGBA.
*/
static void FETCH(YCBCR)( const struct swrast_texture_image *texImage,
static void
FETCH(YCBCR)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLushort *src0 = TEXEL_ADDR(GLushort, texImage, (i & ~1), j, k, 1); /* even */
@ -1101,7 +1174,8 @@ static void FETCH(YCBCR)( const struct swrast_texture_image *texImage,
/**
* Fetch texel from 1D, 2D or 3D ycbcr texture, returning RGBA.
*/
static void FETCH(YCBCR_REV)( const struct swrast_texture_image *texImage,
static void
FETCH(YCBCR_REV)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLushort *src0 = TEXEL_ADDR(GLushort, texImage, (i & ~1), j, k, 1); /* even */
@ -1124,7 +1198,8 @@ static void FETCH(YCBCR_REV)( const struct swrast_texture_image *texImage,
}
static void FETCH(S8_UINT_Z24_UNORM)( const struct swrast_texture_image *texImage,
static void
FETCH(S8_UINT_Z24_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
/* only return Z, not stencil data */
@ -1138,7 +1213,8 @@ static void FETCH(S8_UINT_Z24_UNORM)( const struct swrast_texture_image *texImag
}
static void FETCH(Z24_UNORM_S8_UINT)( const struct swrast_texture_image *texImage,
static void
FETCH(Z24_UNORM_S8_UINT)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
/* only return Z, not stencil data */
@ -1152,7 +1228,8 @@ static void FETCH(Z24_UNORM_S8_UINT)( const struct swrast_texture_image *texImag
}
static void FETCH(R9G9B9E5_FLOAT)( const struct swrast_texture_image *texImage,
static void
FETCH(R9G9B9E5_FLOAT)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLuint *src = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
@ -1161,7 +1238,8 @@ static void FETCH(R9G9B9E5_FLOAT)( const struct swrast_texture_image *texImage,
}
static void FETCH(R11G11B10_FLOAT)( const struct swrast_texture_image *texImage,
static void
FETCH(R11G11B10_FLOAT)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLuint *src = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
@ -1170,7 +1248,8 @@ static void FETCH(R11G11B10_FLOAT)( const struct swrast_texture_image *texImage,
}
static void FETCH(Z32_FLOAT_S8X24_UINT)(const struct swrast_texture_image *texImage,
static void
FETCH(Z32_FLOAT_S8X24_UINT)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 2);