diff options
author | Keith Whitwell <keith@tungstengraphics.com> | 2005-03-22 14:25:55 +0000 |
---|---|---|
committer | Keith Whitwell <keith@tungstengraphics.com> | 2005-03-22 14:25:55 +0000 |
commit | 050b77a9ac45afc5c3acb4d018f1d4858c2f4cc7 (patch) | |
tree | 9c8a33e48be56fe1218b6e6beee8bb8136ebc29f /src/mesa/drivers/dri/unichrome/via_tex.h | |
parent | 59b4b7e07e1374d63eede85c93665e4630a359b1 (diff) | |
download | external_mesa3d-050b77a9ac45afc5c3acb4d018f1d4858c2f4cc7.zip external_mesa3d-050b77a9ac45afc5c3acb4d018f1d4858c2f4cc7.tar.gz external_mesa3d-050b77a9ac45afc5c3acb4d018f1d4858c2f4cc7.tar.bz2 |
merge unichrome changes from branch
Diffstat (limited to 'src/mesa/drivers/dri/unichrome/via_tex.h')
-rw-r--r-- | src/mesa/drivers/dri/unichrome/via_tex.h | 79 |
1 files changed, 2 insertions, 77 deletions
diff --git a/src/mesa/drivers/dri/unichrome/via_tex.h b/src/mesa/drivers/dri/unichrome/via_tex.h index 1b5611a..f6c024e 100644 --- a/src/mesa/drivers/dri/unichrome/via_tex.h +++ b/src/mesa/drivers/dri/unichrome/via_tex.h @@ -27,86 +27,11 @@ #define _VIATEX_H #include "mtypes.h" -#include "mm.h" -#include "via_context.h" -#include "via_3d_reg.h" +struct via_context; -#define VIA_TEX_MAXLEVELS 10 - - -/* For shared texture space managment, these texture objects may also - * be used as proxies for regions of texture memory containing other - * client's textures. Such proxy textures (not to be confused with GL - * proxy textures) are subject to the same LRU aging we use for our - * own private textures, and thus we have a mechanism where we can - * fairly decide between kicking out our own textures and those of - * other clients. - * - * Non-local texture objects have a valid MemBlock to describe the - * region managed by the other client, and can be identified by - * 't->globj == 0' - */ -struct via_texture_object_t { - struct via_texture_object_t *next, *prev; - - GLuint age; - struct gl_texture_object *globj; - - int texelBytes; - int totalSize; - - struct { - GLuint index; - GLuint offset; - GLuint size; - } texMem; - unsigned char* bufAddr; - - GLuint inAGP; - GLuint needClearCache; - GLuint actualLevel; - - GLuint maxLevel; - GLuint dirtyImages; - - struct { - const struct gl_texture_image *image; - int offset; /* into bufAddr */ - int height; - int internalFormat; - } image[VIA_TEX_MAXLEVELS]; - - GLuint dirty; - - GLuint regTexFM; - GLuint regTexWidthLog2[2]; - GLuint regTexHeightLog2[2]; - GLuint regTexBaseH[4]; - struct { - GLuint baseL; - GLuint pitchLog2; - } regTexBaseAndPitch[12]; - - GLint firstLevel, lastLevel; /* upload tObj->Image[first .. lastLevel] */ -}; - -viaTextureObjectPtr viaAllocTextureObject(struct gl_texture_object *texObj); GLboolean viaUpdateTextureState(GLcontext *ctx); void viaInitTextureFuncs(struct dd_function_table * functions); -void viaInitTextures(GLcontext *ctx); - -void viaDestroyTexObj(viaContextPtr vmesa, viaTextureObjectPtr t); -void viaSwapOutTexObj(viaContextPtr vmesa, viaTextureObjectPtr t); -void viaUploadTexImages(viaContextPtr vmesa, viaTextureObjectPtr t); - -void viaResetGlobalLRU(viaContextPtr vmesa); -void viaTexturesGone(viaContextPtr vmesa, - GLuint start, GLuint end, - GLuint in_use); - -void viaPrintLocalLRU(viaContextPtr vmesa); -void viaPrintGlobalLRU(viaContextPtr vmesa); -void viaUpdateTexLRU(viaContextPtr vmesa, viaTextureObjectPtr t); +GLboolean viaSwapOutWork( struct via_context *vmesa ); #endif |