diff options
| -rw-r--r-- | src/mesa/main/texformat_tmp.h | 309 |
1 files changed, 129 insertions, 180 deletions
diff --git a/src/mesa/main/texformat_tmp.h b/src/mesa/main/texformat_tmp.h index 22531d826f..1e2ecbdb26 100644 --- a/src/mesa/main/texformat_tmp.h +++ b/src/mesa/main/texformat_tmp.h @@ -1,6 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 6.3.2 + * Version: 6.5 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * @@ -43,70 +43,24 @@ #if DIM == 1 -#define CHAN_ADDR( t, i, j, k, sz ) \ - ((void) (j), (void) (k), \ - ((GLchan *)(t)->Data + (i) * (sz))) -#define UBYTE_ADDR( t, i, j, k, sz ) \ - ((void) (j), (void) (k), \ - ((GLubyte *)(t)->Data + (i) * (sz))) -#define USHORT_ADDR( t, i, j, k ) \ - ((void) (j), (void) (k), \ - ((GLushort *)(t)->Data + (i))) -#define UINT_ADDR( t, i, j, k ) \ - ((void) (j), (void) (k), \ - ((GLuint *)(t)->Data + (i))) -#define FLOAT_ADDR( t, i, j, k, sz ) \ - ((void) (j), (void) (k), \ - ((GLfloat *)(t)->Data + (i) * (sz))) -#define HALF_ADDR( t, i, j, k, sz ) \ - ((void) (j), (void) (k), \ - ((GLhalfARB *)(t)->Data + (i) * (sz))) +#define TEXEL_ADDR( type, image, i, j, k, size ) \ + ((void) (j), (void) (k), ((type *)(image)->Data + (i) * (size))) #define FETCH(x) fetch_texel_1d_##x #elif DIM == 2 -#define CHAN_ADDR( t, i, j, k, sz ) \ - ((void) (k), \ - ((GLchan *)(t)->Data + ((t)->RowStride * (j) + (i)) * (sz))) -#define UBYTE_ADDR( t, i, j, k, sz ) \ - ((void) (k), \ - ((GLubyte *)(t)->Data + ((t)->RowStride * (j) + (i)) * (sz))) -#define USHORT_ADDR( t, i, j, k ) \ - ((void) (k), \ - ((GLushort *)(t)->Data + ((t)->RowStride * (j) + (i)))) -#define UINT_ADDR( t, i, j, k ) \ - ((void) (k), \ - ((GLuint *)(t)->Data + ((t)->RowStride * (j) + (i)))) -#define FLOAT_ADDR( t, i, j, k, sz ) \ - ((void) (k), \ - ((GLfloat *)(t)->Data + ((t)->RowStride * (j) + (i)) * (sz))) -#define HALF_ADDR( t, i, j, k, sz ) \ - ((void) (k), \ - ((GLhalfARB *)(t)->Data + ((t)->RowStride * (j) + (i)) * (sz))) +#define TEXEL_ADDR( type, image, i, j, k, size ) \ + ((void) (k), \ + ((type *)(image)->Data + ((image)->RowStride * (j) + (i)) * (size))) #define FETCH(x) fetch_texel_2d_##x #elif DIM == 3 -#define CHAN_ADDR( t, i, j, k, sz ) \ - (GLchan *)(t)->Data + (((t)->Height * (k) + (j)) * \ - (t)->RowStride + (i)) * (sz) -#define UBYTE_ADDR( t, i, j, k, sz ) \ - ((GLubyte *)(t)->Data + (((t)->Height * (k) + (j)) * \ - (t)->RowStride + (i)) * (sz)) -#define USHORT_ADDR( t, i, j, k ) \ - ((GLushort *)(t)->Data + (((t)->Height * (k) + (j)) * \ - (t)->RowStride + (i))) -#define UINT_ADDR( t, i, j, k ) \ - ((GLuint *)(t)->Data + (((t)->Height * (k) + (j)) * \ - (t)->RowStride + (i))) -#define FLOAT_ADDR( t, i, j, k, sz ) \ - ((GLfloat *)(t)->Data + (((t)->Height * (k) + (j)) * \ - (t)->RowStride + (i)) * (sz)) -#define HALF_ADDR( t, i, j, k, sz ) \ - ((GLhalfARB *)(t)->Data + (((t)->Height * (k) + (j)) * \ - (t)->RowStride + (i)) * (sz)) +#define TEXEL_ADDR( type, image, i, j, k, size ) \ + ((type *)(image)->Data + (((image)->Height * (k) + (j)) * \ + (image)->RowStride + (i)) * (size)) #define FETCH(x) fetch_texel_3d_##x @@ -121,7 +75,7 @@ static void FETCH(rgba)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLchan *src = CHAN_ADDR( texImage, i, j, k, 4 ); + const GLchan *src = TEXEL_ADDR(GLchan, texImage, i, j, k, 4); COPY_CHAN4( texel, src ); } @@ -129,7 +83,7 @@ static void FETCH(rgba)( const struct gl_texture_image *texImage, static void FETCH(f_rgba)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLchan *src = CHAN_ADDR( texImage, i, j, k, 4 ); + const GLchan *src = TEXEL_ADDR(GLchan, texImage, i, j, k, 4); texel[RCOMP] = CHAN_TO_FLOAT(src[0]); texel[GCOMP] = CHAN_TO_FLOAT(src[1]); texel[BCOMP] = CHAN_TO_FLOAT(src[2]); @@ -142,7 +96,7 @@ static void store_texel_rgba(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLchan *rgba = (const GLchan *) texel; - GLchan *dst = CHAN_ADDR(texImage, i, j, k, 4); + GLchan *dst = TEXEL_ADDR(GLchan, texImage, i, j, k, 4); dst[0] = rgba[RCOMP]; dst[1] = rgba[GCOMP]; dst[2] = rgba[BCOMP]; @@ -156,7 +110,7 @@ static void store_texel_rgba(struct gl_texture_image *texImage, static void FETCH(rgb)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLchan *src = CHAN_ADDR( texImage, i, j, k, 3 ); + const GLchan *src = TEXEL_ADDR(GLchan, texImage, i, j, k, 3); texel[RCOMP] = src[0]; texel[GCOMP] = src[1]; texel[BCOMP] = src[2]; @@ -167,7 +121,7 @@ static void FETCH(rgb)( const struct gl_texture_image *texImage, static void FETCH(f_rgb)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLchan *src = CHAN_ADDR( texImage, i, j, k, 3 ); + const GLchan *src = TEXEL_ADDR(GLchan, texImage, i, j, k, 3); texel[RCOMP] = CHAN_TO_FLOAT(src[0]); texel[GCOMP] = CHAN_TO_FLOAT(src[1]); texel[BCOMP] = CHAN_TO_FLOAT(src[2]); @@ -179,7 +133,7 @@ static void store_texel_rgb(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLchan *rgba = (const GLchan *) texel; - GLchan *dst = CHAN_ADDR(texImage, i, j, k, 3); + GLchan *dst = TEXEL_ADDR(GLchan, texImage, i, j, k, 3); dst[0] = rgba[RCOMP]; dst[1] = rgba[GCOMP]; dst[2] = rgba[BCOMP]; @@ -192,7 +146,7 @@ static void store_texel_rgb(struct gl_texture_image *texImage, static void FETCH(alpha)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLchan *src = CHAN_ADDR( texImage, i, j, k, 1 ); + const GLchan *src = TEXEL_ADDR(GLchan, texImage, i, j, k, 1); texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = 0; @@ -203,7 +157,7 @@ static void FETCH(alpha)( const struct gl_texture_image *texImage, static void FETCH(f_alpha)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLchan *src = CHAN_ADDR( texImage, i, j, k, 1 ); + const GLchan *src = TEXEL_ADDR(GLchan, texImage, i, j, k, 1); texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = 0.0; @@ -215,7 +169,7 @@ static void store_texel_alpha(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLchan *rgba = (const GLchan *) texel; - GLchan *dst = CHAN_ADDR(texImage, i, j, k, 1); + GLchan *dst = TEXEL_ADDR(GLchan, texImage, i, j, k, 1); dst[0] = rgba[ACOMP]; } #endif @@ -226,7 +180,7 @@ static void store_texel_alpha(struct gl_texture_image *texImage, static void FETCH(luminance)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLchan *src = CHAN_ADDR( texImage, i, j, k, 1 ); + const GLchan *src = TEXEL_ADDR(GLchan, texImage, i, j, k, 1); texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = src[0]; @@ -237,7 +191,7 @@ static void FETCH(luminance)( const struct gl_texture_image *texImage, static void FETCH(f_luminance)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLchan *src = CHAN_ADDR( texImage, i, j, k, 1 ); + const GLchan *src = TEXEL_ADDR(GLchan, texImage, i, j, k, 1); texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = CHAN_TO_FLOAT(src[0]); @@ -249,7 +203,7 @@ static void store_texel_luminance(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLchan *rgba = (const GLchan *) texel; - GLchan *dst = CHAN_ADDR(texImage, i, j, k, 1); + GLchan *dst = TEXEL_ADDR(GLchan, texImage, i, j, k, 1); dst[0] = rgba[RCOMP]; } #endif @@ -260,7 +214,7 @@ static void store_texel_luminance(struct gl_texture_image *texImage, static void FETCH(luminance_alpha)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLchan *src = CHAN_ADDR( texImage, i, j, k, 2 ); + const GLchan *src = TEXEL_ADDR(GLchan, texImage, i, j, k, 2); texel[RCOMP] = src[0]; texel[GCOMP] = src[0]; texel[BCOMP] = src[0]; @@ -271,7 +225,7 @@ static void FETCH(luminance_alpha)( const struct gl_texture_image *texImage, static void FETCH(f_luminance_alpha)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLchan *src = CHAN_ADDR( texImage, i, j, k, 2 ); + const GLchan *src = TEXEL_ADDR(GLchan, texImage, i, j, k, 2); texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = CHAN_TO_FLOAT(src[0]); @@ -283,7 +237,7 @@ static void store_texel_luminance_alpha(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLchan *rgba = (const GLchan *) texel; - GLchan *dst = CHAN_ADDR(texImage, i, j, k, 2); + GLchan *dst = TEXEL_ADDR(GLchan, texImage, i, j, k, 2); dst[0] = rgba[RCOMP]; dst[1] = rgba[ACOMP]; } @@ -295,7 +249,7 @@ static void store_texel_luminance_alpha(struct gl_texture_image *texImage, static void FETCH(intensity)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLchan *src = CHAN_ADDR( texImage, i, j, k, 1 ); + const GLchan *src = TEXEL_ADDR(GLchan, texImage, i, j, k, 1); texel[RCOMP] = src[0]; texel[GCOMP] = src[0]; texel[BCOMP] = src[0]; @@ -306,7 +260,7 @@ static void FETCH(intensity)( const struct gl_texture_image *texImage, static void FETCH(f_intensity)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLchan *src = CHAN_ADDR( texImage, i, j, k, 1 ); + const GLchan *src = TEXEL_ADDR(GLchan, texImage, i, j, k, 1); texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = @@ -318,7 +272,7 @@ static void store_texel_intensity(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLchan *rgba = (const GLchan *) texel; - GLchan *dst = CHAN_ADDR(texImage, i, j, k, 1); + GLchan *dst = TEXEL_ADDR(GLchan, texImage, i, j, k, 1); dst[0] = rgba[RCOMP]; } #endif @@ -333,7 +287,7 @@ static void store_texel_intensity(struct gl_texture_image *texImage, static void FETCH(f_depth_component_f32)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLfloat *src = FLOAT_ADDR( texImage, i, j, k, 1 ); + const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1); texel[0] = src[0]; } @@ -342,7 +296,7 @@ static void store_texel_depth_component_f32(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLfloat *depth = (const GLfloat *) texel; - GLfloat *dst = FLOAT_ADDR(texImage, i, j, k, 1); + GLfloat *dst = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1); dst[0] = *depth; } #endif @@ -357,7 +311,7 @@ static void store_texel_depth_component_f32(struct gl_texture_image *texImage, static void FETCH(f_depth_component16)(const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLushort *src = USHORT_ADDR( texImage, i, j, k ); + const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1); texel[0] = src[0] * (1.0F / 65535.0F); } @@ -366,7 +320,7 @@ static void store_texel_depth_component16(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLushort *depth = (const GLushort *) texel; - GLushort *dst = USHORT_ADDR(texImage, i, j, k); + GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1); dst[0] = *depth; } #endif @@ -379,7 +333,7 @@ static void store_texel_depth_component16(struct gl_texture_image *texImage, static void FETCH(rgba_f32)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLfloat *src = FLOAT_ADDR( texImage, i, j, k, 4 ); + 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]); @@ -391,7 +345,7 @@ static void FETCH(rgba_f32)( const struct gl_texture_image *texImage, static void FETCH(f_rgba_f32)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLfloat *src = FLOAT_ADDR( texImage, i, j, k, 4 ); + const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 4); texel[RCOMP] = src[0]; texel[GCOMP] = src[1]; texel[BCOMP] = src[2]; @@ -403,7 +357,7 @@ static void store_texel_rgba_f32(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLfloat *depth = (const GLfloat *) texel; - GLfloat *dst = FLOAT_ADDR(texImage, i, j, k, 1); + GLfloat *dst = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1); dst[0] = depth[RCOMP]; dst[1] = depth[GCOMP]; dst[2] = depth[BCOMP]; @@ -420,7 +374,7 @@ static void store_texel_rgba_f32(struct gl_texture_image *texImage, static void FETCH(rgba_f16)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLhalfARB *src = HALF_ADDR( texImage, i, j, k, 4 ); + 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])); @@ -433,7 +387,7 @@ static void FETCH(rgba_f16)( const struct gl_texture_image *texImage, static void FETCH(f_rgba_f16)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLhalfARB *src = HALF_ADDR( texImage, i, j, k, 4 ); + const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 4); texel[RCOMP] = _mesa_half_to_float(src[0]); texel[GCOMP] = _mesa_half_to_float(src[1]); texel[BCOMP] = _mesa_half_to_float(src[2]); @@ -445,7 +399,7 @@ static void store_texel_rgba_f16(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLfloat *depth = (const GLfloat *) texel; - GLhalfARB *dst = HALF_ADDR(texImage, i, j, k, 1); + GLhalfARB *dst = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1); dst[0] = _mesa_float_to_half(*depth); } #endif @@ -458,7 +412,7 @@ static void store_texel_rgba_f16(struct gl_texture_image *texImage, static void FETCH(rgb_f32)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLfloat *src = FLOAT_ADDR( texImage, i, j, k, 3 ); + 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]); @@ -471,7 +425,7 @@ static void FETCH(rgb_f32)( const struct gl_texture_image *texImage, static void FETCH(f_rgb_f32)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLfloat *src = FLOAT_ADDR( texImage, i, j, k, 3 ); + const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 3); texel[RCOMP] = src[0]; texel[GCOMP] = src[1]; texel[BCOMP] = src[2]; @@ -483,7 +437,7 @@ static void store_texel_rgb_f32(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLfloat *depth = (const GLfloat *) texel; - GLfloat *dst = FLOAT_ADDR(texImage, i, j, k, 1); + GLfloat *dst = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1); dst[0] = *depth; } #endif @@ -497,7 +451,7 @@ static void store_texel_rgb_f32(struct gl_texture_image *texImage, static void FETCH(rgb_f16)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLhalfARB *src = HALF_ADDR( texImage, i, j, k, 3 ); + 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])); @@ -510,7 +464,7 @@ static void FETCH(rgb_f16)( const struct gl_texture_image *texImage, static void FETCH(f_rgb_f16)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLhalfARB *src = HALF_ADDR( texImage, i, j, k, 3 ); + const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 3); texel[RCOMP] = _mesa_half_to_float(src[0]); texel[GCOMP] = _mesa_half_to_float(src[1]); texel[BCOMP] = _mesa_half_to_float(src[2]); @@ -522,7 +476,7 @@ static void store_texel_rgb_f16(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLfloat *depth = (const GLfloat *) texel; - GLhalfARB *dst = HALF_ADDR(texImage, i, j, k, 1); + GLhalfARB *dst = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1); dst[0] = _mesa_float_to_half(*depth); } #endif @@ -536,7 +490,7 @@ static void store_texel_rgb_f16(struct gl_texture_image *texImage, static void FETCH(alpha_f32)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLfloat *src = FLOAT_ADDR( texImage, i, j, k, 1 ); + const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1); texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = 0; @@ -549,7 +503,7 @@ static void FETCH(alpha_f32)( const struct gl_texture_image *texImage, static void FETCH(f_alpha_f32)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLfloat *src = FLOAT_ADDR( texImage, i, j, k, 1 ); + const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1); texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = 0.0F; @@ -561,7 +515,7 @@ static void store_texel_alpha_f32(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLfloat *rgba = (const GLfloat *) texel; - GLfloat *dst = FLOAT_ADDR(texImage, i, j, k, 1); + GLfloat *dst = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1); dst[0] = rgba[ACOMP]; } #endif @@ -575,7 +529,7 @@ static void store_texel_alpha_f32(struct gl_texture_image *texImage, static void FETCH(alpha_f16)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLhalfARB *src = HALF_ADDR( texImage, i, j, k, 1 ); + const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1); texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = 0; @@ -588,7 +542,7 @@ static void FETCH(alpha_f16)( const struct gl_texture_image *texImage, static void FETCH(f_alpha_f16)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLhalfARB *src = HALF_ADDR( texImage, i, j, k, 1 ); + const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1); texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = 0.0F; @@ -600,7 +554,7 @@ static void store_texel_alpha_f16(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLfloat *rgba = (const GLfloat *) texel; - GLhalfARB *dst = HALF_ADDR(texImage, i, j, k, 1); + GLhalfARB *dst = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1); dst[0] = _mesa_float_to_half(rgba[ACOMP]); } #endif @@ -614,7 +568,7 @@ static void store_texel_alpha_f16(struct gl_texture_image *texImage, static void FETCH(luminance_f32)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLfloat *src = FLOAT_ADDR( texImage, i, j, k, 1 ); + 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]; @@ -627,7 +581,7 @@ static void FETCH(luminance_f32)( const struct gl_texture_image *texImage, static void FETCH(f_luminance_f32)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLfloat *src = FLOAT_ADDR( texImage, i, j, k, 1 ); + const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1); texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = src[0]; @@ -639,7 +593,7 @@ static void store_texel_luminance_f32(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLfloat *rgba = (const GLfloat *) texel; - GLfloat *dst = FLOAT_ADDR(texImage, i, j, k, 1); + GLfloat *dst = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1); dst[0] = rgba[RCOMP]; } #endif @@ -653,7 +607,7 @@ static void store_texel_luminance_f32(struct gl_texture_image *texImage, static void FETCH(luminance_f16)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLhalfARB *src = HALF_ADDR( texImage, i, j, k, 1 ); + 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]; @@ -666,7 +620,7 @@ static void FETCH(luminance_f16)( const struct gl_texture_image *texImage, static void FETCH(f_luminance_f16)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLhalfARB *src = HALF_ADDR( texImage, i, j, k, 1 ); + const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1); texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = _mesa_half_to_float(src[0]); @@ -678,7 +632,7 @@ static void store_texel_luminance_f16(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLfloat *rgba = (const GLfloat *) texel; - GLhalfARB *dst = HALF_ADDR(texImage, i, j, k, 1); + GLhalfARB *dst = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1); dst[0] = _mesa_float_to_half(rgba[RCOMP]); } #endif @@ -692,7 +646,7 @@ static void store_texel_luminance_f16(struct gl_texture_image *texImage, static void FETCH(luminance_alpha_f32)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLfloat *src = FLOAT_ADDR( texImage, i, j, k, 2 ); + 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]; @@ -705,7 +659,7 @@ static void FETCH(luminance_alpha_f32)( const struct gl_texture_image *texImage, static void FETCH(f_luminance_alpha_f32)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLfloat *src = FLOAT_ADDR( texImage, i, j, k, 2 ); + const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 2); texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = src[0]; @@ -717,7 +671,7 @@ static void store_texel_luminance_alpha_f32(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLfloat *rgba = (const GLfloat *) texel; - GLfloat *dst = FLOAT_ADDR(texImage, i, j, k, 2); + GLfloat *dst = TEXEL_ADDR(GLfloat, texImage, i, j, k, 2); dst[0] = rgba[RCOMP]; dst[1] = rgba[ACOMP]; } @@ -732,7 +686,7 @@ static void store_texel_luminance_alpha_f32(struct gl_texture_image *texImage, static void FETCH(luminance_alpha_f16)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLhalfARB *src = HALF_ADDR( texImage, i, j, k, 2 ); + 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]; @@ -745,7 +699,7 @@ static void FETCH(luminance_alpha_f16)( const struct gl_texture_image *texImage, static void FETCH(f_luminance_alpha_f16)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLhalfARB *src = HALF_ADDR( texImage, i, j, k, 2 ); + const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 2); texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = _mesa_half_to_float(src[0]); @@ -757,7 +711,7 @@ static void store_texel_luminance_alpha_f16(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLfloat *rgba = (const GLfloat *) texel; - GLhalfARB *dst = HALF_ADDR(texImage, i, j, k, 2); + GLhalfARB *dst = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 2); dst[0] = _mesa_float_to_half(rgba[RCOMP]); dst[1] = _mesa_float_to_half(rgba[ACOMP]); } @@ -772,7 +726,7 @@ static void store_texel_luminance_alpha_f16(struct gl_texture_image *texImage, static void FETCH(intensity_f32)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLfloat *src = FLOAT_ADDR( texImage, i, j, k, 1 ); + const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1); UNCLAMPED_FLOAT_TO_CHAN(texel[RCOMP], src[0]); texel[GCOMP] = texel[BCOMP] = @@ -785,7 +739,7 @@ static void FETCH(intensity_f32)( const struct gl_texture_image *texImage, static void FETCH(f_intensity_f32)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLfloat *src = FLOAT_ADDR( texImage, i, j, k, 1 ); + const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1); texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = @@ -797,7 +751,7 @@ static void store_texel_intensity_f32(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLfloat *rgba = (const GLfloat *) texel; - GLfloat *dst = FLOAT_ADDR(texImage, i, j, k, 1); + GLfloat *dst = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1); dst[0] = rgba[RCOMP]; } #endif @@ -811,7 +765,7 @@ static void store_texel_intensity_f32(struct gl_texture_image *texImage, static void FETCH(intensity_f16)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLhalfARB *src = HALF_ADDR( texImage, i, j, k, 1 ); + 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] = @@ -824,7 +778,7 @@ static void FETCH(intensity_f16)( const struct gl_texture_image *texImage, static void FETCH(f_intensity_f16)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLhalfARB *src = HALF_ADDR( texImage, i, j, k, 1 ); + const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1); texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = @@ -836,7 +790,7 @@ static void store_texel_intensity_f16(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLfloat *rgba = (const GLfloat *) texel; - GLhalfARB *dst = HALF_ADDR(texImage, i, j, k, 1); + GLhalfARB *dst = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1); dst[0] = _mesa_float_to_half(rgba[RCOMP]); } #endif @@ -854,7 +808,7 @@ static void store_texel_intensity_f16(struct gl_texture_image *texImage, static void FETCH(rgba8888)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLuint s = *UINT_ADDR( texImage, i, j, k ); + const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1); texel[RCOMP] = UBYTE_TO_CHAN( (s >> 24) ); texel[GCOMP] = UBYTE_TO_CHAN( (s >> 16) & 0xff ); texel[BCOMP] = UBYTE_TO_CHAN( (s >> 8) & 0xff ); @@ -865,7 +819,7 @@ static void FETCH(rgba8888)( const struct gl_texture_image *texImage, static void FETCH(f_rgba8888)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLuint s = *UINT_ADDR( texImage, i, j, k ); + 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 ); @@ -877,7 +831,7 @@ static void store_texel_rgba8888(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLubyte *rgba = (const GLubyte *) texel; - GLuint *dst = UINT_ADDR(texImage, i, j, k); + GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1); *dst = PACK_COLOR_8888(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP], rgba[ACOMP]); } #endif @@ -889,7 +843,7 @@ static void store_texel_rgba8888(struct gl_texture_image *texImage, static void FETCH(rgba8888_rev)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLuint s = *UINT_ADDR( texImage, i, j, k ); + const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1); texel[RCOMP] = UBYTE_TO_CHAN( (s ) & 0xff ); texel[GCOMP] = UBYTE_TO_CHAN( (s >> 8) & 0xff ); texel[BCOMP] = UBYTE_TO_CHAN( (s >> 16) & 0xff ); @@ -900,7 +854,7 @@ static void FETCH(rgba8888_rev)( const struct gl_texture_image *texImage, static void FETCH(f_rgba8888_rev)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLuint s = *UINT_ADDR( texImage, i, j, k ); + 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 ); @@ -912,7 +866,7 @@ static void store_texel_rgba8888_rev(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLubyte *rgba = (const GLubyte *) texel; - GLuint *dst = UINT_ADDR(texImage, i, j, k); + GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1); *dst = PACK_COLOR_8888_REV(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP], rgba[ACOMP]); } #endif @@ -924,7 +878,7 @@ static void store_texel_rgba8888_rev(struct gl_texture_image *texImage, static void FETCH(argb8888)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLuint s = *UINT_ADDR( texImage, i, j, k ); + const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1); texel[RCOMP] = UBYTE_TO_CHAN( (s >> 16) & 0xff ); texel[GCOMP] = UBYTE_TO_CHAN( (s >> 8) & 0xff ); texel[BCOMP] = UBYTE_TO_CHAN( (s ) & 0xff ); @@ -935,7 +889,7 @@ static void FETCH(argb8888)( const struct gl_texture_image *texImage, static void FETCH(f_argb8888)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLuint s = *UINT_ADDR( texImage, i, j, k ); + 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 ); @@ -947,7 +901,7 @@ static void store_texel_argb8888(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLubyte *rgba = (const GLubyte *) texel; - GLuint *dst = UINT_ADDR(texImage, i, j, k); + GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1); *dst = PACK_COLOR_8888(rgba[ACOMP], rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]); } #endif @@ -959,7 +913,7 @@ static void store_texel_argb8888(struct gl_texture_image *texImage, static void FETCH(argb8888_rev)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLuint s = *UINT_ADDR( texImage, i, j, k ); + const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1); texel[RCOMP] = UBYTE_TO_CHAN( (s >> 8) & 0xff ); texel[GCOMP] = UBYTE_TO_CHAN( (s >> 16) & 0xff ); texel[BCOMP] = UBYTE_TO_CHAN( (s >> 24) ); @@ -970,7 +924,7 @@ static void FETCH(argb8888_rev)( const struct gl_texture_image *texImage, static void FETCH(f_argb8888_rev)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLuint s = *UINT_ADDR( texImage, i, j, k ); + 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) ); @@ -982,7 +936,7 @@ static void store_texel_argb8888_rev(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLubyte *rgba = (const GLubyte *) texel; - GLuint *dst = UINT_ADDR(texImage, i, j, k); + GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1); *dst = PACK_COLOR_8888(rgba[ACOMP], rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]); } #endif @@ -994,7 +948,7 @@ static void store_texel_argb8888_rev(struct gl_texture_image *texImage, static void FETCH(rgb888)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLubyte *src = UBYTE_ADDR( texImage, i, j, k, 3 ); + const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3); texel[RCOMP] = UBYTE_TO_CHAN( src[2] ); texel[GCOMP] = UBYTE_TO_CHAN( src[1] ); texel[BCOMP] = UBYTE_TO_CHAN( src[0] ); @@ -1005,7 +959,7 @@ static void FETCH(rgb888)( const struct gl_texture_image *texImage, static void FETCH(f_rgb888)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLubyte *src = UBYTE_ADDR( texImage, i, j, k, 3 ); + 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] ); @@ -1017,7 +971,7 @@ static void store_texel_rgb888(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLubyte *rgba = (const GLubyte *) texel; - GLubyte *dst = UBYTE_ADDR(texImage, i, j, k, 3); + GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3); dst[0] = rgba[RCOMP]; dst[1] = rgba[GCOMP]; dst[2] = rgba[BCOMP]; @@ -1031,7 +985,7 @@ static void store_texel_rgb888(struct gl_texture_image *texImage, static void FETCH(bgr888)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLubyte *src = UBYTE_ADDR( texImage, i, j, k, 3 ); + const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3); texel[RCOMP] = UBYTE_TO_CHAN( src[0] ); texel[GCOMP] = UBYTE_TO_CHAN( src[1] ); texel[BCOMP] = UBYTE_TO_CHAN( src[2] ); @@ -1042,7 +996,7 @@ static void FETCH(bgr888)( const struct gl_texture_image *texImage, static void FETCH(f_bgr888)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLubyte *src = UBYTE_ADDR( texImage, i, j, k, 3 ); + 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] ); @@ -1054,7 +1008,7 @@ static void store_texel_bgr888(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLubyte *rgba = (const GLubyte *) texel; - GLubyte *dst = UBYTE_ADDR(texImage, i, j, k, 3); + GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3); dst[0] = rgba[BCOMP]; dst[1] = rgba[GCOMP]; dst[2] = rgba[RCOMP]; @@ -1071,7 +1025,7 @@ static void store_texel_bgr888(struct gl_texture_image *texImage, static void FETCH(rgb565)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLushort *src = USHORT_ADDR( texImage, i, j, k ); + const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1); const GLushort s = *src; texel[RCOMP] = UBYTE_TO_CHAN( ((s >> 8) & 0xf8) | ((s >> 13) & 0x7) ); texel[GCOMP] = UBYTE_TO_CHAN( ((s >> 3) & 0xfc) | ((s >> 9) & 0x3) ); @@ -1083,7 +1037,7 @@ static void FETCH(rgb565)( const struct gl_texture_image *texImage, static void FETCH(f_rgb565)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLushort *src = USHORT_ADDR( texImage, i, j, k ); + 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); @@ -1096,7 +1050,7 @@ static void store_texel_rgb565(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLubyte *rgba = (const GLubyte *) texel; - GLushort *dst = USHORT_ADDR(texImage, i, j, k); + GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1); *dst = PACK_COLOR_565(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]); } #endif @@ -1108,7 +1062,7 @@ static void store_texel_rgb565(struct gl_texture_image *texImage, static void FETCH(rgb565_rev)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLushort *src = USHORT_ADDR( texImage, i, j, k ); + const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1); const GLushort s = (*src >> 8) | (*src << 8); /* byte swap */ texel[RCOMP] = UBYTE_TO_CHAN( ((s >> 8) & 0xf8) | ((s >> 13) & 0x7) ); texel[GCOMP] = UBYTE_TO_CHAN( ((s >> 3) & 0xfc) | ((s >> 9) & 0x3) ); @@ -1120,7 +1074,7 @@ static void FETCH(rgb565_rev)( const struct gl_texture_image *texImage, static void FETCH(f_rgb565_rev)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLushort *src = USHORT_ADDR( texImage, i, j, k ); + 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); @@ -1133,7 +1087,7 @@ static void store_texel_rgb565_rev(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLubyte *rgba = (const GLubyte *) texel; - GLushort *dst = USHORT_ADDR(texImage, i, j, k); + GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1); *dst = PACK_COLOR_565(rgba[BCOMP], rgba[GCOMP], rgba[RCOMP]); } #endif @@ -1145,7 +1099,7 @@ static void store_texel_rgb565_rev(struct gl_texture_image *texImage, static void FETCH(argb4444)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLushort *src = USHORT_ADDR( texImage, i, j, k ); + const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1); const GLushort s = *src; texel[RCOMP] = UBYTE_TO_CHAN( ((s >> 8) & 0xf) | ((s >> 4) & 0xf0) ); texel[GCOMP] = UBYTE_TO_CHAN( ((s >> 4) & 0xf) | ((s ) & 0xf0) ); @@ -1157,7 +1111,7 @@ static void FETCH(argb4444)( const struct gl_texture_image *texImage, static void FETCH(f_argb4444)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLushort *src = USHORT_ADDR( texImage, i, j, k ); + 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); @@ -1170,7 +1124,7 @@ static void store_texel_argb4444(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLubyte *rgba = (const GLubyte *) texel; - GLushort *dst = USHORT_ADDR(texImage, i, j, k); + GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1); *dst = PACK_COLOR_4444(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP], rgba[ACOMP]); } #endif @@ -1182,7 +1136,7 @@ static void store_texel_argb4444(struct gl_texture_image *texImage, static void FETCH(argb4444_rev)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLushort s = *USHORT_ADDR( texImage, i, j, k ); + const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1); texel[RCOMP] = UBYTE_TO_CHAN( ((s ) & 0xf) | ((s << 4) & 0xf0) ); texel[GCOMP] = UBYTE_TO_CHAN( ((s >> 12) & 0xf) | ((s >> 8) & 0xf0) ); texel[BCOMP] = UBYTE_TO_CHAN( ((s >> 8) & 0xf) | ((s >> 4) & 0xf0) ); @@ -1193,7 +1147,7 @@ static void FETCH(argb4444_rev)( const struct gl_texture_image *texImage, static void FETCH(f_argb4444_rev)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLushort s = *USHORT_ADDR( texImage, i, j, k ); + 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); @@ -1205,7 +1159,7 @@ static void store_texel_argb4444_rev(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLubyte *rgba = (const GLubyte *) texel; - GLushort *dst = USHORT_ADDR(texImage, i, j, k); + GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1); *dst = PACK_COLOR_4444(rgba[ACOMP], rgba[BCOMP], rgba[GCOMP], rgba[RCOMP]); } #endif @@ -1217,7 +1171,7 @@ static void store_texel_argb4444_rev(struct gl_texture_image *texImage, static void FETCH(argb1555)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLushort *src = USHORT_ADDR( texImage, i, j, k ); + const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1); const GLushort s = *src; texel[RCOMP] = UBYTE_TO_CHAN( ((s >> 7) & 0xf8) | ((s >> 12) & 0x7) ); texel[GCOMP] = UBYTE_TO_CHAN( ((s >> 2) & 0xf8) | ((s >> 7) & 0x7) ); @@ -1229,7 +1183,7 @@ static void FETCH(argb1555)( const struct gl_texture_image *texImage, static void FETCH(f_argb1555)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLushort *src = USHORT_ADDR( texImage, i, j, k ); + 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); @@ -1242,7 +1196,7 @@ static void store_texel_argb1555(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLubyte *rgba = (const GLubyte *) texel; - GLushort *dst = USHORT_ADDR(texImage, i, j, k); + GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1); *dst = PACK_COLOR_1555(rgba[ACOMP], rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]); } #endif @@ -1254,7 +1208,7 @@ static void store_texel_argb1555(struct gl_texture_image *texImage, static void FETCH(argb1555_rev)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLushort *src = USHORT_ADDR( texImage, i, j, k ); + const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1); const GLushort s = (*src << 8) | (*src >> 8); /* byteswap */ texel[RCOMP] = UBYTE_TO_CHAN( ((s >> 7) & 0xf8) | ((s >> 12) & 0x7) ); texel[GCOMP] = UBYTE_TO_CHAN( ((s >> 2) & 0xf8) | ((s >> 7) & 0x7) ); @@ -1266,7 +1220,7 @@ static void FETCH(argb1555_rev)( const struct gl_texture_image *texImage, static void FETCH(f_argb1555_rev)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLushort *src = USHORT_ADDR( texImage, i, j, k ); + 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); @@ -1279,7 +1233,7 @@ static void store_texel_argb1555_rev(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLubyte *rgba = (const GLubyte *) texel; - GLushort *dst = USHORT_ADDR(texImage, i, j, k); + GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1); *dst = PACK_COLOR_1555_REV(rgba[ACOMP], rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]); } #endif @@ -1291,7 +1245,7 @@ static void store_texel_argb1555_rev(struct gl_texture_image *texImage, static void FETCH(al88)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLushort s = *USHORT_ADDR( texImage, i, j, k ); + const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1); texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = UBYTE_TO_CHAN( s & 0xff ); @@ -1302,7 +1256,7 @@ static void FETCH(al88)( const struct gl_texture_image *texImage, static void FETCH(f_al88)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLushort s = *USHORT_ADDR( texImage, i, j, k ); + const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1); texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = UBYTE_TO_FLOAT( s & 0xff ); @@ -1314,7 +1268,7 @@ static void store_texel_al88(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLubyte *rgba = (const GLubyte *) texel; - GLushort *dst = USHORT_ADDR(texImage, i, j, k); + GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1); *dst = PACK_COLOR_88(rgba[ACOMP], rgba[RCOMP]); } #endif @@ -1326,7 +1280,7 @@ static void store_texel_al88(struct gl_texture_image *texImage, static void FETCH(al88_rev)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLushort s = *USHORT_ADDR( texImage, i, j, k ); + const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1); texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = UBYTE_TO_CHAN( s >> 8 ); @@ -1337,7 +1291,7 @@ static void FETCH(al88_rev)( const struct gl_texture_image *texImage, static void FETCH(f_al88_rev)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLushort s = *USHORT_ADDR( texImage, i, j, k ); + const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1); texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = UBYTE_TO_FLOAT( s >> 8 ); @@ -1349,7 +1303,7 @@ static void store_texel_al88_rev(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLubyte *rgba = (const GLubyte *) texel; - GLushort *dst = USHORT_ADDR(texImage, i, j, k); + GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1); *dst = PACK_COLOR_88(rgba[RCOMP], rgba[ACOMP]); } #endif @@ -1363,7 +1317,7 @@ static void FETCH(rgb332)( const struct gl_texture_image *texImage, { static const GLubyte lut2to8[4] = {0, 85, 170, 255}; static const GLubyte lut3to8[8] = {0, 36, 73, 109, 146, 182, 219, 255}; - const GLubyte *src = UBYTE_ADDR( texImage, i, j, k, 1 ); + const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1); const GLubyte s = *src; texel[RCOMP] = UBYTE_TO_CHAN( lut3to8[(s >> 5) & 0x7] ); texel[GCOMP] = UBYTE_TO_CHAN( lut3to8[(s >> 2) & 0x7] ); @@ -1375,7 +1329,7 @@ static void FETCH(rgb332)( const struct gl_texture_image *texImage, static void FETCH(f_rgb332)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLubyte *src = UBYTE_ADDR( texImage, i, j, k, 1 ); + 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); @@ -1388,7 +1342,7 @@ static void store_texel_rgb332(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLubyte *rgba = (const GLubyte *) texel; - GLubyte *dst = UBYTE_ADDR(texImage, i, j, k, 1); + GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1); *dst = PACK_COLOR_332(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]); } #endif @@ -1400,7 +1354,7 @@ static void store_texel_rgb332(struct gl_texture_image *texImage, static void FETCH(a8)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLubyte *src = UBYTE_ADDR( texImage, i, j, k, 1 ); + const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1); texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = 0; @@ -1411,7 +1365,7 @@ static void FETCH(a8)( const struct gl_texture_image *texImage, static void FETCH(f_a8)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLubyte *src = UBYTE_ADDR( texImage, i, j, k, 1 ); + const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1); texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = 0.0; @@ -1423,7 +1377,7 @@ static void store_texel_a8(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLubyte *rgba = (const GLubyte *) texel; - GLubyte *dst = UBYTE_ADDR(texImage, i, j, k, 1); + GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1); *dst = rgba[ACOMP]; } #endif @@ -1435,7 +1389,7 @@ static void store_texel_a8(struct gl_texture_image *texImage, static void FETCH(l8)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLubyte *src = UBYTE_ADDR( texImage, i, j, k, 1 ); + const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1); texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = UBYTE_TO_CHAN( src[0] ); @@ -1446,7 +1400,7 @@ static void FETCH(l8)( const struct gl_texture_image *texImage, static void FETCH(f_l8)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLubyte *src = UBYTE_ADDR( texImage, i, j, k, 1 ); + const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1); texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = UBYTE_TO_FLOAT( src[0] ); @@ -1458,7 +1412,7 @@ static void store_texel_l8(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLubyte *rgba = (const GLubyte *) texel; - GLubyte *dst = UBYTE_ADDR(texImage, i, j, k, 1); + GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1); *dst = rgba[RCOMP]; } #endif @@ -1470,7 +1424,7 @@ static void store_texel_l8(struct gl_texture_image *texImage, static void FETCH(i8)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLubyte *src = UBYTE_ADDR( texImage, i, j, k, 1 ); + const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1); texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = @@ -1481,7 +1435,7 @@ static void FETCH(i8)( const struct gl_texture_image *texImage, static void FETCH(f_i8)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLubyte *src = UBYTE_ADDR( texImage, i, j, k, 1 ); + const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1); texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = @@ -1493,7 +1447,7 @@ static void store_texel_i8(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLubyte *rgba = (const GLubyte *) texel; - GLubyte *dst = UBYTE_ADDR(texImage, i, j, k, 1); + GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1); *dst = rgba[RCOMP]; } #endif @@ -1507,7 +1461,7 @@ static void store_texel_i8(struct gl_texture_image *texImage, static void FETCH(ci8)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLubyte *src = UBYTE_ADDR( texImage, i, j, k, 1 ); + const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1); const struct gl_color_table *palette; const GLchan *table; GLuint index; @@ -1591,7 +1545,7 @@ static void store_texel_ci8(struct gl_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLubyte *index = (const GLubyte *) texel; - GLubyte *dst = UBYTE_ADDR(texImage, i, j, k, 1); + GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1); *dst = *index; } #endif @@ -1605,7 +1559,7 @@ static void store_texel_ci8(struct gl_texture_image *texImage, static void FETCH(ycbcr)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLushort *src0 = USHORT_ADDR( texImage, (i & ~1), j, k ); /* even */ + 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 */ @@ -1635,7 +1589,7 @@ static void FETCH(ycbcr)( const struct gl_texture_image *texImage, static void FETCH(f_ycbcr)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLushort *src0 = USHORT_ADDR( texImage, (i & ~1), j, k ); /* even */ + 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 */ @@ -1682,7 +1636,7 @@ static void store_texel_ycbcr(struct gl_texture_image *texImage, static void FETCH(ycbcr_rev)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - const GLushort *src0 = USHORT_ADDR( texImage, (i & ~1), j, k ); /* even */ + 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 */ @@ -1712,7 +1666,7 @@ static void FETCH(ycbcr_rev)( const struct gl_texture_image *texImage, static void FETCH(f_ycbcr_rev)( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { - const GLushort *src0 = USHORT_ADDR( texImage, (i & ~1), j, k ); /* even */ + 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 */ @@ -1752,11 +1706,6 @@ static void store_texel_ycbcr_rev(struct gl_texture_image *texImage, -#undef CHAN_ADDR -#undef UBYTE_ADDR -#undef USHORT_ADDR -#undef UINT_ADDR -#undef FLOAT_ADDR -#undef HALF_ADDR -#undef FETCH +#undef TEXEL_ADDR #undef DIM +#undef FETCH |