From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 4 Oct 2002 22:28:42 +0000 (+0000)
Subject: forgot to add prototypes for new texture functions to r_textures.h
X-Git-Tag: RELEASE_0_2_0_RC1~154
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=67898d77381f6c48d43f2dc5d911d7aabbf812d7

forgot to add prototypes for new texture functions to r_textures.h
fixed misreporting of texture memory use (was reporting 0 for all textures because sides was 0)


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@2498 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/gl_textures.c b/gl_textures.c
index 19327bac..66f82286 100644
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -898,6 +898,7 @@ static void R_FindImageForTexture(gltexture_t *glt)
 	image->glformat = texinfo->glformat;
 	image->flags = (glt->flags & (TEXF_MIPMAP | TEXF_ALPHA)) | GLTEXF_UPLOAD;
 	image->bytesperpixel = texinfo->internalbytesperpixel;
+	image->sides = image->texturetype == GLTEXTURETYPE_CUBEMAP ? 6 : 1;
 	// get a texture number to use
 	qglGenTextures(1, &image->texnum);
 	*imagechainpointer = image;
diff --git a/r_textures.h b/r_textures.h
index 231ef9cd..4f4eaa57 100644
--- a/r_textures.h
+++ b/r_textures.h
@@ -50,7 +50,11 @@ 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);
+rtexture_t *R_LoadTexture(rtexturepool_t *rtexturepool, char *identifier, int width, int height, qbyte *data, int textype, int flags);
+rtexture_t *R_LoadTexture1D(rtexturepool_t *rtexturepool, char *identifier, int width, qbyte *data, int textype, int flags);
+rtexture_t *R_LoadTexture2D(rtexturepool_t *rtexturepool, char *identifier, int width, int height, qbyte *data, int textype, int flags);
+rtexture_t *R_LoadTexture3D(rtexturepool_t *rtexturepool, char *identifier, int width, int height, int depth, qbyte *data, int textype, int flags);
+rtexture_t *R_LoadTextureCubeMap(rtexturepool_t *rtexturepool, char *identifier, int width, qbyte *data, int textype, int flags);
 
 // free a texture
 void R_FreeTexture(rtexture_t *rt);
@@ -62,6 +66,7 @@ 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);
+void R_FragmentLocation3D(rtexture_t *rt, int *x, int *y, int *z, float *fx1, float *fy1, float *fz1, float *fx2, float *fy2, float *fz2);
 
 // returns the renderer dependent texture slot number (call this before each
 // use, as a texture might not have been precached)