removed GL_NV_blend_square detection because it is no longer used

[xonotic/darkplaces.git] / model_brush.c

diff --git a/model_brush.c b/model_brush.c
index c9c41cfc2e7b4d20614a74a9a979734f0cbd0d10..8ec59177e9091bb129ff65ace5bae4fdf7f0c8d8 100644 (file)
--- a/model_brush.c
+++ b/model_brush.c
@@ -2228,7 +2228,7 @@ static void Mod_Q1BSP_GenerateWarpMesh(msurface_t *surface)
 }
 #endif
 
-extern cvar_t gl_max_size;
+extern cvar_t gl_max_lightmapsize;
 static void Mod_Q1BSP_LoadFaces(lump_t *l)
 {
        dface_t *in;
@@ -2262,7 +2262,7 @@ static void Mod_Q1BSP_LoadFaces(lump_t *l)
        lightmaptexture = NULL;
        deluxemaptexture = r_texture_blanknormalmap;
        lightmapnumber = 1;
-       lightmapsize = max(256, gl_max_size.integer);
+       lightmapsize = bound(256, gl_max_lightmapsize.integer, (int)vid.maxtexturesize_2d);
        totallightmapsamples = 0;
 
        totalverts = 0;
@@ -2405,12 +2405,11 @@ static void Mod_Q1BSP_LoadFaces(lump_t *l)
        // small maps (such as ammo boxes especially) don't need big lightmap
        // textures, so this code tries to guess a good size based on
        // totallightmapsamples (size of the lightmaps lump basically), as well as
-       // trying to max out the gl_max_size if there is a lot of lightmap data to
-       // store
+       // trying to max out the size if there is a lot of lightmap data to store
        // additionally, never choose a lightmapsize that is smaller than the
        // largest surface encountered (as it would fail)
        i = lightmapsize;
-       for (lightmapsize = 64; (lightmapsize < i) && (lightmapsize < gl_max_size.integer) && (totallightmapsamples > lightmapsize*lightmapsize); lightmapsize*=2)
+       for (lightmapsize = 64; (lightmapsize < i) && (lightmapsize < bound(128, gl_max_lightmapsize.integer, (int)vid.maxtexturesize_2d)) && (totallightmapsamples > lightmapsize*lightmapsize); lightmapsize*=2)
                ;
 
        // now that we've decided the lightmap texture size, we can do the rest
@@ -4639,7 +4638,7 @@ static void Mod_Q3BSP_LoadLightmaps(lump_t *l, lump_t *faceslump)
                ;
        // i is now 0 for 128, 1 for 256, etc
 
-       for (power = 1;power + i <= mod_q3bsp_lightmapmergepower.integer && (size << power) <= gl_max_texture_size && (1 << (power * 2)) < 4 * (count >> (loadmodel->brushq3.deluxemapping ? 1 : 0)); power++)
+       for (power = 1;power + i <= mod_q3bsp_lightmapmergepower.integer && (size << power) <= (int)vid.maxtexturesize_2d && (1 << (power * 2)) < 4 * (count >> (loadmodel->brushq3.deluxemapping ? 1 : 0)); power++)
                loadmodel->brushq3.num_lightmapmergepower = power;
 
        loadmodel->brushq3.num_lightmapmerge = 1 << loadmodel->brushq3.num_lightmapmergepower;