fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 11:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa/main: Make FEATURE_texture_fxt1 follow feature conventions.

Browse source 
Also remove the unused initialization and GLchan fetch functions.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
This commit is contained in:
Chia-I Wu 2009-10-29 14:14:04 +08:00 • committed by Brian Paul
parent 920f023e8b
commit 20e20fc5af
4 changed files with 20 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mesa/main/context.c
View file

@ -706,9 +706,6 @@ init_attrib_groups(GLcontext *ctx)
#if FEATURE_texture_s3tc
_mesa_init_texture_s3tc( ctx );
#endif
#if FEATURE_texture_fxt1
_mesa_init_texture_fxt1( ctx );
#endif
/* Miscellaneous */
ctx->NewState = _NEW_ALL;

3
src/mesa/main/texcompress.h
View file

@ -48,9 +48,6 @@ _mesa_compressed_image_address(GLint col, GLint row, GLint img,
extern void
_mesa_init_texture_s3tc( GLcontext *ctx );
extern void
_mesa_init_texture_fxt1( GLcontext *ctx );
#else /* _HAVE_FULL_GL */

35
src/mesa/main/texcompress_fxt1.c
View file

@ -41,6 +41,9 @@
#include "texstore.h"
#if FEATURE_texture_fxt1
static void
fxt1_encode (GLuint width, GLuint height, GLint comps,
const void *source, GLint srcRowStride,
@ -51,16 +54,6 @@ fxt1_decode_1 (const void *texture, GLint stride,
GLint i, GLint j, GLchan *rgba);
/**
* Called during context initialization.
*/
void
_mesa_init_texture_fxt1( GLcontext *ctx )
{
(void) ctx;
}
/**
* Store user's image in rgb_fxt1 format.
*/
@ -175,15 +168,6 @@ _mesa_texstore_rgba_fxt1(TEXSTORE_PARAMS)
}
void
_mesa_fetch_texel_2d_rgba_fxt1( const struct gl_texture_image *texImage,
GLint i, GLint j, GLint k, GLchan *texel )
{
(void) k;
fxt1_decode_1(texImage->Data, texImage->RowStride, i, j, texel);
}
void
_mesa_fetch_texel_2d_f_rgba_fxt1( const struct gl_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel )
@ -199,16 +183,6 @@ _mesa_fetch_texel_2d_f_rgba_fxt1( const struct gl_texture_image *texImage,
}
void
_mesa_fetch_texel_2d_rgb_fxt1( const struct gl_texture_image *texImage,
GLint i, GLint j, GLint k, GLchan *texel )
{
(void) k;
fxt1_decode_1(texImage->Data, texImage->RowStride, i, j, texel);
texel[ACOMP] = 255;
}
void
_mesa_fetch_texel_2d_f_rgb_fxt1( const struct gl_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel )
@ -1673,3 +1647,6 @@ fxt1_decode_1 (const void *texture, GLint stride, /* in pixels */
decode_1[mode](code, t, rgba);
}
#endif /* FEATURE_texture_fxt1 */

22
src/mesa/main/texcompress_fxt1.h
View file

@ -25,29 +25,35 @@
#ifndef TEXCOMPRESS_FXT1_H
#define TEXCOMPRESS_FXT1_H
#include "main/mtypes.h"
#include "texstore.h"
#if FEATURE_texture_fxt1
extern GLboolean
_mesa_texstore_rgb_fxt1(TEXSTORE_PARAMS);
extern GLboolean
_mesa_texstore_rgba_fxt1(TEXSTORE_PARAMS);
extern void
_mesa_fetch_texel_2d_rgba_fxt1(const struct gl_texture_image *texImage,
GLint i, GLint j, GLint k, GLchan *texel);
extern void
_mesa_fetch_texel_2d_f_rgba_fxt1(const struct gl_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel);
extern void
_mesa_fetch_texel_2d_rgb_fxt1(const struct gl_texture_image *texImage,
GLint i, GLint j, GLint k, GLchan *texel);
extern void
_mesa_fetch_texel_2d_f_rgb_fxt1(const struct gl_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel);
#else /* FEATURE_texture_fxt1 */
/* these are used only in texstore_funcs[] */
#define _mesa_texstore_rgb_fxt1 NULL
#define _mesa_texstore_rgba_fxt1 NULL
/* these are used only in texfetch_funcs[] */
#define _mesa_fetch_texel_2d_f_rgba_fxt1 NULL
#define _mesa_fetch_texel_2d_f_rgb_fxt1 NULL
#endif /* FEATURE_texture_fxt1 */
#endif /* TEXCOMPRESS_FXT1_H */