X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=r_textures.h;h=5cd1aa820040717b941818a2a1dfe38a1a81ca78;hb=7977ef74dc79b00067952417dd4252ed3ebcbadb;hp=ebcd8893e71ce1f7817104e224a343e8aeaab067;hpb=1aea459957c5a3df90ca6b93c73b99c30b8b985c;p=xonotic%2Fdarkplaces.git

diff --git a/r_textures.h b/r_textures.h
index ebcd8893..5cd1aa82 100644
--- a/r_textures.h
+++ b/r_textures.h
@@ -10,21 +10,26 @@
 #define TEXF_PRECACHE 0x00000004
 // upload immediately, never defer (ignore r_textureprecache)
 #define TEXF_ALWAYSPRECACHE 0x00000008
-// allocated as a fragment in a larger texture, mipmap is not allowed with
-// this, mostly used for lightmaps
-#define TEXF_FRAGMENT 0x00000010
+// 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
+#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 and gl_max_size cvar
+#define TEXF_PICMIP 0x00000100
 // used for checking if textures mismatch
-#define TEXF_IMPORTANTBITS (TEXF_ALPHA | TEXF_MIPMAP | TEXF_FRAGMENT)
+#define TEXF_IMPORTANTBITS (TEXF_ALPHA | TEXF_MIPMAP | TEXF_CLAMP | TEXF_FORCENEAREST | TEXF_FORCELINEAR | TEXF_PICMIP)
 
-// 8bit quake paletted
-#define TEXTYPE_QPALETTE 1
+// 8bit paletted
+#define TEXTYPE_PALETTE 1
 // 24bit RGB
 #define TEXTYPE_RGB 2
 // 32bit RGBA
 #define TEXTYPE_RGBA 3
 
 // 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;
@@ -32,7 +37,7 @@ typedef struct
 rtexture_t;
 
 // contents of this structure are private to gl_textures.c
-typedef struct
+typedef struct rtexturepool_s
 {
 	int useless;
 }
@@ -43,29 +48,24 @@ rtexturepool_t *R_AllocTexturePool(void);
 // free a texture pool (textures can not be freed individually)
 void R_FreeTexturePool(rtexturepool_t **rtexturepool);
 
-// important technical note:
-// fragment textures must have a width that is compatible with the fragment
-// update system, to get a compliant size, use R_CompatibleFragmentWidth
-int R_CompatibleFragmentWidth(int width, int textype, int flags);
-
 // add a texture to a pool and optionally precache (upload) it
 // (note: data == NULL is perfectly acceptable)
-rtexture_t *R_LoadTexture (rtexturepool_t *rtexturepool, char *identifier, int width, int height, qbyte *data, int textype, int flags);
+// (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);
 
 // free a texture
 void R_FreeTexture(rtexture_t *rt);
 
-// update the image data of a texture, used by lightmap updates and
-// procedural textures.
-void R_UpdateTexture(rtexture_t *rt, qbyte *data);
-
-// location of the fragment in the texture (note: any parameter except rt can
-// be NULL)
-void R_FragmentLocation(rtexture_t *rt, int *x, int *y, float *fx1, float *fy1, float *fx2, float *fy2);
+// 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);
 
 // 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)) : 0)
+#define R_GetTexture(rt) ((rt) ? ((rt)->texnum >= 0 ? (rt)->texnum : R_RealGetTexture(rt)) : r_texture_white->texnum)
 int R_RealGetTexture (rtexture_t *rt);
 
 // returns true if the texture is transparent (useful for rendering code)
@@ -77,5 +77,8 @@ int R_TextureWidth(rtexture_t *rt);
 // returns height of texture, as was specified when it was uploaded
 int R_TextureHeight(rtexture_t *rt);
 
+// frees processing buffers each frame, and may someday animate procedural textures
+void R_Textures_Frame(void);
+
 #endif