diff options
| author | jhartmann <jhartmann> | 2000-04-04 22:08:12 +0000 |
|---|---|---|
| committer | jhartmann <jhartmann> | 2000-04-04 22:08:12 +0000 |
| commit | 4fe5b7fbada2f73c1533e30f8abc5cf71e7c61c4 (patch) | |
| tree | d526515e629abcae4e03e1c5c02b60243dc35f72 /xc/lib/GL/mesa/src/drv/mga/mgatex.h | |
| parent | d13b9c4ecba68ca9c63d94dbf48a395e3d39b847 (diff) | |
Merged mga branch with trunkmga-0-0-2-20000404-merge
Diffstat (limited to 'xc/lib/GL/mesa/src/drv/mga/mgatex.h')
| -rw-r--r-- | xc/lib/GL/mesa/src/drv/mga/mgatex.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/xc/lib/GL/mesa/src/drv/mga/mgatex.h b/xc/lib/GL/mesa/src/drv/mga/mgatex.h index 1e8e7e86f..7873146c0 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgatex.h +++ b/xc/lib/GL/mesa/src/drv/mga/mgatex.h @@ -28,7 +28,6 @@ #ifndef MGATEX_INC #define MGATEX_INC -#include "mga_drm_public.h" #include "types.h" #include "mgacommon.h" #include "mm.h" @@ -48,7 +47,9 @@ typedef struct mga_texture_object_s { mgaUI32 dirty_images; mgaUI32 totalSize; int texelBytes; - mgaUI32 age; + mgaUI32 age; + int bound; + int heap; /* agp or card */ mgaUI32 Setup[MGA_TEX_SETUP_SIZE]; } mgaTextureObject_t; @@ -96,7 +97,7 @@ void mgaUpdateTexturePalette( GLcontext *ctx, struct gl_texture_object *tObj ); GLboolean mgaIsTextureResident( GLcontext *ctx, struct gl_texture_object *t ); -void mgaConvertTexture( mgaUI32 *destPtr, int texelBytes, +void mgaConvertTexture( mgaUI32 *dest, int texelBytes, struct gl_texture_image *image, int x, int y, int width, int height ); @@ -107,9 +108,7 @@ int mgaUploadTexImages( mgaContextPtr mmesa, mgaTextureObjectPtr t ); -void mgaResetGlobalLRU( mgaContextPtr mmesa ); -void mgaTexturesGone( mgaContextPtr mmesa, GLuint offset, - GLuint size, GLuint in_use ); +void mgaAgeTextures( mgaContextPtr mmesa, int heap ); void mgaDDInitTextureFuncs( GLcontext *ctx ); |