X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_textures.c;h=710d2164010a733a7e9d56cdc0d9eed96b0e9c0e;hb=ec327370c5506f6f31adbca2eff03e0e2de467cb;hp=19327bac89787d54408f26f5073eca9964a5dd0e;hpb=3c54a56b01dd702976ba0edcace302609b26a617;p=xonotic%2Fdarkplaces.git diff --git a/gl_textures.c b/gl_textures.c index 19327bac..710d2164 100644 --- a/gl_textures.c +++ b/gl_textures.c @@ -1,5 +1,7 @@ #include "quakedef.h" +#include "image.h" +#include "jpeg.h" cvar_t r_max_size = {CVAR_SAVE, "r_max_size", "2048"}; cvar_t r_max_scrapsize = {CVAR_SAVE, "r_max_scrapsize", "256"}; @@ -36,11 +38,11 @@ typedef struct } textypeinfo_t; -static textypeinfo_t textype_qpalette = {TEXTYPE_QPALETTE, 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_qpalette_alpha = {TEXTYPE_QPALETTE, 1, 4, GL_RGBA, 4}; -static textypeinfo_t textype_rgba_alpha = {TEXTYPE_RGBA , 4, 4, GL_RGBA, 4}; +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}; // a tiling texture (most common type) #define GLIMAGETYPE_TILE 0 @@ -52,6 +54,8 @@ static textypeinfo_t textype_rgba_alpha = {TEXTYPE_RGBA , 4, 4, GL_RGBA, #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 gltexturetypedimensions[4] = {1, 2, 3, 2}; static int cubemapside[6] = { GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB, @@ -108,6 +112,8 @@ typedef struct gltexture_s textypeinfo_t *textype; // one of the GLTEXTURETYPE_ values int texturetype; + // palette if the texture is TEXTYPE_PALETTE + const unsigned int *palette; } gltexture_t; @@ -115,7 +121,7 @@ gltexture_t; typedef struct gltexturepool_s { - int sentinel; + unsigned int sentinel; struct gltextureimage_s *imagechain; struct gltexture_s *gltchain; struct gltexturepool_s *next; @@ -137,8 +143,8 @@ static textypeinfo_t *R_GetTexTypeInfo(int textype, int flags) { switch(textype) { - case TEXTYPE_QPALETTE: - return &textype_qpalette_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; @@ -153,8 +159,8 @@ static textypeinfo_t *R_GetTexTypeInfo(int textype, int flags) { switch(textype) { - case TEXTYPE_QPALETTE: - return &textype_qpalette; + case TEXTYPE_PALETTE: + return &textype_palette; case TEXTYPE_RGB: return &textype_rgb; case TEXTYPE_RGBA: @@ -217,20 +223,23 @@ void R_FreeTexture(rtexture_t *rt) // 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 - image = glt->image; - image->texturecount--; - if (image->texturecount < 1) + if (glt->image) { - 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); + 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); + } } if (glt->identifier) @@ -468,11 +477,16 @@ static void r_textures_start(void) texturemempool = Mem_AllocPool("Texture Info"); texturedatamempool = Mem_AllocPool("Texture Storage (not yet uploaded)"); textureprocessingmempool = Mem_AllocPool("Texture Processing Buffers"); + + JPEG_OpenLibrary (); } static void r_textures_shutdown(void) { rtexturepool_t *temp; + + JPEG_CloseLibrary (); + while(gltexturepoolchain) { temp = (rtexturepool_t *) gltexturepoolchain; @@ -541,14 +555,37 @@ void R_MakeResizeBufferBigger(int size) } } +static void GL_SetupTextureParameters(int flags, int texturetype) +{ + int textureenum = gltexturetypeenums[texturetype]; + int wrapmode = (flags & TEXF_CLAMP) ? GL_CLAMP : GL_REPEAT; + + CHECKGLERROR + + qglTexParameteri(textureenum, GL_TEXTURE_WRAP_S, wrapmode); + qglTexParameteri(textureenum, GL_TEXTURE_WRAP_T, wrapmode); + if (gltexturetypedimensions[texturetype] >= 3) + qglTexParameteri(textureenum, GL_TEXTURE_WRAP_R, wrapmode); + + if (flags & TEXF_MIPMAP) + qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, gl_filter_min); + else + qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, gl_filter_mag); + qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, gl_filter_mag); + + CHECKGLERROR +} + static void R_Upload(gltexture_t *glt, qbyte *data) { int i, mip, width, height, depth, internalformat; qbyte *prevbuffer; prevbuffer = data; + CHECKGLERROR + glt->texnum = glt->image->texnum; - qglBindTexture(GL_TEXTURE_2D, glt->image->texnum); + qglBindTexture(gltexturetypeenums[glt->image->texturetype], glt->image->texnum); CHECKGLERROR glt->flags &= ~GLTEXF_UPLOAD; gl_backend_rebindtextures = true; @@ -566,31 +603,20 @@ static void R_Upload(gltexture_t *glt, qbyte *data) case GLTEXTURETYPE_1D: qglTexImage1D(GL_TEXTURE_1D, 0, glt->image->glinternalformat, glt->image->width, 0, glt->image->glformat, GL_UNSIGNED_BYTE, resizebuffer); CHECKGLERROR - qglTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, gl_filter_mag); - CHECKGLERROR - qglTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, gl_filter_mag); - 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 - qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_mag); - CHECKGLERROR - qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag); - CHECKGLERROR break; case GLTEXTURETYPE_3D: - qglTexImage3DEXT(GL_TEXTURE_3D_EXT, 0, glt->image->glinternalformat, glt->image->width, glt->image->height, glt->image->depth, 0, glt->image->glformat, GL_UNSIGNED_BYTE, resizebuffer); - CHECKGLERROR - qglTexParameteri(GL_TEXTURE_3D_EXT, GL_TEXTURE_MIN_FILTER, gl_filter_mag); - CHECKGLERROR - qglTexParameteri(GL_TEXTURE_3D_EXT, GL_TEXTURE_MAG_FILTER, gl_filter_mag); + 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); } if (prevbuffer == NULL) @@ -599,12 +625,12 @@ static void R_Upload(gltexture_t *glt, qbyte *data) memset(resizebuffer, 255, glt->width * glt->height * glt->image->depth * glt->image->bytesperpixel); prevbuffer = resizebuffer; } - else if (glt->textype->textype == TEXTYPE_QPALETTE) + 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->bytesperpixel); - Image_Copy8bitRGBA(prevbuffer, colorconvertbuffer, glt->width * glt->height * glt->depth, d_8to24table); + 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; } @@ -619,7 +645,7 @@ static void R_Upload(gltexture_t *glt, qbyte *data) CHECKGLERROR break; case GLTEXTURETYPE_3D: - qglTexSubImage3DEXT(GL_TEXTURE_3D_EXT, 0, glt->x, glt->y, glt->z, glt->width, glt->height, glt->depth, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); + 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 break; default: @@ -637,7 +663,7 @@ static void R_Upload(gltexture_t *glt, qbyte *data) for (height = 1;height < glt->height;height <<= 1); for (depth = 1;depth < glt->depth ;depth <<= 1); - R_MakeResizeBufferBigger(width * height * depth * glt->image->bytesperpixel); + R_MakeResizeBufferBigger(width * height * depth * glt->image->sides * glt->image->bytesperpixel); if (prevbuffer == NULL) { @@ -649,33 +675,35 @@ static void R_Upload(gltexture_t *glt, qbyte *data) } else { - if (glt->textype->textype == TEXTYPE_QPALETTE) + 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, d_8to24table); + Image_Copy8bitRGBA(prevbuffer, colorconvertbuffer, glt->width * glt->height * glt->depth * glt->image->sides, glt->palette); prevbuffer = colorconvertbuffer; } + } + + // 3 and 4 are converted by the driver to it's preferred format for the current display mode + internalformat = 3; + if (glt->flags & TEXF_ALPHA) + internalformat = 4; + // cubemaps contain multiple images and thus get processed a bit differently + if (glt->image->texturetype != GLTEXTURETYPE_CUBEMAP) + { if (glt->width != width || glt->height != height || glt->depth != depth) { Image_Resample(prevbuffer, glt->width, glt->height, glt->depth, resizebuffer, width, height, depth, glt->image->bytesperpixel, r_lerpimages.integer); prevbuffer = resizebuffer; } - - // apply picmip/max_size limitations + // picmip/max_size while (width > glt->image->width || height > glt->image->height || depth > glt->image->depth) { Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, glt->image->width, glt->image->height, glt->image->depth, glt->image->bytesperpixel); prevbuffer = resizebuffer; } } - - // 3 and 4 are converted by the driver to it's preferred format for the current display mode - internalformat = 3; - if (glt->flags & TEXF_ALPHA) - internalformat = 4; - mip = 0; switch(glt->image->texturetype) { @@ -691,17 +719,6 @@ static void R_Upload(gltexture_t *glt, qbyte *data) qglTexImage1D(GL_TEXTURE_1D, mip++, internalformat, width, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); CHECKGLERROR } - qglTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, gl_filter_min); - CHECKGLERROR - qglTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, gl_filter_mag); - CHECKGLERROR - } - else - { - qglTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, gl_filter_mag); - CHECKGLERROR - qglTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, gl_filter_mag); - CHECKGLERROR } break; case GLTEXTURETYPE_2D: @@ -716,21 +733,10 @@ static void R_Upload(gltexture_t *glt, qbyte *data) qglTexImage2D(GL_TEXTURE_2D, mip++, internalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); CHECKGLERROR } - qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min); - CHECKGLERROR - qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag); - CHECKGLERROR - } - else - { - qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_mag); - CHECKGLERROR - qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag); - CHECKGLERROR } break; case GLTEXTURETYPE_3D: - qglTexImage3DEXT(GL_TEXTURE_3D_EXT, mip++, internalformat, width, height, depth, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); + qglTexImage3D(GL_TEXTURE_3D, mip++, internalformat, width, height, depth, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); CHECKGLERROR if (glt->flags & TEXF_MIPMAP) { @@ -738,20 +744,9 @@ static void R_Upload(gltexture_t *glt, qbyte *data) { Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel); prevbuffer = resizebuffer; - qglTexImage3DEXT(GL_TEXTURE_3D_EXT, mip++, internalformat, width, height, depth, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); + qglTexImage3D(GL_TEXTURE_3D, mip++, internalformat, width, height, depth, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); CHECKGLERROR } - qglTexParameteri(GL_TEXTURE_3D_EXT, GL_TEXTURE_MIN_FILTER, gl_filter_min); - CHECKGLERROR - qglTexParameteri(GL_TEXTURE_3D_EXT, GL_TEXTURE_MAG_FILTER, gl_filter_mag); - CHECKGLERROR - } - else - { - qglTexParameteri(GL_TEXTURE_3D_EXT, GL_TEXTURE_MIN_FILTER, gl_filter_mag); - CHECKGLERROR - qglTexParameteri(GL_TEXTURE_3D_EXT, GL_TEXTURE_MAG_FILTER, gl_filter_mag); - CHECKGLERROR } break; case GLTEXTURETYPE_CUBEMAP: @@ -762,6 +757,18 @@ static void R_Upload(gltexture_t *glt, qbyte *data) { prevbuffer = texturebuffer; texturebuffer += width * height * depth * glt->textype->inputbytesperpixel; + if (glt->width != width || glt->height != height || glt->depth != depth) + { + Image_Resample(prevbuffer, glt->width, glt->height, glt->depth, resizebuffer, width, height, depth, glt->image->bytesperpixel, r_lerpimages.integer); + prevbuffer = resizebuffer; + } + // picmip/max_size + while (width > glt->image->width || height > glt->image->height || depth > glt->image->depth) + { + Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, glt->image->width, glt->image->height, glt->image->depth, glt->image->bytesperpixel); + prevbuffer = resizebuffer; + } + mip = 0; qglTexImage2D(cubemapside[i], mip++, internalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); CHECKGLERROR if (glt->flags & TEXF_MIPMAP) @@ -773,21 +780,11 @@ static void R_Upload(gltexture_t *glt, qbyte *data) qglTexImage2D(cubemapside[i], mip++, internalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); CHECKGLERROR } - qglTexParameteri(cubemapside[i], GL_TEXTURE_MIN_FILTER, gl_filter_min); - CHECKGLERROR - qglTexParameteri(cubemapside[i], GL_TEXTURE_MAG_FILTER, gl_filter_mag); - CHECKGLERROR - } - else - { - qglTexParameteri(cubemapside[i], GL_TEXTURE_MIN_FILTER, gl_filter_mag); - CHECKGLERROR - qglTexParameteri(cubemapside[i], GL_TEXTURE_MAG_FILTER, gl_filter_mag); - CHECKGLERROR } } break; } + GL_SetupTextureParameters(glt->image->flags, glt->image->texturetype); } static void R_FindImageForTexture(gltexture_t *glt) @@ -817,9 +814,11 @@ static void R_FindImageForTexture(gltexture_t *glt) 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) + 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 @@ -860,7 +859,12 @@ static void R_FindImageForTexture(gltexture_t *glt) 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); - for (image->height = block_size;image->height < glt->height;image->height <<= 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)); @@ -896,8 +900,9 @@ static void R_FindImageForTexture(gltexture_t *glt) image->texturetype = glt->texturetype; image->glinternalformat = texinfo->glinternalformat; image->glformat = texinfo->glformat; - image->flags = (glt->flags & (TEXF_MIPMAP | TEXF_ALPHA)) | GLTEXF_UPLOAD; + image->flags = (glt->flags & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP)) | 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; @@ -926,7 +931,7 @@ static void R_UploadTexture (gltexture_t *glt) 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, char *identifier, int width, int height, int depth, int sides, int flags, int textype, int texturetype, qbyte *data) +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) { int i, size; gltexture_t *glt; @@ -936,16 +941,12 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, char *identifier if (cls.state == ca_dedicated) return NULL; - if (texturetype == GLTEXTURETYPE_CUBEMAP) - { - if (flags & TEXF_FRAGMENT) - Sys_Error("R_LoadTexture: fragment cubemap texture??\n"); - if (!gl_texturecubemap) - Sys_Error("R_LoadTexture: cubemap texture not supported by driver\n"); - } - if (texturetype == GLTEXTURETYPE_3D) - if (!gl_texture3d) - Sys_Error("R_LoadTexture: 3d texture not supported by driver\n"); + if (flags & TEXF_FRAGMENT && texturetype != GLTEXTURETYPE_2D) + Sys_Error("R_LoadTexture: only 2D fragment textures implemented\n"); + if (texturetype == GLTEXTURETYPE_CUBEMAP && !gl_texturecubemap) + Sys_Error("R_LoadTexture: cubemap texture not supported by driver\n"); + if (texturetype == GLTEXTURETYPE_3D && !gl_texture3d) + Sys_Error("R_LoadTexture: 3d texture not supported by driver\n"); /* glt = R_FindTexture (pool, identifier); @@ -958,11 +959,13 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, char *identifier 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); // clear the alpha flag if the texture has no transparent pixels switch(textype) { - case TEXTYPE_QPALETTE: + case TEXTYPE_PALETTE: if (flags & TEXF_ALPHA) { flags &= ~TEXF_ALPHA; @@ -970,7 +973,7 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, char *identifier { for (i = 0;i < size;i++) { - if (data[i] == 255) + if (((qbyte *)&palette[data[i]])[3] == 255) { flags |= TEXF_ALPHA; break; @@ -1022,12 +1025,13 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, char *identifier glt->textype = texinfo; glt->texturetype = texturetype; glt->inputdatasize = size; + glt->palette = palette; if (data) { glt->inputtexels = Mem_Alloc(texturedatamempool, size); if (glt->inputtexels == NULL) - Sys_Error("R_SetupTexture: out of memory\n"); + Sys_Error("R_LoadTexture: out of memory\n"); memcpy(glt->inputtexels, data, size); } else @@ -1039,29 +1043,24 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, char *identifier return (rtexture_t *)glt; } -rtexture_t *R_LoadTexture(rtexturepool_t *rtexturepool, char *identifier, int width, int height, qbyte *data, int textype, int flags) -{ - return R_SetupTexture(rtexturepool, identifier, width, height, 1, 1, flags, textype, GLTEXTURETYPE_2D, data); -} - -rtexture_t *R_LoadTexture1D(rtexturepool_t *rtexturepool, char *identifier, int width, qbyte *data, int textype, int flags) +rtexture_t *R_LoadTexture1D(rtexturepool_t *rtexturepool, const char *identifier, int width, const qbyte *data, int textype, int flags, const unsigned int *palette) { - return R_SetupTexture(rtexturepool, identifier, width, 1, 1, 1, flags, textype, GLTEXTURETYPE_1D, data); + return R_SetupTexture(rtexturepool, identifier, width, 1, 1, 1, flags, textype, GLTEXTURETYPE_1D, data, palette); } -rtexture_t *R_LoadTexture2D(rtexturepool_t *rtexturepool, char *identifier, int width, int height, qbyte *data, int textype, int flags) +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) { - return R_SetupTexture(rtexturepool, identifier, width, height, 1, 1, flags, textype, GLTEXTURETYPE_2D, data); + return R_SetupTexture(rtexturepool, identifier, width, height, 1, 1, flags, textype, GLTEXTURETYPE_2D, data, palette); } -rtexture_t *R_LoadTexture3D(rtexturepool_t *rtexturepool, char *identifier, int width, int height, int depth, qbyte *data, int textype, int flags) +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) { - return R_SetupTexture(rtexturepool, identifier, width, height, depth, 1, flags, textype, GLTEXTURETYPE_3D, data); + return R_SetupTexture(rtexturepool, identifier, width, height, depth, 1, flags, textype, GLTEXTURETYPE_3D, data, palette); } -rtexture_t *R_LoadTextureCubeMap(rtexturepool_t *rtexturepool, char *identifier, int width, qbyte *data, int textype, int flags) +rtexture_t *R_LoadTextureCubeMap(rtexturepool_t *rtexturepool, const char *identifier, int width, const qbyte *data, int textype, int flags, const unsigned int *palette) { - return R_SetupTexture(rtexturepool, identifier, width, width, 1, 6, flags, textype, GLTEXTURETYPE_CUBEMAP, data); + return R_SetupTexture(rtexturepool, identifier, width, width, 1, 6, flags, textype, GLTEXTURETYPE_CUBEMAP, data, palette); } int R_TextureHasAlpha(rtexture_t *rt)