diff options
| author | Eric Anholt <eric@anholt.net> | 2007-12-15 16:12:17 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-12-16 11:26:19 -0800 |
| commit | c0b4257aa9ba783674ccf7162799385734dff211 (patch) | |
| tree | 33d0bbdcd5f2b31660420e82f4b9f99b0e5790ca /src/mesa/drivers/dri/intel/intel_tex.c | |
| parent | 659baa3f25275b622dad626992af60f3c9ea6d66 (diff) | |
[965] Move to using shared texture management code.
This removes the delayed texture upload optimization from 965, in exchange for
bringing us closer to PBO support. It also disables SGIS_generate_mipmap,
which didn't seem to be working before anyway, according to the lodbias demo.
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_tex.c')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_tex.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_tex.c b/src/mesa/drivers/dri/intel/intel_tex.c index b08dee43bc..e02972ec63 100644 --- a/src/mesa/drivers/dri/intel/intel_tex.c +++ b/src/mesa/drivers/dri/intel/intel_tex.c @@ -1,3 +1,4 @@ +#include "swrast/swrast.h" #include "texobj.h" #include "intel_context.h" #include "intel_mipmap_tree.h" @@ -166,10 +167,17 @@ intelInitTextureFuncs(struct dd_function_table *functions) functions->TexSubImage1D = intelTexSubImage1D; functions->TexSubImage2D = intelTexSubImage2D; functions->TexSubImage3D = intelTexSubImage3D; +#ifdef I915 functions->CopyTexImage1D = intelCopyTexImage1D; functions->CopyTexImage2D = intelCopyTexImage2D; functions->CopyTexSubImage1D = intelCopyTexSubImage1D; functions->CopyTexSubImage2D = intelCopyTexSubImage2D; +#else + functions->CopyTexImage1D = _swrast_copy_teximage1d; + functions->CopyTexImage2D = _swrast_copy_teximage2d; + functions->CopyTexSubImage1D = _swrast_copy_texsubimage1d; + functions->CopyTexSubImage2D = _swrast_copy_texsubimage2d; +#endif functions->GetTexImage = intelGetTexImage; /* compressed texture functions */ |