X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=r_textures.h;h=82e3189c8eac6897721640d616fdbfd19dce623d;hb=9bfbab70606e1b1e3dff7a0b2db8ba06862f008c;hp=b66201c49a9b597b73f12b30fe087e758d4beee6;hpb=3e38a6509b932ff0c1033f296737ba378bdc3214;p=xonotic%2Fdarkplaces.git

diff --git a/r_textures.h b/r_textures.h
index b66201c4..82e3189c 100644
--- a/r_textures.h
+++ b/r_textures.h
@@ -34,6 +34,8 @@
 #define TEXF_RENDERTARGET 0x0010000
 // used for checking if textures mismatch
 #define TEXF_IMPORTANTBITS (TEXF_ALPHA | TEXF_MIPMAP | TEXF_RGBMULTIPLYBYALPHA | TEXF_CLAMP | TEXF_FORCENEAREST | TEXF_FORCELINEAR | TEXF_PICMIP | TEXF_COMPRESS | TEXF_COMPARE | TEXF_LOWPRECISION | TEXF_RENDERTARGET)
+// set as a flag to force the texture to be reloaded
+#define TEXF_FORCE_RELOAD 0x80000000
 
 typedef enum textype_e
 {
@@ -43,8 +45,6 @@ typedef enum textype_e
 	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)
@@ -55,12 +55,30 @@ typedef enum textype_e
 	TEXTYPE_DXT3,
 	// 4x4 block compressed 15bit color plus 8bit alpha (8 bits per pixel)
 	TEXTYPE_DXT5,
+
+	// 8bit paletted in sRGB colorspace
+	TEXTYPE_SRGB_PALETTE,
+	// 32bit RGBA in sRGB colorspace
+	TEXTYPE_SRGB_RGBA,
+	// 32bit BGRA (preferred format due to faster uploads on most hardware) in sRGB colorspace
+	TEXTYPE_SRGB_BGRA,
+	// 4x4 block compressed 15bit color (4 bits per pixel) in sRGB colorspace
+	TEXTYPE_SRGB_DXT1,
+	// 4x4 block compressed 15bit color plus 1bit alpha (4 bits per pixel) in sRGB colorspace
+	TEXTYPE_SRGB_DXT1A,
+	// 4x4 block compressed 15bit color plus 8bit alpha (8 bits per pixel) in sRGB colorspace
+	TEXTYPE_SRGB_DXT3,
+	// 4x4 block compressed 15bit color plus 8bit alpha (8 bits per pixel) in sRGB colorspace
+	TEXTYPE_SRGB_DXT5,
+
 	// this represents the same format as the framebuffer, for fast copies
 	TEXTYPE_COLORBUFFER,
 	// this represents an RGBA half_float texture (4 16bit floats)
 	TEXTYPE_COLORBUFFER16F,
 	// this represents an RGBA float texture (4 32bit floats)
-	TEXTYPE_COLORBUFFER32F
+	TEXTYPE_COLORBUFFER32F,
+	// 16bit D16 (16bit depth) or 32bit S8D24 (24bit depth, 8bit stencil unused)
+	TEXTYPE_SHADOWMAP
 }
 textype_t;
 
@@ -127,6 +145,8 @@ extern cvar_t gl_texturecompression_q3bspdeluxemaps;
 extern cvar_t gl_texturecompression_sky;
 extern cvar_t gl_texturecompression_lightcubemaps;
 extern cvar_t gl_texturecompression_reflectmask;
+extern cvar_t r_texture_dds_load;
+extern cvar_t r_texture_dds_save;
 
 // add a texture to a pool and optionally precache (upload) it
 // (note: data == NULL is perfectly acceptable)
@@ -159,6 +179,9 @@ int R_TextureWidth(rtexture_t *rt);
 // returns height of texture, as was specified when it was uploaded
 int R_TextureHeight(rtexture_t *rt);
 
+// returns flags of texture, as was specified when it was uploaded
+int R_TextureFlags(rtexture_t *rt);
+
 // only frees the texture if TEXF_PERSISTENT is not set
 // also resets the variable
 void R_PurgeTexture(rtexture_t *prt);