X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=gl_textures.c;h=97e0aa948fd964b351b73f348d0126fea77cdfac;hb=3eaf4d428c06dcf2f08beccb8a613de02a5498aa;hp=b39b3e3c5c6a25ca66d6a9dd02b85a702d8136d6;hpb=1c9dadb470e254303bacae8bc597a743d3265b0e;p=xonotic%2Fdarkplaces.git diff --git a/gl_textures.c b/gl_textures.c index b39b3e3c..97e0aa94 100644 --- a/gl_textures.c +++ b/gl_textures.c @@ -39,7 +39,6 @@ static textypeinfo_t textype_rgb = {TEXTYPE_RGB , 3, 3, GL_RGB , 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}; #define GLTEXTURETYPE_1D 0 #define GLTEXTURETYPE_2D 1 @@ -145,8 +144,6 @@ static textypeinfo_t *R_GetTexTypeInfo(int textype, int flags) return &textype_rgb; case TEXTYPE_RGBA: return &textype_rgba; - case TEXTYPE_DSDT: - return &textype_dsdt; default: Host_Error("R_GetTexTypeInfo: unknown texture format"); return NULL; @@ -201,7 +198,10 @@ void R_FreeTexture(rtexture_t *rt) Host_Error("R_FreeTexture: texture \"%s\" not linked in pool", glt->identifier); if (glt->texnum) - qglDeleteTextures(1, (GLuint *)&glt->texnum); + { + CHECKGLERROR + qglDeleteTextures(1, (GLuint *)&glt->texnum);CHECKGLERROR + } if (glt->inputtexels) Mem_Free(glt->inputtexels); @@ -296,6 +296,7 @@ static void GL_TextureMode_f (void) // change all the existing mipmap texture objects // FIXME: force renderer(/client/something?) restart instead? + CHECKGLERROR for (pool = gltexturepoolchain;pool;pool = pool->next) { for (glt = pool->gltchain;glt;glt = glt->chain) @@ -303,14 +304,18 @@ static void GL_TextureMode_f (void) // only update already uploaded images if (!(glt->flags & (GLTEXF_UPLOAD | TEXF_FORCENEAREST | TEXF_FORCELINEAR))) { - qglGetIntegerv(gltexturetypebindingenums[glt->texturetype], &oldbindtexnum); - qglBindTexture(gltexturetypeenums[glt->texturetype], glt->texnum); + 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); + { + qglTexParameteri(gltexturetypeenums[glt->texturetype], GL_TEXTURE_MIN_FILTER, gl_filter_min);CHECKGLERROR + } else - qglTexParameteri(gltexturetypeenums[glt->texturetype], GL_TEXTURE_MIN_FILTER, gl_filter_mag); - qglTexParameteri(gltexturetypeenums[glt->texturetype], GL_TEXTURE_MAG_FILTER, gl_filter_mag); - qglBindTexture(gltexturetypeenums[glt->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 } } } @@ -445,8 +450,8 @@ static void R_TextureStats_f(void) static void r_textures_start(void) { // LordHavoc: allow any alignment - qglPixelStorei(GL_UNPACK_ALIGNMENT, 1); CHECKGLERROR + qglPixelStorei(GL_UNPACK_ALIGNMENT, 1);CHECKGLERROR texturemempool = Mem_AllocPool("texture management", 0, NULL); @@ -524,6 +529,7 @@ void R_Textures_Frame (void) Cvar_SetValueQuick(&gl_texture_anisotropy, old_aniso); + CHECKGLERROR for (pool = gltexturepoolchain;pool;pool = pool->next) { for (glt = pool->gltchain;glt;glt = glt->chain) @@ -531,12 +537,12 @@ void R_Textures_Frame (void) // only update already uploaded images if ((glt->flags & (GLTEXF_UPLOAD | TEXF_MIPMAP)) == TEXF_MIPMAP) { - qglGetIntegerv(gltexturetypebindingenums[glt->texturetype], &oldbindtexnum); + qglGetIntegerv(gltexturetypebindingenums[glt->texturetype], &oldbindtexnum);CHECKGLERROR - qglBindTexture(gltexturetypeenums[glt->texturetype], glt->texnum); + qglBindTexture(gltexturetypeenums[glt->texturetype], glt->texnum);CHECKGLERROR qglTexParameteri(gltexturetypeenums[glt->texturetype], GL_TEXTURE_MAX_ANISOTROPY_EXT, old_aniso);CHECKGLERROR - qglBindTexture(gltexturetypeenums[glt->texturetype], oldbindtexnum); + qglBindTexture(gltexturetypeenums[glt->texturetype], oldbindtexnum);CHECKGLERROR } } } @@ -638,10 +644,15 @@ static void R_Upload(gltexture_t *glt, unsigned char *data, int fragx, int fragy CHECKGLERROR // we need to restore the texture binding after finishing the upload - qglGetIntegerv(gltexturetypebindingenums[glt->texturetype], &oldbindtexnum); - qglBindTexture(gltexturetypeenums[glt->texturetype], glt->texnum); - CHECKGLERROR + qglGetIntegerv(gltexturetypebindingenums[glt->texturetype], &oldbindtexnum);CHECKGLERROR + qglBindTexture(gltexturetypeenums[glt->texturetype], glt->texnum);CHECKGLERROR + // these are rounded up versions of the size to do better resampling + for (width = 1;width < glt->inputwidth ;width <<= 1); + for (height = 1;height < glt->inputheight;height <<= 1); + for (depth = 1;depth < glt->inputdepth ;depth <<= 1); + + R_MakeResizeBufferBigger(width * height * depth * glt->sides * glt->bytesperpixel); R_MakeResizeBufferBigger(fragwidth * fragheight * fragdepth * glt->sides * glt->bytesperpixel); if (prevbuffer == NULL) @@ -657,29 +668,19 @@ static void R_Upload(gltexture_t *glt, unsigned char *data, int fragx, int fragy prevbuffer = colorconvertbuffer; } - // these are rounded up versions of the size to do better resampling - for (width = 1;width < glt->inputwidth ;width <<= 1); - for (height = 1;height < glt->inputheight;height <<= 1); - for (depth = 1;depth < glt->inputdepth ;depth <<= 1); - - R_MakeResizeBufferBigger(width * height * depth * glt->sides * glt->bytesperpixel); - - if ((glt->flags & (TEXF_MIPMAP | TEXF_PICMIP | GLTEXF_UPLOAD)) == 0) + 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, fragx, fragwidth, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer); - CHECKGLERROR + qglTexSubImage1D(GL_TEXTURE_1D, 0, fragx, fragwidth, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);CHECKGLERROR break; case GLTEXTURETYPE_2D: - qglTexSubImage2D(GL_TEXTURE_2D, 0, fragx, fragy, fragwidth, fragheight, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer); - CHECKGLERROR + qglTexSubImage2D(GL_TEXTURE_2D, 0, fragx, fragy, fragwidth, fragheight, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);CHECKGLERROR break; case GLTEXTURETYPE_3D: - qglTexSubImage3D(GL_TEXTURE_3D, 0, fragx, fragy, fragz, fragwidth, fragheight, fragdepth, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer); - CHECKGLERROR + qglTexSubImage3D(GL_TEXTURE_3D, 0, fragx, fragy, fragz, fragwidth, fragheight, fragdepth, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);CHECKGLERROR break; default: Host_Error("R_Upload: partial update of type other than 1D, 2D, or 3D"); @@ -713,44 +714,38 @@ static void R_Upload(gltexture_t *glt, unsigned char *data, int fragx, int fragy switch(glt->texturetype) { case GLTEXTURETYPE_1D: - qglTexImage1D(GL_TEXTURE_1D, mip++, glt->glinternalformat, width, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer); - CHECKGLERROR + qglTexImage1D(GL_TEXTURE_1D, mip++, glt->glinternalformat, width, 0, glt->glformat, GL_UNSIGNED_BYTE, 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->bytesperpixel); prevbuffer = resizebuffer; - qglTexImage1D(GL_TEXTURE_1D, mip++, glt->glinternalformat, width, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer); - CHECKGLERROR + qglTexImage1D(GL_TEXTURE_1D, mip++, glt->glinternalformat, width, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);CHECKGLERROR } } break; case GLTEXTURETYPE_2D: - qglTexImage2D(GL_TEXTURE_2D, mip++, glt->glinternalformat, width, height, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer); - CHECKGLERROR + qglTexImage2D(GL_TEXTURE_2D, mip++, glt->glinternalformat, width, height, 0, glt->glformat, GL_UNSIGNED_BYTE, 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->bytesperpixel); prevbuffer = resizebuffer; - qglTexImage2D(GL_TEXTURE_2D, mip++, glt->glinternalformat, width, height, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer); - CHECKGLERROR + qglTexImage2D(GL_TEXTURE_2D, mip++, glt->glinternalformat, width, height, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);CHECKGLERROR } } break; case GLTEXTURETYPE_3D: - qglTexImage3D(GL_TEXTURE_3D, mip++, glt->glinternalformat, width, height, depth, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer); - CHECKGLERROR + qglTexImage3D(GL_TEXTURE_3D, mip++, glt->glinternalformat, width, height, depth, 0, glt->glformat, GL_UNSIGNED_BYTE, 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->bytesperpixel); prevbuffer = resizebuffer; - qglTexImage3D(GL_TEXTURE_3D, mip++, glt->glinternalformat, width, height, depth, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer); - CHECKGLERROR + qglTexImage3D(GL_TEXTURE_3D, mip++, glt->glinternalformat, width, height, depth, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);CHECKGLERROR } } break; @@ -774,16 +769,14 @@ static void R_Upload(gltexture_t *glt, unsigned char *data, int fragx, int fragy prevbuffer = resizebuffer; } mip = 0; - qglTexImage2D(cubemapside[i], mip++, glt->glinternalformat, width, height, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer); - CHECKGLERROR + qglTexImage2D(cubemapside[i], mip++, glt->glinternalformat, width, height, 0, glt->glformat, GL_UNSIGNED_BYTE, 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->bytesperpixel); prevbuffer = resizebuffer; - qglTexImage2D(cubemapside[i], mip++, glt->glinternalformat, width, height, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer); - CHECKGLERROR + qglTexImage2D(cubemapside[i], mip++, glt->glinternalformat, width, height, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);CHECKGLERROR } } } @@ -791,7 +784,7 @@ static void R_Upload(gltexture_t *glt, unsigned char *data, int fragx, int fragy } GL_SetupTextureParameters(glt->flags, glt->texturetype); } - qglBindTexture(gltexturetypeenums[glt->texturetype], oldbindtexnum); + qglBindTexture(gltexturetypeenums[glt->texturetype], oldbindtexnum);CHECKGLERROR } static void R_UploadTexture (gltexture_t *glt) @@ -799,7 +792,8 @@ static void R_UploadTexture (gltexture_t *glt) if (!(glt->flags & GLTEXF_UPLOAD)) return; - qglGenTextures(1, (GLuint *)&glt->texnum); + CHECKGLERROR + qglGenTextures(1, (GLuint *)&glt->texnum);CHECKGLERROR R_Upload(glt, glt->inputtexels, 0, 0, 0, glt->inputwidth, glt->inputheight, glt->inputdepth); if (glt->inputtexels) { @@ -881,8 +875,6 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden } } break; - case TEXTYPE_DSDT: - break; default: Host_Error("R_LoadTexture: unknown texture type"); }