KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

swrast: rename texture fetch functions (pt. 6) 

sed commands:
s/rgb9_e5/R9G9B9E5_FLOAT/g
s/r11_g11_b10f/R11G11B10_FLOAT/g
s/f_alpha_f16/A_FLOAT16/g
s/f_alpha_f32/A_FLOAT32/g
s/f_luminance_f16/L_FLOAT16/g
s/f_luminance_f32/L_FLOAT32/g
s/f_luminance_alpha_f16/LA_FLOAT16/g
s/f_luminance_alpha_f32/LA_FLOAT32/g
s/f_intensity_f16/I_FLOAT16/g
s/f_intensity_f32/I_FLOAT32/g
s/f_r_f16/R_FLOAT16/g
s/f_r_f32/R_FLOAT32/g
s/f_rg_f16/RG_FLOAT16/g
s/f_rg_f32/RG_FLOAT32/g
s/f_rgb_f16/RGB_FLOAT16/g
s/f_rgb_f32/RGB_FLOAT32/g
s/f_rgba_f16/RGBA_FLOAT16/g
s/f_rgba_f32/RGBA_FLOAT32/g
s/xbgr16161616_float/RGBX_FLOAT16/g
s/xbgr32323232_float/RGBX_FLOAT32/g

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Brian Paul 2014-04-05 09:53:01 -06:00
parent 9eb45114fd
commit d41fe0aec2
2 changed files with 83 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
src/mesa/swrast/s_texfetch.c
View File

