Increased lightmap size in GL1
Controlled by new cvar, gl1_biglightmaps. Size is now up to 512x512, for a max quantity of 8 lightmaps. Should reduce rebinding of them, and reduce the number of calls to glTexSubImage2D(), although it may increase data transfer on each call.
This commit is contained in:
Jaime Moreira
parent
a8824972db
commit
81fd2c1027
|
|
@ -460,6 +460,10 @@ Set `0` by default.
|
|||
|
||||
## Graphics (OpenGL 1.4 only)
|
||||
|
||||
* **gl1_biglightmaps**: Enables lightmaps to use a bigger
|
||||
texture size, which means fewer texture switches, improving
|
||||
performance. Default is `1` (enabled). Requires a `vid_restart`.
|
||||
|
||||
* **gl1_intensity**: Sets the color intensity. Must be a floating point
|
||||
value, at least `1.0` - default is `2.0`. Applied when textures are
|
||||
loaded, so it needs a `vid_restart`.
|
||||
|
|
|
|||
|
|
@ -42,13 +42,19 @@ LM_FreeLightmapBuffers(void)
|
|||
}
|
||||
gl_lms.lightmap_buffer[i] = NULL;
|
||||
}
|
||||
|
||||
if (gl_lms.allocated)
|
||||
{
|
||||
free(gl_lms.allocated);
|
||||
gl_lms.allocated = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
LM_AllocLightmapBuffer(int buffer, qboolean clean)
|
||||
{
|
||||
static const unsigned int lightmap_size =
|
||||
BLOCK_WIDTH * BLOCK_HEIGHT * LIGHTMAP_BYTES;
|
||||
const unsigned int lightmap_size =
|
||||
gl_state.block_width * gl_state.block_height * LIGHTMAP_BYTES;
|
||||
|
||||
if (!gl_lms.lightmap_buffer[buffer])
|
||||
{
|
||||
|
|
@ -68,7 +74,7 @@ LM_AllocLightmapBuffer(int buffer, qboolean clean)
|
|||
void
|
||||
LM_InitBlock(void)
|
||||
{
|
||||
memset(gl_lms.allocated, 0, sizeof(gl_lms.allocated));
|
||||
memset(gl_lms.allocated, 0, gl_state.block_width * sizeof(int));
|
||||
|
||||
if (gl_config.multitexture)
|
||||
{
|
||||
|
|
@ -91,7 +97,7 @@ LM_UploadBlock(qboolean dynamic)
|
|||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < BLOCK_WIDTH; i++)
|
||||
for (i = 0; i < gl_state.block_width; i++)
|
||||
{
|
||||
if (gl_lms.allocated[i] > height)
|
||||
{
|
||||
|
|
@ -99,7 +105,7 @@ LM_UploadBlock(qboolean dynamic)
|
|||
}
|
||||
}
|
||||
|
||||
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, BLOCK_WIDTH,
|
||||
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, gl_state.block_width,
|
||||
height, GL_LIGHTMAP_FORMAT, GL_UNSIGNED_BYTE,
|
||||
gl_lms.lightmap_buffer[buffer]);
|
||||
}
|
||||
|
|
@ -107,10 +113,11 @@ LM_UploadBlock(qboolean dynamic)
|
|||
{
|
||||
gl_lms.internal_format = GL_LIGHTMAP_FORMAT;
|
||||
glTexImage2D(GL_TEXTURE_2D, 0, gl_lms.internal_format,
|
||||
BLOCK_WIDTH, BLOCK_HEIGHT, 0, GL_LIGHTMAP_FORMAT,
|
||||
GL_UNSIGNED_BYTE, gl_lms.lightmap_buffer[buffer]);
|
||||
gl_state.block_width, gl_state.block_height,
|
||||
0, GL_LIGHTMAP_FORMAT, GL_UNSIGNED_BYTE,
|
||||
gl_lms.lightmap_buffer[buffer]);
|
||||
|
||||
if (++gl_lms.current_lightmap_texture == MAX_LIGHTMAPS)
|
||||
if (++gl_lms.current_lightmap_texture == gl_state.max_lightmaps)
|
||||
{
|
||||
ri.Sys_Error(ERR_DROP,
|
||||
"LM_UploadBlock() - MAX_LIGHTMAPS exceeded\n");
|
||||
|
|
@ -127,9 +134,9 @@ LM_AllocBlock(int w, int h, int *x, int *y)
|
|||
int i, j;
|
||||
int best, best2;
|
||||
|
||||
best = BLOCK_HEIGHT;
|
||||
best = gl_state.block_height;
|
||||
|
||||
for (i = 0; i < BLOCK_WIDTH - w; i++)
|
||||
for (i = 0; i < gl_state.block_width - w; i++)
|
||||
{
|
||||
best2 = 0;
|
||||
|
||||
|
|
@ -154,7 +161,7 @@ LM_AllocBlock(int w, int h, int *x, int *y)
|
|||
}
|
||||
}
|
||||
|
||||
if (best + h > BLOCK_HEIGHT)
|
||||
if (best + h > gl_state.block_height)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
|
@ -222,13 +229,13 @@ LM_BuildPolygonFromSurface(model_t *currentmodel, msurface_t *fa)
|
|||
s -= fa->texturemins[0];
|
||||
s += fa->light_s * 16;
|
||||
s += 8;
|
||||
s /= BLOCK_WIDTH * 16; /* fa->texinfo->texture->width; */
|
||||
s /= gl_state.block_width * 16; /* fa->texinfo->texture->width; */
|
||||
|
||||
t = DotProduct(vec, fa->texinfo->vecs[1]) + fa->texinfo->vecs[1][3];
|
||||
t -= fa->texturemins[1];
|
||||
t += fa->light_t * 16;
|
||||
t += 8;
|
||||
t /= BLOCK_HEIGHT * 16; /* fa->texinfo->texture->height; */
|
||||
t /= gl_state.block_height * 16; /* fa->texinfo->texture->height; */
|
||||
|
||||
poly->verts[i][5] = s;
|
||||
poly->verts[i][6] = t;
|
||||
|
|
@ -265,10 +272,10 @@ LM_CreateSurfaceLightmap(msurface_t *surf)
|
|||
buffer = (gl_config.multitexture)? surf->lightmaptexturenum : 0;
|
||||
|
||||
base = gl_lms.lightmap_buffer[buffer];
|
||||
base += (surf->light_t * BLOCK_WIDTH + surf->light_s) * LIGHTMAP_BYTES;
|
||||
base += (surf->light_t * gl_state.block_width + surf->light_s) * LIGHTMAP_BYTES;
|
||||
|
||||
R_SetCacheState(surf);
|
||||
R_BuildLightMap(surf, base, BLOCK_WIDTH * LIGHTMAP_BYTES);
|
||||
R_BuildLightMap(surf, base, gl_state.block_width * LIGHTMAP_BYTES);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -277,8 +284,13 @@ LM_BeginBuildingLightmaps(model_t *m)
|
|||
static lightstyle_t lightstyles[MAX_LIGHTSTYLES];
|
||||
int i;
|
||||
|
||||
memset(gl_lms.allocated, 0, sizeof(gl_lms.allocated));
|
||||
LM_FreeLightmapBuffers();
|
||||
gl_lms.allocated = (int*)malloc(gl_state.block_width * sizeof(int));
|
||||
if (!gl_lms.allocated)
|
||||
{
|
||||
ri.Sys_Error(ERR_FATAL, "Could not create lightmap allocator\n");
|
||||
}
|
||||
memset(gl_lms.allocated, 0, gl_state.block_width * sizeof(int));
|
||||
|
||||
r_framecount = 1; /* no dlightcache */
|
||||
|
||||
|
|
@ -317,8 +329,9 @@ LM_BeginBuildingLightmaps(model_t *m)
|
|||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
||||
glTexImage2D(GL_TEXTURE_2D, 0, gl_lms.internal_format,
|
||||
BLOCK_WIDTH, BLOCK_HEIGHT, 0, GL_LIGHTMAP_FORMAT,
|
||||
GL_UNSIGNED_BYTE, gl_lms.lightmap_buffer[0]);
|
||||
gl_state.block_width, gl_state.block_height,
|
||||
0, GL_LIGHTMAP_FORMAT, GL_UNSIGNED_BYTE,
|
||||
gl_lms.lightmap_buffer[0]);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
|||
|
|
@ -91,6 +91,7 @@ cvar_t *gl1_particle_square;
|
|||
cvar_t *gl1_palettedtexture;
|
||||
cvar_t *gl1_pointparameters;
|
||||
cvar_t *gl1_multitexture;
|
||||
cvar_t *gl1_biglightmaps;
|
||||
|
||||
cvar_t *gl_drawbuffer;
|
||||
cvar_t *gl_lightmap;
|
||||
|
|
@ -1217,6 +1218,7 @@ R_Register(void)
|
|||
gl1_palettedtexture = ri.Cvar_Get("r_palettedtextures", "0", CVAR_ARCHIVE);
|
||||
gl1_pointparameters = ri.Cvar_Get("gl1_pointparameters", "1", CVAR_ARCHIVE);
|
||||
gl1_multitexture = ri.Cvar_Get("gl1_multitexture", "2", CVAR_ARCHIVE);
|
||||
gl1_biglightmaps = ri.Cvar_Get("gl1_biglightmaps", "1", CVAR_ARCHIVE);
|
||||
|
||||
gl_drawbuffer = ri.Cvar_Get("gl_drawbuffer", "GL_BACK", 0);
|
||||
r_vsync = ri.Cvar_Get("r_vsync", "1", CVAR_ARCHIVE);
|
||||
|
|
@ -1397,7 +1399,7 @@ R_SetMode(void)
|
|||
qboolean
|
||||
RI_Init(void)
|
||||
{
|
||||
int j;
|
||||
int j, max_tex_size;
|
||||
byte *colormap;
|
||||
extern float r_turbsin[256];
|
||||
|
||||
|
|
@ -1639,6 +1641,34 @@ RI_Init(void)
|
|||
|
||||
// ----
|
||||
|
||||
/* Big lightmaps */
|
||||
R_Printf(PRINT_ALL, " - Big lightmaps: ");
|
||||
|
||||
gl_state.block_width = BLOCK_WIDTH;
|
||||
gl_state.block_height = BLOCK_HEIGHT;
|
||||
gl_state.max_lightmaps = MAX_LIGHTMAPS;
|
||||
glGetIntegerv (GL_MAX_TEXTURE_SIZE, &max_tex_size);
|
||||
if (max_tex_size > BLOCK_WIDTH)
|
||||
{
|
||||
if (gl1_biglightmaps->value)
|
||||
{
|
||||
gl_state.block_width = gl_state.block_height = Q_min(max_tex_size, 512);
|
||||
gl_state.max_lightmaps = (BLOCK_WIDTH * BLOCK_HEIGHT * MAX_LIGHTMAPS)
|
||||
/ (gl_state.block_width * gl_state.block_height);
|
||||
R_Printf(PRINT_ALL, "Okay\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
R_Printf(PRINT_ALL, "Disabled\n");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
R_Printf(PRINT_ALL, "Failed, detected texture size = %d\n", max_tex_size);
|
||||
}
|
||||
|
||||
// ----
|
||||
|
||||
R_SetDefaultState();
|
||||
|
||||
R_InitImages();
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ R_DrawTriangleOutlines(void)
|
|||
glDisable(GL_DEPTH_TEST);
|
||||
glColor4f(1, 1, 1, 1);
|
||||
|
||||
for (i = 0; i < MAX_LIGHTMAPS; i++)
|
||||
for (i = 0; i < gl_state.max_lightmaps; i++)
|
||||
{
|
||||
msurface_t *surf;
|
||||
|
||||
|
|
@ -269,7 +269,7 @@ R_BlendLightmaps(const model_t *currentmodel)
|
|||
}
|
||||
|
||||
/* render static lightmaps first */
|
||||
for (i = 1; i < MAX_LIGHTMAPS; i++)
|
||||
for (i = 1; i < gl_state.max_lightmaps; i++)
|
||||
{
|
||||
if (gl_lms.lightmap_surfaces[i])
|
||||
{
|
||||
|
|
@ -326,10 +326,10 @@ R_BlendLightmaps(const model_t *currentmodel)
|
|||
if (LM_AllocBlock(smax, tmax, &surf->dlight_s, &surf->dlight_t))
|
||||
{
|
||||
base = gl_lms.lightmap_buffer[0];
|
||||
base += (surf->dlight_t * BLOCK_WIDTH +
|
||||
base += (surf->dlight_t * gl_state.block_width +
|
||||
surf->dlight_s) * LIGHTMAP_BYTES;
|
||||
|
||||
R_BuildLightMap(surf, base, BLOCK_WIDTH * LIGHTMAP_BYTES);
|
||||
R_BuildLightMap(surf, base, gl_state.block_width * LIGHTMAP_BYTES);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -353,8 +353,8 @@ R_BlendLightmaps(const model_t *currentmodel)
|
|||
}
|
||||
|
||||
R_DrawGLPolyChain(drawsurf->polys,
|
||||
(drawsurf->light_s - drawsurf->dlight_s) * (1.0 / 128.0),
|
||||
(drawsurf->light_t - drawsurf->dlight_t) * (1.0 / 128.0));
|
||||
(drawsurf->light_s - drawsurf->dlight_s) * (1.0 / (float)gl_state.block_width),
|
||||
(drawsurf->light_t - drawsurf->dlight_t) * (1.0 / (float)gl_state.block_height));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -372,10 +372,10 @@ R_BlendLightmaps(const model_t *currentmodel)
|
|||
}
|
||||
|
||||
base = gl_lms.lightmap_buffer[0];
|
||||
base += (surf->dlight_t * BLOCK_WIDTH +
|
||||
base += (surf->dlight_t * gl_state.block_width +
|
||||
surf->dlight_s) * LIGHTMAP_BYTES;
|
||||
|
||||
R_BuildLightMap(surf, base, BLOCK_WIDTH * LIGHTMAP_BYTES);
|
||||
R_BuildLightMap(surf, base, gl_state.block_width * LIGHTMAP_BYTES);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -397,8 +397,8 @@ R_BlendLightmaps(const model_t *currentmodel)
|
|||
}
|
||||
|
||||
R_DrawGLPolyChain(surf->polys,
|
||||
(surf->light_s - surf->dlight_s) * (1.0 / 128.0),
|
||||
(surf->light_t - surf->dlight_t) * (1.0 / 128.0));
|
||||
(surf->light_s - surf->dlight_s) * (1.0 / (float)gl_state.block_width),
|
||||
(surf->light_t - surf->dlight_t) * (1.0 / (float)gl_state.block_height));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -723,12 +723,12 @@ static void
|
|||
R_UploadDynamicLights(msurface_t *surf)
|
||||
{
|
||||
int map, smax, tmax;
|
||||
byte temp[BLOCK_WIDTH * BLOCK_HEIGHT];
|
||||
|
||||
if ( !gl_config.multitexture || !R_HasDynamicLights(surf, &map) )
|
||||
{
|
||||
return;
|
||||
}
|
||||
YQ2_VLA(byte, temp, gl_state.block_width * gl_state.block_height);
|
||||
|
||||
smax = (surf->extents[0] >> 4) + 1;
|
||||
tmax = (surf->extents[1] >> 4) + 1;
|
||||
|
|
@ -738,6 +738,7 @@ R_UploadDynamicLights(msurface_t *surf)
|
|||
R_Bind(gl_state.lightmap_textures + surf->lightmaptexturenum);
|
||||
glTexSubImage2D(GL_TEXTURE_2D, 0, surf->light_s, surf->light_t, smax,
|
||||
tmax, GL_LIGHTMAP_FORMAT, GL_UNSIGNED_BYTE, temp);
|
||||
YQ2_VLAFREE(temp);
|
||||
}
|
||||
|
||||
/* Upload dynamic lights to each lightmap texture (multitexture path only) */
|
||||
|
|
@ -754,9 +755,9 @@ R_RegenAllLightmaps()
|
|||
return;
|
||||
}
|
||||
|
||||
glPixelStorei(GL_UNPACK_ROW_LENGTH, BLOCK_WIDTH);
|
||||
glPixelStorei(GL_UNPACK_ROW_LENGTH, gl_state.block_width);
|
||||
|
||||
for (i = 1; i < MAX_LIGHTMAPS; i++)
|
||||
for (i = 1; i < gl_state.max_lightmaps; i++)
|
||||
{
|
||||
if (!gl_lms.lightmap_surfaces[i] || !gl_lms.lightmap_buffer[i])
|
||||
{
|
||||
|
|
@ -764,8 +765,8 @@ R_RegenAllLightmaps()
|
|||
}
|
||||
|
||||
affected_lightmap = false;
|
||||
bt = BLOCK_HEIGHT;
|
||||
bl = BLOCK_WIDTH;
|
||||
bt = gl_state.block_height;
|
||||
bl = gl_state.block_width;
|
||||
bb = br = 0;
|
||||
|
||||
for (surf = gl_lms.lightmap_surfaces[i];
|
||||
|
|
@ -787,9 +788,9 @@ R_RegenAllLightmaps()
|
|||
bottom = surf->light_t + tmax;
|
||||
|
||||
base = gl_lms.lightmap_buffer[i];
|
||||
base += (top * BLOCK_WIDTH + left) * LIGHTMAP_BYTES;
|
||||
base += (top * gl_state.block_width + left) * LIGHTMAP_BYTES;
|
||||
|
||||
R_BuildLightMap(surf, base, BLOCK_WIDTH * LIGHTMAP_BYTES);
|
||||
R_BuildLightMap(surf, base, gl_state.block_width * LIGHTMAP_BYTES);
|
||||
R_UpdateSurfCache(surf, map);
|
||||
|
||||
if (left < bl)
|
||||
|
|
@ -816,7 +817,7 @@ R_RegenAllLightmaps()
|
|||
}
|
||||
|
||||
base = gl_lms.lightmap_buffer[i];
|
||||
base += (bt * BLOCK_WIDTH + bl) * LIGHTMAP_BYTES;
|
||||
base += (bt * gl_state.block_width + bl) * LIGHTMAP_BYTES;
|
||||
|
||||
// upload changes
|
||||
R_Bind(gl_state.lightmap_textures + i);
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
#define TEXNUM_IMAGES 1153
|
||||
#define MAX_GLTEXTURES 1024
|
||||
#define MAX_SCRAPS 1
|
||||
#define BLOCK_WIDTH 128
|
||||
#define BLOCK_WIDTH 128 // default values; now defined in glstate_t
|
||||
#define BLOCK_HEIGHT 128
|
||||
#define REF_VERSION "Yamagi Quake II OpenGL Refresher"
|
||||
#define BACKFACE_EPSILON 0.01
|
||||
|
|
@ -163,6 +163,7 @@ extern cvar_t *gl1_overbrightbits;
|
|||
extern cvar_t *gl1_palettedtexture;
|
||||
extern cvar_t *gl1_pointparameters;
|
||||
extern cvar_t *gl1_multitexture;
|
||||
extern cvar_t *gl1_biglightmaps;
|
||||
|
||||
extern cvar_t *gl1_particle_min_size;
|
||||
extern cvar_t *gl1_particle_max_size;
|
||||
|
|
@ -390,6 +391,10 @@ typedef struct
|
|||
enum stereo_modes stereo_mode;
|
||||
|
||||
qboolean stencil;
|
||||
|
||||
int block_width, // replaces BLOCK_WIDTH
|
||||
block_height, // replaces BLOCK_HEIGHT
|
||||
max_lightmaps; // the larger the lightmaps, the fewer the max lightmaps
|
||||
} glstate_t;
|
||||
|
||||
typedef struct
|
||||
|
|
@ -399,7 +404,7 @@ typedef struct
|
|||
|
||||
msurface_t *lightmap_surfaces[MAX_LIGHTMAPS];
|
||||
|
||||
int allocated[BLOCK_WIDTH];
|
||||
int *allocated; // formerly allocated[BLOCK_WIDTH];
|
||||
|
||||
/* the lightmap texture data needs to be kept in
|
||||
main memory so texsubimage can update properly */
|
||||
|
|
|
|||
Loading…
Reference in New Issue