diff options
author | Brian Paul <[email protected]> | 2001-04-04 21:54:20 +0000 |
---|---|---|
committer | Brian Paul <[email protected]> | 2001-04-04 21:54:20 +0000 |
commit | 7d58f44f73be59bd3583e6dfeedf56c43f7fbd55 (patch) | |
tree | ff9f85c072c0fb669a959f12f74ca5f2b2bfc1e4 /src/mesa/drivers/x11/xm_dd.c | |
parent | bb0830da9e35666f26bb0e5e530d18d8b9ec8e71 (diff) |
More texture image changes.
1. Added ctx->Driver.ChooseTextureFormat() function. Examines user's
internalFormat, format, type params and returns a gl_texture_format.
2. _mesa_store_teximage[123]d() calls ctx->Driver.ChooseTextureFormat(),
allocates storage and transfers the image into the desired format.
3. _mesa_transfer_teximage() now takes a gl_texture_format to describe
the destination format. Any combination of input format/type and
output gl_texture_format is accepted. Uses optimized _mesa_convert_-
texsubimage[123]d() functions when possible.
3. DRI driver's TexImage[123]D functions should be a lot simpler now.
Diffstat (limited to 'src/mesa/drivers/x11/xm_dd.c')
-rw-r--r-- | src/mesa/drivers/x11/xm_dd.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c index 0371d3a9cc5..e2c9e80e94a 100644 --- a/src/mesa/drivers/x11/xm_dd.c +++ b/src/mesa/drivers/x11/xm_dd.c @@ -1,4 +1,4 @@ -/* $Id: xm_dd.c,v 1.21 2001/04/03 17:35:54 brianp Exp $ */ +/* $Id: xm_dd.c,v 1.22 2001/04/04 21:54:21 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -35,6 +35,7 @@ #include "mtypes.h" #include "state.h" #include "texstore.h" +#include "texformat.h" #include "xmesaP.h" #include "array_cache/acache.h" #include "swrast/swrast.h" @@ -952,6 +953,7 @@ void xmesa_init_pointers( GLcontext *ctx ) /* Software texture functions: */ + ctx->Driver.ChooseTextureFormat = _mesa_choose_tex_format; ctx->Driver.TexImage1D = _mesa_store_teximage1d; ctx->Driver.TexImage2D = _mesa_store_teximage2d; ctx->Driver.TexImage3D = _mesa_store_teximage3d; |