- loadmodel->brushq3.num_lightmapmergepower = 0;
-
- for(i = 0; (128 << i) < size; ++i)
- ;
- // i is now 0 for 128, 1 for 256, etc
-
- 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;
-
- loadmodel->brushq3.num_mergedlightmaps = ((count >> (loadmodel->brushq3.deluxemapping ? 1 : 0)) + (1 << (loadmodel->brushq3.num_lightmapmergepower * 2)) - 1) >> (loadmodel->brushq3.num_lightmapmergepower * 2);
+ // find the appropriate NxN dimensions to merge to, to avoid wasted space
+ realcount = count >> loadmodel->brushq3.deluxemapping;
+
+ // figure out how big the merged texture has to be
+ mergegoal = 128<<bound(0, mod_q3bsp_lightmapmergepower.integer, 6);
+ mergegoal = bound(size, mergegoal, (int)vid.maxtexturesize_2d);
+ while (mergegoal > size && mergegoal * mergegoal / 4 >= size * size * realcount)
+ mergegoal /= 2;
+ mergedwidth = mergegoal;
+ mergedheight = mergegoal;
+ // choose non-square size (2x1 aspect) if only half the space is used;
+ // this really only happens when the entire set fits in one texture, if
+ // there are multiple textures, we don't worry about shrinking the last
+ // one to fit, because the driver prefers the same texture size on
+ // consecutive draw calls...
+ if (mergedwidth * mergedheight / 2 >= size*size*realcount)
+ mergedheight /= 2;
+
+ loadmodel->brushq3.num_lightmapmergedwidthpower = 0;
+ loadmodel->brushq3.num_lightmapmergedheightpower = 0;
+ while (mergedwidth > size<<loadmodel->brushq3.num_lightmapmergedwidthpower)
+ loadmodel->brushq3.num_lightmapmergedwidthpower++;
+ while (mergedheight > size<<loadmodel->brushq3.num_lightmapmergedheightpower)
+ loadmodel->brushq3.num_lightmapmergedheightpower++;
+ loadmodel->brushq3.num_lightmapmergedwidthheightdeluxepower = loadmodel->brushq3.num_lightmapmergedwidthpower + loadmodel->brushq3.num_lightmapmergedheightpower + (loadmodel->brushq3.deluxemapping ? 1 : 0);
+
+ powerx = loadmodel->brushq3.num_lightmapmergedwidthpower;
+ powery = loadmodel->brushq3.num_lightmapmergedheightpower;
+ powerxy = powerx+powery;
+ powerdxy = loadmodel->brushq3.deluxemapping + powerxy;
+
+ mergedcolumns = 1 << powerx;
+ mergedrows = 1 << powery;
+ mergedrowsxcolumns = 1 << powerxy;
+
+ loadmodel->brushq3.num_mergedlightmaps = (realcount + (1 << powerxy) - 1) >> powerxy;