diff options
| -rw-r--r-- | src/mesa/swrast/s_texfetch.c | 48 | ||||
| -rw-r--r-- | src/mesa/swrast/s_texfetch_tmp.h | 26 |
2 files changed, 37 insertions, 37 deletions
diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c index 098a32fd4be..2a6eee049a0 100644 --- a/src/mesa/swrast/s_texfetch.c +++ b/src/mesa/swrast/s_texfetch.c @@ -163,9 +163,9 @@ texfetch_funcs[] = }, { MESA_FORMAT_R8G8B8A8_UNORM, - fetch_texel_1d_R8G8B8A_UNORM, - fetch_texel_2d_R8G8B8A_UNORM, - fetch_texel_3d_R8G8B8A_UNORM + fetch_texel_1d_R8G8B8A8_UNORM, + fetch_texel_2d_R8G8B8A8_UNORM, + fetch_texel_3d_R8G8B8A8_UNORM }, { MESA_FORMAT_R8G8B8X8_UNORM, @@ -435,9 +435,9 @@ texfetch_funcs[] = }, { MESA_FORMAT_RGBA_UNORM16, - fetch_texel_1d_rgba_16, - fetch_texel_2d_rgba_16, - fetch_texel_3d_rgba_16 + fetch_texel_1d_RGBA_UNORM16, + fetch_texel_2d_RGBA_UNORM16, + fetch_texel_3d_RGBA_UNORM16 }, { MESA_FORMAT_RGBX_UNORM16, @@ -1051,39 +1051,39 @@ texfetch_funcs[] = }, { MESA_FORMAT_RGBA_UINT8, - fetch_texel_1d_rgba_uint8, - fetch_texel_2d_rgba_uint8, - fetch_texel_3d_rgba_uint8 + fetch_texel_1d_RGBA_UINT8, + fetch_texel_2d_RGBA_UINT8, + fetch_texel_3d_RGBA_UINT8 }, { MESA_FORMAT_RGBA_UINT16, - fetch_texel_1d_rgba_uint16, - fetch_texel_2d_rgba_uint16, - fetch_texel_3d_rgba_uint16 + fetch_texel_1d_RGBA_UINT16, + fetch_texel_2d_RGBA_UINT16, + fetch_texel_3d_RGBA_UINT16 }, { MESA_FORMAT_RGBA_UINT32, - fetch_texel_1d_rgba_uint32, - fetch_texel_2d_rgba_uint32, - fetch_texel_3d_rgba_uint32 + fetch_texel_1d_RGBA_UINT32, + fetch_texel_2d_RGBA_UINT32, + fetch_texel_3d_RGBA_UINT32 }, { MESA_FORMAT_RGBA_SINT8, - fetch_texel_1d_rgba_int8, - fetch_texel_2d_rgba_int8, - fetch_texel_3d_rgba_int8 + fetch_texel_1d_RGBA_SINT8, + fetch_texel_2d_RGBA_SINT8, + fetch_texel_3d_RGBA_SINT8 }, { MESA_FORMAT_RGBA_SINT16, - fetch_texel_1d_rgba_int16, - fetch_texel_2d_rgba_int16, - fetch_texel_3d_rgba_int16 + fetch_texel_1d_RGBA_SINT16, + fetch_texel_2d_RGBA_SINT16, + fetch_texel_3d_RGBA_SINT16 }, { MESA_FORMAT_RGBA_SINT32, - fetch_texel_1d_rgba_int32, - fetch_texel_2d_rgba_int32, - fetch_texel_3d_rgba_int32 + fetch_texel_1d_RGBA_SINT32, + fetch_texel_2d_RGBA_SINT32, + fetch_texel_3d_RGBA_SINT32 }, { MESA_FORMAT_RGBX_UINT8, diff --git a/src/mesa/swrast/s_texfetch_tmp.h b/src/mesa/swrast/s_texfetch_tmp.h index c783ae34f1c..d48e39bfd42 100644 --- a/src/mesa/swrast/s_texfetch_tmp.h +++ b/src/mesa/swrast/s_texfetch_tmp.h @@ -292,8 +292,8 @@ FETCH(A8B8G8R8_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) +FETCH(R8G8B8A8_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); texel[RCOMP] = UBYTE_TO_FLOAT( (s ) & 0xff ); @@ -817,8 +817,8 @@ FETCH(L8A8_SRGB)(const struct swrast_texture_image *texImage, static void -FETCH(rgba_int8)(const struct swrast_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel) +FETCH(RGBA_SINT8)(const struct swrast_texture_image *texImage, + GLint i, GLint j, GLint k, GLfloat *texel) { const GLbyte *src = TEXEL_ADDR(GLbyte, texImage, i, j, k, 4); texel[RCOMP] = (GLfloat) src[0]; @@ -829,8 +829,8 @@ FETCH(rgba_int8)(const struct swrast_texture_image *texImage, static void -FETCH(rgba_int16)(const struct swrast_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel) +FETCH(RGBA_SINT16)(const struct swrast_texture_image *texImage, + GLint i, GLint j, GLint k, GLfloat *texel) { const GLshort *src = TEXEL_ADDR(GLshort, texImage, i, j, k, 4); texel[RCOMP] = (GLfloat) src[0]; @@ -841,8 +841,8 @@ FETCH(rgba_int16)(const struct swrast_texture_image *texImage, static void -FETCH(rgba_int32)(const struct swrast_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel) +FETCH(RGBA_SINT32)(const struct swrast_texture_image *texImage, + GLint i, GLint j, GLint k, GLfloat *texel) { const GLint *src = TEXEL_ADDR(GLint, texImage, i, j, k, 4); texel[RCOMP] = (GLfloat) src[0]; @@ -853,7 +853,7 @@ FETCH(rgba_int32)(const struct swrast_texture_image *texImage, static void -FETCH(rgba_uint8)(const struct swrast_texture_image *texImage, +FETCH(RGBA_UINT8)(const struct swrast_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel) { const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 4); @@ -865,7 +865,7 @@ FETCH(rgba_uint8)(const struct swrast_texture_image *texImage, static void -FETCH(rgba_uint16)(const struct swrast_texture_image *texImage, +FETCH(RGBA_UINT16)(const struct swrast_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel) { const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 4); @@ -877,7 +877,7 @@ FETCH(rgba_uint16)(const struct swrast_texture_image *texImage, static void -FETCH(rgba_uint32)(const struct swrast_texture_image *texImage, +FETCH(RGBA_UINT32)(const struct swrast_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel) { const GLuint *src = TEXEL_ADDR(GLuint, texImage, i, j, k, 4); @@ -1110,8 +1110,8 @@ FETCH(RGBA_SNORM16)(const struct swrast_texture_image *texImage, static void -FETCH(rgba_16)(const struct swrast_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel) +FETCH(RGBA_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, 4); texel[RCOMP] = USHORT_TO_FLOAT( s[0] ); |