qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-17 01:11:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Hit some inlining issues with a big stick.

Browse source 
It turns out gcc has a way to force functions to inline even when it thinks
doing so would not be a good idea (call to a modest sized function unlikely).
This commit is contained in:
Bill Currie 2012-11-29 10:18:52 +09:00
parent b5f2da0b78
commit 69d9a2b452
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nq/source/world.c
View file

@ -47,6 +47,8 @@
#include "sv_progs.h"
#include "world.h"
#define always_inline inline __attribute__((__always_inline__))
#define EDICT_LEAFS 32
typedef struct edict_leaf_bucket_s {
struct edict_leaf_bucket_s *next;
@ -674,7 +676,7 @@ SV_ClipMoveToEntity (edict_t *touched, const vec3_t start,
return trace;
}
static inline int
static always_inline int
ctl_pretest_everything (edict_t *touch, moveclip_t *clip)
{
if (touch->free)
@ -690,7 +692,7 @@ ctl_pretest_everything (edict_t *touch, moveclip_t *clip)
return 1;
}
static inline int
static always_inline int
ctl_pretest_triggers (edict_t *touch, moveclip_t *clip)
{
if (SVfloat (touch, solid) != SOLID_TRIGGER)
@ -702,7 +704,7 @@ ctl_pretest_triggers (edict_t *touch, moveclip_t *clip)
return 1;
}
static inline int
static always_inline int
ctl_pretest_other (edict_t *touch, moveclip_t *clip)
{
if (SVfloat (touch, solid) == SOLID_NOT)
@ -717,7 +719,7 @@ ctl_pretest_other (edict_t *touch, moveclip_t *clip)
return 1;
}
static inline int
static always_inline int
ctl_touch_test (edict_t *touch, moveclip_t *clip)
{
if (clip->boxmins[0] > SVvector (touch, absmax)[0]

16
qw/source/world.c
View file

@ -47,6 +47,8 @@
#include "sv_progs.h"
#include "world.h"
#define always_inline inline __attribute__((__always_inline__))
#define EDICT_LEAFS 32
typedef struct edict_leaf_bucket_s {
struct edict_leaf_bucket_s *next;
@ -674,7 +676,7 @@ SV_ClipMoveToEntity (edict_t *touched, const vec3_t start,
return trace;
}
static inline int
static always_inline int
ctl_pretest_everything (edict_t *touch, moveclip_t *clip)
{
if (touch->free)
@ -690,7 +692,7 @@ ctl_pretest_everything (edict_t *touch, moveclip_t *clip)
return 1;
}
static inline int
static always_inline int
ctl_pretest_triggers (edict_t *touch, moveclip_t *clip)
{
if (SVfloat (touch, solid) != SOLID_TRIGGER)
@ -702,7 +704,7 @@ ctl_pretest_triggers (edict_t *touch, moveclip_t *clip)
return 1;
}
static inline int
static always_inline int
ctl_pretest_other (edict_t *touch, moveclip_t *clip)
{
if (SVfloat (touch, solid) == SOLID_NOT)
@ -717,7 +719,7 @@ ctl_pretest_other (edict_t *touch, moveclip_t *clip)
return 1;
}
static inline int
static always_inline int
ctl_pretest_lagged (edict_t *touch, moveclip_t *clip)
{
if (clip->type & MOVE_LAGGED)
@ -727,7 +729,7 @@ ctl_pretest_lagged (edict_t *touch, moveclip_t *clip)
return 1;
}
static inline int
static always_inline int
ctl_touch_common (edict_t *touch, moveclip_t *clip)
{
if (clip->passedict && SVvector (clip->passedict, size)[0]
@ -746,7 +748,7 @@ ctl_touch_common (edict_t *touch, moveclip_t *clip)
return 1;
}
static inline int
static always_inline int
ctl_touch_test (edict_t *touch, moveclip_t *clip)
{
if (clip->boxmins[0] > SVvector (touch, absmax)[0]
@ -760,7 +762,7 @@ ctl_touch_test (edict_t *touch, moveclip_t *clip)
return ctl_touch_common (touch, clip);
}
static inline int
static always_inline int
ctl_touch_test_origin (edict_t *touch, const vec3_t origin, moveclip_t *clip)
{
if (clip->boxmins[0] > origin[0] + SVvector (touch, maxs)[0]