diff options
| author | Brian Paul <brianp@vmware.com> | 2014-04-10 19:00:46 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2014-04-11 11:47:31 -0600 |
| commit | 4da1efb37062950f41c1fe6f9649a507ab98adf4 (patch) | |
| tree | 894406e1de83545170e5c90777a26815a266efaa /src/mesa/swrast/s_texfetch_tmp.h | |
| parent | 9d36a8d4d27230dd91d4c4002a781edeec22d044 (diff) | |
swrast: fix more fetch_texel function names
These were missed/typo'd in the previous patch series:
s/R8G8B8A/R8G8B8A8/
s/rgba_16/RGBA_UNORM16/
s/rgba_uint/RGBA_UINT/
s/rgba_int/RGBA_SINT/
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/mesa/swrast/s_texfetch_tmp.h')
| -rw-r--r-- | src/mesa/swrast/s_texfetch_tmp.h | 26 |
1 files changed, 13 insertions, 13 deletions
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] ); |