diff options
| author | Brian Paul <brianp@vmware.com> | 2011-09-17 14:50:48 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2011-09-17 14:57:40 -0600 |
| commit | a1661dc8957a35899d653e9fffd97f166c56be56 (patch) | |
| tree | 0662287501323357f391c31dae72a01edd824ec3 /src/mesa/main/texcompress_s3tc.h | |
| parent | 20177a620ef123ae7cdbc7252fd41a48f5b76acc (diff) | |
| download | external_mesa3d-a1661dc8957a35899d653e9fffd97f166c56be56.zip external_mesa3d-a1661dc8957a35899d653e9fffd97f166c56be56.tar.gz external_mesa3d-a1661dc8957a35899d653e9fffd97f166c56be56.tar.bz2 | |
mesa: move gl_texture_image::FetchTexel fields to swrast
This also involves passing swrast_texture_image instead of gl_texture_image
into all the fetch functions.
Diffstat (limited to 'src/mesa/main/texcompress_s3tc.h')
| -rw-r--r-- | src/mesa/main/texcompress_s3tc.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mesa/main/texcompress_s3tc.h b/src/mesa/main/texcompress_s3tc.h index 74a0343..709c35a 100644 --- a/src/mesa/main/texcompress_s3tc.h +++ b/src/mesa/main/texcompress_s3tc.h @@ -31,7 +31,7 @@ #include "texstore.h" struct gl_context; -struct gl_texture_image; +struct swrast_texture_image; #if FEATURE_texture_s3tc @@ -48,35 +48,35 @@ extern GLboolean _mesa_texstore_rgba_dxt5(TEXSTORE_PARAMS); extern void -_mesa_fetch_texel_2d_f_rgb_dxt1(const struct gl_texture_image *texImage, +_mesa_fetch_texel_2d_f_rgb_dxt1(const struct swrast_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel); extern void -_mesa_fetch_texel_2d_f_rgba_dxt1(const struct gl_texture_image *texImage, +_mesa_fetch_texel_2d_f_rgba_dxt1(const struct swrast_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel); extern void -_mesa_fetch_texel_2d_f_rgba_dxt3(const struct gl_texture_image *texImage, +_mesa_fetch_texel_2d_f_rgba_dxt3(const struct swrast_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel); extern void -_mesa_fetch_texel_2d_f_rgba_dxt5(const struct gl_texture_image *texImage, +_mesa_fetch_texel_2d_f_rgba_dxt5(const struct swrast_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel); extern void -_mesa_fetch_texel_2d_f_srgb_dxt1(const struct gl_texture_image *texImage, +_mesa_fetch_texel_2d_f_srgb_dxt1(const struct swrast_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel); extern void -_mesa_fetch_texel_2d_f_srgba_dxt1(const struct gl_texture_image *texImage, +_mesa_fetch_texel_2d_f_srgba_dxt1(const struct swrast_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel); extern void -_mesa_fetch_texel_2d_f_srgba_dxt3(const struct gl_texture_image *texImage, +_mesa_fetch_texel_2d_f_srgba_dxt3(const struct swrast_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel); extern void -_mesa_fetch_texel_2d_f_srgba_dxt5(const struct gl_texture_image *texImage, +_mesa_fetch_texel_2d_f_srgba_dxt5(const struct swrast_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel); extern void |