XInput support

GpD3D/GpAppEnvironment.cpp

@@ -6,6 +6,7 @@
 #include "GpPLGlueDisplayDriver.h"
 #include "HostSuspendCallArgument.h"
 #include "IGpFiber.h"
+#include "IGpInputDriver.h"
 
 #include <assert.h>
 
@@ -13,6 +14,8 @@ GpAppEnvironment::GpAppEnvironment()
 	: m_applicationState(ApplicationState_NotStarted)
 	, m_displayDriver(nullptr)
 	, m_audioDriver(nullptr)
+	, m_inputDrivers(nullptr)
+	, m_numInputDrivers(0)
 	, m_fontHandler(nullptr)
 	, m_vosEventQueue(nullptr)
 	, m_applicationFiber(nullptr)
@@ -53,6 +56,7 @@ void GpAppEnvironment::Tick(IGpFiber *vosFiber)
 		case ApplicationState_WaitingForEvents:
 			return;
 		case ApplicationState_Running:
+			SynchronizeState();
 			m_applicationFiber->YieldTo();
 			break;
 		case ApplicationState_SystemCall:
@@ -96,6 +100,12 @@ void GpAppEnvironment::SetAudioDriver(IGpAudioDriver *audioDriver)
 	m_audioDriver = audioDriver;
 }
 
+void GpAppEnvironment::SetInputDrivers(IGpInputDriver *const* inputDrivers, size_t numDrivers)
+{
+	m_inputDrivers = inputDrivers;
+	m_numInputDrivers = numDrivers;
+}
+
 void GpAppEnvironment::SetFontHandler(PortabilityLayer::HostFontHandler *fontHandler)
 {
 	m_fontHandler = fontHandler;
@@ -125,13 +135,15 @@ void GpAppEnvironment::InitializeApplicationState()
 	GpAppInterface_Get()->PL_HostFontHandler_SetInstance(m_fontHandler);
 	GpAppInterface_Get()->PL_HostVOSEventQueue_SetInstance(m_vosEventQueue);
 
-	SynchronizeState();
+	GpPLGlueDisplayDriver::GetInstance()->SetGpDisplayDriver(m_displayDriver);
+	GpPLGlueAudioDriver::GetInstance()->SetGpAudioDriver(m_audioDriver);
 }
 
 void GpAppEnvironment::SynchronizeState()
 {
-	GpPLGlueDisplayDriver::GetInstance()->SetGpDisplayDriver(m_displayDriver);
-	GpPLGlueAudioDriver::GetInstance()->SetGpAudioDriver(m_audioDriver);
+	const size_t numInputDrivers = m_numInputDrivers;
+	for (size_t i = 0; i < numInputDrivers; i++)
+		m_inputDrivers[i]->ProcessInput();
 }
 
 void GpAppEnvironment::StaticSuspendHookFunc(void *context, PortabilityLayer::HostSuspendCallID callID, const PortabilityLayer::HostSuspendCallArgument *args, PortabilityLayer::HostSuspendCallArgument *returnValue)

GpD3D/GpAppEnvironment.h

@@ -14,6 +14,7 @@ namespace PortabilityLayer
 
 struct IGpDisplayDriver;
 struct IGpAudioDriver;
+struct IGpInputDriver;
 struct IGpFiber;
 
 class GpAppEnvironment
@@ -29,6 +30,7 @@ public:
 
 	void SetDisplayDriver(IGpDisplayDriver *displayDriver);
 	void SetAudioDriver(IGpAudioDriver *audioDriver);
+	void SetInputDrivers(IGpInputDriver *const* inputDrivers, size_t numDrivers);
 	void SetFontHandler(PortabilityLayer::HostFontHandler *fontHandler);
 	void SetVOSEventQueue(GpVOSEventQueue *eventQueue);
 
@@ -54,12 +56,14 @@ private:
 	ApplicationState m_applicationState;
 	IGpDisplayDriver *m_displayDriver;
 	IGpAudioDriver *m_audioDriver;
+	IGpInputDriver *const* m_inputDrivers;
 	PortabilityLayer::HostFontHandler *m_fontHandler;
 	GpVOSEventQueue *m_vosEventQueue;
 	IGpFiber *m_applicationFiber;
 	IGpFiber *m_vosFiber;
 
 	uint32_t m_delaySuspendTicks;
+	size_t m_numInputDrivers;
 
 	PortabilityLayer::HostSuspendCallID m_suspendCallID;
 	const PortabilityLayer::HostSuspendCallArgument *m_suspendArgs;

