diff options
Diffstat (limited to 'src/mesa/main/texformat_tmp.h')
| -rw-r--r-- | src/mesa/main/texformat_tmp.h | 492 |
1 files changed, 1 insertions, 491 deletions
diff --git a/src/mesa/main/texformat_tmp.h b/src/mesa/main/texformat_tmp.h index 1e2ecbdb265..f060179eeea 100644 --- a/src/mesa/main/texformat_tmp.h +++ b/src/mesa/main/texformat_tmp.h @@ -153,17 +153,6 @@ static void FETCH(alpha)( const struct gl_texture_image *texImage, texel[ACOMP] = src[0]; } -/* Fetch texel from 1D, 2D or 3D ALPHA texture, returning 4 GLfloats */ -static void FETCH(f_alpha)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel ) -{ - const GLchan *src = TEXEL_ADDR(GLchan, texImage, i, j, k, 1); - texel[RCOMP] = - texel[GCOMP] = - texel[BCOMP] = 0.0; - texel[ACOMP] = CHAN_TO_FLOAT(src[0]); -} - #if DIM == 3 static void store_texel_alpha(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) @@ -187,17 +176,6 @@ static void FETCH(luminance)( const struct gl_texture_image *texImage, texel[ACOMP] = CHAN_MAX; } -/* Fetch texel from 1D, 2D or 3D LUMIN texture, returning 4 GLfloats */ -static void FETCH(f_luminance)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel ) -{ - const GLchan *src = TEXEL_ADDR(GLchan, texImage, i, j, k, 1); - texel[RCOMP] = - texel[GCOMP] = - texel[BCOMP] = CHAN_TO_FLOAT(src[0]); - texel[ACOMP] = 1.0F; -} - #if DIM == 3 static void store_texel_luminance(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) @@ -221,17 +199,6 @@ static void FETCH(luminance_alpha)( const struct gl_texture_image *texImage, texel[ACOMP] = src[1]; } -/* Fetch texel from 1D, 2D or 3D L_A texture, returning 4 GLfloats */ -static void FETCH(f_luminance_alpha)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel ) -{ - const GLchan *src = TEXEL_ADDR(GLchan, texImage, i, j, k, 2); - texel[RCOMP] = - texel[GCOMP] = - texel[BCOMP] = CHAN_TO_FLOAT(src[0]); - texel[ACOMP] = CHAN_TO_FLOAT(src[1]); -} - #if DIM == 3 static void store_texel_luminance_alpha(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) @@ -256,17 +223,6 @@ static void FETCH(intensity)( const struct gl_texture_image *texImage, texel[ACOMP] = src[0]; } -/* Fetch texel from 1D, 2D or 3D INT. texture, returning 4 GLfloats */ -static void FETCH(f_intensity)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel ) -{ - const GLchan *src = TEXEL_ADDR(GLchan, texImage, i, j, k, 1); - texel[RCOMP] = - texel[GCOMP] = - texel[BCOMP] = - texel[ACOMP] = CHAN_TO_FLOAT(src[0]); -} - #if DIM == 3 static void store_texel_intensity(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) @@ -328,18 +284,6 @@ static void store_texel_depth_component16(struct gl_texture_image *texImage, /* MESA_FORMAT_RGBA_F32 ******************************************************/ -/* Fetch texel from 1D, 2D or 3D RGBA_FLOAT32 texture, returning 4 GLchans. - */ -static void FETCH(rgba_f32)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLchan *texel ) -{ - const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 4); - UNCLAMPED_FLOAT_TO_CHAN(texel[RCOMP], src[0]); - UNCLAMPED_FLOAT_TO_CHAN(texel[GCOMP], src[1]); - UNCLAMPED_FLOAT_TO_CHAN(texel[BCOMP], src[2]); - UNCLAMPED_FLOAT_TO_CHAN(texel[ACOMP], src[3]); -} - /* Fetch texel from 1D, 2D or 3D RGBA_FLOAT32 texture, returning 4 GLfloats. */ static void FETCH(f_rgba_f32)( const struct gl_texture_image *texImage, @@ -369,19 +313,6 @@ static void store_texel_rgba_f32(struct gl_texture_image *texImage, /* MESA_FORMAT_RGBA_F16 ******************************************************/ /* Fetch texel from 1D, 2D or 3D RGBA_FLOAT16 texture, - * returning 4 GLchans. - */ -static void FETCH(rgba_f16)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLchan *texel ) -{ - const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 4); - UNCLAMPED_FLOAT_TO_CHAN(texel[RCOMP], _mesa_half_to_float(src[0])); - UNCLAMPED_FLOAT_TO_CHAN(texel[GCOMP], _mesa_half_to_float(src[1])); - UNCLAMPED_FLOAT_TO_CHAN(texel[BCOMP], _mesa_half_to_float(src[2])); - UNCLAMPED_FLOAT_TO_CHAN(texel[ACOMP], _mesa_half_to_float(src[3])); -} - -/* Fetch texel from 1D, 2D or 3D RGBA_FLOAT16 texture, * returning 4 GLfloats. */ static void FETCH(f_rgba_f16)( const struct gl_texture_image *texImage, @@ -407,19 +338,6 @@ static void store_texel_rgba_f16(struct gl_texture_image *texImage, /* MESA_FORMAT_RGB_F32 *******************************************************/ /* Fetch texel from 1D, 2D or 3D RGB_FLOAT32 texture, - * returning 4 GLchans. - */ -static void FETCH(rgb_f32)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLchan *texel ) -{ - const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 3); - UNCLAMPED_FLOAT_TO_CHAN(texel[RCOMP], src[0]); - UNCLAMPED_FLOAT_TO_CHAN(texel[GCOMP], src[1]); - UNCLAMPED_FLOAT_TO_CHAN(texel[BCOMP], src[2]); - texel[ACOMP] = CHAN_MAX; -} - -/* Fetch texel from 1D, 2D or 3D RGB_FLOAT32 texture, * returning 4 GLfloats. */ static void FETCH(f_rgb_f32)( const struct gl_texture_image *texImage, @@ -443,20 +361,7 @@ static void store_texel_rgb_f32(struct gl_texture_image *texImage, #endif -/* MESA_FORAMT_RGB_F16 *******************************************************/ - -/* Fetch texel from 1D, 2D or 3D RGBA_FLOAT16 texture, - * returning 4 GLchans. - */ -static void FETCH(rgb_f16)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLchan *texel ) -{ - const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 3); - UNCLAMPED_FLOAT_TO_CHAN(texel[RCOMP], _mesa_half_to_float(src[0])); - UNCLAMPED_FLOAT_TO_CHAN(texel[GCOMP], _mesa_half_to_float(src[1])); - UNCLAMPED_FLOAT_TO_CHAN(texel[BCOMP], _mesa_half_to_float(src[2])); - texel[ACOMP] = CHAN_MAX; -} +/* MESA_FORMAT_RGB_F16 *******************************************************/ /* Fetch texel from 1D, 2D or 3D RGB_FLOAT16 texture, * returning 4 GLfloats. @@ -485,19 +390,6 @@ static void store_texel_rgb_f16(struct gl_texture_image *texImage, /* MESA_FORMAT_ALPHA_F32 *****************************************************/ /* Fetch texel from 1D, 2D or 3D ALPHA_FLOAT32 texture, - * returning 4 GLchans. - */ -static void FETCH(alpha_f32)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLchan *texel ) -{ - const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1); - texel[RCOMP] = - texel[GCOMP] = - texel[BCOMP] = 0; - UNCLAMPED_FLOAT_TO_CHAN(texel[ACOMP], src[0]); -} - -/* Fetch texel from 1D, 2D or 3D ALPHA_FLOAT32 texture, * returning 4 GLfloats. */ static void FETCH(f_alpha_f32)( const struct gl_texture_image *texImage, @@ -524,19 +416,6 @@ static void store_texel_alpha_f32(struct gl_texture_image *texImage, /* MESA_FORMAT_ALPHA_F32 *****************************************************/ /* Fetch texel from 1D, 2D or 3D ALPHA_FLOAT16 texture, - * returning 4 GLchans. - */ -static void FETCH(alpha_f16)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLchan *texel ) -{ - const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1); - texel[RCOMP] = - texel[GCOMP] = - texel[BCOMP] = 0; - UNCLAMPED_FLOAT_TO_CHAN(texel[ACOMP], _mesa_half_to_float(src[0])); -} - -/* Fetch texel from 1D, 2D or 3D ALPHA_FLOAT16 texture, * returning 4 GLfloats. */ static void FETCH(f_alpha_f16)( const struct gl_texture_image *texImage, @@ -563,19 +442,6 @@ static void store_texel_alpha_f16(struct gl_texture_image *texImage, /* MESA_FORMAT_LUMINANCE_F32 *************************************************/ /* Fetch texel from 1D, 2D or 3D LUMINANCE_FLOAT32 texture, - * returning 4 GLchans. - */ -static void FETCH(luminance_f32)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLchan *texel ) -{ - const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1); - UNCLAMPED_FLOAT_TO_CHAN(texel[RCOMP], src[0]); - texel[GCOMP] = - texel[BCOMP] = texel[RCOMP]; - texel[ACOMP] = CHAN_MAX; -} - -/* Fetch texel from 1D, 2D or 3D LUMINANCE_FLOAT32 texture, * returning 4 GLfloats. */ static void FETCH(f_luminance_f32)( const struct gl_texture_image *texImage, @@ -602,19 +468,6 @@ static void store_texel_luminance_f32(struct gl_texture_image *texImage, /* MESA_FORMAT_LUMINANCE_F16 *************************************************/ /* Fetch texel from 1D, 2D or 3D LUMINANCE_FLOAT16 texture, - * returning 4 GLchans. - */ -static void FETCH(luminance_f16)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLchan *texel ) -{ - const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1); - UNCLAMPED_FLOAT_TO_CHAN(texel[RCOMP], _mesa_half_to_float(src[0])); - texel[GCOMP] = - texel[BCOMP] = texel[RCOMP]; - texel[ACOMP] = CHAN_MAX; -} - -/* Fetch texel from 1D, 2D or 3D LUMINANCE_FLOAT16 texture, * returning 4 GLfloats. */ static void FETCH(f_luminance_f16)( const struct gl_texture_image *texImage, @@ -641,19 +494,6 @@ static void store_texel_luminance_f16(struct gl_texture_image *texImage, /* MESA_FORMAT_LUMINANCE_ALPHA_F32 *******************************************/ /* Fetch texel from 1D, 2D or 3D LUMINANCE_ALPHA_FLOAT32 texture, - * returning 4 GLchans. - */ -static void FETCH(luminance_alpha_f32)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLchan *texel ) -{ - const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 2); - UNCLAMPED_FLOAT_TO_CHAN(texel[RCOMP], src[0]); - texel[GCOMP] = - texel[BCOMP] = texel[RCOMP]; - UNCLAMPED_FLOAT_TO_CHAN(texel[ACOMP], src[1]); -} - -/* Fetch texel from 1D, 2D or 3D LUMINANCE_ALPHA_FLOAT32 texture, * returning 4 GLfloats. */ static void FETCH(f_luminance_alpha_f32)( const struct gl_texture_image *texImage, @@ -683,19 +523,6 @@ static void store_texel_luminance_alpha_f32(struct gl_texture_image *texImage, /* Fetch texel from 1D, 2D or 3D LUMINANCE_ALPHA_FLOAT16 texture, * returning 4 GLfloats. */ -static void FETCH(luminance_alpha_f16)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLchan *texel ) -{ - const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 2); - UNCLAMPED_FLOAT_TO_CHAN(texel[RCOMP], _mesa_half_to_float(src[0])); - texel[GCOMP] = - texel[BCOMP] = texel[RCOMP]; - UNCLAMPED_FLOAT_TO_CHAN(texel[ACOMP], _mesa_half_to_float(src[1])); -} - -/* Fetch texel from 1D, 2D or 3D LUMINANCE_ALPHA_FLOAT16 texture, - * returning 4 GLfloats. - */ static void FETCH(f_luminance_alpha_f16)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { @@ -721,19 +548,6 @@ static void store_texel_luminance_alpha_f16(struct gl_texture_image *texImage, /* MESA_FORMAT_INTENSITY_F32 *************************************************/ /* Fetch texel from 1D, 2D or 3D INTENSITY_FLOAT32 texture, - * returning 4 GLchans. - */ -static void FETCH(intensity_f32)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLchan *texel ) -{ - const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1); - UNCLAMPED_FLOAT_TO_CHAN(texel[RCOMP], src[0]); - texel[GCOMP] = - texel[BCOMP] = - texel[ACOMP] = texel[RCOMP]; -} - -/* Fetch texel from 1D, 2D or 3D INTENSITY_FLOAT32 texture, * returning 4 GLfloats. */ static void FETCH(f_intensity_f32)( const struct gl_texture_image *texImage, @@ -760,19 +574,6 @@ static void store_texel_intensity_f32(struct gl_texture_image *texImage, /* MESA_FORMAT_INTENSITY_F16 *************************************************/ /* Fetch texel from 1D, 2D or 3D INTENSITY_FLOAT16 texture, - * returning 4 GLchans. - */ -static void FETCH(intensity_f16)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLchan *texel ) -{ - const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1); - UNCLAMPED_FLOAT_TO_CHAN(texel[RCOMP], _mesa_half_to_float(src[0])); - texel[GCOMP] = - texel[BCOMP] = - texel[ACOMP] = texel[RCOMP]; -} - -/* Fetch texel from 1D, 2D or 3D INTENSITY_FLOAT16 texture, * returning 4 GLfloats. */ static void FETCH(f_intensity_f16)( const struct gl_texture_image *texImage, @@ -815,17 +616,6 @@ static void FETCH(rgba8888)( const struct gl_texture_image *texImage, texel[ACOMP] = UBYTE_TO_CHAN( (s ) & 0xff ); } -/* Fetch texel from 1D, 2D or 3D rgba8888 texture, return 4 GLfloats */ -static void FETCH(f_rgba8888)( const struct gl_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 >> 24) ); - texel[GCOMP] = UBYTE_TO_FLOAT( (s >> 16) & 0xff ); - texel[BCOMP] = UBYTE_TO_FLOAT( (s >> 8) & 0xff ); - texel[ACOMP] = UBYTE_TO_FLOAT( (s ) & 0xff ); -} - #if DIM == 3 static void store_texel_rgba8888(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) @@ -850,17 +640,6 @@ static void FETCH(rgba8888_rev)( const struct gl_texture_image *texImage, texel[ACOMP] = UBYTE_TO_CHAN( (s >> 24) ); } -/* Fetch texel from 1D, 2D or 3D abgr8888 texture, return 4 GLfloats */ -static void FETCH(f_rgba8888_rev)( const struct gl_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 ); - texel[GCOMP] = UBYTE_TO_FLOAT( (s >> 8) & 0xff ); - texel[BCOMP] = UBYTE_TO_FLOAT( (s >> 16) & 0xff ); - texel[ACOMP] = UBYTE_TO_FLOAT( (s >> 24) ); -} - #if DIM == 3 static void store_texel_rgba8888_rev(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) @@ -885,17 +664,6 @@ static void FETCH(argb8888)( const struct gl_texture_image *texImage, texel[ACOMP] = UBYTE_TO_CHAN( (s >> 24) ); } -/* Fetch texel from 1D, 2D or 3D argb8888 texture, return 4 GLfloats */ -static void FETCH(f_argb8888)( const struct gl_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 >> 16) & 0xff ); - texel[GCOMP] = UBYTE_TO_FLOAT( (s >> 8) & 0xff ); - texel[BCOMP] = UBYTE_TO_FLOAT( (s ) & 0xff ); - texel[ACOMP] = UBYTE_TO_FLOAT( (s >> 24) ); -} - #if DIM == 3 static void store_texel_argb8888(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) @@ -920,17 +688,6 @@ static void FETCH(argb8888_rev)( const struct gl_texture_image *texImage, texel[ACOMP] = UBYTE_TO_CHAN( (s ) & 0xff ); } -/* Fetch texel from 1D, 2D or 3D argb8888_rev texture, return 4 GLfloats */ -static void FETCH(f_argb8888_rev)( const struct gl_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 >> 8) & 0xff ); - texel[GCOMP] = UBYTE_TO_FLOAT( (s >> 16) & 0xff ); - texel[BCOMP] = UBYTE_TO_FLOAT( (s >> 24) ); - texel[ACOMP] = UBYTE_TO_FLOAT( (s ) & 0xff ); -} - #if DIM == 3 static void store_texel_argb8888_rev(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) @@ -955,17 +712,6 @@ static void FETCH(rgb888)( const struct gl_texture_image *texImage, texel[ACOMP] = CHAN_MAX; } -/* Fetch texel from 1D, 2D or 3D rgb888 texture, return 4 GLfloats */ -static void FETCH(f_rgb888)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel ) -{ - const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3); - texel[RCOMP] = UBYTE_TO_FLOAT( src[2] ); - texel[GCOMP] = UBYTE_TO_FLOAT( src[1] ); - texel[BCOMP] = UBYTE_TO_FLOAT( src[0] ); - texel[ACOMP] = 1.0F; -} - #if DIM == 3 static void store_texel_rgb888(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) @@ -992,17 +738,6 @@ static void FETCH(bgr888)( const struct gl_texture_image *texImage, texel[ACOMP] = CHAN_MAX; } -/* Fetch texel from 1D, 2D or 3D bgr888 texture, return 4 GLfloats */ -static void FETCH(f_bgr888)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel ) -{ - const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3); - texel[RCOMP] = UBYTE_TO_FLOAT( src[0] ); - texel[GCOMP] = UBYTE_TO_FLOAT( src[1] ); - texel[BCOMP] = UBYTE_TO_FLOAT( src[2] ); - texel[ACOMP] = 1.0F; -} - #if DIM == 3 static void store_texel_bgr888(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) @@ -1033,18 +768,6 @@ static void FETCH(rgb565)( const struct gl_texture_image *texImage, texel[ACOMP] = CHAN_MAX; } -/* Fetch texel from 1D, 2D or 3D rgb565 texture, return 4 GLfloats */ -static void FETCH(f_rgb565)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel ) -{ - const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1); - const GLushort s = *src; - texel[RCOMP] = ((s >> 8) & 0xf8) * (1.0F / 248.0F); - texel[GCOMP] = ((s >> 3) & 0xfc) * (1.0F / 252.0F); - texel[BCOMP] = ((s << 3) & 0xf8) * (1.0F / 248.0F); - texel[ACOMP] = 1.0F; -} - #if DIM == 3 static void store_texel_rgb565(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) @@ -1070,18 +793,6 @@ static void FETCH(rgb565_rev)( const struct gl_texture_image *texImage, texel[ACOMP] = CHAN_MAX; } -/* Fetch texel from 1D, 2D or 3D rgb565_rev texture, return 4 GLfloats */ -static void FETCH(f_rgb565_rev)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel ) -{ - const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1); - const GLushort s = (*src >> 8) | (*src << 8); /* byte swap */ - texel[RCOMP] = ((s >> 8) & 0xf8) * (1.0F / 248.0F); - texel[GCOMP] = ((s >> 3) & 0xfc) * (1.0F / 252.0F); - texel[BCOMP] = ((s << 3) & 0xf8) * (1.0F / 248.0F); - texel[ACOMP] = 1.0F; -} - #if DIM == 3 static void store_texel_rgb565_rev(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) @@ -1107,18 +818,6 @@ static void FETCH(argb4444)( const struct gl_texture_image *texImage, texel[ACOMP] = UBYTE_TO_CHAN( ((s >> 12) & 0xf) | ((s >> 8) & 0xf0) ); } -/* Fetch texel from 1D, 2D or 3D argb4444 texture, return 4 GLfloats */ -static void FETCH(f_argb4444)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel ) -{ - const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1); - const GLushort s = *src; - texel[RCOMP] = ((s >> 8) & 0xf) * (1.0F / 15.0F); - texel[GCOMP] = ((s >> 4) & 0xf) * (1.0F / 15.0F); - texel[BCOMP] = ((s ) & 0xf) * (1.0F / 15.0F); - texel[ACOMP] = ((s >> 12) & 0xf) * (1.0F / 15.0F); -} - #if DIM == 3 static void store_texel_argb4444(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) @@ -1143,17 +842,6 @@ static void FETCH(argb4444_rev)( const struct gl_texture_image *texImage, texel[ACOMP] = UBYTE_TO_CHAN( ((s >> 4) & 0xf) | ((s ) & 0xf0) ); } -/* Fetch texel from 1D, 2D or 3D argb4444_rev texture, return 4 GLfloats */ -static void FETCH(f_argb4444_rev)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel ) -{ - const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1); - texel[RCOMP] = ((s ) & 0xf) * (1.0F / 15.0F); - texel[GCOMP] = ((s >> 12) & 0xf) * (1.0F / 15.0F); - texel[BCOMP] = ((s >> 8) & 0xf) * (1.0F / 15.0F); - texel[ACOMP] = ((s >> 4) & 0xf) * (1.0F / 15.0F); -} - #if DIM == 3 static void store_texel_argb4444_rev(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) @@ -1179,18 +867,6 @@ static void FETCH(argb1555)( const struct gl_texture_image *texImage, texel[ACOMP] = UBYTE_TO_CHAN( ((s >> 15) & 0x01) * 255 ); } -/* Fetch texel from 1D, 2D or 3D argb1555 texture, return 4 GLfloats */ -static void FETCH(f_argb1555)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel ) -{ - const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1); - const GLushort s = *src; - texel[RCOMP] = ((s >> 10) & 0x1f) * (1.0F / 31.0F); - texel[GCOMP] = ((s >> 5) & 0x1f) * (1.0F / 31.0F); - texel[BCOMP] = ((s ) & 0x1f) * (1.0F / 31.0F); - texel[ACOMP] = ((s >> 15) & 0x01); -} - #if DIM == 3 static void store_texel_argb1555(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) @@ -1216,18 +892,6 @@ static void FETCH(argb1555_rev)( const struct gl_texture_image *texImage, texel[ACOMP] = UBYTE_TO_CHAN( ((s >> 15) & 0x01) * 255 ); } -/* Fetch texel from 1D, 2D or 3D argb1555_rev texture, return 4 GLfloats */ -static void FETCH(f_argb1555_rev)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel ) -{ - const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1); - const GLushort s = (*src << 8) | (*src >> 8); /* byteswap */ - texel[RCOMP] = ((s >> 10) & 0x1f) * (1.0F / 31.0F); - texel[GCOMP] = ((s >> 5) & 0x1f) * (1.0F / 31.0F); - texel[BCOMP] = ((s ) & 0x1f) * (1.0F / 31.0F); - texel[ACOMP] = ((s >> 15) & 0x01); -} - #if DIM == 3 static void store_texel_argb1555_rev(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) @@ -1252,17 +916,6 @@ static void FETCH(al88)( const struct gl_texture_image *texImage, texel[ACOMP] = UBYTE_TO_CHAN( s >> 8 ); } -/* Fetch texel from 1D, 2D or 3D al88 texture, return 4 GLfloats */ -static void FETCH(f_al88)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel ) -{ - const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1); - texel[RCOMP] = - texel[GCOMP] = - texel[BCOMP] = UBYTE_TO_FLOAT( s & 0xff ); - texel[ACOMP] = UBYTE_TO_FLOAT( s >> 8 ); -} - #if DIM == 3 static void store_texel_al88(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) @@ -1287,17 +940,6 @@ static void FETCH(al88_rev)( const struct gl_texture_image *texImage, texel[ACOMP] = UBYTE_TO_CHAN( s & 0xff ); } -/* Fetch texel from 1D, 2D or 3D al88_rev texture, return 4 GLfloats */ -static void FETCH(f_al88_rev)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel ) -{ - const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1); - texel[RCOMP] = - texel[GCOMP] = - texel[BCOMP] = UBYTE_TO_FLOAT( s >> 8 ); - texel[ACOMP] = UBYTE_TO_FLOAT( s & 0xff ); -} - #if DIM == 3 static void store_texel_al88_rev(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) @@ -1325,18 +967,6 @@ static void FETCH(rgb332)( const struct gl_texture_image *texImage, texel[ACOMP] = CHAN_MAX; } -/* Fetch texel from 1D, 2D or 3D rgb332 texture, return 4 GLfloats */ -static void FETCH(f_rgb332)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel ) -{ - const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1); - const GLubyte s = *src; - texel[RCOMP] = ((s ) & 0xe0) * (1.0F / 224.0F); - texel[GCOMP] = ((s << 3) & 0xe0) * (1.0F / 224.0F); - texel[BCOMP] = ((s << 6) & 0xc0) * (1.0F / 192.0F); - texel[ACOMP] = 1.0F; -} - #if DIM == 3 static void store_texel_rgb332(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) @@ -1361,17 +991,6 @@ static void FETCH(a8)( const struct gl_texture_image *texImage, texel[ACOMP] = UBYTE_TO_CHAN( src[0] ); } -/* Fetch texel from 1D, 2D or 3D a8 texture, return 4 GLfloats */ -static void FETCH(f_a8)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel ) -{ - const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1); - texel[RCOMP] = - texel[GCOMP] = - texel[BCOMP] = 0.0; - texel[ACOMP] = UBYTE_TO_FLOAT( src[0] ); -} - #if DIM == 3 static void store_texel_a8(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) @@ -1396,17 +1015,6 @@ static void FETCH(l8)( const struct gl_texture_image *texImage, texel[ACOMP] = CHAN_MAX; } -/* Fetch texel from 1D, 2D or 3D l8 texture, return 4 GLfloats */ -static void FETCH(f_l8)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel ) -{ - const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1); - texel[RCOMP] = - texel[GCOMP] = - texel[BCOMP] = UBYTE_TO_FLOAT( src[0] ); - texel[ACOMP] = 1.0F; -} - #if DIM == 3 static void store_texel_l8(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) @@ -1431,17 +1039,6 @@ static void FETCH(i8)( const struct gl_texture_image *texImage, texel[ACOMP] = UBYTE_TO_CHAN( src[0] ); } -/* Fetch texel from 1D, 2D or 3D i8 texture, return 4 GLfloats */ -static void FETCH(f_i8)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel ) -{ - const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1); - texel[RCOMP] = - texel[GCOMP] = - texel[BCOMP] = - texel[ACOMP] = UBYTE_TO_FLOAT( src[0] ); -} - #if DIM == 3 static void store_texel_i8(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) @@ -1523,23 +1120,6 @@ static void FETCH(ci8)( const struct gl_texture_image *texImage, } } - -/* Fetch CI texel from 1D, 2D or 3D ci8 texture, lookup the index in a - * color table, and return 4 GLfloats. - */ -static void FETCH(f_ci8)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel ) -{ - GLchan rgba[4]; - /* Sample as GLchan */ - FETCH(ci8)(texImage, i, j, k, rgba); - /* and return as floats */ - texel[RCOMP] = CHAN_TO_FLOAT(rgba[RCOMP]); - texel[GCOMP] = CHAN_TO_FLOAT(rgba[GCOMP]); - texel[BCOMP] = CHAN_TO_FLOAT(rgba[BCOMP]); - texel[ACOMP] = CHAN_TO_FLOAT(rgba[ACOMP]); -} - #if DIM == 3 static void store_texel_ci8(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) @@ -1584,41 +1164,6 @@ static void FETCH(ycbcr)( const struct gl_texture_image *texImage, texel[ACOMP] = CHAN_MAX; } -/* Fetch texel from 1D, 2D or 3D ycbcr texture, return 4 GLfloats */ -/* We convert YCbCr to RGB here */ -static void FETCH(f_ycbcr)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel ) -{ - const GLushort *src0 = TEXEL_ADDR(GLushort, texImage, (i & ~1), j, k, 1); /* even */ - const GLushort *src1 = src0 + 1; /* odd */ - const GLubyte y0 = (*src0 >> 8) & 0xff; /* luminance */ - const GLubyte cb = *src0 & 0xff; /* chroma U */ - const GLubyte y1 = (*src1 >> 8) & 0xff; /* luminance */ - const GLubyte cr = *src1 & 0xff; /* chroma V */ - GLfloat r, g, b; - if (i & 1) { - /* odd pixel: use y1,cr,cb */ - r = (1.164 * (y1-16) + 1.596 * (cr-128)); - g = (1.164 * (y1-16) - 0.813 * (cr-128) - 0.391 * (cb-128)); - b = (1.164 * (y1-16) + 2.018 * (cb-128)); - } - else { - /* even pixel: use y0,cr,cb */ - r = (1.164 * (y0-16) + 1.596 * (cr-128)); - g = (1.164 * (y0-16) - 0.813 * (cr-128) - 0.391 * (cb-128)); - b = (1.164 * (y0-16) + 2.018 * (cb-128)); - } - /* XXX remove / 255 here by tweaking arithmetic above */ - r /= 255.0; - g /= 255.0; - b /= 255.0; - /* XXX should we really clamp??? */ - texel[RCOMP] = CLAMP(r, 0.0, 1.0); - texel[GCOMP] = CLAMP(g, 0.0, 1.0); - texel[BCOMP] = CLAMP(b, 0.0, 1.0); - texel[ACOMP] = 1.0F; -} - #if DIM == 3 static void store_texel_ycbcr(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) @@ -1661,41 +1206,6 @@ static void FETCH(ycbcr_rev)( const struct gl_texture_image *texImage, texel[ACOMP] = CHAN_MAX; } -/* Fetch texel from 1D, 2D or 3D ycbcr_rev texture, return 4 GLfloats */ -/* We convert YCbCr to RGB here */ -static void FETCH(f_ycbcr_rev)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel ) -{ - const GLushort *src0 = TEXEL_ADDR(GLushort, texImage, (i & ~1), j, k, 1); /* even */ - const GLushort *src1 = src0 + 1; /* odd */ - const GLubyte y0 = *src0 & 0xff; /* luminance */ - const GLubyte cr = (*src0 >> 8) & 0xff; /* chroma V */ - const GLubyte y1 = *src1 & 0xff; /* luminance */ - const GLubyte cb = (*src1 >> 8) & 0xff; /* chroma U */ - GLfloat r, g, b; - if (i & 1) { - /* odd pixel: use y1,cr,cb */ - r = (1.164 * (y1-16) + 1.596 * (cr-128)); - g = (1.164 * (y1-16) - 0.813 * (cr-128) - 0.391 * (cb-128)); - b = (1.164 * (y1-16) + 2.018 * (cb-128)); - } - else { - /* even pixel: use y0,cr,cb */ - r = (1.164 * (y0-16) + 1.596 * (cr-128)); - g = (1.164 * (y0-16) - 0.813 * (cr-128) - 0.391 * (cb-128)); - b = (1.164 * (y0-16) + 2.018 * (cb-128)); - } - /* XXX remove / 255 here by tweaking arithmetic above */ - r /= 255.0; - g /= 255.0; - b /= 255.0; - /* XXX should we really clamp??? */ - texel[RCOMP] = CLAMP(r, 0.0, 1.0); - texel[GCOMP] = CLAMP(g, 0.0, 1.0); - texel[BCOMP] = CLAMP(b, 0.0, 1.0); - texel[ACOMP] = 1.0F; -} - #if DIM == 3 static void store_texel_ycbcr_rev(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) |