diff options
| author | marha <marha@users.sourceforge.net> | 2012-12-17 12:16:30 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-12-17 12:16:30 +0100 |
| commit | b3f7d4f6ce0d42d826f384223144936ba6797a10 (patch) | |
| tree | 2f329beffff890b402625bff8547e243071c47bd /mesalib/src/mesa/main/texcompress_rgtc.h | |
| parent | c648afe73ef43a15094508d2dd439e05738735bf (diff) | |
| parent | 840c8745518b92303d40f6834e9c616587242231 (diff) | |
| download | vcxsrv-b3f7d4f6ce0d42d826f384223144936ba6797a10.tar.gz vcxsrv-b3f7d4f6ce0d42d826f384223144936ba6797a10.tar.bz2 vcxsrv-b3f7d4f6ce0d42d826f384223144936ba6797a10.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libXft pixman mesa git update 17 dec 2012
Conflicts:
mesalib/src/mesa/drivers/dri/swrast/swrast.c
Diffstat (limited to 'mesalib/src/mesa/main/texcompress_rgtc.h')
| -rw-r--r-- | mesalib/src/mesa/main/texcompress_rgtc.h | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/mesalib/src/mesa/main/texcompress_rgtc.h b/mesalib/src/mesa/main/texcompress_rgtc.h index 91fda882d..9e1cce438 100644 --- a/mesalib/src/mesa/main/texcompress_rgtc.h +++ b/mesalib/src/mesa/main/texcompress_rgtc.h @@ -28,7 +28,6 @@ #include "mfeatures.h" #include "texstore.h" -struct swrast_texture_image; extern GLboolean _mesa_texstore_red_rgtc1(TEXSTORE_PARAMS); @@ -42,36 +41,8 @@ _mesa_texstore_rg_rgtc2(TEXSTORE_PARAMS); extern GLboolean _mesa_texstore_signed_rg_rgtc2(TEXSTORE_PARAMS); -extern void -_mesa_fetch_texel_red_rgtc1(const struct swrast_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel); +extern compressed_fetch_func +_mesa_get_compressed_rgtc_func(gl_format format); -extern void -_mesa_fetch_texel_signed_red_rgtc1(const struct swrast_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel); - -extern void -_mesa_fetch_texel_rg_rgtc2(const struct swrast_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel); - -extern void -_mesa_fetch_texel_signed_rg_rgtc2(const struct swrast_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel); - -extern void -_mesa_fetch_texel_l_latc1(const struct swrast_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel); - -extern void -_mesa_fetch_texel_signed_l_latc1(const struct swrast_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel); - -extern void -_mesa_fetch_texel_la_latc2(const struct swrast_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel); - -extern void -_mesa_fetch_texel_signed_la_latc2(const struct swrast_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel); #endif |