From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 16 Dec 2009 08:49:20 +0000 (+0000)
Subject: fix a bug where gl_max_lightmapsize cvar was not registered (and hence
X-Git-Tag: xonotic-v0.1.0preview~1060
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6342bcd51428f2483d97be38f9607836c80d15c7;p=xonotic%2Fdarkplaces.git

fix a bug where gl_max_lightmapsize cvar was not registered (and hence
always behaved like a value of 0, causing lightmaps to be small)
added R_LoadTextureRectangle function


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

diff --git a/gl_textures.c b/gl_textures.c
index 95e1fbf1..083f4f3c 100644
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -592,6 +592,7 @@ void R_Textures_Init (void)
 	Cmd_AddCommand("r_texturestats", R_TextureStats_f, "print information about all loaded textures and some statistics");
 	Cvar_RegisterVariable (&gl_max_size);
 	Cvar_RegisterVariable (&gl_picmip);
+	Cvar_RegisterVariable (&gl_max_lightmapsize);
 	Cvar_RegisterVariable (&r_lerpimages);
 	Cvar_RegisterVariable (&r_precachetextures);
 	Cvar_RegisterVariable (&gl_texture_anisotropy);
@@ -1112,6 +1113,11 @@ rtexture_t *R_LoadTextureCubeMap(rtexturepool_t *rtexturepool, const char *ident
 	return R_SetupTexture(rtexturepool, identifier, width, width, 1, 6, flags, textype, GLTEXTURETYPE_CUBEMAP, data, 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)
+{
+	return R_SetupTexture(rtexturepool, identifier, width, height, 1, 1, flags, textype, GLTEXTURETYPE_RECTANGLE, data, palette);
+}
+
 static int R_ShadowMapTextureFlags(int precision, qboolean filter)
 {
 	int flags = TEXF_ALWAYSPRECACHE | TEXF_CLAMP;
diff --git a/r_textures.h b/r_textures.h
index fb422f0c..516394ae 100644
--- a/r_textures.h
+++ b/r_textures.h
@@ -82,6 +82,7 @@ extern cvar_t gl_texturecompression_lightcubemaps;
 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_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);