A couple of minor changes.

- engine.c: comment out some unused decls with RELEASE=0 DEBUGANYWAY=1
- Lunatic: update dump.lua and v.lua
- Lunatic: test/test_geom.lua: note a perf regression (wrt older LuaJIT,
  or I mis-configured / built something wrong)

git-svn-id: https://svn.eduke32.com/eduke32@4048 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-09-05 17:37:44 +00:00
parent 1b7c622f31
commit d48383d2f7
5 changed files with 12 additions and 4 deletions

View file

@ -2374,7 +2374,9 @@ typedef struct { int32_t x1, y1, x2, y2; } linetype;
static linetype clipit[MAXCLIPNUM]; static linetype clipit[MAXCLIPNUM];
static int32_t clipsectnum, origclipsectnum, clipspritenum; static int32_t clipsectnum, origclipsectnum, clipspritenum;
static int16_t clipsectorlist[MAXCLIPNUM], origclipsectorlist[MAXCLIPNUM]; static int16_t clipsectorlist[MAXCLIPNUM], origclipsectorlist[MAXCLIPNUM];
#ifdef HAVE_CLIPSHAPE_FEATURE
static int16_t clipspritelist[MAXCLIPNUM]; // sector-like sprite clipping static int16_t clipspritelist[MAXCLIPNUM]; // sector-like sprite clipping
#endif
static int16_t clipobjectval[MAXCLIPNUM]; static int16_t clipobjectval[MAXCLIPNUM];
typedef struct typedef struct
@ -11992,10 +11994,13 @@ static int32_t try_facespr_intersect(const spritetype *spr, const vec3_t *refpos
return 0; return 0;
} }
// //
// hitscan // hitscan
// //
#ifdef HAVE_CLIPSHAPE_FEATURE
static int32_t clipsprite_initindex(int32_t curidx, spritetype *curspr, int32_t *clipsectcnt, const vec3_t *vect); static int32_t clipsprite_initindex(int32_t curidx, spritetype *curspr, int32_t *clipsectcnt, const vec3_t *vect);
#endif
int32_t hitscan(const vec3_t *sv, int16_t sectnum, int32_t vx, int32_t vy, int32_t vz, int32_t hitscan(const vec3_t *sv, int16_t sectnum, int32_t vx, int32_t vy, int32_t vz,
hitdata_t *hit, uint32_t cliptype) hitdata_t *hit, uint32_t cliptype)

View file

@ -2,7 +2,7 @@
-- This file contains LuaJIT definitions of stuff that's common to the game and -- This file contains LuaJIT definitions of stuff that's common to the game and
-- editor. The 'decl' function is expected to be defined in the global -- editor. The 'decl' function is expected to be defined in the global
-- environment. -- environment.
-- See the included license file "BUILDLIC.TXT" for license info. -- See the file "BUILDLIC.TXT" distributed with EDuke32 for license info.
-- Will be 'true' if running from engine Lua state: -- Will be 'true' if running from engine Lua state:
local _LUNATIC_AUX = _LUNATIC_AUX local _LUNATIC_AUX = _LUNATIC_AUX

View file

@ -54,7 +54,7 @@
-- Cache some library functions and objects. -- Cache some library functions and objects.
local jit = require("jit") local jit = require("jit")
assert(jit.version_num == 20001, "LuaJIT core/library version mismatch") assert(jit.version_num == 20002, "LuaJIT core/library version mismatch")
local jutil = require("jit.util") local jutil = require("jit.util")
local vmdef = require("jit.vmdef") local vmdef = require("jit.vmdef")
local funcinfo, funcbc = jutil.funcinfo, jutil.funcbc local funcinfo, funcbc = jutil.funcinfo, jutil.funcbc

View file

@ -5,7 +5,8 @@ local os = require("os")
local xmath = require("xmath") local xmath = require("xmath")
local N = os.exit and (arg[1] and tostring(arg[1])) or 1e6 -- XXX: perf regression? (See below PERF_REGRESSION)
local N = os.exit and (arg[1] and tostring(arg[1])) or 1e5 --1e6
local A,B = {}, {} local A,B = {}, {}
local V,W = {}, {} local V,W = {}, {}
@ -79,3 +80,5 @@ print("getdbl: ".. 1000*(t2-t1))
print("genpoints: ".. 1000*(t3-t2)) -- x86_64: 500 ms, x86: 700 ms print("genpoints: ".. 1000*(t3-t2)) -- x86_64: 500 ms, x86: 700 ms
print("intersect: ".. 1000*(t4-t3)) -- x86_64, x86: about 35 ms <- thanks to allocation sinking (else, about 500 ms?) print("intersect: ".. 1000*(t4-t3)) -- x86_64, x86: about 35 ms <- thanks to allocation sinking (else, about 500 ms?)
print("result: ".. tostring(v)) print("result: ".. tostring(v))
-- PERF_REGRESSION: with N==1e6 getdbl, genpoints now about 1000ms from EDuke32!

View file

@ -59,7 +59,7 @@
-- Cache some library functions and objects. -- Cache some library functions and objects.
local jit = require("jit") local jit = require("jit")
assert(jit.version_num == 20001, "LuaJIT core/library version mismatch") assert(jit.version_num == 20002, "LuaJIT core/library version mismatch")
local jutil = require("jit.util") local jutil = require("jit.util")
local vmdef = require("jit.vmdef") local vmdef = require("jit.vmdef")
local funcinfo, traceinfo = jutil.funcinfo, jutil.traceinfo local funcinfo, traceinfo = jutil.funcinfo, jutil.traceinfo