From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 5 Aug 2002 11:54:28 +0000 (+0000)
Subject: removed procedural texture support because it was inefficient where it was implemente...
X-Git-Tag: RELEASE_0_2_0_RC1~370
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0b9f4c8aec2e2012295b2165757aa1380073c9f0;p=xonotic%2Fdarkplaces.git
removed procedural texture support because it was inefficient where it was implemented - it can be implemented more efficiently in renderer code than in R_GetTexture
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@2201 d7cf8633-e32d-0410-b094-e92efae38249
---
diff --git a/gl_textures.c b/gl_textures.c
index 0a7f2a1d..e987acb1 100644
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -18,10 +18,8 @@ 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
-// texture generated by code, also causes permanent GLTEXF_UPLOAD effect
-#define GLTEXF_PROCEDURAL 0x00020000
// bitmask for mismatch checking
-#define GLTEXF_IMPORTANTBITS (GLTEXF_PROCEDURAL)
+#define GLTEXF_IMPORTANTBITS (0)
// set when image is uploaded and freed
#define GLTEXF_DESTROYED 0x00040000
@@ -89,17 +87,9 @@ typedef struct gltexture_s
qbyte *inputtexels;
// to identify cache mismatchs (this might be removed someday)
int crc;
- // flags supplied to the LoadTexture/ProceduralTexture functions
+ // flags supplied to the LoadTexture function
// (might be altered to remove TEXF_ALPHA), and GLTEXF_ private flags
int flags;
- // procedural texture generation function, called once per frame if the texture is used
- int (*generate)(qbyte *buffer, int width, int height, void *parameterdata, int parameterdatasize);
- // data provided to generate, persistent from call to call
- qbyte *proceduraldata;
- // size of data
- int proceduraldatasize;
- // used only to avoid updating the texture more than once per frame
- int proceduralframecount;
// pointer to one of the textype_ structs
textypeinfo_t *textype;
}
@@ -184,19 +174,8 @@ int R_GetTexture(rtexture_t *rt)
if (!rt)
return 0;
glt = (gltexture_t *)rt;
- if (glt->flags & (GLTEXF_UPLOAD | GLTEXF_PROCEDURAL))
- {
- if (glt->flags & GLTEXF_PROCEDURAL)
- {
- if (glt->proceduralframecount != r_framecount)
- {
- glt->proceduralframecount = r_framecount;
- R_UploadTexture(glt);
- }
- }
- else
- R_UploadTexture(glt);
- }
+ if (glt->flags & GLTEXF_UPLOAD)
+ R_UploadTexture(glt);
return glt->image->texnum;
}
@@ -243,8 +222,6 @@ void R_FreeTexture(rtexture_t *rt)
Mem_Free(glt->identifier);
if (glt->inputtexels)
Mem_Free(glt->inputtexels);
- if (glt->proceduraldata)
- Mem_Free(glt->proceduraldata);
Mem_Free(glt);
}
@@ -447,10 +424,7 @@ static void R_TextureStats_f(void)
for (glt = pool->gltchain;glt;glt = glt->chain)
{
loaded = !(glt->flags & GLTEXF_UPLOAD);
- if (glt->flags & GLTEXF_PROCEDURAL)
- Con_Printf("%c%4i%c %4i PROC %s %s %s %s\n" , loaded ? '[' : ' ', (R_CalcTexelDataSize(glt) + 1023) / 1024, loaded ? ']' : ' ', (glt->width * glt->height * glt->textype->inputbytesperpixel + 1023) / 1024, loaded ? "loaded" : " ", (glt->flags & TEXF_MIPMAP) ? "mip" : " ", (glt->flags & TEXF_ALPHA) ? "alpha" : " ", glt->identifier ? glt->identifier : "<unnamed>");
- else
- Con_Printf("%c%4i%c%c%4i%c %04X %s %s %s %s\n", loaded ? '[' : ' ', (R_CalcTexelDataSize(glt) + 1023) / 1024, loaded ? ']' : ' ', glt->inputtexels ? '[' : ' ', (glt->width * glt->height * glt->textype->inputbytesperpixel + 1023) / 1024, glt->inputtexels ? ']' : ' ', glt->crc, loaded ? "loaded" : " ", (glt->flags & TEXF_MIPMAP) ? "mip" : " ", (glt->flags & TEXF_ALPHA) ? "alpha" : " ", glt->identifier ? glt->identifier : "<unnamed>");
+ Con_Printf("%c%4i%c%c%4i%c %04X %s %s %s %s\n", loaded ? '[' : ' ', (R_CalcTexelDataSize(glt) + 1023) / 1024, loaded ? ']' : ' ', glt->inputtexels ? '[' : ' ', (glt->width * glt->height * glt->textype->inputbytesperpixel + 1023) / 1024, glt->inputtexels ? ']' : ' ', glt->crc, loaded ? "loaded" : " ", (glt->flags & TEXF_MIPMAP) ? "mip" : " ", (glt->flags & TEXF_ALPHA) ? "alpha" : " ", glt->identifier ? glt->identifier : "<unnamed>");
}
Con_Printf("pool %10p\n", pool);
}
@@ -767,39 +741,21 @@ static void R_FindImageForTexture(gltexture_t *glt)
// note: R_FindImageForTexture must be called before this
static void R_UploadTexture (gltexture_t *glt)
{
- if (!(glt->flags & (GLTEXF_UPLOAD | GLTEXF_PROCEDURAL)))
+ if (!(glt->flags & GLTEXF_UPLOAD))
return;
- if (glt->flags & GLTEXF_PROCEDURAL)
- {
- if (glt->generate)
- {
- if (texturebuffersize < glt->width * glt->height * glt->textype->inputbytesperpixel)
- {
- if (texturebuffer)
- Mem_Free(texturebuffer);
- texturebuffersize = glt->width * glt->height * glt->textype->inputbytesperpixel;
- texturebuffer = Mem_Alloc(textureprocessingmempool, texturebuffersize);
- }
-
- glt->generate(texturebuffer, glt->width, glt->height, (void *)glt->proceduraldata, glt->proceduraldatasize);
- }
- }
- else
+ R_Upload(glt, glt->inputtexels);
+ if (glt->inputtexels)
{
- R_Upload(glt, glt->inputtexels);
- if (glt->inputtexels)
- {
- Mem_Free(glt->inputtexels);
- glt->inputtexels = NULL;
- glt->flags |= GLTEXF_DESTROYED;
- }
- else if (glt->flags & GLTEXF_DESTROYED)
- Con_Printf("R_UploadTexture: Texture %s already uploaded and destroyed. Can not upload original image again. Uploaded blank texture.\n", glt->identifier);
+ Mem_Free(glt->inputtexels);
+ glt->inputtexels = NULL;
+ glt->flags |= GLTEXF_DESTROYED;
}
+ else if (glt->flags & GLTEXF_DESTROYED)
+ Con_Printf("R_UploadTexture: Texture %s already uploaded and destroyed. Can not upload original image again. Uploaded blank texture.\n", glt->identifier);
}
-static gltexture_t *R_SetupTexture(gltexturepool_t *pool, char *identifier, int crc, int width, int height, int flags, textypeinfo_t *texinfo, qbyte *data, int (*generate)(qbyte *buffer, int width, int height, void *proceduraldata, int proceduraldatasize), void *proceduraldata, int proceduraldatasize)
+static gltexture_t *R_SetupTexture(gltexturepool_t *pool, char *identifier, int crc, int width, int height, int flags, textypeinfo_t *texinfo, qbyte *data)
{
gltexture_t *glt;
glt = Mem_Alloc(texturemempool, sizeof(gltexture_t));
@@ -829,17 +785,6 @@ static gltexture_t *R_SetupTexture(gltexturepool_t *pool, char *identifier, int
else
glt->inputtexels = NULL;
- glt->generate = generate;
- glt->proceduraldatasize = proceduraldatasize;
- if (proceduraldatasize)
- {
- glt->proceduraldata = Mem_Alloc(texturemempool, proceduraldatasize);
- if (glt->proceduraldata == NULL)
- Sys_Error("R_SetupTexture: out of memory\n");
- }
- else
- glt->proceduraldata = NULL;
-
R_FindImageForTexture(glt);
R_PrecacheTexture(glt);
@@ -925,37 +870,7 @@ rtexture_t *R_LoadTexture (rtexturepool_t *rtexturepool, char *identifier, int w
R_FreeTexture((rtexture_t *)glt);
}
- return (rtexture_t *)R_SetupTexture(pool, identifier, crc, width, height, flags | GLTEXF_UPLOAD, texinfo, data, NULL, NULL, 0);
-}
-
-rtexture_t *R_ProceduralTexture (rtexturepool_t *rtexturepool, char *identifier, int width, int height, int textype, int flags, int (*generate)(qbyte *buffer, int width, int height, void *proceduraldata, int proceduraldatasize), void *proceduraldata, int proceduraldatasize)
-{
- gltexture_t *glt;
- gltexturepool_t *pool = (gltexturepool_t *)rtexturepool;
- textypeinfo_t *texinfo;
-
- if (cls.state == ca_dedicated)
- return NULL;
-
- texinfo = R_GetTexTypeInfo(textype, flags);
-
- if (flags & TEXF_FRAGMENT)
- if ((width * texinfo->internalbytesperpixel) & 3)
- Host_Error("R_ProceduralTexture: incompatible width for fragment");
-
- // see if the texture is already present
- if (identifier && (glt = R_FindTexture(pool, identifier)))
- {
- if (width == glt->width && height == glt->height && texinfo == glt->textype && ((flags ^ glt->flags) & TEXF_IMPORTANTBITS) == 0 && ((flags ^ glt->flags) & GLTEXF_IMPORTANTBITS) == 0)
- {
- Con_Printf("R_LoadTexture: exact match with existing texture %s\n", identifier);
- return (rtexture_t *)glt; // exact match, use existing
- }
- Con_Printf("R_LoadTexture: cache mismatch, replacing old texture\n");
- R_FreeTexture((rtexture_t *)glt);
- }
-
- return (rtexture_t *)R_SetupTexture(pool, identifier, 0, width, height, flags | GLTEXF_PROCEDURAL | GLTEXF_UPLOAD, texinfo, NULL, generate, proceduraldata, proceduraldatasize);
+ return (rtexture_t *)R_SetupTexture(pool, identifier, crc, width, height, flags | GLTEXF_UPLOAD, texinfo, data);
}
int R_TextureHasAlpha(rtexture_t *rt)
diff --git a/r_textures.h b/r_textures.h
index d0646392..4b52c76d 100644
--- a/r_textures.h
+++ b/r_textures.h
@@ -11,7 +11,7 @@
// 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 (which are procedural textures)
+// this, mostly used for lightmaps
#define TEXF_FRAGMENT 0x00000010
// used for checking if textures mismatch
#define TEXF_IMPORTANTBITS (TEXF_ALPHA | TEXF_MIPMAP | TEXF_FRAGMENT)
@@ -37,7 +37,7 @@ typedef struct
}
rtexturepool_t;
-// allocate a texture pool, to be used with R_LoadTexture/R_ProceduralTexture
+// allocate a texture pool, to be used with R_LoadTexture
rtexturepool_t *R_AllocTexturePool(void);
// free a texture pool (textures can not be freed individually)
void R_FreeTexturePool(rtexturepool_t **rtexturepool);
@@ -47,23 +47,23 @@ void R_FreeTexturePool(rtexturepool_t **rtexturepool);
// update system, to get a compliant size, use R_CompatibleFragmentWidth
int R_CompatibleFragmentWidth(int width, int textype, int flags);
-// these two functions add a texture to a pool, and may precache (upload) it
-// a normal static texture
+// 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);
-// a procedurally generated texture, often animated over time, note: generate can be NULL (for odd uses)
-rtexture_t *R_ProceduralTexture (rtexturepool_t *rtexturepool, char *identifier, int width, int height, int textype, int flags, int (*generate)(qbyte *buffer, int width, int height, void *parameterdata, int parameterdatasize), void *parameterdata, int parameterdatasize);
// free a texture
void R_FreeTexture(rtexture_t *rt);
-// update the image data of a texture, used by lightmap updates and procedural
-// textures.
+// 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)
+// 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);
-// returns the renderer dependent texture slot number (call this before each use, as a texture might not have been precached, or it might change over time if it is procedural)
+// returns the renderer dependent texture slot number (call this before each
+// use, as a texture might not have been precached)
int R_GetTexture (rtexture_t *rt);
// returns true if the texture is transparent (useful for rendering code)