zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-28 12:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- replaced 'static FORCE_INLINE' globally with 'inline'.

Browse source 
I have no idea what kind of compiler needs such a construct, it's totally not how C++ should be written.
This commit is contained in:
Christoph Oelckers 2021-03-24 21:43:36 +01:00
parent b7e8815133
commit 368b2319f2
4 changed files with 20 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
source/build/include/build.h
View file

@ -451,13 +451,13 @@ void updatesectorneighbor(int32_t const x, int32_t const y, int16_t * const sect
void updatesectorneighborz(int32_t const x, int32_t const y, int32_t const z, int16_t * const sectnum, int32_t initialMaxDistance = INITIALUPDATESECTORDIST, int32_t maxDistance = MAXUPDATESECTORDIST) ATTRIBUTE((nonnull(4))); void updatesectorneighborz(int32_t const x, int32_t const y, int32_t const z, int16_t * const sectnum, int32_t initialMaxDistance = INITIALUPDATESECTORDIST, int32_t maxDistance = MAXUPDATESECTORDIST) ATTRIBUTE((nonnull(4)));
int findwallbetweensectors(int sect1, int sect2); int findwallbetweensectors(int sect1, int sect2);
static FORCE_INLINE int sectoradjacent(int sect1, int sect2) { return findwallbetweensectors(sect1, sect2) != -1; } inline int sectoradjacent(int sect1, int sect2) { return findwallbetweensectors(sect1, sect2) != -1; }
int32_t getsectordist(vec2_t const in, int const sectnum, vec2_t * const out = nullptr); int32_t getsectordist(vec2_t const in, int const sectnum, vec2_t * const out = nullptr);
extern const int16_t *chsecptr_onextwall; extern const int16_t *chsecptr_onextwall;
int32_t checksectorpointer(int16_t i, int16_t sectnum); int32_t checksectorpointer(int16_t i, int16_t sectnum);
#if !KRANDDEBUG #if !KRANDDEBUG
static FORCE_INLINE int32_t krand(void) inline int32_t krand(void)
{ {
randomseed = (randomseed * 1664525ul) + 221297ul; randomseed = (randomseed * 1664525ul) + 221297ul;
return ((uint32_t) randomseed)>>16; return ((uint32_t) randomseed)>>16;
@ -474,12 +474,12 @@ inline int32_t ksqrt(uint32_t num)
int32_t getangle(int32_t xvect, int32_t yvect); int32_t getangle(int32_t xvect, int32_t yvect);
fixed_t gethiq16angle(int32_t xvect, int32_t yvect); fixed_t gethiq16angle(int32_t xvect, int32_t yvect);
static FORCE_INLINE constexpr uint32_t uhypsq(int32_t const dx, int32_t const dy) inline constexpr uint32_t uhypsq(int32_t const dx, int32_t const dy)
{ {
return (uint32_t)dx*dx + (uint32_t)dy*dy; return (uint32_t)dx*dx + (uint32_t)dy*dy;
} }
static FORCE_INLINE int32_t logapproach(int32_t const val, int32_t const targetval) inline int32_t logapproach(int32_t const val, int32_t const targetval)
{ {
int32_t const dif = targetval - val; int32_t const dif = targetval - val;
return (dif>>1) ? val + (dif>>1) : targetval; return (dif>>1) ? val + (dif>>1) : targetval;
@ -508,36 +508,36 @@ void yax_getzsofslope(int sectNum, int playerX, int playerY, int32_t* pCeilZ, in
int32_t yax_getceilzofslope(int const sectnum, vec2_t const vect); int32_t yax_getceilzofslope(int const sectnum, vec2_t const vect);
int32_t yax_getflorzofslope(int const sectnum, vec2_t const vect); int32_t yax_getflorzofslope(int const sectnum, vec2_t const vect);
static FORCE_INLINE int32_t getceilzofslope(int16_t sectnum, int32_t dax, int32_t day) inline int32_t getceilzofslope(int16_t sectnum, int32_t dax, int32_t day)
{ {
return getceilzofslopeptr((usectorptr_t)&sector[sectnum], dax, day); return getceilzofslopeptr((usectorptr_t)&sector[sectnum], dax, day);
} }
static FORCE_INLINE int32_t getflorzofslope(int16_t sectnum, int32_t dax, int32_t day) inline int32_t getflorzofslope(int16_t sectnum, int32_t dax, int32_t day)
{ {
return getflorzofslopeptr((usectorptr_t)&sector[sectnum], dax, day); return getflorzofslopeptr((usectorptr_t)&sector[sectnum], dax, day);
} }
static FORCE_INLINE void getzsofslope(int16_t sectnum, int32_t dax, int32_t day, int32_t *ceilz, int32_t *florz) inline void getzsofslope(int16_t sectnum, int32_t dax, int32_t day, int32_t *ceilz, int32_t *florz)
{ {
getzsofslopeptr((usectorptr_t)&sector[sectnum], dax, day, ceilz, florz); getzsofslopeptr((usectorptr_t)&sector[sectnum], dax, day, ceilz, florz);
} }
static FORCE_INLINE void getcorrectzsofslope(int16_t sectnum, int32_t dax, int32_t day, int32_t *ceilz, int32_t *florz) inline void getcorrectzsofslope(int16_t sectnum, int32_t dax, int32_t day, int32_t *ceilz, int32_t *florz)
{ {
vec2_t closest = { dax, day }; vec2_t closest = { dax, day };
getsectordist(closest, sectnum, &closest); getsectordist(closest, sectnum, &closest);
getzsofslopeptr((usectorptr_t)&sector[sectnum], closest.x, closest.y, ceilz, florz); getzsofslopeptr((usectorptr_t)&sector[sectnum], closest.x, closest.y, ceilz, florz);
} }
static FORCE_INLINE int32_t getcorrectceilzofslope(int16_t sectnum, int32_t dax, int32_t day) inline int32_t getcorrectceilzofslope(int16_t sectnum, int32_t dax, int32_t day)
{ {
vec2_t closest = { dax, day }; vec2_t closest = { dax, day };
getsectordist(closest, sectnum, &closest); getsectordist(closest, sectnum, &closest);
return getceilzofslopeptr((usectorptr_t)&sector[sectnum], closest.x, closest.y); return getceilzofslopeptr((usectorptr_t)&sector[sectnum], closest.x, closest.y);
} }
static FORCE_INLINE int32_t getcorrectflorzofslope(int16_t sectnum, int32_t dax, int32_t day) inline int32_t getcorrectflorzofslope(int16_t sectnum, int32_t dax, int32_t day)
{ {
vec2_t closest = { dax, day }; vec2_t closest = { dax, day };
getsectordist(closest, sectnum, &closest); getsectordist(closest, sectnum, &closest);
@ -546,12 +546,12 @@ static FORCE_INLINE int32_t getcorrectflorzofslope(int16_t sectnum, int32_t dax,
// Is <wal> a red wall in a safe fashion, i.e. only if consistency invariant // Is <wal> a red wall in a safe fashion, i.e. only if consistency invariant
// ".nextsector >= 0 iff .nextwall >= 0" holds. // ".nextsector >= 0 iff .nextwall >= 0" holds.
static FORCE_INLINE int32_t redwallp(uwallptr_t wal) inline int32_t redwallp(uwallptr_t wal)
{ {
return (wal->nextwall >= 0 && wal->nextsector >= 0); return (wal->nextwall >= 0 && wal->nextsector >= 0);
} }
static FORCE_INLINE int32_t E_SpriteIsValid(const int32_t i) inline int32_t E_SpriteIsValid(const int32_t i)
{ {
return ((unsigned)i < MAXSPRITES && sprite[i].statnum != MAXSTATUS); return ((unsigned)i < MAXSPRITES && sprite[i].statnum != MAXSTATUS);
} }
@ -594,7 +594,7 @@ inline void setspritepos(int spnum, int x, int y, int z)
int32_t setspritez(int16_t spritenum, const vec3_t *) ATTRIBUTE((nonnull(2))); int32_t setspritez(int16_t spritenum, const vec3_t *) ATTRIBUTE((nonnull(2)));
int32_t spriteheightofsptr(uspriteptr_t spr, int32_t *height, int32_t alsotileyofs); int32_t spriteheightofsptr(uspriteptr_t spr, int32_t *height, int32_t alsotileyofs);
static FORCE_INLINE int32_t spriteheightofs(int16_t i, int32_t *height, int32_t alsotileyofs) inline int32_t spriteheightofs(int16_t i, int32_t *height, int32_t alsotileyofs)
{ {
return spriteheightofsptr((uspriteptr_t)&sprite[i], height, alsotileyofs); return spriteheightofsptr((uspriteptr_t)&sprite[i], height, alsotileyofs);
} }
@ -653,13 +653,13 @@ typedef struct
EXTERN int32_t mdinited; EXTERN int32_t mdinited;
EXTERN tile2model_t tile2model[MAXTILES+EXTRATILES]; EXTERN tile2model_t tile2model[MAXTILES+EXTRATILES];
static FORCE_INLINE int32_t md_tilehasmodel(int32_t const tilenume, int32_t const pal) inline int32_t md_tilehasmodel(int32_t const tilenume, int32_t const pal)
{ {
return mdinited ? tile2model[Ptile2tile(tilenume,pal)].modelid : -1; return mdinited ? tile2model[Ptile2tile(tilenume,pal)].modelid : -1;
} }
#endif // defined USE_OPENGL #endif // defined USE_OPENGL
static FORCE_INLINE int tilehasmodelorvoxel(int const tilenume, int pal) inline int tilehasmodelorvoxel(int const tilenume, int pal)
{ {
UNREFERENCED_PARAMETER(pal); UNREFERENCED_PARAMETER(pal);
return return
@ -688,7 +688,7 @@ extern int skiptile;
static vec2_t const zerovec = { 0, 0 }; static vec2_t const zerovec = { 0, 0 };
static FORCE_INLINE int inside_p(int32_t const x, int32_t const y, int const sectnum) { return (sectnum >= 0 && inside(x, y, sectnum) == 1); } inline int inside_p(int32_t const x, int32_t const y, int const sectnum) { return (sectnum >= 0 && inside(x, y, sectnum) == 1); }
#define SET_AND_RETURN(Lval, Rval) \ #define SET_AND_RETURN(Lval, Rval) \
do \ do \

24
source/build/include/compat.h
View file

@ -27,26 +27,6 @@
#endif #endif
#ifndef MAY_ALIAS
# ifdef _MSC_VER
# define MAY_ALIAS
# else
# define MAY_ALIAS __attribute__((may_alias))
# endif
#endif
#ifndef FORCE_INLINE
# ifdef _MSC_VER
# define FORCE_INLINE __forceinline
# else
# ifdef __GNUC__
# define FORCE_INLINE inline __attribute__((always_inline))
# else
# define FORCE_INLINE inline
# endif
# endif
#endif
# define fallthrough__ [[fallthrough]] # define fallthrough__ [[fallthrough]]
////////// Architecture detection ////////// ////////// Architecture detection //////////
@ -122,8 +102,8 @@ static_assert(sizeof(vec3f_t) == sizeof(float) * 3);
////////// Bitfield manipulation ////////// ////////// Bitfield manipulation //////////
static FORCE_INLINE void bitmap_set(uint8_t *const ptr, int const n) { ptr[n>>3] |= 1 << (n&7); } inline void bitmap_set(uint8_t *const ptr, int const n) { ptr[n>>3] |= 1 << (n&7); }
static FORCE_INLINE char bitmap_test(uint8_t const *const ptr, int const n) { return ptr[n>>3] & (1 << (n&7)); } inline char bitmap_test(uint8_t const *const ptr, int const n) { return ptr[n>>3] & (1 << (n&7)); }
////////// Utility functions ////////// ////////// Utility functions //////////

2
source/build/src/clip.cpp
View file

@ -132,7 +132,7 @@ static void addclipline(int32_t dax1, int32_t day1, int32_t dax2, int32_t day2,
clipnum++; clipnum++;
} }
static FORCE_INLINE void clipmove_tweak_pos(const vec3_t *pos, int32_t gx, int32_t gy, int32_t x1, int32_t y1, int32_t x2, inline void clipmove_tweak_pos(const vec3_t *pos, int32_t gx, int32_t gy, int32_t x1, int32_t y1, int32_t x2,
int32_t y2, int32_t *daxptr, int32_t *dayptr) int32_t y2, int32_t *daxptr, int32_t *dayptr)
{ {
int32_t daz; int32_t daz;

2
source/build/src/engine_priv.h
View file

@ -34,7 +34,7 @@ extern int32_t hitallsprites;
int32_t animateoffs(int tilenum, int fakevar); int32_t animateoffs(int tilenum, int fakevar);
static FORCE_INLINE int32_t bad_tspr(tspriteptr_t tspr) inline int32_t bad_tspr(tspriteptr_t tspr)
{ {
// NOTE: tspr->owner >= MAXSPRITES (could be model) has to be handled by // NOTE: tspr->owner >= MAXSPRITES (could be model) has to be handled by
// caller. // caller.