X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=gl_textures.c;h=94d0461662ef03e405200b372f18b11f1ffcc836;hb=b19c27fd82074c42e1aba5b9d293f70f90995d02;hp=e0c9720c526896211272f85448de153ad89c08d6;hpb=58eab13c07cc60570bb94d0a511ae57433f0019c;p=xonotic%2Fdarkplaces.git diff --git a/gl_textures.c b/gl_textures.c index e0c9720c..94d04616 100644 --- a/gl_textures.c +++ b/gl_textures.c @@ -60,11 +60,11 @@ static textypeinfo_t textype_bgra = {TEXTYPE_BGRA , 4, 4, 4. 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_shadowmap16 = {TEXTYPE_SHADOWMAP,2,2, 2.0f, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT16_ARB, GL_UNSIGNED_SHORT}; +static textypeinfo_t textype_shadowmap24 = {TEXTYPE_SHADOWMAP,4,4, 4.0f, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT24_ARB, GL_UNSIGNED_INT}; typedef enum gltexturetype_e { - GLTEXTURETYPE_1D, GLTEXTURETYPE_2D, GLTEXTURETYPE_3D, GLTEXTURETYPE_CUBEMAP, @@ -73,9 +73,9 @@ typedef enum gltexturetype_e } 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 gltexturetypeenums[GLTEXTURETYPE_TOTAL] = {GL_TEXTURE_2D, GL_TEXTURE_3D, GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_RECTANGLE_ARB}; +static int gltexturetypebindingenums[GLTEXTURETYPE_TOTAL] = {GL_TEXTURE_BINDING_2D, GL_TEXTURE_BINDING_3D, GL_TEXTURE_BINDING_CUBE_MAP_ARB, GL_TEXTURE_BINDING_RECTANGLE_ARB}; +static int gltexturetypedimensions[GLTEXTURETYPE_TOTAL] = {2, 3, 2, 2}; static int cubemapside[6] = { GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB, @@ -217,7 +217,7 @@ static textypeinfo_t *R_GetTexTypeInfo(textype_t textype, int flags) case TEXTYPE_BGRA: return &textype_bgra; case TEXTYPE_SHADOWMAP: - return &textype_shadowmap; + return (flags & TEXF_LOWPRECISION) ? &textype_shadowmap16 : &textype_shadowmap24; default: Host_Error("R_GetTexTypeInfo: unknown texture format"); return NULL; @@ -264,41 +264,6 @@ static void R_UpdateDynamicTexture(gltexture_t *glt) { } } -static void R_UploadTexture(gltexture_t *t); - -static void R_PrecacheTexture(gltexture_t *glt) -{ - int precache; - precache = false; - if (glt->flags & TEXF_ALWAYSPRECACHE) - precache = true; - else if (r_precachetextures.integer >= 2) - precache = true; - else if (r_precachetextures.integer >= 1) - if (glt->flags & TEXF_PRECACHE) - precache = true; - - if (precache) - R_UploadTexture(glt); -} - -int R_RealGetTexture(rtexture_t *rt) -{ - if (rt) - { - gltexture_t *glt; - glt = (gltexture_t *)rt; - if (glt->flags & GLTEXF_DYNAMIC) - R_UpdateDynamicTexture(glt); - if (glt->flags & GLTEXF_UPLOAD) - R_UploadTexture(glt); - - return glt->texnum; - } - else - return 0; -} - void R_PurgeTexture(rtexture_t *rt) { if(rt && !(((gltexture_t*) rt)->flags & TEXF_PERSISTENT)) { @@ -454,7 +419,6 @@ static void GL_Texture_CalcImageSize(int texturetype, int flags, int inwidth, in switch (texturetype) { default: - case GLTEXTURETYPE_1D: case GLTEXTURETYPE_2D: maxsize = gl_max_texture_size; break; @@ -847,9 +811,6 @@ static void R_Upload(gltexture_t *glt, const unsigned char *data, int fragx, int // update a portion of the image switch(glt->texturetype) { - case GLTEXTURETYPE_1D: - qglTexSubImage1D(GL_TEXTURE_1D, 0, fragx, fragwidth, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR - break; case GLTEXTURETYPE_2D: qglTexSubImage2D(GL_TEXTURE_2D, 0, fragx, fragy, fragwidth, fragheight, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR break; @@ -857,7 +818,7 @@ static void R_Upload(gltexture_t *glt, const unsigned char *data, int fragx, int qglTexSubImage3D(GL_TEXTURE_3D, 0, fragx, fragy, fragz, fragwidth, fragheight, fragdepth, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR break; default: - Host_Error("R_Upload: partial update of type other than 1D, 2D, or 3D"); + Host_Error("R_Upload: partial update of type other than 2D"); break; } } @@ -895,18 +856,6 @@ static void R_Upload(gltexture_t *glt, const unsigned char *data, int fragx, int } 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_MipReduce32(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1); - prevbuffer = resizebuffer; - 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->glinternalformat, width, height, 0, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR if (glt->flags & TEXF_MIPMAP) @@ -972,22 +921,33 @@ static void R_Upload(gltexture_t *glt, const unsigned char *data, int fragx, int qglBindTexture(gltexturetypeenums[glt->texturetype], oldbindtexnum);CHECKGLERROR } -static void R_UploadTexture (gltexture_t *glt) +int R_RealGetTexture(rtexture_t *rt) { - if (!(glt->flags & GLTEXF_UPLOAD)) - return; - - CHECKGLERROR - qglGenTextures(1, (GLuint *)&glt->texnum);CHECKGLERROR - R_Upload(glt, glt->inputtexels, 0, 0, 0, glt->inputwidth, glt->inputheight, glt->inputdepth); - if (glt->inputtexels) + if (rt) { - Mem_Free(glt->inputtexels); - glt->inputtexels = NULL; - glt->flags |= GLTEXF_DESTROYED; + gltexture_t *glt; + glt = (gltexture_t *)rt; + if (glt->flags & GLTEXF_DYNAMIC) + R_UpdateDynamicTexture(glt); + if (glt->flags & GLTEXF_UPLOAD) + { + 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); + glt->inputtexels = NULL; + glt->flags |= GLTEXF_DESTROYED; + } + else if (glt->flags & GLTEXF_DESTROYED) + Con_Printf("R_GetTexture: Texture %s already uploaded and destroyed. Can not upload original image again. Uploaded blank texture.\n", glt->identifier); + } + + return glt->texnum; } - 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); + else + return 0; } 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) @@ -996,6 +956,7 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden gltexture_t *glt; gltexturepool_t *pool = (gltexturepool_t *)rtexturepool; textypeinfo_t *texinfo; + int precache; if (cls.state == ca_dedicated) return NULL; @@ -1093,16 +1054,45 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden glt->updatecallback = NULL; glt->updatacallback_data = NULL; - if (data) + GL_Texture_CalcImageSize(glt->texturetype, glt->flags, glt->inputwidth, glt->inputheight, glt->inputdepth, &glt->tilewidth, &glt->tileheight, &glt->tiledepth); + + precache = false; + if (glt->flags & TEXF_ALWAYSPRECACHE) + precache = true; + else if (r_precachetextures.integer >= 2) + precache = true; + else if (r_precachetextures.integer >= 1) + if (glt->flags & TEXF_PRECACHE) + precache = true; + + if (precache) { - glt->inputtexels = (unsigned char *)Mem_Alloc(texturemempool, size); - memcpy(glt->inputtexels, data, size); + // immediate upload (most common case) + // data may be NULL (blank texture for dynamic rendering) + CHECKGLERROR + qglGenTextures(1, (GLuint *)&glt->texnum);CHECKGLERROR + R_Upload(glt, data, 0, 0, 0, glt->inputwidth, glt->inputheight, glt->inputdepth); + } + else if (data) + { + // deferred texture upload (menu graphics) + // optimize first if possible + if ((textype == TEXTYPE_BGRA || textype == TEXTYPE_RGBA) && glt->inputwidth * glt->inputheight * glt->inputdepth > glt->tilewidth * glt->tileheight * glt->tiledepth) + { + glt->inputtexels = (unsigned char *)Mem_Alloc(texturemempool, glt->tilewidth*glt->tileheight*glt->tiledepth*glt->sides*glt->bytesperpixel); + Image_Resample32(data, glt->inputwidth, glt->inputheight, glt->inputdepth, glt->inputtexels, glt->tilewidth, glt->tileheight, glt->tiledepth, r_lerpimages.integer); + // change texture size accordingly + glt->inputwidth = glt->tilewidth; + glt->inputheight = glt->tileheight; + glt->inputdepth = glt->tiledepth; + GL_Texture_CalcImageSize(glt->texturetype, glt->flags, glt->inputwidth, glt->inputheight, glt->inputdepth, &glt->tilewidth, &glt->tileheight, &glt->tiledepth); + } + else + { + glt->inputtexels = (unsigned char *)Mem_Alloc(texturemempool, size); + memcpy(glt->inputtexels, data, size); + } } - else - glt->inputtexels = NULL; - - 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); @@ -1110,11 +1100,6 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden return (rtexture_t *)glt; } -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 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); @@ -1130,19 +1115,31 @@ 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_LoadTextureShadowMapRectangle(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, qboolean filter) +static int R_ShadowMapTextureFlags(int precision, qboolean filter) { - 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 flags = TEXF_ALWAYSPRECACHE | TEXF_CLAMP; + if (filter) + flags |= TEXF_FORCELINEAR | TEXF_COMPARE; + else + flags |= TEXF_FORCENEAREST; + if (precision <= 16) + flags |= TEXF_LOWPRECISION; + return flags; +} + +rtexture_t *R_LoadTextureShadowMapRectangle(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, int precision, qboolean filter) +{ + return R_SetupTexture(rtexturepool, identifier, width, height, 1, 1, R_ShadowMapTextureFlags(precision, filter), TEXTYPE_SHADOWMAP, GLTEXTURETYPE_RECTANGLE, NULL, NULL); } -rtexture_t *R_LoadTextureShadowMap2D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, qboolean filter) +rtexture_t *R_LoadTextureShadowMap2D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, int precision, qboolean filter) { - return R_SetupTexture(rtexturepool, identifier, width, height, 1, 1, TEXF_ALWAYSPRECACHE | TEXF_CLAMP | (filter ? TEXF_FORCELINEAR | TEXF_COMPARE : TEXF_FORCENEAREST), TEXTYPE_SHADOWMAP, GLTEXTURETYPE_2D, NULL, NULL); + return R_SetupTexture(rtexturepool, identifier, width, height, 1, 1, R_ShadowMapTextureFlags(precision, filter), TEXTYPE_SHADOWMAP, GLTEXTURETYPE_2D, NULL, NULL); } -rtexture_t *R_LoadTextureShadowMapCube(rtexturepool_t *rtexturepool, const char *identifier, int width, qboolean filter) +rtexture_t *R_LoadTextureShadowMapCube(rtexturepool_t *rtexturepool, const char *identifier, int width, int precision, qboolean filter) { - return R_SetupTexture(rtexturepool, identifier, width, width, 1, 6, TEXF_ALWAYSPRECACHE | TEXF_CLAMP | (filter ? TEXF_FORCELINEAR | TEXF_COMPARE : TEXF_FORCENEAREST), TEXTYPE_SHADOWMAP, GLTEXTURETYPE_CUBEMAP, NULL, NULL); + return R_SetupTexture(rtexturepool, identifier, width, width, 1, 6, R_ShadowMapTextureFlags(precision, filter), TEXTYPE_SHADOWMAP, GLTEXTURETYPE_CUBEMAP, NULL, NULL); } int R_TextureHasAlpha(rtexture_t *rt) @@ -1167,13 +1164,12 @@ void R_UpdateTexture(rtexture_t *rt, const unsigned char *data, int x, int y, in Host_Error("R_UpdateTexture: no texture supplied"); if (data == NULL) Host_Error("R_UpdateTexture: no data supplied"); - glt = (gltexture_t *)rt; // we need it to be uploaded before we can update a part of it - if (glt->flags & GLTEXF_UPLOAD) - R_UploadTexture(glt); + R_RealGetTexture(rt); // update part of the texture + glt = (gltexture_t *)rt; R_Upload(glt, data, x, y, 0, width, height, 1); }