@ -649,15 +649,15 @@ texfetch_funcs[] =
/* Packed float formats */
{
MESA_FORMAT_R9G9B9E5_FLOAT,
fetch_texel_1d_rgb9_e5,
fetch_texel_2d_rgb9_e5,
fetch_texel_3d_rgb9_e5
fetch_texel_1d_R9G9B9E5_FLOAT,
fetch_texel_2d_R9G9B9E5_FLOAT,
fetch_texel_3d_R9G9B9E5_FLOAT
},
{
MESA_FORMAT_R11G11B10_FLOAT,
fetch_texel_1d_r11_g11_b10f,
fetch_texel_2d_r11_g11_b10f,
fetch_texel_3d_r11_g11_b10f
fetch_texel_1d_R11G11B10_FLOAT,
fetch_texel_2d_R11G11B10_FLOAT,
fetch_texel_3d_R11G11B10_FLOAT
},
{
MESA_FORMAT_Z32_FLOAT_S8X24_UINT,
@ -669,117 +669,117 @@ texfetch_funcs[] =
/* Array float formats */
{
MESA_FORMAT_A_FLOAT16,
fetch_texel_1d_f_alpha_f16,
fetch_texel_2d_f_alpha_f16,
fetch_texel_3d_f_alpha_f16
fetch_texel_1d_A_FLOAT16,
fetch_texel_2d_A_FLOAT16,
fetch_texel_3d_A_FLOAT16
},
{
MESA_FORMAT_A_FLOAT32,
fetch_texel_1d_f_alpha_f32,
fetch_texel_2d_f_alpha_f32,
fetch_texel_3d_f_alpha_f32
fetch_texel_1d_A_FLOAT32,
fetch_texel_2d_A_FLOAT32,
fetch_texel_3d_A_FLOAT32
},
{
MESA_FORMAT_L_FLOAT16,
fetch_texel_1d_f_luminance_f16,
fetch_texel_2d_f_luminance_f16,
fetch_texel_3d_f_luminance_f16
fetch_texel_1d_L_FLOAT16,
fetch_texel_2d_L_FLOAT16,
fetch_texel_3d_L_FLOAT16
},
{
MESA_FORMAT_L_FLOAT32,
fetch_texel_1d_f_luminance_f32,
fetch_texel_2d_f_luminance_f32,
fetch_texel_3d_f_luminance_f32
fetch_texel_1d_L_FLOAT32,
fetch_texel_2d_L_FLOAT32,
fetch_texel_3d_L_FLOAT32
},
{
MESA_FORMAT_LA_FLOAT16,
fetch_texel_1d_f_luminance_alpha_f16,
fetch_texel_2d_f_luminance_alpha_f16,
fetch_texel_3d_f_luminance_alpha_f16
fetch_texel_1d_LA_FLOAT16,
fetch_texel_2d_LA_FLOAT16,
fetch_texel_3d_LA_FLOAT16
},
{
MESA_FORMAT_LA_FLOAT32,
fetch_texel_1d_f_luminance_alpha_f32,
fetch_texel_2d_f_luminance_alpha_f32,
fetch_texel_3d_f_luminance_alpha_f32
fetch_texel_1d_LA_FLOAT32,
fetch_texel_2d_LA_FLOAT32,
fetch_texel_3d_LA_FLOAT32
},
{
MESA_FORMAT_I_FLOAT16,
fetch_texel_1d_f_intensity_f16,
fetch_texel_2d_f_intensity_f16,
fetch_texel_3d_f_intensity_f16
fetch_texel_1d_I_FLOAT16,
fetch_texel_2d_I_FLOAT16,
fetch_texel_3d_I_FLOAT16
},
{
MESA_FORMAT_I_FLOAT32,
fetch_texel_1d_f_intensity_f32,
fetch_texel_2d_f_intensity_f32,
fetch_texel_3d_f_intensity_f32
fetch_texel_1d_I_FLOAT32,
fetch_texel_2d_I_FLOAT32,
fetch_texel_3d_I_FLOAT32
},
{
MESA_FORMAT_R_FLOAT16,
fetch_texel_1d_f_r_f16,
fetch_texel_2d_f_r_f16,
fetch_texel_3d_f_r_f16
fetch_texel_1d_R_FLOAT16,
fetch_texel_2d_R_FLOAT16,
fetch_texel_3d_R_FLOAT16
},
{
MESA_FORMAT_R_FLOAT32,
fetch_texel_1d_f_r_f32,
fetch_texel_2d_f_r_f32,
fetch_texel_3d_f_r_f32
fetch_texel_1d_R_FLOAT32,
fetch_texel_2d_R_FLOAT32,
fetch_texel_3d_R_FLOAT32
},
{
MESA_FORMAT_RG_FLOAT16,
fetch_texel_1d_f_rg_f16,
fetch_texel_2d_f_rg_f16,
fetch_texel_3d_f_rg_f16
fetch_texel_1d_RG_FLOAT16,
fetch_texel_2d_RG_FLOAT16,
fetch_texel_3d_RG_FLOAT16
},
{
MESA_FORMAT_RG_FLOAT32,
fetch_texel_1d_f_rg_f32,
fetch_texel_2d_f_rg_f32,
fetch_texel_3d_f_rg_f32
fetch_texel_1d_RG_FLOAT32,
fetch_texel_2d_RG_FLOAT32,
fetch_texel_3d_RG_FLOAT32
},
{
MESA_FORMAT_RGB_FLOAT16,
fetch_texel_1d_f_rgb_f16,
fetch_texel_2d_f_rgb_f16,
fetch_texel_3d_f_rgb_f16
fetch_texel_1d_RGB_FLOAT16,
fetch_texel_2d_RGB_FLOAT16,
fetch_texel_3d_RGB_FLOAT16
},
{
MESA_FORMAT_RGB_FLOAT32,
fetch_texel_1d_f_rgb_f32,
fetch_texel_2d_f_rgb_f32,
fetch_texel_3d_f_rgb_f32
fetch_texel_1d_RGB_FLOAT32,
fetch_texel_2d_RGB_FLOAT32,
fetch_texel_3d_RGB_FLOAT32
},
{
MESA_FORMAT_RGBA_FLOAT16,
fetch_texel_1d_f_rgba_f16,
fetch_texel_2d_f_rgba_f16,
fetch_texel_3d_f_rgba_f16
fetch_texel_1d_RGBA_FLOAT16,
fetch_texel_2d_RGBA_FLOAT16,
fetch_texel_3d_RGBA_FLOAT16
},
{
MESA_FORMAT_RGBA_FLOAT32,
fetch_texel_1d_f_rgba_f32,
fetch_texel_2d_f_rgba_f32,
fetch_texel_3d_f_rgba_f32
fetch_texel_1d_RGBA_FLOAT32,
fetch_texel_2d_RGBA_FLOAT32,
fetch_texel_3d_RGBA_FLOAT32
},
{
MESA_FORMAT_RGBX_FLOAT16,
fetch_texel_1d_xbgr16161616_float,
fetch_texel_2d_xbgr16161616_float,
fetch_texel_3d_xbgr16161616_float
fetch_texel_1d_RGBX_FLOAT16,
fetch_texel_2d_RGBX_FLOAT16,
fetch_texel_3d_RGBX_FLOAT16
},
{
MESA_FORMAT_RGBX_FLOAT32,
fetch_texel_1d_xbgr32323232_float,
fetch_texel_2d_xbgr32323232_float,
fetch_texel_3d_xbgr32323232_float
fetch_texel_1d_RGBX_FLOAT32,
fetch_texel_2d_RGBX_FLOAT32,
fetch_texel_3d_RGBX_FLOAT32
},
{
MESA_FORMAT_Z_FLOAT32,
fetch_texel_1d_f_r_f32, /* Reuse the R32F functions. */
fetch_texel_2d_f_r_f32,
fetch_texel_3d_f_r_f32
fetch_texel_1d_R_FLOAT32, /* Reuse the R32F functions. */
fetch_texel_2d_R_FLOAT32,
fetch_texel_3d_R_FLOAT32
},
/* Packed signed/unsigned non-normalized integer formats */

40
src/mesa/swrast/s_texfetch_tmp.h
View File

@ -102,7 +102,7 @@ static void FETCH(f_z16)(const struct swrast_texture_image *texImage,
/* Fetch texel from 1D, 2D or 3D RGBA_FLOAT32 texture, returning 4 GLfloats.
*/
static void FETCH(f_rgba_f32)( 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);
@ -120,7 +120,7 @@ static void FETCH(f_rgba_f32)( const struct swrast_texture_image *texImage,
/* Fetch texel from 1D, 2D or 3D RGBA_FLOAT16 texture,
* returning 4 GLfloats.
*/
static void FETCH(f_rgba_f16)( 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);
@ -137,7 +137,7 @@ static void FETCH(f_rgba_f16)( const struct swrast_texture_image *texImage,
/* Fetch texel from 1D, 2D or 3D RGB_FLOAT32 texture,
* returning 4 GLfloats.
*/
static void FETCH(f_rgb_f32)( 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);
@ -155,7 +155,7 @@ static void FETCH(f_rgb_f32)( const struct swrast_texture_image *texImage,
/* Fetch texel from 1D, 2D or 3D RGB_FLOAT16 texture,
* returning 4 GLfloats.
*/
static void FETCH(f_rgb_f16)( 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);
@ -173,7 +173,7 @@ static void FETCH(f_rgb_f16)( const struct swrast_texture_image *texImage,
/* Fetch texel from 1D, 2D or 3D ALPHA_FLOAT32 texture,
* returning 4 GLfloats.
*/
static void FETCH(f_alpha_f32)( 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);
@ -191,7 +191,7 @@ static void FETCH(f_alpha_f32)( const struct swrast_texture_image *texImage,
/* Fetch texel from 1D, 2D or 3D ALPHA_FLOAT16 texture,
* returning 4 GLfloats.
*/
static void FETCH(f_alpha_f16)( 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);
@ -209,7 +209,7 @@ static void FETCH(f_alpha_f16)( const struct swrast_texture_image *texImage,
/* Fetch texel from 1D, 2D or 3D LUMINANCE_FLOAT32 texture,
* returning 4 GLfloats.
*/
static void FETCH(f_luminance_f32)( 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);
@ -227,7 +227,7 @@ static void FETCH(f_luminance_f32)( const struct swrast_texture_image *texImage,
/* Fetch texel from 1D, 2D or 3D LUMINANCE_FLOAT16 texture,
* returning 4 GLfloats.
*/
static void FETCH(f_luminance_f16)( 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);
@ -245,7 +245,7 @@ static void FETCH(f_luminance_f16)( const struct swrast_texture_image *texImage,
/* Fetch texel from 1D, 2D or 3D LUMINANCE_ALPHA_FLOAT32 texture,
* returning 4 GLfloats.
*/
static void FETCH(f_luminance_alpha_f32)( 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);
@ -263,7 +263,7 @@ static void FETCH(f_luminance_alpha_f32)( const struct swrast_texture_image *tex
/* Fetch texel from 1D, 2D or 3D LUMINANCE_ALPHA_FLOAT16 texture,
* returning 4 GLfloats.
*/
static void FETCH(f_luminance_alpha_f16)( 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);
@ -281,7 +281,7 @@ static void FETCH(f_luminance_alpha_f16)( const struct swrast_texture_image *tex
/* Fetch texel from 1D, 2D or 3D INTENSITY_FLOAT32 texture,
* returning 4 GLfloats.
*/
static void FETCH(f_intensity_f32)( 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);
@ -299,7 +299,7 @@ static void FETCH(f_intensity_f32)( const struct swrast_texture_image *texImage,
/* Fetch texel from 1D, 2D or 3D INTENSITY_FLOAT16 texture,
* returning 4 GLfloats.
*/
static void FETCH(f_intensity_f16)( 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);
@ -317,7 +317,7 @@ static void FETCH(f_intensity_f16)( const struct swrast_texture_image *texImage,
/* Fetch texel from 1D, 2D or 3D R_FLOAT32 texture,
* returning 4 GLfloats.
*/
static void FETCH(f_r_f32)( 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);
@ -335,7 +335,7 @@ static void FETCH(f_r_f32)( const struct swrast_texture_image *texImage,
/* Fetch texel from 1D, 2D or 3D R_FLOAT16 texture,
* returning 4 GLfloats.
*/
static void FETCH(f_r_f16)( 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);
@ -353,7 +353,7 @@ static void FETCH(f_r_f16)( const struct swrast_texture_image *texImage,
/* Fetch texel from 1D, 2D or 3D RG_FLOAT32 texture,
* returning 4 GLfloats.
*/
static void FETCH(f_rg_f32)( 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);
@ -371,7 +371,7 @@ static void FETCH(f_rg_f32)( const struct swrast_texture_image *texImage,
/* Fetch texel from 1D, 2D or 3D RG_FLOAT16 texture,
* returning 4 GLfloats.
*/
static void FETCH(f_rg_f16)( 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);
@ -1468,7 +1468,7 @@ FETCH(RGBX_UNORM16)(const struct swrast_texture_image *texImage,
}
static void
FETCH(xbgr16161616_float)(const struct swrast_texture_image *texImage,
FETCH(RGBX_FLOAT16)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLhalfARB *s = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 4);
@ -1479,7 +1479,7 @@ FETCH(xbgr16161616_float)(const struct swrast_texture_image *texImage,
}
static void
FETCH(xbgr32323232_float)(const struct swrast_texture_image *texImage,
FETCH(RGBX_FLOAT32)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{
const GLfloat *s = TEXEL_ADDR(GLfloat, texImage, i, j, k, 4);
@ -1591,7 +1591,7 @@ static void FETCH(f_s8_z24)( const struct swrast_texture_image *texImage,
/* MESA_FORMAT_RGB9_E5 ******************************************************/
static void FETCH(rgb9_e5)( 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);
@ -1604,7 +1604,7 @@ static void FETCH(rgb9_e5)( const struct swrast_texture_image *texImage,
/* MESA_FORMAT_R11G11B10_FLOAT *********************************************/
static void FETCH(r11_g11_b10f)( 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);