From faa8a8e8b2e71367ed747cf18697b3733b84557b Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 5 Apr 2014 09:53:01 -0600 Subject: [PATCH] swrast: rename texture fetch functions (pt. 4) sed commands: s/signed_rg1616/R16G16_SNORM/g s/signed_rg88_rev/R8G8_SNORM/g s/signed_al88/L8A8_SNORM/g s/signed_a8/A_SNORM8/g s/signed_a16/A_SNORM16/g s/signed_l8/L_SNORM8/g s/signed_l16/L_SNORM16/g s/signed_i8/I_SNORM8/g s/signed_i16/I_SNORM16/g s/signed_r8/R_SNORM8/g s/signed_r16/R_SNORM16/g s/signed_al1616/LA_SNORM16/g s/signed_rgb_16/RGB_SNORM16/g s/signed_rgba_16/RGBA_SNORM16/g Reviewed-by: Ian Romanick --- src/mesa/swrast/s_texfetch.c | 84 ++++++++++++++++---------------- src/mesa/swrast/s_texfetch_tmp.h | 28 +++++------ 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c index 173c0f9a375..cecdd5e3d01 100644 --- a/src/mesa/swrast/s_texfetch.c +++ b/src/mesa/swrast/s_texfetch.c @@ -491,9 +491,9 @@ texfetch_funcs[] = }, { MESA_FORMAT_R16G16_SNORM, - fetch_texel_1d_signed_rg1616, - fetch_texel_2d_signed_rg1616, - fetch_texel_3d_signed_rg1616 + fetch_texel_1d_R16G16_SNORM, + fetch_texel_2d_R16G16_SNORM, + fetch_texel_3d_R16G16_SNORM }, { MESA_FORMAT_G16R16_SNORM, @@ -503,9 +503,9 @@ texfetch_funcs[] = }, { MESA_FORMAT_R8G8_SNORM, - fetch_texel_1d_signed_rg88_rev, - fetch_texel_2d_signed_rg88_rev, - fetch_texel_3d_signed_rg88_rev + fetch_texel_1d_R8G8_SNORM, + fetch_texel_2d_R8G8_SNORM, + fetch_texel_3d_R8G8_SNORM }, { MESA_FORMAT_G8R8_SNORM, @@ -515,77 +515,77 @@ texfetch_funcs[] = }, { MESA_FORMAT_L8A8_SNORM, - fetch_texel_1d_signed_al88, - fetch_texel_2d_signed_al88, - fetch_texel_3d_signed_al88 + fetch_texel_1d_L8A8_SNORM, + fetch_texel_2d_L8A8_SNORM, + fetch_texel_3d_L8A8_SNORM }, /* Array signed/normalized formats */ { MESA_FORMAT_A_SNORM8, - fetch_texel_1d_signed_a8, - fetch_texel_2d_signed_a8, - fetch_texel_3d_signed_a8 + fetch_texel_1d_A_SNORM8, + fetch_texel_2d_A_SNORM8, + fetch_texel_3d_A_SNORM8 }, { MESA_FORMAT_A_SNORM16, - fetch_texel_1d_signed_a16, - fetch_texel_2d_signed_a16, - fetch_texel_3d_signed_a16 + fetch_texel_1d_A_SNORM16, + fetch_texel_2d_A_SNORM16, + fetch_texel_3d_A_SNORM16 }, { MESA_FORMAT_L_SNORM8, - fetch_texel_1d_signed_l8, - fetch_texel_2d_signed_l8, - fetch_texel_3d_signed_l8 + fetch_texel_1d_L_SNORM8, + fetch_texel_2d_L_SNORM8, + fetch_texel_3d_L_SNORM8 }, { MESA_FORMAT_L_SNORM16, - fetch_texel_1d_signed_l16, - fetch_texel_2d_signed_l16, - fetch_texel_3d_signed_l16 + fetch_texel_1d_L_SNORM16, + fetch_texel_2d_L_SNORM16, + fetch_texel_3d_L_SNORM16 }, { MESA_FORMAT_I_SNORM8, - fetch_texel_1d_signed_i8, - fetch_texel_2d_signed_i8, - fetch_texel_3d_signed_i8 + fetch_texel_1d_I_SNORM8, + fetch_texel_2d_I_SNORM8, + fetch_texel_3d_I_SNORM8 }, { MESA_FORMAT_I_SNORM16, - fetch_texel_1d_signed_i16, - fetch_texel_2d_signed_i16, - fetch_texel_3d_signed_i16 + fetch_texel_1d_I_SNORM16, + fetch_texel_2d_I_SNORM16, + fetch_texel_3d_I_SNORM16 }, { MESA_FORMAT_R_SNORM8, - fetch_texel_1d_signed_r8, - fetch_texel_2d_signed_r8, - fetch_texel_3d_signed_r8 + fetch_texel_1d_R_SNORM8, + fetch_texel_2d_R_SNORM8, + fetch_texel_3d_R_SNORM8 }, { MESA_FORMAT_R_SNORM16, - fetch_texel_1d_signed_r16, - fetch_texel_2d_signed_r16, - fetch_texel_3d_signed_r16 + fetch_texel_1d_R_SNORM16, + fetch_texel_2d_R_SNORM16, + fetch_texel_3d_R_SNORM16 }, { MESA_FORMAT_LA_SNORM16, - fetch_texel_1d_signed_al1616, - fetch_texel_2d_signed_al1616, - fetch_texel_3d_signed_al1616 + fetch_texel_1d_LA_SNORM16, + fetch_texel_2d_LA_SNORM16, + fetch_texel_3d_LA_SNORM16 }, { MESA_FORMAT_RGB_SNORM16, - fetch_texel_1d_signed_rgb_16, - fetch_texel_2d_signed_rgb_16, - fetch_texel_3d_signed_rgb_16 + fetch_texel_1d_RGB_SNORM16, + fetch_texel_2d_RGB_SNORM16, + fetch_texel_3d_RGB_SNORM16 }, { MESA_FORMAT_RGBA_SNORM16, - fetch_texel_1d_signed_rgba_16, - fetch_texel_2d_signed_rgba_16, - fetch_texel_3d_signed_rgba_16 + fetch_texel_1d_RGBA_SNORM16, + fetch_texel_2d_RGBA_SNORM16, + fetch_texel_3d_RGBA_SNORM16 }, { MESA_FORMAT_RGBX_SNORM16, diff --git a/src/mesa/swrast/s_texfetch_tmp.h b/src/mesa/swrast/s_texfetch_tmp.h index 547951f7f2e..ea0d56a2c8a 100644 --- a/src/mesa/swrast/s_texfetch_tmp.h +++ b/src/mesa/swrast/s_texfetch_tmp.h @@ -1179,7 +1179,7 @@ static void FETCH(dudv8)(const struct swrast_texture_image *texImage, /* MESA_FORMAT_R_SNORM8 ***********************************************/ -static void FETCH(signed_r8)( 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); @@ -1194,7 +1194,7 @@ static void FETCH(signed_r8)( const struct swrast_texture_image *texImage, /* MESA_FORMAT_A_SNORM8 ***********************************************/ -static void FETCH(signed_a8)( 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); @@ -1209,7 +1209,7 @@ static void FETCH(signed_a8)( const struct swrast_texture_image *texImage, /* MESA_FORMAT_L_SNORM8 ***********************************************/ -static void FETCH(signed_l8)( 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); @@ -1224,7 +1224,7 @@ static void FETCH(signed_l8)( const struct swrast_texture_image *texImage, /* MESA_FORMAT_I_SNORM8 ***********************************************/ -static void FETCH(signed_i8)( 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); @@ -1239,7 +1239,7 @@ static void FETCH(signed_i8)( const struct swrast_texture_image *texImage, /* MESA_FORMAT_R8G8_SNORM ***********************************************/ -static void FETCH(signed_rg88_rev)( 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); @@ -1254,7 +1254,7 @@ static void FETCH(signed_rg88_rev)( const struct swrast_texture_image *texImage, /* MESA_FORMAT_L8A8_SNORM ***********************************************/ -static void FETCH(signed_al88)( 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); @@ -1313,7 +1313,7 @@ static void FETCH(R8G8B8A8_SNORM)( const struct swrast_texture_image *texImage, /* MESA_FORMAT_R_SNORM16 ***********************************************/ static void -FETCH(signed_r16)(const struct swrast_texture_image *texImage, +FETCH(R_SNORM16)(const struct swrast_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel) { const GLshort s = *TEXEL_ADDR(GLshort, texImage, i, j, k, 1); @@ -1329,7 +1329,7 @@ FETCH(signed_r16)(const struct swrast_texture_image *texImage, /* MESA_FORMAT_A_SNORM16 ***********************************************/ static void -FETCH(signed_a16)(const struct swrast_texture_image *texImage, +FETCH(A_SNORM16)(const struct swrast_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel) { const GLshort s = *TEXEL_ADDR(GLshort, texImage, i, j, k, 1); @@ -1345,7 +1345,7 @@ FETCH(signed_a16)(const struct swrast_texture_image *texImage, /* MESA_FORMAT_L_SNORM16 ***********************************************/ static void -FETCH(signed_l16)(const struct swrast_texture_image *texImage, +FETCH(L_SNORM16)(const struct swrast_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel) { const GLshort s = *TEXEL_ADDR(GLshort, texImage, i, j, k, 1); @@ -1361,7 +1361,7 @@ FETCH(signed_l16)(const struct swrast_texture_image *texImage, /* MESA_FORMAT_I_SNORM16 ***********************************************/ static void -FETCH(signed_i16)(const struct swrast_texture_image *texImage, +FETCH(I_SNORM16)(const struct swrast_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel) { const GLshort s = *TEXEL_ADDR(GLshort, texImage, i, j, k, 1); @@ -1377,7 +1377,7 @@ FETCH(signed_i16)(const struct swrast_texture_image *texImage, /* MESA_FORMAT_G16R16_SNORM ***********************************************/ static void -FETCH(signed_rg1616)(const struct swrast_texture_image *texImage, +FETCH(R16G16_SNORM)(const struct swrast_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel) { const GLshort *s = TEXEL_ADDR(GLshort, texImage, i, j, k, 2); @@ -1393,7 +1393,7 @@ FETCH(signed_rg1616)(const struct swrast_texture_image *texImage, /* MESA_FORMAT_LA_SNORM16 ***********************************************/ static void -FETCH(signed_al1616)(const struct swrast_texture_image *texImage, +FETCH(LA_SNORM16)(const struct swrast_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel) { const GLshort *s = TEXEL_ADDR(GLshort, texImage, i, j, k, 2); @@ -1409,7 +1409,7 @@ FETCH(signed_al1616)(const struct swrast_texture_image *texImage, /* MESA_FORMAT_RGB_SNORM16 ***********************************************/ static void -FETCH(signed_rgb_16)(const struct swrast_texture_image *texImage, +FETCH(RGB_SNORM16)(const struct swrast_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel) { const GLshort *s = TEXEL_ADDR(GLshort, texImage, i, j, k, 3); @@ -1425,7 +1425,7 @@ FETCH(signed_rgb_16)(const struct swrast_texture_image *texImage, /* MESA_FORMAT_RGBA_SNORM16 ***********************************************/ static void -FETCH(signed_rgba_16)(const struct swrast_texture_image *texImage, +FETCH(RGBA_SNORM16)(const struct swrast_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel) { const GLshort *s = TEXEL_ADDR(GLshort, texImage, i, j, k, 4); -- 2.30.2