qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-23 12:52:46 +00:00
Code Issues Projects Releases Packages Wiki Activity
quakeforge/libs/video/renderer/r_bsp.c

132 lines
2.9 KiB
C
Raw Normal View History

Merge R_MarkLeaves from gl, sw, and sw32. Other than novis, they're functionally identical. Now sw and sw32 have novis as well.
2012-01-03 12:04:27 +00:00
/*
r_bsp.c
Common bsp rendering.
Copyright (C) 1996-1997 Id Software, Inc.
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:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_STRING_H
# include "string.h"
#endif
#ifdef HAVE_STRINGS_H
# include "strings.h"
#endif
#include "QF/cvar.h"
[model] Remove 64k limit on visible leafs Modern maps can have many more leafs (eg, ad_tears has 98983 leafs). Using set_t makes dynamic leaf counts easy to support and the code much easier to read (though set_is_member and the iterators are a little slower). The main thing to watch out for is the novis set and the set returned by Mod_LeafPVS never shrink, and may have excess elements (ie, indicate that nonexistent leafs are visible).
2021-07-26 02:15:51 +00:00
#include "QF/set.h"
Merge out R_TextureAnimation.
2012-01-08 01:21:08 +00:00
#include "QF/sys.h"
Merge R_MarkLeaves from gl, sw, and sw32. Other than novis, they're functionally identical. Now sw and sw32 have novis as well.
2012-01-03 12:04:27 +00:00
[scene] Move entity_t etc into scene headers I meant to do this a while ago but forgot about it. Things are a bit of a mess in that the renderer knows too much about entities, but eventually the renderer will know about only things to render (meshes, particles, etc).
2022-03-29 05:40:48 +00:00
#include "QF/scene/entity.h"
Take the first step towards render plugins. No clients link. Even if they did, nothing would work.
2012-02-14 08:28:09 +00:00
#include "r_internal.h"
Merge R_MarkLeaves from gl, sw, and sw32. Other than novis, they're functionally identical. Now sw and sw32 have novis as well.
2012-01-03 12:04:27 +00:00
Make r_novis 0 take effect immediately.
2012-01-03 14:17:49 +00:00
static mleaf_t *r_oldviewleaf;
[model] Remove 64k limit on visible leafs Modern maps can have many more leafs (eg, ad_tears has 98983 leafs). Using set_t makes dynamic leaf counts easy to support and the code much easier to read (though set_is_member and the iterators are a little slower). The main thing to watch out for is the novis set and the set returned by Mod_LeafPVS never shrink, and may have excess elements (ie, indicate that nonexistent leafs are visible).
2021-07-26 02:15:51 +00:00
static set_t *solid;
Merge R_MarkLeaves from gl, sw, and sw32. Other than novis, they're functionally identical. Now sw and sw32 have novis as well.
2012-01-03 12:04:27 +00:00
void
[model] Move visframe out of msurface_t One more step towards BSP thread-safety. This one brought with it a very noticeable speed boost (ie, not lost in the noise) thanks to the face visframes being in tightly packed groups instead of 128 bytes apart, though the sw render's boost is lost in the noise (but it's very fill-rate limited).
2022-05-22 07:31:24 +00:00
R_MarkLeaves (mleaf_t *viewleaf, int *node_visframes, int *leaf_visframes,
int *face_visframes)
Merge R_MarkLeaves from gl, sw, and sw32. Other than novis, they're functionally identical. Now sw and sw32 have novis as well.
2012-01-03 12:04:27 +00:00
{
[model] Remove 64k limit on visible leafs Modern maps can have many more leafs (eg, ad_tears has 98983 leafs). Using set_t makes dynamic leaf counts easy to support and the code much easier to read (though set_is_member and the iterators are a little slower). The main thing to watch out for is the novis set and the set returned by Mod_LeafPVS never shrink, and may have excess elements (ie, indicate that nonexistent leafs are visible).
2021-07-26 02:15:51 +00:00
set_t *vis;
Merge R_MarkLeaves from gl, sw, and sw32. Other than novis, they're functionally identical. Now sw and sw32 have novis as well.
2012-01-03 12:04:27 +00:00
int c;
mleaf_t *leaf;
msurface_t **mark;
[renderer] move r_worldentity and r_viewleaf into refdef More cleanup of globals that seem to be quake specific.
2022-03-14 06:27:43 +00:00
mod_brush_t *brush = &r_refdef.worldmodel->brush;
Merge R_MarkLeaves from gl, sw, and sw32. Other than novis, they're functionally identical. Now sw and sw32 have novis as well.
2012-01-03 12:04:27 +00:00
[vulkan] Move non-specific lighting code out of Vulkan The parsing of light data from maps is now in the client library, and basic light management is in scene. Putting the light loading code into the Vulkan renderer was a mistake I've wanted to correct for a while. The client code still needs a bit of cleanup, but the basics are working nicely.
2022-05-05 05:58:47 +00:00
if (r_oldviewleaf == viewleaf && !r_novis)
Merge R_MarkLeaves from gl, sw, and sw32. Other than novis, they're functionally identical. Now sw and sw32 have novis as well.
2012-01-03 12:04:27 +00:00
return;
r_visframecount++;
[vulkan] Move non-specific lighting code out of Vulkan The parsing of light data from maps is now in the client library, and basic light management is in scene. Putting the light loading code into the Vulkan renderer was a mistake I've wanted to correct for a while. The client code still needs a bit of cleanup, but the basics are working nicely.
2022-05-05 05:58:47 +00:00
r_oldviewleaf = viewleaf;
if (!viewleaf)
Fix the missing world on map reload. If the map got reloaded but the current leaf didn't change the world (and most entities) didn't get drawn. Forcing a vis update by first setting r_viewleaf to null and marking surfaces does the trick :)
2012-01-29 07:09:35 +00:00
return;
Merge R_MarkLeaves from gl, sw, and sw32. Other than novis, they're functionally identical. Now sw and sw32 have novis as well.
2012-01-03 12:04:27 +00:00
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
if (r_novis) {
Make r_novis 0 take effect immediately.
2012-01-03 14:17:49 +00:00
r_oldviewleaf = 0; // so vis will be recalcualted when novis gets
// turned off
[model] Remove 64k limit on visible leafs Modern maps can have many more leafs (eg, ad_tears has 98983 leafs). Using set_t makes dynamic leaf counts easy to support and the code much easier to read (though set_is_member and the iterators are a little slower). The main thing to watch out for is the novis set and the set returned by Mod_LeafPVS never shrink, and may have excess elements (ie, indicate that nonexistent leafs are visible).
2021-07-26 02:15:51 +00:00
if (!solid) {
solid = set_new ();
set_everything (solid);
}
Merge R_MarkLeaves from gl, sw, and sw32. Other than novis, they're functionally identical. Now sw and sw32 have novis as well.
2012-01-03 12:04:27 +00:00
vis = solid;
} else
[vulkan] Move non-specific lighting code out of Vulkan The parsing of light data from maps is now in the client library, and basic light management is in scene. Putting the light loading code into the Vulkan renderer was a mistake I've wanted to correct for a while. The client code still needs a bit of cleanup, but the basics are working nicely.
2022-05-05 05:58:47 +00:00
vis = Mod_LeafPVS (viewleaf, r_refdef.worldmodel);
Merge R_MarkLeaves from gl, sw, and sw32. Other than novis, they're functionally identical. Now sw and sw32 have novis as well.
2012-01-03 12:04:27 +00:00
[model] Remove the confusion about numleafs The fact that numleafs did not include leaf 0 actually caused in many places due to never being sure whether to add 1. Hopefully this fixes some of the confusion. (and that comment in sv_init didn't last long :P)
2021-07-27 03:32:40 +00:00
for (unsigned i = 0; i < brush->visleafs; i++) {
[model] Remove 64k limit on visible leafs Modern maps can have many more leafs (eg, ad_tears has 98983 leafs). Using set_t makes dynamic leaf counts easy to support and the code much easier to read (though set_is_member and the iterators are a little slower). The main thing to watch out for is the novis set and the set returned by Mod_LeafPVS never shrink, and may have excess elements (ie, indicate that nonexistent leafs are visible).
2021-07-26 02:15:51 +00:00
if (set_is_member (vis, i)) {
[model] Move parent pointer out of leaf/node struct The node struct was 72 bytes thus two cache line. Moving the pointer into the brush model data block allows nodes to fit in a single cache line (not that they're aligned yet, but that's next). It doesn't seem to have made any difference to performance (at least in the vulkan renderer), but it hasn't hurt, either, as the only place that needed the parent pointer was R_MarkLeaves.
2021-02-03 02:41:38 +00:00
leaf = &brush->leafs[i + 1];
Merge R_MarkLeaves from gl, sw, and sw32. Other than novis, they're functionally identical. Now sw and sw32 have novis as well.
2012-01-03 12:04:27 +00:00
if ((c = leaf->nummarksurfaces)) {
[model] Make firstmarksurface an int instead of pointer While it takes one extra step to grab the marksurface pointer, R_MarkLeaves and R_MarkLights (the two actual users) seem to be either the same speed or fractionally faster (by a few microseconds). I imagine the loss gone to the extra fetch is made up for by better bandwidth while traversing the leafs array (mleaf_t now fits in a single cache line, so leafs are cache-aligned since hunk allocations are aligned).
2022-05-10 05:30:48 +00:00
mark = brush->marksurfaces + leaf->firstmarksurface;
Merge R_MarkLeaves from gl, sw, and sw32. Other than novis, they're functionally identical. Now sw and sw32 have novis as well.
2012-01-03 12:04:27 +00:00
do {
[model] Move visframe out of msurface_t One more step towards BSP thread-safety. This one brought with it a very noticeable speed boost (ie, not lost in the noise) thanks to the face visframes being in tightly packed groups instead of 128 bytes apart, though the sw render's boost is lost in the noise (but it's very fill-rate limited).
2022-05-22 07:31:24 +00:00
face_visframes[*mark - brush->surfaces] = r_visframecount;
Merge R_MarkLeaves from gl, sw, and sw32. Other than novis, they're functionally identical. Now sw and sw32 have novis as well.
2012-01-03 12:04:27 +00:00
mark++;
} while (--c);
}
[model] Move visframe out of mleaf_t This is next critical step to making BSP rendering thread-safe. visframe was replaced with cluster (not used yet) in anticipation of BSP cluster reconstruction (which will be necessary for dealing with large maps like ad_tears).
2022-05-22 05:43:07 +00:00
leaf_visframes[i + 1] = r_visframecount;
[model] Move plane info into mnode_t, and visframe out The main goal was to get visframe out of mnode_t to make it thread-safe (each thread can have its own visframe array), but moving the plane info into mnode_t made for better data access patters when traversing the bsp tree as the plane is right there with the child indices. Nicely, the size of mnode_t is the same as before (64 bytes due to alignment), with 4 bytes wasted. Performance-wise, there seems to be very little difference. Maybe slightly slower. The unfortunate thing about the change is the plane distance is negated, possibly leading to some confusion, particularly since the box and sphere culling functions were affected. However, this is so point-plane distance calculations can be done with a single 4d dot product.
2022-05-22 02:18:32 +00:00
int node_id = brush->leaf_parents[leaf - brush->leafs];
while (node_id >= 0) {
if (node_visframes[node_id] == r_visframecount)
Merge R_MarkLeaves from gl, sw, and sw32. Other than novis, they're functionally identical. Now sw and sw32 have novis as well.
2012-01-03 12:04:27 +00:00
break;
[model] Move plane info into mnode_t, and visframe out The main goal was to get visframe out of mnode_t to make it thread-safe (each thread can have its own visframe array), but moving the plane info into mnode_t made for better data access patters when traversing the bsp tree as the plane is right there with the child indices. Nicely, the size of mnode_t is the same as before (64 bytes due to alignment), with 4 bytes wasted. Performance-wise, there seems to be very little difference. Maybe slightly slower. The unfortunate thing about the change is the plane distance is negated, possibly leading to some confusion, particularly since the box and sphere culling functions were affected. However, this is so point-plane distance calculations can be done with a single 4d dot product.
2022-05-22 02:18:32 +00:00
node_visframes[node_id] = r_visframecount;
node_id = brush->node_parents[node_id];
[model] Move parent pointer out of leaf/node struct The node struct was 72 bytes thus two cache line. Moving the pointer into the brush model data block allows nodes to fit in a single cache line (not that they're aligned yet, but that's next). It doesn't seem to have made any difference to performance (at least in the vulkan renderer), but it hasn't hurt, either, as the only place that needed the parent pointer was R_MarkLeaves.
2021-02-03 02:41:38 +00:00
}
Merge R_MarkLeaves from gl, sw, and sw32. Other than novis, they're functionally identical. Now sw and sw32 have novis as well.
2012-01-03 12:04:27 +00:00
}
}
}
Merge out R_TextureAnimation.
2012-01-08 01:21:08 +00:00
/*
R_TextureAnimation
Returns the proper texture for a given time and base texture
*/
texture_t *
[sw] Take advantage of the ECS for edge rendering This fixes the segfault due to the world entity not actually existing, without adding a world entity. It takes advantage of the ECS in that the edge renderer needs only the world matrix, brush model pointer, and the animation frame number (which is just 0/1 for brush models), thus the inherent SOA of ECS helps out, though benchmarking is needed to see if it made any real difference. With this, all 4 renderers are working again.
2022-10-25 10:36:09 +00:00
R_TextureAnimation (int frame, msurface_t *surf)
Merge out R_TextureAnimation.
2012-01-08 01:21:08 +00:00
{
texture_t *base = surf->texinfo->texture;
int count, relative;
[sw] Take advantage of the ECS for edge rendering This fixes the segfault due to the world entity not actually existing, without adding a world entity. It takes advantage of the ECS in that the edge renderer needs only the world matrix, brush model pointer, and the animation frame number (which is just 0/1 for brush models), thus the inherent SOA of ECS helps out, though benchmarking is needed to see if it made any real difference. With this, all 4 renderers are working again.
2022-10-25 10:36:09 +00:00
if (frame) {
Merge out R_TextureAnimation.
2012-01-08 01:21:08 +00:00
if (base->alternate_anims)
base = base->alternate_anims;
}
if (!base->anim_total)
return base;
[renderer] Clean up r_bsp a little Move r_pcurrentvertbase into the sw renderer, cleaning up gl's use of (not really needed there). Not ready to move r_bsp into the main bin yet as there are linking issues since only the low-level code references any of its symbols.
2022-03-17 04:09:20 +00:00
relative = (int) (r_data->realtime * 10) % base->anim_total;
Merge out R_TextureAnimation.
2012-01-08 01:21:08 +00:00
count = 0;
while (base->anim_min > relative || base->anim_max <= relative) {
base = base->anim_next;
if (!base)
Sys_Error ("R_TextureAnimation: broken cycle");
if (++count > 100)
Sys_Error ("R_TextureAnimation: infinite cycle");
}
return base;
}
Reference in a new issue Copy permalink