GpD3D/GpD3D.vcxproj

@@ -153,6 +153,7 @@
     <ClCompile Include="GpFontHandlerFactory.cpp" />
     <ClCompile Include="GpFontHandler_FreeType2.cpp" />
     <ClCompile Include="GpGlobalConfig.cpp" />
+    <ClCompile Include="GpInputDriverFactory.cpp" />
     <ClCompile Include="GpMain.cpp" />
     <ClCompile Include="GpMain_Win32.cpp" />
     <ClCompile Include="GpMemoryBuffer.cpp" />
@@ -166,20 +167,18 @@
     <ClCompile Include="GpVOSEventQueue.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\GpCommon\EGpInputDriverType.h" />
     <ClInclude Include="..\GpCommon\EGpStandardCursor.h" />
+    <ClInclude Include="..\GpCommon\GpInputDriverProperties.h" />
     <ClInclude Include="..\GpCommon\IGpColorCursor.h" />
     <ClInclude Include="..\GpCommon\IGpAudioChannelCallbacks.h" />
     <ClInclude Include="..\GpCommon\GpColorCursor_Win32.h" />
     <ClInclude Include="..\GpCommon\IGpDisplayDriverSurface.h" />
-    <ClInclude Include="EGpAudioDriverType.h" />
-    <ClInclude Include="EGpDisplayDriverType.h" />
     <ClInclude Include="GpAppEnvironment.h" />
     <ClInclude Include="GpAudioDriverFactory.h" />
-    <ClInclude Include="GpAudioDriverProperties.h" />
     <ClInclude Include="GpComPtr.h" />
     <ClInclude Include="GpCoreDefs.h" />
     <ClInclude Include="GpDisplayDriverFactory.h" />
-    <ClInclude Include="GpDisplayDriverProperties.h" />
     <ClInclude Include="GpFiber.h" />
     <ClInclude Include="GpFiber_Win32.h" />
     <ClInclude Include="GpFileStream_Win32.h" />
@@ -187,6 +186,7 @@
     <ClInclude Include="GpFontHandler_FreeType2.h" />
     <ClInclude Include="GpFontHandlerFactory.h" />
     <ClInclude Include="GpGlobalConfig.h" />
+    <ClInclude Include="GpInputDriverFactory.h" />
     <ClInclude Include="GpMain.h" />
     <ClInclude Include="GpMemoryBuffer.h" />
     <ClInclude Include="GpMutex_Win32.h" />
@@ -217,6 +217,9 @@
     <ProjectReference Include="..\GpDisplayDriver_D3D11\GpDisplayDriver_D3D11.vcxproj">
       <Project>{ffc961ac-55b4-4a38-a83e-06ae98f59acc}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\GpInputDriver_XInput\GpInputDriver_XInput.vcxproj">
+      <Project>{17b96f07-ef92-47cd-95a5-8e6ee38ab564}</Project>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="GpD3D.rc" />

GpD3D/GpD3D.vcxproj.filters

@@ -78,6 +78,9 @@
     <ClCompile Include="GpColorCursor_Win32.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="GpInputDriverFactory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="GpWindows.h">
@@ -92,12 +95,6 @@
     <ClInclude Include="GpMain.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="EGpDisplayDriverType.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="GpDisplayDriverProperties.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="GpGlobalConfig.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -140,12 +137,6 @@
     <ClInclude Include="GpAudioDriverFactory.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="EGpAudioDriverType.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="GpAudioDriverProperties.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="GpPLGlueAudioDriver.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -191,6 +182,15 @@
     <ClInclude Include="resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="GpInputDriverFactory.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\GpCommon\EGpInputDriverType.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\GpCommon\GpInputDriverProperties.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="GpD3D.rc">

GpD3D/GpDisplayDriverFactory.cpp

