zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-14 08:30:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reduce calling overhead for A_SetUser* functions by making them non-action functions

Browse source
This commit is contained in:
Randy Heit 2016-04-18 23:18:34 -05:00
parent e83bc53678
commit c795f29cc4
3 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/thingdef/thingdef_codeptr.cpp
View file

@ -4604,7 +4604,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetSpecial)
// //
//=========================================================================== //===========================================================================
static PField *GetVar(AActor *self, FName varname) static PField *GetVar(DObject *self, FName varname)
{ {
PField *var = dyn_cast<PField>(self->GetClass()->Symbols.FindSymbol(varname, true)); PField *var = dyn_cast<PField>(self->GetClass()->Symbols.FindSymbol(varname, true));
@ -4619,7 +4619,8 @@ static PField *GetVar(AActor *self, FName varname)
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetUserVar) DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetUserVar)
{ {
PARAM_ACTION_PROLOGUE; PARAM_PROLOGUE;
PARAM_OBJECT(self, DObject);
PARAM_NAME (varname); PARAM_NAME (varname);
PARAM_INT (value); PARAM_INT (value);
@ -4634,7 +4635,8 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetUserVar)
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetUserVarFloat) DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetUserVarFloat)
{ {
PARAM_ACTION_PROLOGUE; PARAM_PROLOGUE;
PARAM_OBJECT(self, DObject);
PARAM_NAME (varname); PARAM_NAME (varname);
PARAM_FLOAT (value); PARAM_FLOAT (value);
@ -4653,7 +4655,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetUserVarFloat)
// //
//=========================================================================== //===========================================================================
static PField *GetArrayVar(AActor *self, FName varname, int pos) static PField *GetArrayVar(DObject *self, FName varname, int pos)
{ {
PField *var = dyn_cast<PField>(self->GetClass()->Symbols.FindSymbol(varname, true)); PField *var = dyn_cast<PField>(self->GetClass()->Symbols.FindSymbol(varname, true));
@ -4676,7 +4678,8 @@ static PField *GetArrayVar(AActor *self, FName varname, int pos)
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetUserArray) DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetUserArray)
{ {
PARAM_ACTION_PROLOGUE; PARAM_PROLOGUE;
PARAM_OBJECT(self, DObject);
PARAM_NAME (varname); PARAM_NAME (varname);
PARAM_INT (pos); PARAM_INT (pos);
PARAM_INT (value); PARAM_INT (value);
@ -4693,7 +4696,8 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetUserArray)
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetUserArrayFloat) DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetUserArrayFloat)
{ {
PARAM_ACTION_PROLOGUE; PARAM_PROLOGUE;
PARAM_OBJECT(self, DObject);
PARAM_NAME (varname); PARAM_NAME (varname);
PARAM_INT (pos); PARAM_INT (pos);
PARAM_FLOAT (value); PARAM_FLOAT (value);

5
src/thingdef/thingdef_parse.cpp
View file

@ -473,7 +473,7 @@ static void ParseNativeFunction(FScanner &sc, PClassActor *cls)
FScriptPosition::ErrorCounter++; FScriptPosition::ErrorCounter++;
} }
// Read the type and make sure it's int or float. // Read the type and make sure it's acceptable.
sc.MustGetAnyToken(); sc.MustGetAnyToken();
switch (sc.TokenType) switch (sc.TokenType)
{ {
@ -490,6 +490,9 @@ static void ParseNativeFunction(FScanner &sc, PClassActor *cls)
rets.Push(TypeState); rets.Push(TypeState);
break; break;
case TK_Void:
break;
case TK_Identifier: case TK_Identifier:
rets.Push(NewPointer(RUNTIME_CLASS(DObject))); rets.Push(NewPointer(RUNTIME_CLASS(DObject)));
// Todo: Object type // Todo: Object type

8
wadsrc/static/actors/actor.txt
View file

@ -274,10 +274,10 @@ ACTOR Actor native //: Thinker
action native A_ScaleVelocity(float scale, int ptr = AAPTR_DEFAULT); action native A_ScaleVelocity(float scale, int ptr = AAPTR_DEFAULT);
action native A_ChangeVelocity(float x = 0, float y = 0, float z = 0, int flags = 0, int ptr = AAPTR_DEFAULT); action native A_ChangeVelocity(float x = 0, float y = 0, float z = 0, int flags = 0, int ptr = AAPTR_DEFAULT);
action native A_SetArg(int pos, int value); action native A_SetArg(int pos, int value);
action native A_SetUserVar(name varname, int value); native void A_SetUserVar(name varname, int value);
action native A_SetUserArray(name varname, int index, int value); native void A_SetUserArray(name varname, int index, int value);
action native A_SetUserVarFloat(name varname, float value); native void A_SetUserVarFloat(name varname, float value);
action native A_SetUserArrayFloat(name varname, int index, float value); native void A_SetUserArrayFloat(name varname, int index, float value);
action native A_SetSpecial(int spec, int arg0 = 0, int arg1 = 0, int arg2 = 0, int arg3 = 0, int arg4 = 0); action native A_SetSpecial(int spec, int arg0 = 0, int arg1 = 0, int arg2 = 0, int arg3 = 0, int arg4 = 0);
action native A_Quake(int intensity, int duration, int damrad, int tremrad, sound sfx = "world/quake"); action native A_Quake(int intensity, int duration, int damrad, int tremrad, sound sfx = "world/quake");
action native A_QuakeEx(int intensityX, int intensityY, int intensityZ, int duration, int damrad, int tremrad, sound sfx = "world/quake", int flags = 0, float mulWaveX = 1, float mulWaveY = 1, float mulWaveZ = 1, int falloff = 0, int highpoint = 0); action native A_QuakeEx(int intensityX, int intensityY, int intensityZ, int duration, int damrad, int tremrad, sound sfx = "world/quake", int flags = 0, float mulWaveX = 1, float mulWaveY = 1, float mulWaveZ = 1, int falloff = 0, int highpoint = 0);