NUKE unused IPC calls

Author: VReaperV

src/engine/client/cg_msgdef.h

@@ -132,16 +132,13 @@ enum cgameImport_t
   // Misc
   CG_SENDCLIENTCOMMAND,
   CG_UPDATESCREEN,
-  CG_CM_MARKFRAGMENTS,
   CG_CM_BATCHMARKFRAGMENTS,
   CG_GETCURRENTSNAPSHOTNUMBER,
   CG_GETSNAPSHOT,
   CG_GETCURRENTCMDNUMBER,
   CG_GETUSERCMD,
   CG_SETUSERCMDVALUE,
-  CG_GET_ENTITY_TOKEN,
   CG_REGISTER_BUTTON_COMMANDS,
-  CG_QUOTESTRING,
   CG_NOTIFY_TEAMCHANGE,
   CG_PREPAREKEYUP,
 
@@ -167,7 +164,6 @@ enum cgameImport_t
   CG_R_GETSHADERNAMEFROMHANDLE,
   CG_R_SCISSOR_ENABLE,
   CG_R_SCISSOR_SET,
-  CG_R_INPVVS,
   CG_R_LOADWORLDMAP,
   CG_R_REGISTERMODEL,
   CG_R_REGISTERSKIN,
@@ -191,7 +187,6 @@ enum cgameImport_t
   CG_R_MODELBOUNDS,
   CG_R_LERPTAG,
   CG_R_REMAP_SHADER,
-  CG_R_INPVS,
   CG_R_BATCHINPVS,
   CG_R_LIGHTFORPOINT,
   CG_R_REGISTERANIMATION,
@@ -244,11 +239,7 @@ using SendClientCommandMsg = IPC::SyncMessage<
 using UpdateScreenMsg = IPC::SyncMessage<
 	IPC::Message<IPC::Id<VM::QVM, CG_UPDATESCREEN>>
 >;
-// TODO can move to VM too ?
-using CMMarkFragmentsMsg = IPC::SyncMessage<
-	IPC::Message<IPC::Id<VM::QVM, CG_CM_MARKFRAGMENTS>, std::vector<std::array<float, 3>>, std::array<float, 3>, int, int>,
-	IPC::Reply<std::vector<std::array<float, 3>>, std::vector<markFragment_t>>
->;
+// TODO can move to VM too?
 using CMBatchMarkFragments = IPC::SyncMessage<
 	IPC::Message<
 		IPC::Id<VM::QVM, CG_CM_BATCHMARKFRAGMENTS>,
@@ -276,17 +267,7 @@ using GetUserCmdMsg = IPC::SyncMessage<
 	IPC::Reply<bool, usercmd_t>
 >;
 using SetUserCmdValueMsg = IPC::Message<IPC::Id<VM::QVM, CG_SETUSERCMDVALUE>, int, int, float>;
-// TODO what?
-using CgGetEntityTokenMsg =  IPC::SyncMessage<
-	IPC::Message<IPC::Id<VM::QVM, CG_GET_ENTITY_TOKEN>, int>,
-	IPC::Reply<bool, std::string>
->;
 using RegisterButtonCommandsMsg = IPC::Message<IPC::Id<VM::QVM, CG_REGISTER_BUTTON_COMMANDS>, std::string>;
-// TODO using Command.h for that ?
-using QuoteStringMsg = IPC::SyncMessage<
-	IPC::Message<IPC::Id<VM::QVM, CG_QUOTESTRING>, int, std::string>,
-	IPC::Reply<std::string>
->;
 using NotifyTeamChangeMsg = IPC::SyncMessage<
 	IPC::Message<IPC::Id<VM::QVM, CG_NOTIFY_TEAMCHANGE>, int>
 >;