@@ -7,8 +7,8 @@ IGpDisplayDriver *GpDisplayDriverFactory::CreateDisplayDriver(const GpDisplayDri
 {
 	assert(properties.m_type < EGpDisplayDriverType_Count);
 
-	if (ms_Registry[properties.m_type])
-		return ms_Registry[properties.m_type](properties);
+	if (ms_registry[properties.m_type])
+		return ms_registry[properties.m_type](properties);
 	else
 		return nullptr;
 }
@@ -17,7 +17,7 @@ void GpDisplayDriverFactory::RegisterDisplayDriverFactory(EGpDisplayDriverType t
 {
 	assert(type < EGpDisplayDriverType_Count);
 
-	ms_Registry[type] = func;
+	ms_registry[type] = func;
 }
 
-GpDisplayDriverFactory::FactoryFunc_t GpDisplayDriverFactory::ms_Registry[EGpDisplayDriverType_Count];
+GpDisplayDriverFactory::FactoryFunc_t GpDisplayDriverFactory::ms_registry[EGpDisplayDriverType_Count];

GpD3D/GpDisplayDriverFactory.h

@@ -14,5 +14,5 @@ public:
 	static void RegisterDisplayDriverFactory(EGpDisplayDriverType type, FactoryFunc_t func);
 
 private:
-	static FactoryFunc_t ms_Registry[EGpDisplayDriverType_Count];
+	static FactoryFunc_t ms_registry[EGpDisplayDriverType_Count];
 };

GpD3D/GpGlobalConfig.h

@@ -1,10 +1,16 @@
 #pragma once
 
-#include "EGpDisplayDriverType.h"
+#include "EGpDisplayDriverType.h"
+#include "EGpAudioDriverType.h"
+#include "EGpInputDriverType.h"
 
 struct GpGlobalConfig
 {
 	EGpDisplayDriverType m_displayDriverType;
+	EGpAudioDriverType m_audioDriverType;
+	const EGpInputDriverType *m_inputDriverTypes;
+	size_t m_numInputDrivers;
+
 	void *m_osGlobals;
 };
 

GpD3D/GpInputDriverFactory.cpp

@@ -0,0 +1,23 @@
+#include "GpInputDriverFactory.h"
+#include "GpInputDriverProperties.h"
+
+#include <assert.h>
+
+IGpInputDriver *GpInputDriverFactory::CreateInputDriver(const GpInputDriverProperties &properties)
+{
+	assert(properties.m_type < EGpInputDriverType_Count);
+
+	if (ms_registry[properties.m_type])
+		return ms_registry[properties.m_type](properties);
+	else
+		return nullptr;
+}
+
+void GpInputDriverFactory::RegisterInputDriverFactory(EGpInputDriverType type, FactoryFunc_t func)
+{
+	assert(type < EGpInputDriverType_Count);
+
+	ms_registry[type] = func;
+}
+
+GpInputDriverFactory::FactoryFunc_t GpInputDriverFactory::ms_registry[EGpInputDriverType_Count];

GpD3D/GpInputDriverFactory.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include "EGpInputDriverType.h"
+
+struct IGpInputDriver;
+struct GpInputDriverProperties;
+
+class GpInputDriverFactory
+{
+public:
+	typedef IGpInputDriver *(*FactoryFunc_t)(const GpInputDriverProperties &properties);
+
+	static IGpInputDriver *CreateInputDriver(const GpInputDriverProperties &properties);
+	static void RegisterInputDriverFactory(EGpInputDriverType type, FactoryFunc_t func);
+
+private:
+	static FactoryFunc_t ms_registry[EGpInputDriverType_Count];
+};

GpD3D/GpMain.cpp

@@ -4,12 +4,16 @@
 #include "GpFontHandlerFactory.h"
 #include "GpDisplayDriverFactory.h"
 #include "GpDisplayDriverProperties.h"
+#include "GpInputDriverFactory.h"
+#include "GpInputDriverProperties.h"
 #include "GpGlobalConfig.h"
 #include "GpAppEnvironment.h"
 #include "IGpAudioDriver.h"
 #include "IGpDisplayDriver.h"
+#include "IGpInputDriver.h"
 
 #include <string.h>
+#include <stdlib.h>
 
 namespace
 {
@@ -32,8 +36,6 @@ int GpMain::Run()
 	GpDisplayDriverProperties ddProps;
 	memset(&ddProps, 0, sizeof(ddProps));
 
-	ddProps.m_type = EGpDisplayDriverType_D3D11;
-
 	ddProps.m_frameTimeLockNumerator = 1;
 	ddProps.m_frameTimeLockDenominator = 60;
 
@@ -58,10 +60,28 @@ int GpMain::Run()
 
 	// The sample rate used in all of Glider PRO's sound is 0x56ee8ba3
 	// This appears to be the "standard" Mac sample rate, probably rounded from 244800/11.
-	adProps.m_type = EGpAudioDriverType_XAudio2;
+	adProps.m_type = g_gpGlobalConfig.m_audioDriverType;
 	adProps.m_sampleRate = (244800 * 2 + 11) / (11 * 2);
 	adProps.m_debug = true;
 
+	IGpInputDriver **inputDrivers = static_cast<IGpInputDriver**>(malloc(sizeof(IGpInputDriver*) * g_gpGlobalConfig.m_numInputDrivers));
+
+	size_t numCreatedInputDrivers = 0;
+	if (inputDrivers)
+	{
+		for (size_t i = 0; i < g_gpGlobalConfig.m_numInputDrivers; i++)
+		{
+			GpInputDriverProperties inputProps;
+			memset(&inputProps, 0, sizeof(inputProps));
+
+			inputProps.m_type = g_gpGlobalConfig.m_inputDriverTypes[i];
+			inputProps.m_eventQueue = eventQueue;
+
+			if (IGpInputDriver *driver = GpInputDriverFactory::CreateInputDriver(inputProps))
+				inputDrivers[numCreatedInputDrivers++] = driver;
+		}
+	}
+
 	IGpDisplayDriver *displayDriver = GpDisplayDriverFactory::CreateDisplayDriver(ddProps);
 	IGpAudioDriver *audioDriver = GpAudioDriverFactory::CreateAudioDriver(adProps);
 	PortabilityLayer::HostFontHandler *fontHandler = GpFontHandlerFactory::Create();
@@ -70,11 +90,23 @@ int GpMain::Run()
 
 	appEnvironment->SetDisplayDriver(displayDriver);
 	appEnvironment->SetAudioDriver(audioDriver);
+	appEnvironment->SetInputDrivers(inputDrivers, numCreatedInputDrivers);
 	appEnvironment->SetFontHandler(fontHandler);
 	appEnvironment->SetVOSEventQueue(eventQueue);
 
 	// Start the display loop
 	displayDriver->Run();
 
+	// Clean up
+	if (inputDrivers)
+	{
+		for (size_t i = 0; i < numCreatedInputDrivers; i++)
+			inputDrivers[i]->Shutdown();
+
+		free(inputDrivers);
+	}
+
+	// GP TODO: Cleanup
+
 	return 0;
 }

GpD3D/GpMain_Win32.cpp

@@ -5,6 +5,7 @@
 #include "GpGlobalConfig.h"
 #include "GpFiber_Win32.h"
 #include "GpFileSystem_Win32.h"
+#include "GpInputDriverFactory.h"
 #include "GpAppInterface.h"
 #include "GpSystemServices_Win32.h"
 #include "GpVOSEvent.h"
@@ -21,6 +22,7 @@ GpWindowsGlobals g_gpWindowsGlobals;
 
 extern "C" __declspec(dllimport) IGpAudioDriver *GpDriver_CreateAudioDriver_XAudio2(const GpAudioDriverProperties &properties);
 extern "C" __declspec(dllimport) IGpDisplayDriver *GpDriver_CreateDisplayDriver_D3D11(const GpDisplayDriverProperties &properties);
+extern "C" __declspec(dllimport) IGpInputDriver *GpDriver_CreateInputDriver_XInput(const GpInputDriverProperties &properties);
 
 static void PostMouseEvent(IGpVOSEventQueue *eventQueue, GpMouseEventType_t eventType, GpMouseButton_t button, int32_t x, int32_t y)
 {
@@ -372,10 +374,21 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 	g_gpWindowsGlobals.m_translateWindowsMessageFunc = TranslateWindowsMessage;
 
 	g_gpGlobalConfig.m_displayDriverType = EGpDisplayDriverType_D3D11;
+	g_gpGlobalConfig.m_audioDriverType = EGpAudioDriverType_XAudio2;
+
+	EGpInputDriverType inputDrivers[] =
+	{
+		EGpInputDriverType_XInput
+	};
+
+	g_gpGlobalConfig.m_inputDriverTypes = inputDrivers;
+	g_gpGlobalConfig.m_numInputDrivers = sizeof(inputDrivers) / sizeof(inputDrivers[0]);
+
 	g_gpGlobalConfig.m_osGlobals = &g_gpWindowsGlobals;
 
 	GpDisplayDriverFactory::RegisterDisplayDriverFactory(EGpDisplayDriverType_D3D11, GpDriver_CreateDisplayDriver_D3D11);
 	GpAudioDriverFactory::RegisterAudioDriverFactory(EGpAudioDriverType_XAudio2, GpDriver_CreateAudioDriver_XAudio2);
+	GpInputDriverFactory::RegisterInputDriverFactory(EGpInputDriverType_XInput, GpDriver_CreateInputDriver_XInput);
 
 	return GpMain::Run();
 }