#include "quakedef.h"
+#include "image.h"
cvar_t r_max_size = {CVAR_SAVE, "r_max_size", "2048"};
cvar_t r_max_scrapsize = {CVAR_SAVE, "r_max_scrapsize", "256"};
}
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
#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,
textypeinfo_t *textype;
// one of the GLTEXTURETYPE_ values
int texturetype;
+ // palette if the texture is TEXTYPE_PALETTE
+ const unsigned int *palette;
}
gltexture_t;
{
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;
{
switch(textype)
{
- case TEXTYPE_QPALETTE:
- return &textype_qpalette;
+ case TEXTYPE_PALETTE:
+ return &textype_palette;
case TEXTYPE_RGB:
return &textype_rgb;
case TEXTYPE_RGBA:
}
}
+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;
- switch(glt->image->texturetype)
- {
- case GLTEXTURETYPE_1D:
- qglBindTexture(GL_TEXTURE_1D, glt->image->texnum);
- CHECKGLERROR
- break;
- case GLTEXTURETYPE_2D:
- qglBindTexture(GL_TEXTURE_2D, glt->image->texnum);
- CHECKGLERROR
- break;
- case GLTEXTURETYPE_3D:
- qglBindTexture(GL_TEXTURE_3D, glt->image->texnum);
- CHECKGLERROR
- break;
- case GLTEXTURETYPE_CUBEMAP:
- qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, glt->image->texnum);
- CHECKGLERROR
- break;
- }
+ qglBindTexture(gltexturetypeenums[glt->image->texturetype], glt->image->texnum);
+ CHECKGLERROR
glt->flags &= ~GLTEXF_UPLOAD;
gl_backend_rebindtextures = true;
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:
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
- qglTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
- CHECKGLERROR
- qglTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
- 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)
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;
}
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)
{
}
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)
{
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:
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:
qglTexImage3D(GL_TEXTURE_3D, mip++, internalformat, width, height, depth, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
CHECKGLERROR
}
- qglTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
- CHECKGLERROR
- qglTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
- CHECKGLERROR
- }
- else
- {
- qglTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
- CHECKGLERROR
- qglTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
- CHECKGLERROR
}
break;
case GLTEXTURETYPE_CUBEMAP:
{
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)
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)
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
// 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 (glt->texturetype != GLTEXTURETYPE_1D)
+ if (gltexturetypedimensions[glt->texturetype] >= 2)
for (image->height = block_size;image->height < glt->height;image->height <<= 1);
image->depth = 1;
- if (glt->texturetype == GLTEXTURETYPE_3D)
+ 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));
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
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;
// 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;
{
for (i = 0;i < size;i++)
{
- if (data[i] == 255)
+ if (((qbyte *)&palette[data[i]])[3] == 255)
{
flags |= TEXF_ALPHA;
break;
glt->textype = texinfo;
glt->texturetype = texturetype;
glt->inputdatasize = size;
+ glt->palette = palette;
if (data)
{
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)
projects / xonotic / darkplaces.git / blobdiff