@@ -326,11 +307,6 @@ namespace Render {
 		IPC::Message<IPC::Id<VM::QVM, CG_R_GETSHADERNAMEFROMHANDLE>, int>,
 		IPC::Reply<std::string>
 	>;
-	// TODO not a renderer call, handle in CM in the VM?
-	using InPVVSMsg = IPC::SyncMessage<
-		IPC::Message<IPC::Id<VM::QVM, CG_R_INPVVS>, std::array<float, 3>, std::array<float, 3>>,
-		IPC::Reply<bool>
-	>;
 	// TODO is it really async?
 	using LoadWorldMapMsg = IPC::Message<IPC::Id<VM::QVM, CG_R_LOADWORLDMAP>, std::string>;
 	using RegisterModelMsg = IPC::SyncMessage<
@@ -355,10 +331,6 @@ namespace Render {
 	>;
 	using RemapShaderMsg = IPC::Message<IPC::Id<VM::QVM, CG_R_REMAP_SHADER>, std::string, std::string, std::string>;
 	// TODO not a renderer call, handle in CM in the VM?
-	using InPVSMsg = IPC::SyncMessage<
-		IPC::Message<IPC::Id<VM::QVM, CG_R_INPVS>, std::array<float, 3>, std::array<float, 3>>,
-		IPC::Reply<bool>
-	>;
 	using BatchInPVSMsg = IPC::SyncMessage<
 		IPC::Message<IPC::Id<
 			VM::QVM, CG_R_BATCHINPVS>,

src/engine/client/cl_cgame.cpp

@@ -1091,17 +1091,6 @@ void CGameVM::QVMSyscall(int syscallNum, Util::Reader& reader, IPC::Channel& cha
 			});
 			break;
 
-		case CG_CM_MARKFRAGMENTS:
-			// TODO wow this is very ugly and expensive, find something better?
-			// plus we have a lot of const casts for the vector buffers
-			IPC::HandleMsg<CMMarkFragmentsMsg>(channel, std::move(reader), [this] (std::vector<std::array<float, 3>> points, std::array<float, 3> projection, int maxPoints, int maxFragments, std::vector<std::array<float, 3>>& pointBuffer, std::vector<markFragment_t>& fragmentBuffer) {
-				pointBuffer.resize(maxPoints);
-				fragmentBuffer.resize(maxFragments);
-				int numFragments = re.MarkFragments(points.size(), (vec3_t*)points.data(), projection.data(), maxPoints, (float*) pointBuffer.data(), maxFragments, fragmentBuffer.data());
-				fragmentBuffer.resize(numFragments);
-			});
-			break;
-
 		case CG_CM_BATCHMARKFRAGMENTS:
 			IPC::HandleMsg<CMBatchMarkFragments>(channel, std::move(reader), [this] (
 				unsigned maxPoints,
@@ -1174,30 +1163,12 @@ void CGameVM::QVMSyscall(int syscallNum, Util::Reader& reader, IPC::Channel& cha
 			});
 			break;
 
-		case CG_GET_ENTITY_TOKEN:
-			IPC::HandleMsg<CgGetEntityTokenMsg>(channel, std::move(reader), [this] (int len, bool& res, std::string& token) {
-				std::unique_ptr<char[]> buffer(new char[len]);
-				buffer[0] = '\0';
-				res = re.GetEntityToken(buffer.get(), len);
-				token.assign(buffer.get());
-			});
-			break;
-
 		case CG_REGISTER_BUTTON_COMMANDS:
 			IPC::HandleMsg<RegisterButtonCommandsMsg>(channel, std::move(reader), [this] (const std::string& commands) {
 				CL_RegisterButtonCommands(commands.c_str());
 			});
 			break;
 
-		case CG_QUOTESTRING:
-			IPC::HandleMsg<QuoteStringMsg>(channel, std::move(reader), [this] (int len, const std::string& input, std::string& output) {
-				std::unique_ptr<char[]> buffer(new char[len]);
-				buffer[0] = '\0';
-				Cmd_QuoteStringBuffer(input.c_str(), buffer.get(), len);
-				output.assign(buffer.get());
-			});
-			break;
-
 		case CG_NOTIFY_TEAMCHANGE:
 			IPC::HandleMsg<NotifyTeamChangeMsg>(channel, std::move(reader), [this] (int team) {
 				CL_OnTeamChanged(team);
@@ -1232,12 +1203,6 @@ void CGameVM::QVMSyscall(int syscallNum, Util::Reader& reader, IPC::Channel& cha
 			});
 			break;
 
-		case CG_R_INPVVS:
-			IPC::HandleMsg<Render::InPVVSMsg>(channel, std::move(reader), [this] (const std::array<float, 3>& p1, const std::array<float, 3>& p2, bool& res) {
-				res = re.inPVVS(p1.data(), p2.data());
-			});
-			break;
-
 		case CG_R_LOADWORLDMAP:
 			IPC::HandleMsg<Render::LoadWorldMapMsg>(channel, std::move(reader), [this] (const std::string& mapName) {
 				re.SetWorldVisData(CM_ClusterPVS(-1));
@@ -1281,12 +1246,6 @@ void CGameVM::QVMSyscall(int syscallNum, Util::Reader& reader, IPC::Channel& cha
 			});
 			break;
 
-		case CG_R_INPVS:
-			IPC::HandleMsg<Render::InPVSMsg>(channel, std::move(reader), [this] (const std::array<float, 3>& p1, const std::array<float, 3>& p2, bool& res) {
-				res = re.inPVS(p1.data(), p2.data());
-			});
-			break;
-
 		case CG_R_BATCHINPVS:
 			IPC::HandleMsg<Render::BatchInPVSMsg>(channel, std::move(reader), [this] (
 				const std::array<float, 3>& origin,

src/engine/qcommon/cmd.cpp

@@ -398,18 +398,6 @@ const char *Cmd_QuoteString( const char *in )
 	return EscapeString( in, true );
 }
 
-/*
-============
-Cmd_QuoteStringBuffer
-
-Cmd_QuoteString for VM usage
-============
-*/
-void Cmd_QuoteStringBuffer( const char *in, char *buffer, int size )
-{
-	Q_strncpyz( buffer, Cmd_QuoteString( in ), size );
-}
-
 /*
 ===================
 Cmd_UnquoteString

src/engine/qcommon/qcommon.h

@@ -322,8 +322,6 @@ char *Cmd_ArgsFrom( int arg );
 const char *Cmd_QuoteString( const char *in );
 const char *Cmd_UnquoteString( const char *in );
 
-void Cmd_QuoteStringBuffer( const char *in, char *buffer, int size );
-
 // The functions that execute commands get their parameters with these
 // functions. Cmd_Argv () will return an empty string, not a nullptr
 // if arg >= argc, so string operations are always safe.

src/shared/client/cg_api.cpp

@@ -49,24 +49,6 @@ void trap_UpdateScreen()
 	VM::SendMsg<UpdateScreenMsg>();
 }
 
-int trap_CM_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projection, int maxPoints, vec3_t pointBuffer, int maxFragments, markFragment_t *fragmentBuffer )
-{
-	if (!numPoints) return 0;
-
-	std::vector<std::array<float, 3>> mypoints(numPoints);
-	std::array<float, 3> myproj;
-	memcpy(mypoints.data(), points, sizeof(float) * 3 * numPoints);
-	VectorCopy(projection, myproj);
-
-	std::vector<std::array<float, 3>> mypointBuffer;
-	std::vector<markFragment_t> myfragmentBuffer;
-	VM::SendMsg<CMMarkFragmentsMsg>(mypoints, myproj, maxPoints, maxFragments, mypointBuffer, myfragmentBuffer);
-
-	memcpy(pointBuffer, mypointBuffer.data(), sizeof(float) * 3 * maxPoints);
-	std::copy(myfragmentBuffer.begin(), myfragmentBuffer.end(), fragmentBuffer);
-	return myfragmentBuffer.size();
-}
-
 void trap_CM_BatchMarkFragments(
 	unsigned maxPoints, //per mark
 	unsigned maxFragments, //per mark
@@ -135,27 +117,11 @@ void trap_SetUserCmdValue( int stateValue, int flags, float sensitivityScale )
 	VM::SendMsg<SetUserCmdValueMsg>(stateValue, flags, sensitivityScale);
 }
 
-bool trap_GetEntityToken( char *buffer, int bufferSize )
-{
-	bool res;
-	std::string token;
-	VM::SendMsg<CgGetEntityTokenMsg>(bufferSize, res, token);
-	Q_strncpyz(buffer, token.c_str(), bufferSize);
-	return res;
-}
-
 void trap_RegisterButtonCommands( const char *cmds )
 {
 	VM::SendMsg<RegisterButtonCommandsMsg>(cmds);
 }
 
-void trap_QuoteString( const char *str, char *buffer, int size )
-{
-	std::string quoted;
-	VM::SendMsg<QuoteStringMsg>(size, str, quoted);
-	Q_strncpyz(buffer, quoted.c_str(), size);
-}
-
 void trap_notify_onTeamChange( int newTeam )
 {
 	VM::SendMsg<NotifyTeamChangeMsg>(newTeam);
@@ -291,16 +257,6 @@ void trap_R_ScissorSet( int x, int y, int w, int h )
 	cmdBuffer.SendMsg<Render::ScissorSetMsg>(x, y, w, h);
 }
 
-bool trap_R_inPVVS( const vec3_t p1, const vec3_t p2 )
-{
-	bool res;
-	std::array<float, 3> myp1, myp2;
-	VectorCopy(p1, myp1);
-	VectorCopy(p2, myp2);
-	VM::SendMsg<Render::InPVVSMsg>(myp1, myp2, res);
-	return res;
-}
-
 void trap_R_LoadWorldMap( const char *mapname )
 {
 	VM::SendMsg<Render::LoadWorldMapMsg>(mapname);
@@ -459,16 +415,6 @@ void trap_R_RemapShader( const char *oldShader, const char *newShader, const cha
 	VM::SendMsg<Render::RemapShaderMsg>(oldShader, newShader, timeOffset);
 }
 
-bool trap_R_inPVS( const vec3_t p1, const vec3_t p2 )
-{
-	bool res;
-	std::array<float, 3> myp1, myp2;
-	VectorCopy(p1, myp1);
-	VectorCopy(p2, myp2);
-	VM::SendMsg<Render::InPVSMsg>(myp1, myp2, res);
-	return res;
-}
-
 std::vector<bool> trap_R_BatchInPVS(
 	const vec3_t origin,
 	const std::vector<std::array<float, 3>>& posEntities )

src/shared/client/cg_api.h

@@ -43,7 +43,6 @@ extern IPC::CommandBufferClient cmdBuffer;
 
 void            trap_SendClientCommand( const char *s );
 void            trap_UpdateScreen();
-int             trap_CM_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projection, int maxPoints, vec3_t pointBuffer, int maxFragments, markFragment_t *fragmentBuffer );
 
 void trap_CM_BatchMarkFragments(
 	unsigned maxPoints,
@@ -101,16 +100,13 @@ std::vector<bool> trap_Key_KeysDown( const std::vector<Keyboard::Key>& keys );
 void            trap_SetMouseMode( MouseMode mode );
 void            trap_S_StopBackgroundTrack();
 void            trap_R_RemapShader( const char *oldShader, const char *newShader, const char *timeOffset );
-bool        trap_GetEntityToken( char *buffer, int bufferSize );
 std::vector<std::vector<Keyboard::Key>> trap_Key_GetKeysForBinds(int team, const std::vector<std::string>& binds);
 int             trap_Key_GetCharForScancode( int scancode );
-bool        trap_R_inPVS( const vec3_t p1, const vec3_t p2 );
 
 std::vector<bool> trap_R_BatchInPVS(
 	const vec3_t origin,
 	const std::vector<std::array<float, 3>>& posEntities );
 
-bool        trap_R_inPVVS( const vec3_t p1, const vec3_t p2 );
 int             trap_R_LightForPoint( vec3_t point, vec3_t ambientLight, vec3_t directedLight, vec3_t lightDir );
 qhandle_t       trap_R_RegisterAnimation( const char *name );
 int             trap_R_BuildSkeleton( refSkeleton_t *skel, qhandle_t anim, int startFrame, int endFrame, float frac, bool clearOrigin );
@@ -119,7 +115,6 @@ int             trap_R_BoneIndex( qhandle_t hModel, const char *boneName );
 int             trap_R_AnimNumFrames( qhandle_t hAnim );
 int             trap_R_AnimFrameRate( qhandle_t hAnim );
 void            trap_RegisterButtonCommands( const char *cmds );
-void            trap_QuoteString( const char *, char*, int );
 void            trap_notify_onTeamChange( int newTeam );
 qhandle_t       trap_RegisterVisTest();
 void            trap_AddVisTestToScene( qhandle_t hTest, const vec3_t pos,