#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"};
typedef struct gltexturepool_s
{
- int sentinel;
+ unsigned int sentinel;
struct gltextureimage_s *imagechain;
struct gltexture_s *gltchain;
struct gltexturepool_s *next;
// 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)
}
for (i = 0;i < 6;i++)
- if (!Q_strcasecmp (modes[i].name, Cmd_Argv(1) ) )
+ if (!strcasecmp (modes[i].name, Cmd_Argv(1) ) )
break;
if (i == 6)
{
}
}
}
- gl_backend_rebindtextures = true;
}
static int R_CalcTexelDataSize (gltexture_t *glt)
texturemempool = Mem_AllocPool("Texture Info");
texturedatamempool = Mem_AllocPool("Texture Storage (not yet uploaded)");
textureprocessingmempool = Mem_AllocPool("Texture Processing Buffers");
+
+ // Disable JPEG screenshots if the DLL isn't loaded
+ if (! JPEG_OpenLibrary ())
+ Cvar_SetValueQuick (&scr_screenshot_jpeg, 0);
}
static void r_textures_shutdown(void)
{
rtexturepool_t *temp;
+
+ JPEG_CloseLibrary ();
+
while(gltexturepoolchain)
{
temp = (rtexturepool_t *) gltexturepoolchain;
static void GL_SetupTextureParameters(int flags, int texturetype)
{
int textureenum = gltexturetypeenums[texturetype];
- int wrapmode = (flags & TEXF_CLAMP) ? GL_CLAMP : GL_REPEAT;
+ int wrapmode = ((flags & TEXF_CLAMP) && gl_support_clamptoedge) ? GL_CLAMP_TO_EDGE : GL_REPEAT;
CHECKGLERROR
qglTexParameteri(textureenum, GL_TEXTURE_WRAP_S, wrapmode);
- if (gltexturetypedimensions[texturetype] >= 2)
- qglTexParameteri(textureenum, GL_TEXTURE_WRAP_T, 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);
+ if (flags & TEXF_FORCENEAREST)
+ {
+ if (flags & TEXF_MIPMAP)
+ qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST);
+ else
+ qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ }
+ else if (flags & TEXF_FORCELINEAR)
+ {
+ if (flags & TEXF_MIPMAP)
+ {
+ if (gl_filter_min == GL_NEAREST_MIPMAP_LINEAR || gl_filter_min == GL_LINEAR_MIPMAP_LINEAR)
+ qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+ else
+ qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
+ }
+ else
+ qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ }
else
- qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
- qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+ {
+ 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
}
qbyte *prevbuffer;
prevbuffer = data;
+ R_Mesh_EndBatch();
+
CHECKGLERROR
glt->texnum = glt->image->texnum;
{
// 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);
+ 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)
{
{
// 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, glt->palette);
+ 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)
{
{
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)
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)
{
for (i = 0;i < size;i++)
{
- if (((qbyte *)&palette[data[i]])[3] == 255)
+ if (((qbyte *)&palette[data[i]])[3] < 255)
{
flags |= TEXF_ALPHA;
break;
{
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