#include "quakedef.h"
#include "image.h"
#include "jpeg.h"
-
-cvar_t gl_max_size = {CVAR_SAVE, "gl_max_size", "2048"};
-cvar_t gl_max_scrapsize = {CVAR_SAVE, "gl_max_scrapsize", "256"};
-cvar_t gl_picmip = {CVAR_SAVE, "gl_picmip", "0"};
-cvar_t r_lerpimages = {CVAR_SAVE, "r_lerpimages", "1"};
-cvar_t r_precachetextures = {CVAR_SAVE, "r_precachetextures", "1"};
-cvar_t gl_texture_anisotropy = {CVAR_SAVE, "gl_texture_anisotropy", "1"};
+#include "image_png.h"
+
+cvar_t gl_max_size = {CVAR_SAVE, "gl_max_size", "2048", "maximum allowed texture size, can be used to reduce video memory usage, note: this is automatically reduced to match video card capabilities (such as 256 on 3Dfx cards before Voodoo4/5)"};
+cvar_t gl_picmip = {CVAR_SAVE, "gl_picmip", "0", "reduces resolution of textures by powers of 2, for example 1 will halve width/height, reducing texture memory usage by 75%"};
+cvar_t r_lerpimages = {CVAR_SAVE, "r_lerpimages", "1", "bilinear filters images when scaling them up to power of 2 size (mode 1), looks better than glquake (mode 0)"};
+cvar_t r_precachetextures = {CVAR_SAVE, "r_precachetextures", "1", "0 = never upload textures until used, 1 = upload most textures before use (exceptions: rarely used skin colormap layers), 2 = upload all textures before use (can increase texture memory usage significantly)"};
+cvar_t gl_texture_anisotropy = {CVAR_SAVE, "gl_texture_anisotropy", "1", "anisotropic filtering quality (if supported by hardware), 1 sample (no anisotropy) and 8 sample (8 tap anisotropy) are recommended values"};
+cvar_t gl_texturecompression = {CVAR_SAVE, "gl_texturecompression", "0", "whether to compress textures, a value of 0 disables compression (even if the individual cvars are 1), 1 enables fast (low quality) compression at startup, 2 enables slow (high quality) compression at startup"};
+cvar_t gl_texturecompression_color = {CVAR_SAVE, "gl_texturecompression_color", "1", "whether to compress colormap (diffuse) textures"};
+cvar_t gl_texturecompression_normal = {CVAR_SAVE, "gl_texturecompression_normal", "0", "whether to compress normalmap (normalmap) textures"};
+cvar_t gl_texturecompression_gloss = {CVAR_SAVE, "gl_texturecompression_gloss", "1", "whether to compress glossmap (specular) textures"};
+cvar_t gl_texturecompression_glow = {CVAR_SAVE, "gl_texturecompression_glow", "1", "whether to compress glowmap (luma) textures"};
+cvar_t gl_texturecompression_2d = {CVAR_SAVE, "gl_texturecompression_2d", "0", "whether to compress 2d (hud/menu) textures other than the font"};
+cvar_t gl_texturecompression_q3bsplightmaps = {CVAR_SAVE, "gl_texturecompression_q3bsplightmaps", "0", "whether to compress lightmaps in q3bsp format levels"};
+cvar_t gl_texturecompression_q3bspdeluxemaps = {CVAR_SAVE, "gl_texturecompression_q3bspdeluxemaps", "0", "whether to compress deluxemaps in q3bsp format levels (only levels compiled with q3map2 -deluxe have these)"};
+cvar_t gl_texturecompression_sky = {CVAR_SAVE, "gl_texturecompression_sky", "0", "whether to compress sky textures"};
+cvar_t gl_texturecompression_lightcubemaps = {CVAR_SAVE, "gl_texturecompression_lightcubemaps", "1", "whether to compress light cubemaps (spotlights and other light projection images)"};
int gl_filter_min = GL_LINEAR_MIPMAP_LINEAR;
int gl_filter_mag = GL_LINEAR;
static mempool_t *texturemempool;
-static mempool_t *texturedatamempool;
-static mempool_t *textureprocessingmempool;
// note: this must not conflict with TEXF_ flags in r_textures.h
// cleared when a texture is uploaded
-#define GLTEXF_UPLOAD 0x00010000
+#define GLTEXF_UPLOAD 0x00010000
// bitmask for mismatch checking
#define GLTEXF_IMPORTANTBITS (0)
// set when image is uploaded and freed
-#define GLTEXF_DESTROYED 0x00040000
-
-// size of images which hold fragment textures, ignores picmip and max_size
-static int block_size;
+#define GLTEXF_DESTROYED 0x00040000
+// dynamic texture (treat texnum == 0 differently)
+#define GLTEXF_DYNAMIC 0x00080000
-typedef struct
+typedef struct textypeinfo_s
{
- int textype;
+ textype_t textype;
int inputbytesperpixel;
int internalbytesperpixel;
+ float glinternalbytesperpixel;
int glformat;
int glinternalformat;
+ int gltype;
}
textypeinfo_t;
-static textypeinfo_t textype_palette = {TEXTYPE_PALETTE, 1, 4, GL_RGBA , 3};
-static textypeinfo_t textype_rgb = {TEXTYPE_RGB , 3, 3, GL_RGB , 3};
-static textypeinfo_t textype_rgba = {TEXTYPE_RGBA , 4, 4, GL_RGBA , 3};
-static textypeinfo_t textype_palette_alpha = {TEXTYPE_PALETTE, 1, 4, GL_RGBA , 4};
-static textypeinfo_t textype_rgba_alpha = {TEXTYPE_RGBA , 4, 4, GL_RGBA , 4};
-static textypeinfo_t textype_dsdt = {TEXTYPE_DSDT , 2, 2, GL_DSDT_NV, GL_DSDT8_NV};
-
-// a tiling texture (most common type)
-#define GLIMAGETYPE_TILE 0
-// a fragments texture (contains one or more fragment textures)
-#define GLIMAGETYPE_FRAGMENTS 1
-
-#define GLTEXTURETYPE_1D 0
-#define GLTEXTURETYPE_2D 1
-#define GLTEXTURETYPE_3D 2
-#define GLTEXTURETYPE_CUBEMAP 3
-
-static int gltexturetypeenums[4] = {GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, GL_TEXTURE_CUBE_MAP_ARB};
-static int gltexturetypebindingenums[4] = {GL_TEXTURE_BINDING_1D, GL_TEXTURE_BINDING_2D, GL_TEXTURE_BINDING_3D, GL_TEXTURE_BINDING_CUBE_MAP_ARB};
-static int gltexturetypedimensions[4] = {1, 2, 3, 2};
+static textypeinfo_t textype_palette = {TEXTYPE_PALETTE, 1, 4, 4.0f, GL_BGRA , 3, GL_UNSIGNED_BYTE};
+static textypeinfo_t textype_palette_alpha = {TEXTYPE_PALETTE, 1, 4, 4.0f, GL_BGRA , 4, GL_UNSIGNED_BYTE};
+static textypeinfo_t textype_palette_compress = {TEXTYPE_PALETTE, 1, 4, 0.5f, GL_BGRA , GL_COMPRESSED_RGB_ARB, GL_UNSIGNED_BYTE};
+static textypeinfo_t textype_palette_alpha_compress = {TEXTYPE_PALETTE, 1, 4, 1.0f, GL_BGRA , GL_COMPRESSED_RGBA_ARB, GL_UNSIGNED_BYTE};
+static textypeinfo_t textype_rgba = {TEXTYPE_RGBA , 4, 4, 4.0f, GL_RGBA , 3, GL_UNSIGNED_BYTE};
+static textypeinfo_t textype_rgba_alpha = {TEXTYPE_RGBA , 4, 4, 4.0f, GL_RGBA , 4, GL_UNSIGNED_BYTE};
+static textypeinfo_t textype_rgba_compress = {TEXTYPE_RGBA , 4, 4, 0.5f, GL_RGBA , GL_COMPRESSED_RGB_ARB, GL_UNSIGNED_BYTE};
+static textypeinfo_t textype_rgba_alpha_compress = {TEXTYPE_RGBA , 4, 4, 1.0f, GL_RGBA , GL_COMPRESSED_RGBA_ARB, GL_UNSIGNED_BYTE};
+static textypeinfo_t textype_bgra = {TEXTYPE_BGRA , 4, 4, 4.0f, GL_BGRA , 3, GL_UNSIGNED_BYTE};
+static textypeinfo_t textype_bgra_alpha = {TEXTYPE_BGRA , 4, 4, 4.0f, GL_BGRA , 4, GL_UNSIGNED_BYTE};
+static textypeinfo_t textype_bgra_compress = {TEXTYPE_BGRA , 4, 4, 0.5f, GL_BGRA , GL_COMPRESSED_RGB_ARB, GL_UNSIGNED_BYTE};
+static textypeinfo_t textype_bgra_alpha_compress = {TEXTYPE_BGRA , 4, 4, 1.0f, GL_BGRA , GL_COMPRESSED_RGBA_ARB, GL_UNSIGNED_BYTE};
+static textypeinfo_t textype_shadowmap = {TEXTYPE_SHADOWMAP,4,4, 4.0f, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT24_ARB, GL_UNSIGNED_INT};
+static textypeinfo_t textype_projection = {TEXTYPE_PROJECTION,4,4,4.0f, GL_LUMINANCE_ALPHA, GL_LUMINANCE16_ALPHA16, GL_UNSIGNED_SHORT};
+
+typedef enum gltexturetype_e
+{
+ GLTEXTURETYPE_1D,
+ GLTEXTURETYPE_2D,
+ GLTEXTURETYPE_3D,
+ GLTEXTURETYPE_CUBEMAP,
+ GLTEXTURETYPE_RECTANGLE,
+ GLTEXTURETYPE_TOTAL
+}
+gltexturetype_t;
+
+static int gltexturetypeenums[GLTEXTURETYPE_TOTAL] = {GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_RECTANGLE_ARB};
+static int gltexturetypebindingenums[GLTEXTURETYPE_TOTAL] = {GL_TEXTURE_BINDING_1D, GL_TEXTURE_BINDING_2D, GL_TEXTURE_BINDING_3D, GL_TEXTURE_BINDING_CUBE_MAP_ARB, GL_TEXTURE_BINDING_RECTANGLE_ARB};
+static int gltexturetypedimensions[GLTEXTURETYPE_TOTAL] = {1, 2, 3, 2, 2};
static int cubemapside[6] =
{
GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB,
GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB
};
-// a gltextureimage can have one (or more if fragments) gltextures inside
-typedef struct gltextureimage_s
-{
- struct gltextureimage_s *imagechain;
- int texturecount;
- int type; // one of the GLIMAGETYPE_ values
- int texturetype; // one of the GLTEXTURETYPE_ values
- int sides; // 1 or 6 depending on texturetype
- int texnum; // GL texture slot number
- int width, height, depth; // 3D texture support
- int bytesperpixel; // bytes per pixel
- int glformat; // GL_RGB or GL_RGBA
- int glinternalformat; // 3 or 4
- int flags;
- short *blockallocation; // fragment allocation (2D only)
-}
-gltextureimage_t;
-
typedef struct gltexture_s
{
// this field is exposed to the R_GetTexture macro, for speed reasons
// (must be identical in rtexture_t)
int texnum; // GL texture slot number
+ // dynamic texture stuff [11/22/2007 Black]
+ // used to hold the texture number of dirty textures
+ int dirtytexnum;
+ updatecallback_t updatecallback;
+ void *updatacallback_data;
+ // --- [11/22/2007 Black]
+
// pointer to texturepool (check this to see if the texture is allocated)
struct gltexturepool_s *pool;
// pointer to next texture in texturepool chain
struct gltexture_s *chain;
- // pointer into gltextureimage array
- gltextureimage_t *image;
// name of the texture (this might be removed someday), no duplicates
- char *identifier;
- // location in the image, and size
- int x, y, z, width, height, depth;
+ char identifier[MAX_QPATH + 32];
+ // original data size in *inputtexels
+ int inputwidth, inputheight, inputdepth;
// copy of the original texture(s) supplied to the upload function, for
// delayed uploads (non-precached)
- qbyte *inputtexels;
+ unsigned char *inputtexels;
// original data size in *inputtexels
int inputdatasize;
// flags supplied to the LoadTexture function
int texturetype;
// palette if the texture is TEXTYPE_PALETTE
const unsigned int *palette;
+ // actual stored texture size after gl_picmip and gl_max_size are applied
+ // (power of 2 if gl_support_arb_texture_non_power_of_two is not supported)
+ int tilewidth, tileheight, tiledepth;
+ // 1 or 6 depending on texturetype
+ int sides;
+ // bytes per pixel
+ int bytesperpixel;
+ // GL_RGB or GL_RGBA or GL_DEPTH_COMPONENT
+ int glformat;
+ // 3 or 4
+ int glinternalformat;
+ // GL_UNSIGNED_BYTE or GL_UNSIGNED_INT or GL_UNSIGNED_SHORT or GL_FLOAT
+ int gltype;
}
gltexture_t;
typedef struct gltexturepool_s
{
unsigned int sentinel;
- struct gltextureimage_s *imagechain;
struct gltexture_s *gltchain;
struct gltexturepool_s *next;
}
static gltexturepool_t *gltexturepoolchain = NULL;
-static qbyte *resizebuffer = NULL, *colorconvertbuffer;
+static unsigned char *resizebuffer = NULL, *colorconvertbuffer;
static int resizebuffersize = 0;
-static qbyte *texturebuffer;
+static const unsigned char *texturebuffer;
static int texturebuffersize = 0;
-static int realmaxsize = 0;
-
-static textypeinfo_t *R_GetTexTypeInfo(int textype, int flags)
+static textypeinfo_t *R_GetTexTypeInfo(textype_t textype, int flags)
{
- if (flags & TEXF_ALPHA)
+ if ((flags & TEXF_COMPRESS) && gl_texturecompression.integer >= 1 && gl_support_texture_compression)
{
- switch(textype)
+ if (flags & TEXF_ALPHA)
{
- case TEXTYPE_PALETTE:
- return &textype_palette_alpha;
- case TEXTYPE_RGB:
- Host_Error("R_GetTexTypeInfo: RGB format has no alpha, TEXF_ALPHA not allowed\n");
- return NULL;
- case TEXTYPE_RGBA:
- return &textype_rgba_alpha;
- default:
- Host_Error("R_GetTexTypeInfo: unknown texture format\n");
- return NULL;
+ switch(textype)
+ {
+ case TEXTYPE_PALETTE:
+ return &textype_palette_alpha_compress;
+ case TEXTYPE_RGBA:
+ return &textype_rgba_alpha_compress;
+ case TEXTYPE_BGRA:
+ return &textype_bgra_alpha_compress;
+ default:
+ Host_Error("R_GetTexTypeInfo: unknown texture format");
+ return NULL;
+ }
+ }
+ else
+ {
+ switch(textype)
+ {
+ case TEXTYPE_PALETTE:
+ return &textype_palette_compress;
+ case TEXTYPE_RGBA:
+ return &textype_rgba_compress;
+ case TEXTYPE_BGRA:
+ return &textype_bgra_compress;
+ default:
+ Host_Error("R_GetTexTypeInfo: unknown texture format");
+ return NULL;
+ }
}
}
else
{
- switch(textype)
+ if (flags & TEXF_ALPHA)
{
- case TEXTYPE_PALETTE:
- return &textype_palette;
- case TEXTYPE_RGB:
- return &textype_rgb;
- case TEXTYPE_RGBA:
- return &textype_rgba;
- case TEXTYPE_DSDT:
- return &textype_dsdt;
- default:
- Host_Error("R_GetTexTypeInfo: unknown texture format\n");
- return NULL;
+ switch(textype)
+ {
+ case TEXTYPE_PALETTE:
+ return &textype_palette_alpha;
+ case TEXTYPE_RGBA:
+ return &textype_rgba_alpha;
+ case TEXTYPE_BGRA:
+ return &textype_bgra_alpha;
+ default:
+ Host_Error("R_GetTexTypeInfo: unknown texture format");
+ return NULL;
+ }
+ }
+ else
+ {
+ switch(textype)
+ {
+ case TEXTYPE_PALETTE:
+ return &textype_palette;
+ case TEXTYPE_RGBA:
+ return &textype_rgba;
+ case TEXTYPE_BGRA:
+ return &textype_bgra;
+ case TEXTYPE_SHADOWMAP:
+ return &textype_shadowmap;
+ case TEXTYPE_PROJECTION:
+ return &textype_projection;
+ default:
+ Host_Error("R_GetTexTypeInfo: unknown texture format");
+ return NULL;
+ }
}
}
+ return NULL; // this line only to hush compiler warnings
+}
+
+// dynamic texture code [11/22/2007 Black]
+void R_MarkDirtyTexture(rtexture_t *rt) {
+ gltexture_t *glt = (gltexture_t*) rt;
+ if( !glt ) {
+ return;
+ }
+
+ // dont do anything if the texture is already dirty (and make sure this *is* a dynamic texture after all!)
+ if( !glt->dirtytexnum && glt->flags & GLTEXF_DYNAMIC ) {
+ glt->dirtytexnum = glt->texnum;
+ // mark it as dirty, so R_RealGetTexture gets called
+ glt->texnum = 0;
+ }
+}
+
+void R_MakeTextureDynamic(rtexture_t *rt, updatecallback_t updatecallback, void *data) {
+ gltexture_t *glt = (gltexture_t*) rt;
+ if( !glt ) {
+ return;
+ }
+
+ glt->flags |= GLTEXF_DYNAMIC;
+ glt->updatecallback = updatecallback;
+ glt->updatacallback_data = data;
+ glt->dirtytexnum = 0;
+}
+
+static void R_UpdateDynamicTexture(gltexture_t *glt) {
+ glt->texnum = glt->dirtytexnum;
+ // reset dirtytexnum again (not dirty anymore)
+ glt->dirtytexnum = 0;
+ // TODO: now assert that t->texnum != 0 ?
+ if( glt->updatecallback ) {
+ glt->updatecallback( (rtexture_t*) glt, glt->updatacallback_data );
+ }
}
static void R_UploadTexture(gltexture_t *t);
{
gltexture_t *glt;
glt = (gltexture_t *)rt;
+ if (glt->flags & GLTEXF_DYNAMIC)
+ R_UpdateDynamicTexture(glt);
if (glt->flags & GLTEXF_UPLOAD)
R_UploadTexture(glt);
- glt->texnum = glt->image->texnum;
- return glt->image->texnum;
+
+ return glt->texnum;
}
else
return 0;
}
+void R_PurgeTexture(rtexture_t *rt)
+{
+ if(rt && !(((gltexture_t*) rt)->flags & TEXF_PERSISTENT)) {
+ R_FreeTexture(rt);
+ }
+}
+
void R_FreeTexture(rtexture_t *rt)
{
gltexture_t *glt, **gltpointer;
- gltextureimage_t *image, **gltimagepointer;
glt = (gltexture_t *)rt;
if (glt == NULL)
- Host_Error("R_FreeTexture: texture == NULL\n");
+ Host_Error("R_FreeTexture: texture == NULL");
for (gltpointer = &glt->pool->gltchain;*gltpointer && *gltpointer != glt;gltpointer = &(*gltpointer)->chain);
if (*gltpointer == glt)
*gltpointer = glt->chain;
else
- Host_Error("R_FreeTexture: texture \"%s\" not linked in pool\n", glt->identifier);
+ Host_Error("R_FreeTexture: texture \"%s\" not linked in pool", glt->identifier);
- // note: if freeing a fragment texture, this will not make the claimed
- // space available for new textures unless all other fragments in the
- // image are also freed
- if (glt->image)
+ if (!(glt->flags & GLTEXF_UPLOAD))
{
- image = glt->image;
- image->texturecount--;
- if (image->texturecount < 1)
- {
- for (gltimagepointer = &glt->pool->imagechain;*gltimagepointer && *gltimagepointer != image;gltimagepointer = &(*gltimagepointer)->imagechain);
- if (*gltimagepointer == image)
- *gltimagepointer = image->imagechain;
- else
- Host_Error("R_FreeTexture: image not linked in pool\n");
- if (image->texnum)
- qglDeleteTextures(1, &image->texnum);
- if (image->blockallocation)
- Mem_Free(image->blockallocation);
- Mem_Free(image);
- }
+ CHECKGLERROR
+ qglDeleteTextures(1, (GLuint *)&glt->texnum);CHECKGLERROR
}
- if (glt->identifier)
- Mem_Free(glt->identifier);
if (glt->inputtexels)
Mem_Free(glt->inputtexels);
Mem_Free(glt);
}
-/*
-static gltexture_t *R_FindTexture (gltexturepool_t *pool, char *identifier)
-{
- gltexture_t *glt;
-
- if (!identifier)
- return NULL;
-
- for (glt = pool->gltchain;glt;glt = glt->chain)
- if (glt->identifier && !strcmp (identifier, glt->identifier))
- return glt;
-
- return NULL;
-}
-*/
-
rtexturepool_t *R_AllocTexturePool(void)
{
gltexturepool_t *pool;
if (texturemempool == NULL)
return NULL;
- pool = Mem_Alloc(texturemempool, sizeof(gltexturepool_t));
+ pool = (gltexturepool_t *)Mem_Alloc(texturemempool, sizeof(gltexturepool_t));
if (pool == NULL)
return NULL;
pool->next = gltexturepoolchain;
pool = (gltexturepool_t *)(*rtexturepool);
*rtexturepool = NULL;
if (pool->sentinel != TEXTUREPOOL_SENTINEL)
- Host_Error("R_FreeTexturePool: pool already freed\n");
+ Host_Error("R_FreeTexturePool: pool already freed");
for (poolpointer = &gltexturepoolchain;*poolpointer && *poolpointer != pool;poolpointer = &(*poolpointer)->next);
if (*poolpointer == pool)
*poolpointer = pool->next;
else
- Host_Error("R_FreeTexturePool: pool not linked\n");
+ Host_Error("R_FreeTexturePool: pool not linked");
while (pool->gltchain)
R_FreeTexture((rtexture_t *)pool->gltchain);
- if (pool->imagechain)
- Sys_Error("R_FreeTexturePool: not all images freed\n");
Mem_Free(pool);
}
-typedef struct
+typedef struct glmode_s
{
char *name;
int minification, magnification;
}
glmode_t;
-static glmode_t modes[] =
+static glmode_t modes[6] =
{
{"GL_NEAREST", GL_NEAREST, GL_NEAREST},
{"GL_LINEAR", GL_LINEAR, GL_LINEAR},
{
int i;
GLint oldbindtexnum;
- gltextureimage_t *image;
+ gltexture_t *glt;
gltexturepool_t *pool;
if (Cmd_Argc() == 1)
// change all the existing mipmap texture objects
// FIXME: force renderer(/client/something?) restart instead?
+ CHECKGLERROR
for (pool = gltexturepoolchain;pool;pool = pool->next)
{
- for (image = pool->imagechain;image;image = image->imagechain)
+ for (glt = pool->gltchain;glt;glt = glt->chain)
{
// only update already uploaded images
- if (!(image->flags & GLTEXF_UPLOAD) && !(image->flags & (TEXF_FORCENEAREST | TEXF_FORCELINEAR)))
+ if (!(glt->flags & (GLTEXF_UPLOAD | TEXF_FORCENEAREST | TEXF_FORCELINEAR)))
{
- qglGetIntegerv(gltexturetypebindingenums[image->texturetype], &oldbindtexnum);
- qglBindTexture(gltexturetypeenums[image->texturetype], image->texnum);
- if (image->flags & TEXF_MIPMAP)
- qglTexParameteri(gltexturetypeenums[image->texturetype], GL_TEXTURE_MIN_FILTER, gl_filter_min);
+ qglGetIntegerv(gltexturetypebindingenums[glt->texturetype], &oldbindtexnum);CHECKGLERROR
+ qglBindTexture(gltexturetypeenums[glt->texturetype], glt->texnum);CHECKGLERROR
+ if (glt->flags & TEXF_MIPMAP)
+ {
+ qglTexParameteri(gltexturetypeenums[glt->texturetype], GL_TEXTURE_MIN_FILTER, gl_filter_min);CHECKGLERROR
+ }
else
- qglTexParameteri(gltexturetypeenums[image->texturetype], GL_TEXTURE_MIN_FILTER, gl_filter_mag);
- qglTexParameteri(gltexturetypeenums[image->texturetype], GL_TEXTURE_MAG_FILTER, gl_filter_mag);
- qglBindTexture(gltexturetypeenums[image->texturetype], oldbindtexnum);
+ {
+ qglTexParameteri(gltexturetypeenums[glt->texturetype], GL_TEXTURE_MIN_FILTER, gl_filter_mag);CHECKGLERROR
+ }
+ qglTexParameteri(gltexturetypeenums[glt->texturetype], GL_TEXTURE_MAG_FILTER, gl_filter_mag);CHECKGLERROR
+ qglBindTexture(gltexturetypeenums[glt->texturetype], oldbindtexnum);CHECKGLERROR
}
}
}
}
-static int R_CalcTexelDataSize (gltexture_t *glt)
+static void GL_Texture_CalcImageSize(int texturetype, int flags, int inwidth, int inheight, int indepth, int *outwidth, int *outheight, int *outdepth)
{
- int width2, height2, depth2, size, picmip;
- if (glt->flags & TEXF_FRAGMENT)
- size = glt->width * glt->height * glt->depth;
- else
+ int picmip = 0, maxsize = 0, width2 = 1, height2 = 1, depth2 = 1;
+
+ if (gl_max_size.integer > gl_max_texture_size)
+ Cvar_SetValue("gl_max_size", gl_max_texture_size);
+
+ switch (texturetype)
+ {
+ default:
+ case GLTEXTURETYPE_1D:
+ case GLTEXTURETYPE_2D:
+ maxsize = gl_max_texture_size;
+ break;
+ case GLTEXTURETYPE_3D:
+ maxsize = gl_max_3d_texture_size;
+ break;
+ case GLTEXTURETYPE_CUBEMAP:
+ maxsize = gl_max_cube_map_texture_size;
+ break;
+ }
+
+ if (flags & TEXF_PICMIP)
+ {
+ maxsize = min(maxsize, gl_max_size.integer);
+ picmip = gl_picmip.integer;
+ }
+
+ if (outwidth)
{
- picmip = 0;
- if (glt->flags & TEXF_PICMIP)
- picmip = gl_picmip.integer;
- if (gl_max_size.integer > realmaxsize)
- Cvar_SetValue("gl_max_size", realmaxsize);
- // calculate final size
- for (width2 = 1;width2 < glt->width;width2 <<= 1);
- for (height2 = 1;height2 < glt->height;height2 <<= 1);
- for (depth2 = 1;depth2 < glt->depth;depth2 <<= 1);
- for (width2 >>= picmip;width2 > gl_max_size.integer;width2 >>= 1);
- for (height2 >>= picmip;height2 > gl_max_size.integer;height2 >>= 1);
- for (depth2 >>= picmip;depth2 > gl_max_size.integer;depth2 >>= 1);
- if (width2 < 1) width2 = 1;
- if (height2 < 1) height2 = 1;
- if (depth2 < 1) depth2 = 1;
-
- size = 0;
- if (glt->flags & TEXF_MIPMAP)
+ if (gl_support_arb_texture_non_power_of_two)
+ width2 = min(inwidth >> picmip, maxsize);
+ else
{
- while (width2 > 1 || height2 > 1 || depth2 > 1)
- {
- size += width2 * height2 * depth2;
- if (width2 > 1)
- width2 >>= 1;
- if (height2 > 1)
- height2 >>= 1;
- if (depth2 > 1)
- depth2 >>= 1;
- }
- size++; // count the last 1x1 mipmap
+ for (width2 = 1;width2 < inwidth;width2 <<= 1);
+ for (width2 >>= picmip;width2 > maxsize;width2 >>= 1);
}
+ *outwidth = max(1, width2);
+ }
+ if (outheight)
+ {
+ if (gl_support_arb_texture_non_power_of_two)
+ height2 = min(inheight >> picmip, maxsize);
else
- size = width2 * height2 * depth2;
+ {
+ for (height2 = 1;height2 < inheight;height2 <<= 1);
+ for (height2 >>= picmip;height2 > maxsize;height2 >>= 1);
+ }
+ *outheight = max(1, height2);
+ }
+ if (outdepth)
+ {
+ if (gl_support_arb_texture_non_power_of_two)
+ depth2 = min(indepth >> picmip, maxsize);
+ else
+ {
+ for (depth2 = 1;depth2 < indepth;depth2 <<= 1);
+ for (depth2 >>= picmip;depth2 > maxsize;depth2 >>= 1);
+ }
+ *outdepth = max(1, depth2);
}
- size *= glt->textype->internalbytesperpixel * glt->image->sides;
-
- return size;
}
-void R_TextureStats_PrintTotal(void)
+
+static int R_CalcTexelDataSize (gltexture_t *glt)
{
- int glsize, total = 0, totalt = 0, totalp = 0, loaded = 0, loadedt = 0, loadedp = 0;
- gltexture_t *glt;
- gltexturepool_t *pool;
- for (pool = gltexturepoolchain;pool;pool = pool->next)
+ int width2, height2, depth2, size;
+
+ GL_Texture_CalcImageSize(glt->texturetype, glt->flags, glt->inputwidth, glt->inputheight, glt->inputdepth, &width2, &height2, &depth2);
+
+ size = width2 * height2 * depth2;
+
+ if (glt->flags & TEXF_MIPMAP)
{
- for (glt = pool->gltchain;glt;glt = glt->chain)
+ while (width2 > 1 || height2 > 1 || depth2 > 1)
{
- glsize = R_CalcTexelDataSize(glt);
- total++;
- totalt += glsize;
- totalp += glt->inputdatasize;
- if (!(glt->flags & GLTEXF_UPLOAD))
- {
- loaded++;
- loadedt += glsize;
- loadedp += glt->inputdatasize;
- }
+ if (width2 > 1)
+ width2 >>= 1;
+ if (height2 > 1)
+ height2 >>= 1;
+ if (depth2 > 1)
+ depth2 >>= 1;
+ size += width2 * height2 * depth2;
}
}
- Con_Printf("total: %i (%.3fMB, %.3fMB original), uploaded %i (%.3fMB, %.3fMB original), upload on demand %i (%.3fMB, %.3fMB original)\n", total, totalt / 1048576.0, totalp / 1048576.0, loaded, loadedt / 1048576.0, loadedp / 1048576.0, total - loaded, (totalt - loadedt) / 1048576.0, (totalp - loadedp) / 1048576.0);
+
+ return (int)(size * glt->textype->glinternalbytesperpixel) * glt->sides;
}
-static void R_TextureStats_f(void)
+void R_TextureStats_Print(qboolean printeach, qboolean printpool, qboolean printtotal)
{
- int loaded;
+ int glsize;
+ int isloaded;
+ int pooltotal = 0, pooltotalt = 0, pooltotalp = 0, poolloaded = 0, poolloadedt = 0, poolloadedp = 0;
+ int sumtotal = 0, sumtotalt = 0, sumtotalp = 0, sumloaded = 0, sumloadedt = 0, sumloadedp = 0;
gltexture_t *glt;
gltexturepool_t *pool;
- Con_Print("glsize input loaded mip alpha name\n");
+ if (printeach)
+ Con_Print("glsize input loaded mip alpha name\n");
for (pool = gltexturepoolchain;pool;pool = pool->next)
{
+ pooltotal = 0;
+ pooltotalt = 0;
+ pooltotalp = 0;
+ poolloaded = 0;
+ poolloadedt = 0;
+ poolloadedp = 0;
for (glt = pool->gltchain;glt;glt = glt->chain)
{
- loaded = !(glt->flags & GLTEXF_UPLOAD);
- Con_Printf("%c%4i%c%c%4i%c %s %s %s %s\n", loaded ? '[' : ' ', (R_CalcTexelDataSize(glt) + 1023) / 1024, loaded ? ']' : ' ', glt->inputtexels ? '[' : ' ', (glt->inputdatasize + 1023) / 1024, glt->inputtexels ? ']' : ' ', loaded ? "loaded" : " ", (glt->flags & TEXF_MIPMAP) ? "mip" : " ", (glt->flags & TEXF_ALPHA) ? "alpha" : " ", glt->identifier ? glt->identifier : "<unnamed>");
+ glsize = R_CalcTexelDataSize(glt);
+ isloaded = !(glt->flags & GLTEXF_UPLOAD);
+ pooltotal++;
+ pooltotalt += glsize;
+ pooltotalp += glt->inputdatasize;
+ if (isloaded)
+ {
+ poolloaded++;
+ poolloadedt += glsize;
+ poolloadedp += glt->inputdatasize;
+ }
+ if (printeach)
+ Con_Printf("%c%4i%c%c%4i%c %s %s %s %s\n", isloaded ? '[' : ' ', (glsize + 1023) / 1024, isloaded ? ']' : ' ', glt->inputtexels ? '[' : ' ', (glt->inputdatasize + 1023) / 1024, glt->inputtexels ? ']' : ' ', isloaded ? "loaded" : " ", (glt->flags & TEXF_MIPMAP) ? "mip" : " ", (glt->flags & TEXF_ALPHA) ? "alpha" : " ", glt->identifier);
}
- Con_Printf("pool %10p\n", pool);
+ if (printpool)
+ Con_Printf("texturepool %10p total: %i (%.3fMB, %.3fMB original), uploaded %i (%.3fMB, %.3fMB original), upload on demand %i (%.3fMB, %.3fMB original)\n", (void *)pool, pooltotal, pooltotalt / 1048576.0, pooltotalp / 1048576.0, poolloaded, poolloadedt / 1048576.0, poolloadedp / 1048576.0, pooltotal - poolloaded, (pooltotalt - poolloadedt) / 1048576.0, (pooltotalp - poolloadedp) / 1048576.0);
+ sumtotal += pooltotal;
+ sumtotalt += pooltotalt;
+ sumtotalp += pooltotalp;
+ sumloaded += poolloaded;
+ sumloadedt += poolloadedt;
+ sumloadedp += poolloadedp;
}
- R_TextureStats_PrintTotal();
+ if (printtotal)
+ Con_Printf("textures total: %i (%.3fMB, %.3fMB original), uploaded %i (%.3fMB, %.3fMB original), upload on demand %i (%.3fMB, %.3fMB original)\n", sumtotal, sumtotalt / 1048576.0, sumtotalp / 1048576.0, sumloaded, sumloadedt / 1048576.0, sumloadedp / 1048576.0, sumtotal - sumloaded, (sumtotalt - sumloadedt) / 1048576.0, (sumtotalp - sumloadedp) / 1048576.0);
}
-char engineversion[40];
+static void R_TextureStats_f(void)
+{
+ R_TextureStats_Print(true, true, true);
+}
static void r_textures_start(void)
{
- // deal with size limits of various drivers (3dfx in particular)
- qglGetIntegerv(GL_MAX_TEXTURE_SIZE, &realmaxsize);
- CHECKGLERROR
// LordHavoc: allow any alignment
- qglPixelStorei(GL_UNPACK_ALIGNMENT, 1);
CHECKGLERROR
+ qglPixelStorei(GL_UNPACK_ALIGNMENT, 1);CHECKGLERROR
+ qglPixelStorei(GL_PACK_ALIGNMENT, 1);CHECKGLERROR
- // use the largest scrap texture size we can (not sure if this is really a good idea)
- for (block_size = 1;block_size < realmaxsize && block_size < gl_max_scrapsize.integer;block_size <<= 1);
-
- texturemempool = Mem_AllocPool("Texture Info", 0, NULL);
- texturedatamempool = Mem_AllocPool("Texture Storage (not yet uploaded)", 0, NULL);
- textureprocessingmempool = Mem_AllocPool("Texture Processing Buffers", 0, NULL);
+ texturemempool = Mem_AllocPool("texture management", 0, NULL);
// Disable JPEG screenshots if the DLL isn't loaded
if (! JPEG_OpenLibrary ())
Cvar_SetValueQuick (&scr_screenshot_jpeg, 0);
+ // TODO: support png screenshots?
+ PNG_OpenLibrary ();
}
static void r_textures_shutdown(void)
colorconvertbuffer = NULL;
texturebuffer = NULL;
Mem_FreePool(&texturemempool);
- Mem_FreePool(&texturedatamempool);
- Mem_FreePool(&textureprocessingmempool);
}
static void r_textures_newmap(void)
void R_Textures_Init (void)
{
- Cmd_AddCommand("gl_texturemode", &GL_TextureMode_f);
- Cmd_AddCommand("r_texturestats", R_TextureStats_f);
- Cvar_RegisterVariable (&gl_max_scrapsize);
+ Cmd_AddCommand("gl_texturemode", &GL_TextureMode_f, "set texture filtering mode (GL_NEAREST, GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, etc)");
+ 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 (&r_lerpimages);
Cvar_RegisterVariable (&r_precachetextures);
Cvar_RegisterVariable (&gl_texture_anisotropy);
+ Cvar_RegisterVariable (&gl_texturecompression);
+ Cvar_RegisterVariable (&gl_texturecompression_color);
+ Cvar_RegisterVariable (&gl_texturecompression_normal);
+ Cvar_RegisterVariable (&gl_texturecompression_gloss);
+ Cvar_RegisterVariable (&gl_texturecompression_glow);
+ Cvar_RegisterVariable (&gl_texturecompression_2d);
+ Cvar_RegisterVariable (&gl_texturecompression_q3bsplightmaps);
+ Cvar_RegisterVariable (&gl_texturecompression_q3bspdeluxemaps);
+ Cvar_RegisterVariable (&gl_texturecompression_sky);
+ Cvar_RegisterVariable (&gl_texturecompression_lightcubemaps);
R_RegisterModule("R_Textures", r_textures_start, r_textures_shutdown, r_textures_newmap);
}
if (old_aniso != gl_texture_anisotropy.integer)
{
- gltextureimage_t *image;
+ gltexture_t *glt;
gltexturepool_t *pool;
GLint oldbindtexnum;
old_aniso = bound(1, gl_texture_anisotropy.integer, gl_max_anisotropy);
-
+
Cvar_SetValueQuick(&gl_texture_anisotropy, old_aniso);
+ CHECKGLERROR
for (pool = gltexturepoolchain;pool;pool = pool->next)
{
- for (image = pool->imagechain;image;image = image->imagechain)
+ for (glt = pool->gltchain;glt;glt = glt->chain)
{
// only update already uploaded images
- if (!(image->flags & GLTEXF_UPLOAD))
+ if ((glt->flags & (GLTEXF_UPLOAD | TEXF_MIPMAP)) == TEXF_MIPMAP)
{
- qglGetIntegerv(gltexturetypebindingenums[image->texturetype], &oldbindtexnum);
+ qglGetIntegerv(gltexturetypebindingenums[glt->texturetype], &oldbindtexnum);CHECKGLERROR
- qglBindTexture(gltexturetypeenums[image->texturetype], image->texnum);
- qglTexParameteri(gltexturetypeenums[image->texturetype], GL_TEXTURE_MAX_ANISOTROPY_EXT, old_aniso);CHECKGLERROR
+ qglBindTexture(gltexturetypeenums[glt->texturetype], glt->texnum);CHECKGLERROR
+ qglTexParameteri(gltexturetypeenums[glt->texturetype], GL_TEXTURE_MAX_ANISOTROPY_EXT, old_aniso);CHECKGLERROR
- qglBindTexture(gltexturetypeenums[image->texturetype], oldbindtexnum);
+ qglBindTexture(gltexturetypeenums[glt->texturetype], oldbindtexnum);CHECKGLERROR
}
}
}
Mem_Free(resizebuffer);
if (colorconvertbuffer)
Mem_Free(colorconvertbuffer);
- resizebuffer = Mem_Alloc(textureprocessingmempool, resizebuffersize);
- colorconvertbuffer = Mem_Alloc(textureprocessingmempool, resizebuffersize);
+ resizebuffer = (unsigned char *)Mem_Alloc(texturemempool, resizebuffersize);
+ colorconvertbuffer = (unsigned char *)Mem_Alloc(texturemempool, resizebuffersize);
if (!resizebuffer || !colorconvertbuffer)
- Host_Error("R_Upload: out of memory\n");
+ Host_Error("R_Upload: out of memory");
}
}
-static void GL_SetupTextureParameters(int flags, int texturetype)
+static void GL_SetupTextureParameters(int flags, textype_t textype, int texturetype)
{
int textureenum = gltexturetypeenums[texturetype];
int wrapmode = ((flags & TEXF_CLAMP) && gl_support_clamptoedge) ? GL_CLAMP_TO_EDGE : GL_REPEAT;
CHECKGLERROR
- if (gl_support_anisotropy)
+ if (gl_support_anisotropy && (flags & TEXF_MIPMAP))
{
int aniso = bound(1, gl_texture_anisotropy.integer, gl_max_anisotropy);
if (gl_texture_anisotropy.integer != aniso)
qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, gl_filter_mag);CHECKGLERROR
}
+ if (textype == TEXTYPE_SHADOWMAP)
+ {
+ if (flags & TEXF_COMPARE)
+ {
+ qglTexParameteri(textureenum, GL_TEXTURE_COMPARE_MODE_ARB, GL_COMPARE_R_TO_TEXTURE_ARB);CHECKGLERROR
+ qglTexParameteri(textureenum, GL_TEXTURE_COMPARE_FUNC_ARB, GL_LEQUAL);CHECKGLERROR
+ }
+ else
+ {
+ qglTexParameteri(textureenum, GL_TEXTURE_COMPARE_MODE_ARB, GL_NONE);CHECKGLERROR
+ qglTexParameteri(textureenum, GL_TEXTURE_COMPARE_FUNC_ARB, GL_ALWAYS);CHECKGLERROR
+ }
+ qglTexParameteri(textureenum, GL_DEPTH_TEXTURE_MODE_ARB, GL_INTENSITY);CHECKGLERROR
+ }
+
CHECKGLERROR
}
-static void R_Upload(gltexture_t *glt, qbyte *data)
+static void R_Upload(gltexture_t *glt, const unsigned char *data, int fragx, int fragy, int fragz, int fragwidth, int fragheight, int fragdepth)
{
int i, mip, width, height, depth;
GLint oldbindtexnum;
- qbyte *prevbuffer;
+ const unsigned char *prevbuffer;
prevbuffer = data;
CHECKGLERROR
- glt->texnum = glt->image->texnum;
// we need to restore the texture binding after finishing the upload
- qglGetIntegerv(gltexturetypebindingenums[glt->image->texturetype], &oldbindtexnum);
- qglBindTexture(gltexturetypeenums[glt->image->texturetype], glt->image->texnum);
- CHECKGLERROR
- glt->flags &= ~GLTEXF_UPLOAD;
+ qglGetIntegerv(gltexturetypebindingenums[glt->texturetype], &oldbindtexnum);CHECKGLERROR
+ qglBindTexture(gltexturetypeenums[glt->texturetype], glt->texnum);CHECKGLERROR
- if (glt->flags & TEXF_FRAGMENT)
+ // these are rounded up versions of the size to do better resampling
+ if (gl_support_arb_texture_non_power_of_two || glt->texturetype == GLTEXTURETYPE_RECTANGLE)
{
- if (glt->image->flags & GLTEXF_UPLOAD)
- {
- glt->image->flags &= ~GLTEXF_UPLOAD;
- Con_DPrint("uploaded new fragments image\n");
- R_MakeResizeBufferBigger(glt->image->width * glt->image->height * glt->image->depth * glt->image->bytesperpixel);
- memset(resizebuffer, 255, glt->image->width * glt->image->height * glt->image->depth * glt->image->bytesperpixel);
- switch(glt->image->texturetype)
- {
- case GLTEXTURETYPE_1D:
- qglTexImage1D(GL_TEXTURE_1D, 0, glt->image->glinternalformat, glt->image->width, 0, glt->image->glformat, GL_UNSIGNED_BYTE, resizebuffer);
- CHECKGLERROR
- break;
- case GLTEXTURETYPE_2D:
- qglTexImage2D(GL_TEXTURE_2D, 0, glt->image->glinternalformat, glt->image->width, glt->image->height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, resizebuffer);
- CHECKGLERROR
- break;
- case GLTEXTURETYPE_3D:
- qglTexImage3D(GL_TEXTURE_3D, 0, glt->image->glinternalformat, glt->image->width, glt->image->height, glt->image->depth, 0, glt->image->glformat, GL_UNSIGNED_BYTE, resizebuffer);
- CHECKGLERROR
- break;
- default:
- Host_Error("R_Upload: fragment texture of type other than 1D, 2D, or 3D\n");
- break;
- }
- GL_SetupTextureParameters(glt->image->flags, glt->image->texturetype);
- }
+ width = glt->inputwidth;
+ height = glt->inputheight;
+ depth = glt->inputdepth;
+ }
+ else
+ {
+ for (width = 1;width < glt->inputwidth ;width <<= 1);
+ for (height = 1;height < glt->inputheight;height <<= 1);
+ for (depth = 1;depth < glt->inputdepth ;depth <<= 1);
+ }
- if (prevbuffer == NULL)
- {
- R_MakeResizeBufferBigger(glt->image->width * glt->image->height * glt->image->depth * glt->image->bytesperpixel);
- memset(resizebuffer, 0, glt->width * glt->height * glt->image->depth * glt->image->bytesperpixel);
- prevbuffer = resizebuffer;
- }
- else if (glt->textype->textype == TEXTYPE_PALETTE)
- {
- // promote paletted to RGBA, so we only have to worry about RGB and
- // RGBA in the rest of this code
- R_MakeResizeBufferBigger(glt->image->width * glt->image->height * glt->image->depth * glt->image->sides * glt->image->bytesperpixel);
- Image_Copy8bitRGBA(prevbuffer, colorconvertbuffer, glt->width * glt->height * glt->depth, glt->palette);
- prevbuffer = colorconvertbuffer;
- }
+ R_MakeResizeBufferBigger(width * height * depth * glt->sides * glt->bytesperpixel);
+ R_MakeResizeBufferBigger(fragwidth * fragheight * fragdepth * glt->sides * glt->bytesperpixel);
+
+ if (prevbuffer == NULL)
+ {
+ memset(resizebuffer, 0, fragwidth * fragheight * fragdepth * glt->bytesperpixel);
+ prevbuffer = resizebuffer;
+ }
+ else if (glt->textype->textype == TEXTYPE_PALETTE)
+ {
+ // promote paletted to BGRA, so we only have to worry about BGRA in the rest of this code
+ Image_Copy8bitBGRA(prevbuffer, colorconvertbuffer, fragwidth * fragheight * fragdepth * glt->sides, glt->palette);
+ prevbuffer = colorconvertbuffer;
+ }
- switch(glt->image->texturetype)
+ if ((glt->flags & (TEXF_MIPMAP | TEXF_PICMIP | GLTEXF_UPLOAD)) == 0 && glt->inputwidth == glt->tilewidth && glt->inputheight == glt->tileheight && glt->inputdepth == glt->tiledepth)
+ {
+ // update a portion of the image
+ switch(glt->texturetype)
{
case GLTEXTURETYPE_1D:
- qglTexSubImage1D(GL_TEXTURE_1D, 0, glt->x, glt->width, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
- CHECKGLERROR
+ qglTexSubImage1D(GL_TEXTURE_1D, 0, fragx, fragwidth, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR
break;
case GLTEXTURETYPE_2D:
- qglTexSubImage2D(GL_TEXTURE_2D, 0, glt->x, glt->y, glt->width, glt->height, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
- CHECKGLERROR
+ qglTexSubImage2D(GL_TEXTURE_2D, 0, fragx, fragy, fragwidth, fragheight, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR
break;
case GLTEXTURETYPE_3D:
- qglTexSubImage3D(GL_TEXTURE_3D, 0, glt->x, glt->y, glt->z, glt->width, glt->height, glt->depth, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
- CHECKGLERROR
+ qglTexSubImage3D(GL_TEXTURE_3D, 0, fragx, fragy, fragz, fragwidth, fragheight, fragdepth, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR
break;
default:
- Host_Error("R_Upload: fragment texture of type other than 1D, 2D, or 3D\n");
+ Host_Error("R_Upload: partial update of type other than 1D, 2D, or 3D");
break;
}
}
else
{
- glt->image->flags &= ~GLTEXF_UPLOAD;
-
- // these are rounded up versions of the size to do better resampling
- for (width = 1;width < glt->width ;width <<= 1);
- for (height = 1;height < glt->height;height <<= 1);
- for (depth = 1;depth < glt->depth ;depth <<= 1);
-
- R_MakeResizeBufferBigger(width * height * depth * glt->image->sides * glt->image->bytesperpixel);
+ if (fragx || fragy || fragz || glt->inputwidth != fragwidth || glt->inputheight != fragheight || glt->inputdepth != fragdepth)
+ Host_Error("R_Upload: partial update not allowed on initial upload or in combination with PICMIP or MIPMAP\n");
- if (prevbuffer == NULL)
- {
- width = glt->image->width;
- height = glt->image->height;
- depth = glt->image->depth;
- memset(resizebuffer, 0, width * height * depth * glt->image->bytesperpixel);
- prevbuffer = resizebuffer;
- }
- else
- {
- if (glt->textype->textype == TEXTYPE_PALETTE)
- {
- // promote paletted to RGBA, so we only have to worry about RGB and
- // RGBA in the rest of this code
- Image_Copy8bitRGBA(prevbuffer, colorconvertbuffer, glt->width * glt->height * glt->depth * glt->image->sides, glt->palette);
- prevbuffer = colorconvertbuffer;
- }
- }
+ // upload the image for the first time
+ glt->flags &= ~GLTEXF_UPLOAD;
// cubemaps contain multiple images and thus get processed a bit differently
- if (glt->image->texturetype != GLTEXTURETYPE_CUBEMAP)
+ if (glt->texturetype != GLTEXTURETYPE_CUBEMAP)
{
- if (glt->width != width || glt->height != height || glt->depth != depth)
+ if (glt->inputwidth != width || glt->inputheight != height || glt->inputdepth != depth)
{
- Image_Resample(prevbuffer, glt->width, glt->height, glt->depth, resizebuffer, width, height, depth, glt->image->bytesperpixel, r_lerpimages.integer);
+ Image_Resample32(prevbuffer, glt->inputwidth, glt->inputheight, glt->inputdepth, resizebuffer, width, height, depth, r_lerpimages.integer);
prevbuffer = resizebuffer;
}
// picmip/max_size
- while (width > glt->image->width || height > glt->image->height || depth > glt->image->depth)
+ while (width > glt->tilewidth || height > glt->tileheight || depth > glt->tiledepth)
{
- Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, glt->image->width, glt->image->height, glt->image->depth, glt->image->bytesperpixel);
+ Image_MipReduce32(prevbuffer, resizebuffer, &width, &height, &depth, glt->tilewidth, glt->tileheight, glt->tiledepth);
prevbuffer = resizebuffer;
}
}
mip = 0;
- switch(glt->image->texturetype)
+ if (gl_support_texture_compression)
{
- case GLTEXTURETYPE_1D:
- qglTexImage1D(GL_TEXTURE_1D, mip++, glt->image->glinternalformat, width, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+ if (gl_texturecompression.integer >= 2)
+ qglHint(GL_TEXTURE_COMPRESSION_HINT_ARB, GL_NICEST);
+ else
+ qglHint(GL_TEXTURE_COMPRESSION_HINT_ARB, GL_FASTEST);
CHECKGLERROR
+ }
+ switch(glt->texturetype)
+ {
+ case GLTEXTURETYPE_1D:
+ qglTexImage1D(GL_TEXTURE_1D, mip++, glt->glinternalformat, width, 0, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR
if (glt->flags & TEXF_MIPMAP)
{
while (width > 1 || height > 1 || depth > 1)
{
- Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel);
+ Image_MipReduce32(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1);
prevbuffer = resizebuffer;
- qglTexImage1D(GL_TEXTURE_1D, mip++, glt->image->glinternalformat, width, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
- CHECKGLERROR
+ qglTexImage1D(GL_TEXTURE_1D, mip++, glt->glinternalformat, width, 0, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR
}
}
break;
case GLTEXTURETYPE_2D:
- qglTexImage2D(GL_TEXTURE_2D, mip++, glt->image->glinternalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
- CHECKGLERROR
+ qglTexImage2D(GL_TEXTURE_2D, mip++, glt->glinternalformat, width, height, 0, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR
if (glt->flags & TEXF_MIPMAP)
{
while (width > 1 || height > 1 || depth > 1)
{
- Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel);
+ Image_MipReduce32(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1);
prevbuffer = resizebuffer;
- qglTexImage2D(GL_TEXTURE_2D, mip++, glt->image->glinternalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
- CHECKGLERROR
+ qglTexImage2D(GL_TEXTURE_2D, mip++, glt->glinternalformat, width, height, 0, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR
}
}
break;
case GLTEXTURETYPE_3D:
- qglTexImage3D(GL_TEXTURE_3D, mip++, glt->image->glinternalformat, width, height, depth, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
- CHECKGLERROR
+ qglTexImage3D(GL_TEXTURE_3D, mip++, glt->glinternalformat, width, height, depth, 0, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR
if (glt->flags & TEXF_MIPMAP)
{
while (width > 1 || height > 1 || depth > 1)
{
- Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel);
+ Image_MipReduce32(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1);
prevbuffer = resizebuffer;
- qglTexImage3D(GL_TEXTURE_3D, mip++, glt->image->glinternalformat, width, height, depth, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
- CHECKGLERROR
+ qglTexImage3D(GL_TEXTURE_3D, mip++, glt->glinternalformat, width, height, depth, 0, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR
}
}
break;
case GLTEXTURETYPE_CUBEMAP:
// convert and upload each side in turn,
// from a continuous block of input texels
- texturebuffer = prevbuffer;
+ texturebuffer = (unsigned char *)prevbuffer;
for (i = 0;i < 6;i++)
{
prevbuffer = texturebuffer;
- texturebuffer += glt->width * glt->height * glt->depth * glt->textype->inputbytesperpixel;
- if (glt->width != width || glt->height != height || glt->depth != depth)
+ texturebuffer += glt->inputwidth * glt->inputheight * glt->inputdepth * glt->textype->inputbytesperpixel;
+ if (glt->inputwidth != width || glt->inputheight != height || glt->inputdepth != depth)
{
- Image_Resample(prevbuffer, glt->width, glt->height, glt->depth, resizebuffer, width, height, depth, glt->image->bytesperpixel, r_lerpimages.integer);
+ Image_Resample32(prevbuffer, glt->inputwidth, glt->inputheight, glt->inputdepth, resizebuffer, width, height, depth, r_lerpimages.integer);
prevbuffer = resizebuffer;
}
// picmip/max_size
- while (width > glt->image->width || height > glt->image->height || depth > glt->image->depth)
+ while (width > glt->tilewidth || height > glt->tileheight || depth > glt->tiledepth)
{
- Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, glt->image->width, glt->image->height, glt->image->depth, glt->image->bytesperpixel);
+ Image_MipReduce32(prevbuffer, resizebuffer, &width, &height, &depth, glt->tilewidth, glt->tileheight, glt->tiledepth);
prevbuffer = resizebuffer;
}
mip = 0;
- qglTexImage2D(cubemapside[i], mip++, glt->image->glinternalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
- CHECKGLERROR
+ qglTexImage2D(cubemapside[i], mip++, glt->glinternalformat, width, height, 0, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR
if (glt->flags & TEXF_MIPMAP)
{
while (width > 1 || height > 1 || depth > 1)
{
- Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel);
+ Image_MipReduce32(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1);
prevbuffer = resizebuffer;
- qglTexImage2D(cubemapside[i], mip++, glt->image->glinternalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
- CHECKGLERROR
+ qglTexImage2D(cubemapside[i], mip++, glt->glinternalformat, width, height, 0, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR
}
}
}
break;
+ case GLTEXTURETYPE_RECTANGLE:
+ qglTexImage2D(GL_TEXTURE_RECTANGLE_ARB, mip++, glt->glinternalformat, width, height, 0, glt->glformat, glt->gltype, NULL);CHECKGLERROR
+ break;
}
- GL_SetupTextureParameters(glt->image->flags, glt->image->texturetype);
- }
- qglBindTexture(gltexturetypeenums[glt->image->texturetype], oldbindtexnum);
-}
-
-static void R_FindImageForTexture(gltexture_t *glt)
-{
- int i, j, best, best2, x, y, z, w, h, d, picmip;
- textypeinfo_t *texinfo;
- gltexturepool_t *pool;
- gltextureimage_t *image, **imagechainpointer;
- texinfo = glt->textype;
- pool = glt->pool;
-
- // remains -1 until uploaded
- glt->texnum = -1;
-
- x = 0;
- y = 0;
- z = 0;
- w = glt->width;
- h = glt->height;
- d = glt->depth;
- if (glt->flags & TEXF_FRAGMENT)
- {
- for (imagechainpointer = &pool->imagechain;*imagechainpointer;imagechainpointer = &(*imagechainpointer)->imagechain)
- {
- image = *imagechainpointer;
- if (image->type != GLIMAGETYPE_FRAGMENTS)
- continue;
- if (image->texturetype != glt->texturetype)
- continue;
- if ((image->flags ^ glt->flags) & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP))
- continue;
- if (image->glformat != texinfo->glformat || image->glinternalformat != texinfo->glinternalformat)
- continue;
- if (glt->width > image->width || glt->height > image->height || glt->depth > image->depth)
- continue;
-
- // got a fragments texture, find a place in it if we can
- for (best = image->width, i = 0;i < image->width - w;i++)
- {
- for (best2 = 0, j = 0;j < w;j++)
- {
- if (image->blockallocation[i+j] >= best)
- break;
- if (best2 < image->blockallocation[i+j])
- best2 = image->blockallocation[i+j];
- }
- if (j == w)
- {
- // this is a valid spot
- x = i;
- y = best = best2;
- }
- }
-
- if (best + h > image->height)
- continue;
-
- for (i = 0;i < w;i++)
- image->blockallocation[x + i] = best + h;
-
- glt->x = x;
- glt->y = y;
- glt->z = 0;
- glt->image = image;
- image->texturecount++;
- return;
- }
-
- image = Mem_Alloc(texturemempool, sizeof(gltextureimage_t));
- if (image == NULL)
- Sys_Error("R_FindImageForTexture: ran out of memory\n");
- image->type = GLIMAGETYPE_FRAGMENTS;
- // make sure the created image is big enough for the fragment
- for (image->width = block_size;image->width < glt->width;image->width <<= 1);
- image->height = 1;
- if (gltexturetypedimensions[glt->texturetype] >= 2)
- for (image->height = block_size;image->height < glt->height;image->height <<= 1);
- image->depth = 1;
- if (gltexturetypedimensions[glt->texturetype] >= 3)
- for (image->depth = block_size;image->depth < glt->depth;image->depth <<= 1);
- image->blockallocation = Mem_Alloc(texturemempool, image->width * sizeof(short));
- memset(image->blockallocation, 0, image->width * sizeof(short));
-
- x = 0;
- y = 0;
- z = 0;
- for (i = 0;i < w;i++)
- image->blockallocation[x + i] = y + h;
- }
- else
- {
- for (imagechainpointer = &pool->imagechain;*imagechainpointer;imagechainpointer = &(*imagechainpointer)->imagechain);
-
- image = Mem_Alloc(texturemempool, sizeof(gltextureimage_t));
- if (image == NULL)
- Sys_Error("R_FindImageForTexture: ran out of memory\n");
- image->type = GLIMAGETYPE_TILE;
- image->blockallocation = NULL;
-
- picmip = 0;
- if (glt->flags & TEXF_PICMIP)
- picmip = gl_picmip.integer;
- // calculate final size
- if (gl_max_size.integer > realmaxsize)
- Cvar_SetValue("gl_max_size", realmaxsize);
- for (image->width = 1;image->width < glt->width;image->width <<= 1);
- for (image->height = 1;image->height < glt->height;image->height <<= 1);
- for (image->depth = 1;image->depth < glt->depth;image->depth <<= 1);
- for (image->width >>= picmip;image->width > gl_max_size.integer;image->width >>= 1);
- for (image->height >>= picmip;image->height > gl_max_size.integer;image->height >>= 1);
- for (image->depth >>= picmip;image->depth > gl_max_size.integer;image->depth >>= 1);
- if (image->width < 1) image->width = 1;
- if (image->height < 1) image->height = 1;
- if (image->depth < 1) image->depth = 1;
+ GL_SetupTextureParameters(glt->flags, glt->textype->textype, glt->texturetype);
}
- image->texturetype = glt->texturetype;
- image->glinternalformat = texinfo->glinternalformat;
- image->glformat = texinfo->glformat;
- image->flags = (glt->flags & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP | TEXF_PICMIP)) | 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;
- image->texturecount++;
-
- glt->x = x;
- glt->y = y;
- glt->y = z;
- glt->image = image;
+ qglBindTexture(gltexturetypeenums[glt->texturetype], oldbindtexnum);CHECKGLERROR
}
-// note: R_FindImageForTexture must be called before this
static void R_UploadTexture (gltexture_t *glt)
{
if (!(glt->flags & GLTEXF_UPLOAD))
return;
- R_Upload(glt, glt->inputtexels);
+ CHECKGLERROR
+ qglGenTextures(1, (GLuint *)&glt->texnum);CHECKGLERROR
+ R_Upload(glt, glt->inputtexels, 0, 0, 0, glt->inputwidth, glt->inputheight, glt->inputdepth);
if (glt->inputtexels)
{
Mem_Free(glt->inputtexels);
Con_Printf("R_UploadTexture: Texture %s already uploaded and destroyed. Can not upload original image again. Uploaded blank texture.\n", glt->identifier);
}
-static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, int depth, int sides, int flags, int textype, int texturetype, const qbyte *data, const unsigned int *palette)
+static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, int depth, int sides, int flags, textype_t textype, int texturetype, const unsigned char *data, const unsigned int *palette)
{
int i, size;
gltexture_t *glt;
if (cls.state == ca_dedicated)
return NULL;
- if (flags & TEXF_FRAGMENT && texturetype != GLTEXTURETYPE_2D)
- Sys_Error("R_LoadTexture: only 2D fragment textures implemented\n");
+ if (texturetype == GLTEXTURETYPE_RECTANGLE && !gl_texturerectangle)
+ {
+ Con_Printf ("R_LoadTexture: rectangle texture not supported by driver\n");
+ return NULL;
+ }
if (texturetype == GLTEXTURETYPE_CUBEMAP && !gl_texturecubemap)
- Sys_Error("R_LoadTexture: cubemap texture not supported by driver\n");
+ {
+ Con_Printf ("R_LoadTexture: cubemap texture not supported by driver\n");
+ return NULL;
+ }
if (texturetype == GLTEXTURETYPE_3D && !gl_texture3d)
- Sys_Error("R_LoadTexture: 3d texture not supported by driver\n");
-
- /*
- glt = R_FindTexture (pool, identifier);
- if (glt)
{
- Con_Printf("R_LoadTexture: replacing existing texture %s\n", identifier);
- R_FreeTexture((rtexture_t *)glt);
+ Con_Printf ("R_LoadTexture: 3d texture not supported by driver\n");
+ return NULL;
}
- */
texinfo = R_GetTexTypeInfo(textype, flags);
size = width * height * depth * sides * texinfo->inputbytesperpixel;
if (size < 1)
- Sys_Error("R_LoadTexture: bogus texture size (%dx%dx%dx%dbppx%dsides = %d bytes)\n", width, height, depth, texinfo->inputbytesperpixel * 8, sides);
+ {
+ Con_Printf ("R_LoadTexture: bogus texture size (%dx%dx%dx%dbppx%dsides = %d bytes)\n", width, height, depth, texinfo->inputbytesperpixel * 8, sides, size);
+ return NULL;
+ }
// clear the alpha flag if the texture has no transparent pixels
switch(textype)
{
for (i = 0;i < size;i++)
{
- if (((qbyte *)&palette[data[i]])[3] < 255)
+ if (((unsigned char *)&palette[data[i]])[3] < 255)
{
flags |= TEXF_ALPHA;
break;
}
}
break;
- case TEXTYPE_RGB:
- if (flags & TEXF_ALPHA)
- Host_Error("R_LoadTexture: RGB has no alpha, don't specify TEXF_ALPHA\n");
- break;
case TEXTYPE_RGBA:
+ case TEXTYPE_BGRA:
if (flags & TEXF_ALPHA)
{
flags &= ~TEXF_ALPHA;
}
}
break;
- case TEXTYPE_DSDT:
+ case TEXTYPE_SHADOWMAP:
+ case TEXTYPE_PROJECTION:
break;
default:
- Host_Error("R_LoadTexture: unknown texture type\n");
+ Host_Error("R_LoadTexture: unknown texture type");
}
- glt = Mem_Alloc(texturemempool, sizeof(gltexture_t));
+ glt = (gltexture_t *)Mem_Alloc(texturemempool, sizeof(gltexture_t));
if (identifier)
- {
- glt->identifier = Mem_Alloc(texturemempool, strlen(identifier)+1);
- strcpy (glt->identifier, identifier);
- }
- else
- glt->identifier = NULL;
+ strlcpy (glt->identifier, identifier, sizeof(glt->identifier));
glt->pool = pool;
glt->chain = pool->gltchain;
pool->gltchain = glt;
- glt->width = width;
- glt->height = height;
- glt->depth = depth;
+ glt->inputwidth = width;
+ glt->inputheight = height;
+ glt->inputdepth = depth;
glt->flags = flags | GLTEXF_UPLOAD;
glt->textype = texinfo;
glt->texturetype = texturetype;
glt->inputdatasize = size;
glt->palette = palette;
+ glt->glinternalformat = texinfo->glinternalformat;
+ glt->glformat = texinfo->glformat;
+ glt->gltype = texinfo->gltype;
+ glt->bytesperpixel = texinfo->internalbytesperpixel;
+ glt->sides = glt->texturetype == GLTEXTURETYPE_CUBEMAP ? 6 : 1;
+ glt->texnum = 0;
+ // init the dynamic texture attributes, too [11/22/2007 Black]
+ glt->dirtytexnum = 0;
+ glt->updatecallback = NULL;
+ glt->updatacallback_data = NULL;
if (data)
{
- glt->inputtexels = Mem_Alloc(texturedatamempool, size);
- if (glt->inputtexels == NULL)
- Sys_Error("R_LoadTexture: out of memory\n");
+ glt->inputtexels = (unsigned char *)Mem_Alloc(texturemempool, size);
memcpy(glt->inputtexels, data, size);
}
else
glt->inputtexels = NULL;
- R_FindImageForTexture(glt);
+ GL_Texture_CalcImageSize(glt->texturetype, glt->flags, glt->inputwidth, glt->inputheight, glt->inputdepth, &glt->tilewidth, &glt->tileheight, &glt->tiledepth);
R_PrecacheTexture(glt);
+ // texture converting and uploading can take a while, so make sure we're sending keepalives
+ CL_KeepaliveMessage(false);
+
return (rtexture_t *)glt;
}
-rtexture_t *R_LoadTexture1D(rtexturepool_t *rtexturepool, const char *identifier, int width, const qbyte *data, int textype, int flags, const unsigned int *palette)
+rtexture_t *R_LoadTexture1D(rtexturepool_t *rtexturepool, const char *identifier, int width, const unsigned char *data, textype_t textype, int flags, const unsigned int *palette)
{
return R_SetupTexture(rtexturepool, identifier, width, 1, 1, 1, flags, textype, GLTEXTURETYPE_1D, data, palette);
}
-rtexture_t *R_LoadTexture2D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, const qbyte *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, textype_t textype, int flags, const unsigned int *palette)
{
return R_SetupTexture(rtexturepool, identifier, width, height, 1, 1, flags, textype, GLTEXTURETYPE_2D, data, palette);
}
-rtexture_t *R_LoadTexture3D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, int depth, const qbyte *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, textype_t textype, int flags, const unsigned int *palette)
{
return R_SetupTexture(rtexturepool, identifier, width, height, depth, 1, flags, textype, GLTEXTURETYPE_3D, data, palette);
}
-rtexture_t *R_LoadTextureCubeMap(rtexturepool_t *rtexturepool, const char *identifier, int width, const qbyte *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, textype_t textype, int flags, const unsigned int *palette)
{
return R_SetupTexture(rtexturepool, identifier, width, width, 1, 6, flags, textype, GLTEXTURETYPE_CUBEMAP, data, palette);
}
-int R_TextureHasAlpha(rtexture_t *rt)
-{
- return rt ? (((gltexture_t *)rt)->flags & TEXF_ALPHA) != 0 : false;
-}
-
-int R_TextureWidth(rtexture_t *rt)
+rtexture_t *R_LoadTextureShadowMapRectangle(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, qboolean filter)
{
- return rt ? ((gltexture_t *)rt)->width : 0;
+ return R_SetupTexture(rtexturepool, identifier, width, height, 1, 1, TEXF_ALWAYSPRECACHE | TEXF_CLAMP | (filter ? TEXF_FORCELINEAR | TEXF_COMPARE : TEXF_FORCENEAREST), TEXTYPE_SHADOWMAP, GLTEXTURETYPE_RECTANGLE, NULL, NULL);
}
-int R_TextureHeight(rtexture_t *rt)
+rtexture_t *R_LoadTextureCubeProjection(rtexturepool_t *rtexturepool, const char *identifier, int size, int border)
{
- return rt ? ((gltexture_t *)rt)->height : 0;
-}
-
-void R_FragmentLocation3D(rtexture_t *rt, int *x, int *y, int *z, float *fx1, float *fy1, float *fz1, float *fx2, float *fy2, float *fz2)
-{
- gltexture_t *glt;
- float iwidth, iheight, idepth;
- if (cls.state == ca_dedicated)
- {
- if (x)
- *x = 0;
- if (y)
- *y = 0;
- if (z)
- *z = 0;
- if (fx1 || fy1 || fx2 || fy2)
- {
- if (fx1)
- *fx1 = 0;
- if (fy1)
- *fy1 = 0;
- if (fz1)
- *fz1 = 0;
- if (fx2)
- *fx2 = 1;
- if (fy2)
- *fy2 = 1;
- if (fz2)
- *fz2 = 1;
- }
- return;
- }
- if (!rt)
- Host_Error("R_FragmentLocation: no texture supplied\n");
- glt = (gltexture_t *)rt;
- if (glt->flags & TEXF_FRAGMENT)
- {
- if (x)
- *x = glt->x;
- if (y)
- *y = glt->y;
- if (fx1 || fy1 || fx2 || fy2)
- {
- iwidth = 1.0f / glt->image->width;
- iheight = 1.0f / glt->image->height;
- idepth = 1.0f / glt->image->depth;
- if (fx1)
- *fx1 = glt->x * iwidth;
- if (fy1)
- *fy1 = glt->y * iheight;
- if (fz1)
- *fz1 = glt->z * idepth;
- if (fx2)
- *fx2 = (glt->x + glt->width) * iwidth;
- if (fy2)
- *fy2 = (glt->y + glt->height) * iheight;
- if (fz2)
- *fz2 = (glt->z + glt->depth) * idepth;
- }
- }
- else
+ // maps to a 2x3 texture rectangle with normalized coordinates (must be scaled by size after lookup)
+ // +-
+ // XX
+ // YY
+ // ZZ
+ rtexture_t *projection;
+ unsigned short *data, *texel;
+ unsigned int sizebits = 0, stepbits = 0, res, i, j, k;
+ while ((1 << sizebits) < size) sizebits++;
+ while ((1 << stepbits) <= border) stepbits++;
+ stepbits = min(stepbits, sizebits);
+ res = size>>stepbits;
+ stepbits += 16 - sizebits - 1;
+ data = (unsigned short *)Mem_Alloc(texturemempool, 2*sizeof(unsigned short)*res*res*6);
+ texel = data;
+ for (i = 0;i < 6;i++)
{
- if (x)
- *x = 0;
- if (y)
- *y = 0;
- if (z)
- *z = 0;
- if (fx1 || fy1 || fx2 || fy2)
+ unsigned int x = (i&1)<<16, y = (i>>1)<<16;
+ for (j = 0;j < res;j++)
{
- if (fx1)
- *fx1 = 0;
- if (fy1)
- *fy1 = 0;
- if (fz1)
- *fz1 = 0;
- if (fx2)
- *fx2 = 1;
- if (fy2)
- *fy2 = 1;
- if (fz2)
- *fz2 = 1;
+ for (k = 0;k < res;k++)
+ {
+ *texel++ = (x + ((2*k + 1)<<stepbits))/2;
+ *texel++ = (y + ((2*j + 1)<<stepbits))/3;
+ }
}
}
+ projection = R_SetupTexture(rtexturepool, identifier, res, res, 1, 6, TEXF_ALWAYSPRECACHE | TEXF_FORCELINEAR | TEXF_CLAMP, TEXTYPE_PROJECTION, GLTEXTURETYPE_CUBEMAP, (unsigned char *)data, NULL);
+ Mem_Free(data);
+ return projection;
+}
+
+int R_TextureHasAlpha(rtexture_t *rt)
+{
+ return rt ? (((gltexture_t *)rt)->flags & TEXF_ALPHA) != 0 : false;
}
-void R_FragmentLocation(rtexture_t *rt, int *x, int *y, float *fx1, float *fy1, float *fx2, float *fy2)
+int R_TextureWidth(rtexture_t *rt)
{
- R_FragmentLocation3D(rt, x, y, NULL, fx1, fy1, NULL, fx2, fy2, NULL);
+ return rt ? ((gltexture_t *)rt)->inputwidth : 0;
}
-int R_CompatibleFragmentWidth(int width, int textype, int flags)
+int R_TextureHeight(rtexture_t *rt)
{
- return width;
+ return rt ? ((gltexture_t *)rt)->inputheight : 0;
}
-void R_UpdateTexture(rtexture_t *rt, qbyte *data)
+void R_UpdateTexture(rtexture_t *rt, const unsigned char *data, int x, int y, int width, int height)
{
gltexture_t *glt;
if (rt == NULL)
- Host_Error("R_UpdateTexture: no texture supplied\n");
+ Host_Error("R_UpdateTexture: no texture supplied");
if (data == NULL)
- Host_Error("R_UpdateTexture: no data supplied\n");
+ Host_Error("R_UpdateTexture: no data supplied");
glt = (gltexture_t *)rt;
- // if it has not been uploaded yet, update the data that will be used when it is
- if (glt->inputtexels)
- memcpy(glt->inputtexels, data, glt->inputdatasize);
- else
- R_Upload(glt, data);
+ // we need it to be uploaded before we can update a part of it
+ if (glt->flags & GLTEXF_UPLOAD)
+ R_UploadTexture(glt);
+
+ // update part of the texture
+ R_Upload(glt, data, x, y, 0, width, height, 1);
}
+void R_ClearTexture (rtexture_t *rt)
+{
+ gltexture_t *glt = (gltexture_t *)rt;
+
+ R_Upload( glt, NULL, 0, 0, 0, glt->tilewidth, glt->tileheight, glt->tiledepth );
+}
projects / xonotic / darkplaces.git / blobdiff