avoid NULL pointer access if a surface had an unsupported type

[xonotic/darkplaces.git] / r_textures.h

diff --git a/r_textures.h b/r_textures.h
index 07485408387002f2eaf06b4f32262afab9d5cd7b..0cbad6523820d2371364545c2f4b81e8aab5736b 100644 (file)
--- a/r_textures.h
+++ b/r_textures.h
@@ -22,8 +22,12 @@
 #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
+// indicates texture should support R_UpdateTexture on small regions, actual uploads may be delayed until R_Mesh_TexBind if gl_nopartialtextureupdates is on
 #define TEXF_ALLOWUPDATES 0x00002000
+// indicates texture should be affected by gl_picmip_world and r_picmipworld (maybe others in the future) instead of gl_picmip_other
+#define TEXF_ISWORLD 0x00004000
+// indicates texture should be affected by gl_picmip_sprites and r_picmipsprites (maybe others in the future) instead of gl_picmip_other
+#define TEXF_ISSPRITE 0x00008000
 // used for checking if textures mismatch
 #define TEXF_IMPORTANTBITS (TEXF_ALPHA | TEXF_MIPMAP | TEXF_CLAMP | TEXF_FORCENEAREST | TEXF_FORCELINEAR | TEXF_PICMIP | TEXF_COMPRESS | TEXF_COMPARE | TEXF_LOWPRECISION)
 
@@ -39,6 +43,16 @@ typedef enum textype_e
        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;
 
@@ -77,17 +91,22 @@ 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_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_LoadTexture2D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, const unsigned char *data, textype_t textype, int flags, int miplevel, 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, int miplevel, 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, int miplevel, 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, int miplevel, 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, int miplevel);
+
+// saves a texture to a DDS file
+int R_SaveTextureDDSFile(rtexture_t *rt, const char *filename, qboolean skipuncompressed, qboolean hasalpha);
 
 // free a texture
 void R_FreeTexture(rtexture_t *rt);
@@ -122,5 +141,8 @@ void R_MakeTextureDynamic(rtexture_t *rt, updatecallback_t updatecallback, void
 // Clear the texture's contents
 void R_ClearTexture (rtexture_t *rt);
 
+// returns the desired picmip level for given TEXF_ flags
+int R_PicmipForFlags(int flags);
+
 #endif