X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=r_textures.h;h=63c4769d04aa6f3ead83180c525c23288102d27f;hb=5cb8042fac7c4f77d63b50646fb2236cf95432d3;hp=0cef25500d0513efd6407ec7f625bd23bdf879c2;hpb=4a0c55c2f53d3b18ae28eddb822a0c670636c0f9;p=xonotic%2Fdarkplaces.git diff --git a/r_textures.h b/r_textures.h index 0cef2550..63c4769d 100644 --- a/r_textures.h +++ b/r_textures.h @@ -6,10 +6,6 @@ #define TEXF_ALPHA 0x00000001 // mipmapped #define TEXF_MIPMAP 0x00000002 -// upload if r_textureprecache >= 1, otherwise defer loading until it is used -#define TEXF_PRECACHE 0x00000004 -// upload immediately, never defer (ignore r_textureprecache) -#define TEXF_ALWAYSPRECACHE 0x00000008 // indicates texture coordinates should be clamped rather than wrapping #define TEXF_CLAMP 0x00000020 // indicates texture should be uploaded using GL_NEAREST or GL_NEAREST_MIPMAP_NEAREST mode @@ -20,21 +16,49 @@ #define TEXF_PICMIP 0x00000100 // indicates texture should be compressed if possible #define TEXF_COMPRESS 0x00000200 +// use this flag to block R_PurgeTexture from freeing a texture (only used by r_texture_white and similar which may be used in skinframe_t) +#define TEXF_PERSISTENT 0x00000400 +// indicates texture should use GL_COMPARE_R_TO_TEXTURE mode +#define TEXF_COMPARE 0x00000800 +// indicates texture should use lower precision where supported +#define TEXF_LOWPRECISION 0x00001000 +// indicates texture should support R_UpdateTexture, actual uploads may be delayed until R_Mesh_TexBind if gl_nopartialtextureupdates is on +#define TEXF_ALLOWUPDATES 0x00002000 // used for checking if textures mismatch -#define TEXF_IMPORTANTBITS (TEXF_ALPHA | TEXF_MIPMAP | TEXF_CLAMP | TEXF_FORCENEAREST | TEXF_FORCELINEAR | TEXF_PICMIP | TEXF_COMPRESS) +#define TEXF_IMPORTANTBITS (TEXF_ALPHA | TEXF_MIPMAP | TEXF_CLAMP | TEXF_FORCENEAREST | TEXF_FORCELINEAR | TEXF_PICMIP | TEXF_COMPRESS | TEXF_COMPARE | TEXF_LOWPRECISION) -// 8bit paletted -#define TEXTYPE_PALETTE 1 -// 24bit RGB -#define TEXTYPE_RGB 2 -// 32bit RGBA -#define TEXTYPE_RGBA 3 +typedef enum textype_e +{ + // 8bit paletted + TEXTYPE_PALETTE, + // 32bit RGBA + TEXTYPE_RGBA, + // 32bit BGRA (preferred format due to faster uploads on most hardware) + TEXTYPE_BGRA, + // 16bit D16 (16bit depth) or 32bit S8D24 (24bit depth, 8bit stencil unused) + TEXTYPE_SHADOWMAP, + // 8bit ALPHA (used for freetype fonts) + TEXTYPE_ALPHA, + // 4x4 block compressed 15bit color (4 bits per pixel) + TEXTYPE_DXT1, + // 4x4 block compressed 15bit color plus 1bit alpha (4 bits per pixel) + TEXTYPE_DXT1A, + // 4x4 block compressed 15bit color plus 8bit alpha (8 bits per pixel) + TEXTYPE_DXT3, + // 4x4 block compressed 15bit color plus 8bit alpha (8 bits per pixel) + TEXTYPE_DXT5, + // this represents the same format as the framebuffer, for fast copies + TEXTYPE_COLORBUFFER, +} +textype_t; // contents of this structure are mostly private to gl_textures.c typedef struct rtexture_s { // this is exposed (rather than private) for speed reasons only int texnum; + qboolean dirty; + int gltexturetypeenum; // exposed for use in R_Mesh_TexBind } rtexture_t; @@ -45,6 +69,8 @@ typedef struct rtexturepool_s } rtexturepool_t; +typedef void (*updatecallback_t)(rtexture_t *rt, void *data); + // allocate a texture pool, to be used with R_LoadTexture rtexturepool_t *R_AllocTexturePool(void); // free a texture pool (textures can not be freed individually) @@ -61,38 +87,55 @@ extern cvar_t gl_texturecompression_q3bsplightmaps; extern cvar_t gl_texturecompression_q3bspdeluxemaps; extern cvar_t gl_texturecompression_sky; extern cvar_t gl_texturecompression_lightcubemaps; +extern cvar_t gl_texturecompression_reflectmask; // add a texture to a pool and optionally precache (upload) it // (note: data == NULL is perfectly acceptable) // (note: palette must not be NULL if using TEXTYPE_PALETTE) -rtexture_t *R_LoadTexture1D(rtexturepool_t *rtexturepool, const char *identifier, int width, const unsigned char *data, int textype, int flags, const unsigned int *palette); -rtexture_t *R_LoadTexture2D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, const unsigned char *data, int textype, int flags, const unsigned int *palette); -rtexture_t *R_LoadTexture3D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, int depth, const unsigned char *data, int textype, int flags, const unsigned int *palette); -rtexture_t *R_LoadTextureCubeMap(rtexturepool_t *rtexturepool, const char *identifier, int width, const unsigned char *data, int textype, int flags, const unsigned int *palette); +rtexture_t *R_LoadTexture2D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, const unsigned char *data, textype_t textype, int flags, const unsigned int *palette); +rtexture_t *R_LoadTexture3D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, int depth, const unsigned char *data, textype_t textype, int flags, const unsigned int *palette); +rtexture_t *R_LoadTextureCubeMap(rtexturepool_t *rtexturepool, const char *identifier, int width, const unsigned char *data, textype_t textype, int flags, const unsigned int *palette); +rtexture_t *R_LoadTextureRectangle(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, const unsigned char *data, textype_t textype, int flags, const unsigned int *palette); +rtexture_t *R_LoadTextureShadowMapRectangle(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, int precision, qboolean filter); +rtexture_t *R_LoadTextureShadowMap2D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, int precision, qboolean filter); +rtexture_t *R_LoadTextureShadowMapCube(rtexturepool_t *rtexturepool, const char *identifier, int width, int precision, qboolean filter); +rtexture_t *R_LoadTextureDDSFile(rtexturepool_t *rtexturepool, const char *filename, int flags, qboolean *hasalphaflag, float *avgcolor); + +// saves a texture to a DDS file +int R_SaveTextureDDSFile(rtexture_t *rt, const char *filename, qboolean skipuncompressed); // free a texture void R_FreeTexture(rtexture_t *rt); // update a portion of the image data of a texture, used by lightmap updates -// and procedural textures such as video playback. -void R_UpdateTexture(rtexture_t *rt, unsigned char *data, int x, int y, int width, int height); +// and procedural textures such as video playback, actual uploads may be +// delayed by gl_nopartialtextureupdates cvar until R_Mesh_TexBind uses it +void R_UpdateTexture(rtexture_t *rt, const unsigned char *data, int x, int y, int width, int height); // returns the renderer dependent texture slot number (call this before each // use, as a texture might not have been precached) -#define R_GetTexture(rt) ((rt) ? ((rt)->texnum >= 0 ? (rt)->texnum : R_RealGetTexture(rt)) : r_texture_white->texnum) +#define R_GetTexture(rt) ((rt) ? ((rt)->dirty ? R_RealGetTexture(rt) : (rt)->texnum) : r_texture_white->texnum) int R_RealGetTexture (rtexture_t *rt); -// returns true if the texture is transparent (useful for rendering code) -int R_TextureHasAlpha(rtexture_t *rt); - // returns width of texture, as was specified when it was uploaded int R_TextureWidth(rtexture_t *rt); // returns height of texture, as was specified when it was uploaded int R_TextureHeight(rtexture_t *rt); +// only frees the texture if TEXF_PERSISTENT is not set +// also resets the variable +void R_PurgeTexture(rtexture_t *prt); + // frees processing buffers each frame, and may someday animate procedural textures void R_Textures_Frame(void); +// maybe rename this - sounds awful? [11/21/2007 Black] +void R_MarkDirtyTexture(rtexture_t *rt); +void R_MakeTextureDynamic(rtexture_t *rt, updatecallback_t updatecallback, void *data); + +// Clear the texture's contents +void R_ClearTexture (rtexture_t *rt); + #endif