From 156df3e83417149efc1f18e9e47ed7d5dbba629c Mon Sep 17 00:00:00 2001 From: Felix Kuehling Date: Sun, 7 Mar 2004 20:41:42 +0000 Subject: Rewrote tiled texture upload. Small mipmap levels work correctly now. --- src/mesa/drivers/dri/savage/savagetex.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/mesa/drivers/dri/savage/savagetex.h') diff --git a/src/mesa/drivers/dri/savage/savagetex.h b/src/mesa/drivers/dri/savage/savagetex.h index 9ff85e2e32..d26f625f4d 100644 --- a/src/mesa/drivers/dri/savage/savagetex.h +++ b/src/mesa/drivers/dri/savage/savagetex.h @@ -61,12 +61,20 @@ typedef struct { GLuint hwPhysAddress; } savage_texture_parameter_t; +/** \brief Texture tiling information */ +typedef struct savage_tileinfo_t { + GLuint width, height; /**< tile width and height */ + GLuint wInSub, hInSub; /**< tile width and height in subtiles */ + GLuint subWidth, subHeight; /**< subtile width and height */ + GLuint tinyOffset[2]; /**< internal offsets size 1 and 2 images */ +} savageTileInfo, *savageTileInfoPtr; + struct savage_texture_object_t { struct savage_texture_object_t *next, *prev; struct gl_texture_object *globj; GLuint age; - + const savageTileInfo *tileInfo; GLuint texelBytes; GLuint totalSize; GLuint bound; @@ -100,7 +108,7 @@ struct savage_texture_object_t { #define __HWParseTexEnvCombine(imesa, flag0, TexCtrl, TexBlendCtrl) -extern void (*savageUpdateTextureState)( GLcontext *ctx ); +void savageUpdateTextureState( GLcontext *ctx ); void savageDDInitTextureFuncs( struct dd_function_table *functions ); void savageDestroyTexObj( savageContextPtr imesa, savageTextureObjectPtr t); -- cgit v1.2.3