gave names to nearly all structs and enums which should make for better C++ error...

[xonotic/darkplaces.git] / r_textures.h

diff --git a/r_textures.h b/r_textures.h
index 330825aac386e079ef2ab55df64e416832adfa99..0fe506befff63ee9e38cde6b1c28051397a816da 100644 (file)
--- a/r_textures.h
+++ b/r_textures.h
@@ -19,8 +19,10 @@
 #define TEXF_FORCENEAREST 0x00000040
 // indicates texture should be uploaded using GL_LINEAR or GL_LINEAR_MIPMAP_NEAREST or GL_LINEAR_MIPMAP_LINEAR mode
 #define TEXF_FORCELINEAR 0x00000080
+// indicates texture should be affected by gl_picmip
+#define TEXF_PICMIP 0x00000100
 // used for checking if textures mismatch
-#define TEXF_IMPORTANTBITS (TEXF_ALPHA | TEXF_MIPMAP | TEXF_FRAGMENT | TEXF_CLAMP | TEXF_FORCENEAREST | TEXF_FORCELINEAR)
+#define TEXF_IMPORTANTBITS (TEXF_ALPHA | TEXF_MIPMAP | TEXF_FRAGMENT | TEXF_CLAMP | TEXF_FORCENEAREST | TEXF_FORCELINEAR | TEXF_PICMIP)
 
 // 8bit paletted
 #define TEXTYPE_PALETTE 1
@@ -32,7 +34,7 @@
 #define TEXTYPE_DSDT 4
 
 // contents of this structure are mostly private to gl_textures.c
-typedef struct
+typedef struct rtexture_s
 {
        // this is exposed (rather than private) for speed reasons only
        int texnum;
@@ -40,7 +42,7 @@ typedef struct
 rtexture_t;
 
 // contents of this structure are private to gl_textures.c
-typedef struct
+typedef struct rtexturepool_s
 {
        int useless;
 }