+/*
+Copyright (C) 2000-2020 DarkPlaces contributors
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+*/
+
#include "quakedef.h"
#include "image.h"
#include "jpeg.h"
#include "image_png.h"
-#include "intoverflow.h"
cvar_t gl_max_size = {CF_CLIENT | CF_ARCHIVE, "gl_max_size", "2048", "maximum allowed texture size, can be used to reduce video memory usage, limited by hardware capabilities (typically 2048, 4096, or 8192)"};
-cvar_t gl_max_lightmapsize = {CF_CLIENT | CF_ARCHIVE, "gl_max_lightmapsize", "1024", "maximum allowed texture size for lightmap textures, use larger values to improve rendering speed, as long as there is enough video memory available (setting it too high for the hardware will cause very bad performance)"};
+cvar_t gl_max_lightmapsize = {CF_CLIENT | CF_ARCHIVE, "gl_max_lightmapsize", "512", "maximum allowed texture size for lightmap textures, use larger values to improve rendering speed, as long as there is enough video memory available (setting it too high for the hardware will cause very bad performance)"};
cvar_t gl_picmip = {CF_CLIENT | CF_ARCHIVE, "gl_picmip", "0", "reduces resolution of textures by powers of 2, for example 1 will halve width/height, reducing texture memory usage by 75%"};
cvar_t gl_picmip_world = {CF_CLIENT | CF_ARCHIVE, "gl_picmip_world", "0", "extra picmip level for world textures (may be negative, which will then reduce gl_picmip for these)"};
cvar_t r_picmipworld = {CF_CLIENT | CF_ARCHIVE, "r_picmipworld", "1", "whether gl_picmip shall apply to world textures too (setting this to 0 is a shorthand for gl_picmip_world -9999999)"};
cvar_t gl_texturecompression_lightcubemaps = {CF_CLIENT | CF_ARCHIVE, "gl_texturecompression_lightcubemaps", "1", "whether to compress light cubemaps (spotlights and other light projection images)"};
cvar_t gl_texturecompression_reflectmask = {CF_CLIENT | CF_ARCHIVE, "gl_texturecompression_reflectmask", "1", "whether to compress reflection cubemap masks (mask of which areas of the texture should reflect the generic shiny cubemap)"};
cvar_t gl_texturecompression_sprites = {CF_CLIENT | CF_ARCHIVE, "gl_texturecompression_sprites", "1", "whether to compress sprites"};
-cvar_t gl_nopartialtextureupdates = {CF_CLIENT | CF_ARCHIVE, "gl_nopartialtextureupdates", "1", "use alternate path for dynamic lightmap updates that avoids a possibly slow code path in the driver"};
cvar_t r_texture_dds_load_alphamode = {CF_CLIENT, "r_texture_dds_load_alphamode", "1", "0: trust DDPF_ALPHAPIXELS flag, 1: texture format and brute force search if ambiguous, 2: texture format only"};
cvar_t r_texture_dds_load_logfailure = {CF_CLIENT, "r_texture_dds_load_logfailure", "0", "log missing DDS textures to ddstexturefailures.log, 0: done log, 1: log with no optional textures (_norm, glow etc.). 2: log all"};
cvar_t r_texture_dds_swdecode = {CF_CLIENT, "r_texture_dds_swdecode", "0", "0: don't software decode DDS, 1: software decode DDS if unsupported, 2: always software decode DDS"};
void *updatecallback_data;
// --- [11/22/2007 Black]
- // stores backup copy of texture for deferred texture updates (gl_nopartialtextureupdates cvar)
+ // stores backup copy of texture for deferred texture updates (R_UpdateTexture when combine = true)
unsigned char *bufferpixels;
+ int modified_mins[3], modified_maxs[3];
qbool buffermodified;
// pointer to texturepool (check this to see if the texture is allocated)
Cvar_RegisterVariable (&gl_texturecompression_lightcubemaps);
Cvar_RegisterVariable (&gl_texturecompression_reflectmask);
Cvar_RegisterVariable (&gl_texturecompression_sprites);
- Cvar_RegisterVariable (&gl_nopartialtextureupdates);
Cvar_RegisterVariable (&r_texture_dds_load_alphamode);
Cvar_RegisterVariable (&r_texture_dds_load_logfailure);
Cvar_RegisterVariable (&r_texture_dds_swdecode);
}
R_UploadFullTexture(glt, data);
- if ((glt->flags & TEXF_ALLOWUPDATES) && gl_nopartialtextureupdates.integer)
+ if (glt->flags & TEXF_ALLOWUPDATES)
glt->bufferpixels = (unsigned char *)Mem_Alloc(texturemempool, glt->tilewidth*glt->tileheight*glt->tiledepth*glt->sides*glt->bytesperpixel);
+ glt->buffermodified = false;
+ VectorClear(glt->modified_mins);
+ VectorClear(glt->modified_maxs);
+
// free any temporary processing buffer we allocated...
if (temppixels)
Mem_Free(temppixels);
return rt ? ((gltexture_t *)rt)->flags : 0;
}
-void R_UpdateTexture(rtexture_t *rt, const unsigned char *data, int x, int y, int z, int width, int height, int depth)
+void R_UpdateTexture(rtexture_t *rt, const unsigned char *data, int x, int y, int z, int width, int height, int depth, int combine)
{
gltexture_t *glt = (gltexture_t *)rt;
if (data == NULL)
// update part of the texture
if (glt->bufferpixels)
{
- int j;
- int bpp = glt->bytesperpixel;
- int inputskip = width*bpp;
- int outputskip = glt->tilewidth*bpp;
- const unsigned char *input = data;
- unsigned char *output = glt->bufferpixels;
+ size_t j, bpp = glt->bytesperpixel;
+
+ // depth and sides are not fully implemented here - can still do full updates but not partial.
if (glt->inputdepth != 1 || glt->sides != 1)
- Sys_Error("R_UpdateTexture on buffered texture that is not 2D\n");
- if (x < 0)
- {
- width += x;
- input -= x*bpp;
- x = 0;
- }
- if (y < 0)
+ Host_Error("R_UpdateTexture on buffered texture that is not 2D\n");
+ if (x < 0 || y < 0 || z < 0 || glt->tilewidth < x + width || glt->tileheight < y + height || glt->tiledepth < z + depth)
+ Host_Error("R_UpdateTexture on buffered texture with out of bounds coordinates (%i %i %i to %i %i %i is not within 0 0 0 to %i %i %i)", x, y, z, x + width, y + height, z + depth, glt->tilewidth, glt->tileheight, glt->tiledepth);
+
+ for (j = 0; j < (size_t)height; j++)
+ memcpy(glt->bufferpixels + ((y + j) * glt->tilewidth + x) * bpp, data + j * width * bpp, width * bpp);
+
+ switch(combine)
{
- height += y;
- input -= y*inputskip;
- y = 0;
+ case 0:
+ // immediately update the part of the texture, no combining
+ R_UploadPartialTexture(glt, data, x, y, z, width, height, depth);
+ break;
+ case 1:
+ // keep track of the region that is modified, decide later how big the partial update area is
+ if (glt->buffermodified)
+ {
+ glt->modified_mins[0] = min(glt->modified_mins[0], x);
+ glt->modified_mins[1] = min(glt->modified_mins[1], y);
+ glt->modified_mins[2] = min(glt->modified_mins[2], z);
+ glt->modified_maxs[0] = max(glt->modified_maxs[0], x + width);
+ glt->modified_maxs[1] = max(glt->modified_maxs[1], y + height);
+ glt->modified_maxs[2] = max(glt->modified_maxs[2], z + depth);
+ }
+ else
+ {
+ glt->buffermodified = true;
+ glt->modified_mins[0] = x;
+ glt->modified_mins[1] = y;
+ glt->modified_mins[2] = z;
+ glt->modified_maxs[0] = x + width;
+ glt->modified_maxs[1] = y + height;
+ glt->modified_maxs[2] = z + depth;
+ }
+ glt->dirty = true;
+ break;
+ default:
+ case 2:
+ // mark the entire texture as dirty, it will be uploaded later
+ glt->buffermodified = true;
+ glt->modified_mins[0] = 0;
+ glt->modified_mins[1] = 0;
+ glt->modified_mins[2] = 0;
+ glt->modified_maxs[0] = glt->tilewidth;
+ glt->modified_maxs[1] = glt->tileheight;
+ glt->modified_maxs[2] = glt->tiledepth;
+ glt->dirty = true;
+ break;
}
- if (width > glt->tilewidth - x)
- width = glt->tilewidth - x;
- if (height > glt->tileheight - y)
- height = glt->tileheight - y;
- if (width < 1 || height < 1)
- return;
- glt->dirty = true;
- glt->buffermodified = true;
- output += y*outputskip + x*bpp;
- for (j = 0;j < height;j++, output += outputskip, input += inputskip)
- memcpy(output, input, width*bpp);
}
- else if (x || y || z || width != glt->inputwidth || height != glt->inputheight || depth != glt->inputdepth)
- R_UploadPartialTexture(glt, data, x, y, z, width, height, depth);
else
R_UploadFullTexture(glt, data);
}
if (glt->buffermodified && glt->bufferpixels)
{
glt->buffermodified = false;
- R_UploadFullTexture(glt, glt->bufferpixels);
+ // Because we currently don't set the relevant upload stride parameters, just make it full width.
+ glt->modified_mins[0] = 0;
+ glt->modified_maxs[0] = glt->tilewidth;
+ // Check also if it's updating at least half the height of the texture.
+ if (glt->modified_maxs[1] - glt->modified_mins[1] > glt->tileheight / 2)
+ R_UploadFullTexture(glt, glt->bufferpixels);
+ else
+ R_UploadPartialTexture(glt, glt->bufferpixels + (size_t)glt->modified_mins[1] * glt->tilewidth * glt->bytesperpixel, glt->modified_mins[0], glt->modified_mins[1], glt->modified_mins[2], glt->modified_maxs[0] - glt->modified_mins[0], glt->modified_maxs[1] - glt->modified_mins[1], glt->modified_maxs[2] - glt->modified_mins[2]);
}
+ VectorClear(glt->modified_mins);
+ VectorClear(glt->modified_maxs);
glt->dirty = false;
return glt->texnum;
}
projects / xonotic / darkplaces.git / blobdiff