diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-03-25 02:26:28 +0000 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-03-25 02:26:28 +0000 |
commit | a46bd6f96a78525dc98bcb2176494e6d6dce5dce (patch) | |
tree | f5e3ca54c429badb8d93a6af3ea18b25ac49eea3 /src/mesa/drivers/x11 | |
parent | 45bc887da226403f2c41077e40ca38b6f60f1359 (diff) |
histogram code move, remove s_histogram.[ch] from Makefiles
Diffstat (limited to 'src/mesa/drivers/x11')
-rw-r--r-- | src/mesa/drivers/x11/xm_dd.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c index 0d29481e32..bdf0b66886 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.42 2003/01/16 19:10:46 alanh Exp $ */ +/* $Id: xm_dd.c,v 1.43 2003/03/25 02:26:30 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -35,6 +35,7 @@ #include "imports.h" #include "mtypes.h" #include "state.h" +#include "texobj.h" #include "texstore.h" #include "texformat.h" #include "xmesaP.h" @@ -705,7 +706,7 @@ clear_buffers( GLcontext *ctx, GLbitfield mask, if ((mask & (DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT)) && xmesa->xm_draw_buffer->mesa_buffer.UseSoftwareAlphaBuffers && ctx->Color.ColorMask[ACOMP]) { - _mesa_clear_alpha_buffers(ctx); + _swrast_clear_alpha_buffers(ctx); } /* we can't handle color or index masking */ @@ -963,6 +964,9 @@ void xmesa_init_pointers( GLcontext *ctx ) ctx->Driver.CopyTexSubImage2D = _swrast_copy_texsubimage2d; ctx->Driver.CopyTexSubImage3D = _swrast_copy_texsubimage3d; + ctx->Driver.NewTextureObject = _mesa_alloc_texture_object; + ctx->Driver.DeleteTexture = _mesa_free_texture_object; + ctx->Driver.CompressedTexImage1D = _mesa_store_compressed_teximage1d; ctx->Driver.CompressedTexImage2D = _mesa_store_compressed_teximage2d; ctx->Driver.CompressedTexImage3D = _mesa_store_compressed_teximage3d; |