OpenGL display driver

Diomendius · Sep 26, 2020 · 45aa5b4 · 45aa5b4
1 parent da3cdb3
commit 45aa5b4
Show file tree

Hide file tree

Showing 26 changed files with 2,922 additions and 33 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,6 +29,7 @@ InstallerPackages/*
 *.wixpdb
 *.wixobj
 *.CopyComplete
+*.lnk
 ReleasePackageInstaller/obj/*
 ReleasePackageInstaller/bin/*
 ReleasePackageInstaller/AerofoilPackageDefs.wxi

diff --git a/GpCommon/GpCursor_Win32.h → Aerofoil/GpCursor_Win32.h b/GpCommon/GpCursor_Win32.h → Aerofoil/GpCursor_Win32.h
diff --git a/Aerofoil/GpFiberStarter_Win32.cpp b/Aerofoil/GpFiberStarter_Win32.cpp
@@ -20,7 +20,7 @@ namespace GpFiberStarter_Win32
 		GpFiberStarter::ThreadFunc_t threadFunc = tss->m_threadFunc;
 		IGpFiber *creatingFiber = tss->m_creatingFiber;
 		void *context = tss->m_context;
-		creatingFiber->YieldTo();
+		SwitchToFiber(static_cast<GpFiber_Win32*>(creatingFiber)->GetFiber());
 
 		threadFunc(context);
 

diff --git a/Aerofoil/GpFiber_Win32.cpp b/Aerofoil/GpFiber_Win32.cpp
@@ -1,32 +1,32 @@
 #include "GpFiber_Win32.h"
-#include <new>
-
-GpFiber_Win32::GpFiber_Win32(LPVOID fiber)
-	: m_fiber(fiber)
-{
-}
-
-void GpFiber_Win32::YieldTo()
-{
-	SwitchToFiber(m_fiber);
-}
-
-void GpFiber_Win32::Destroy()
+#include <new>
+
+GpFiber_Win32::GpFiber_Win32(LPVOID fiber)
+	: m_fiber(fiber)
+{
+}
+
+void GpFiber_Win32::YieldTo(IGpFiber *toFiber)
+{
+	SwitchToFiber(static_cast<GpFiber_Win32*>(toFiber)->m_fiber);
+}
+
+void GpFiber_Win32::Destroy()
 {
 	this->~GpFiber_Win32();
 	free(this);
 }
 
 GpFiber_Win32::~GpFiber_Win32()
-{
-	DeleteFiber(m_fiber);
+{
+	DeleteFiber(m_fiber);
 }
-
+
 IGpFiber *GpFiber_Win32::Create(LPVOID fiber)
 {
 	void *storage = malloc(sizeof(GpFiber_Win32));
 	if (!storage)
 		return nullptr;
 
-	return new (storage) GpFiber_Win32(fiber);
+	return new (storage) GpFiber_Win32(fiber);
 }
diff --git a/Aerofoil/GpFiber_Win32.h b/Aerofoil/GpFiber_Win32.h
@@ -5,14 +5,21 @@
 class GpFiber_Win32 final : public IGpFiber
 {
 public:
-	void YieldTo() override;
+	void YieldTo(IGpFiber *toFiber) override;
 	void Destroy() override;
 
 	static IGpFiber *Create(LPVOID fiber);
 
+	LPVOID GetFiber() const;
+
 private:
 	explicit GpFiber_Win32(LPVOID fiber);
 	~GpFiber_Win32();
 
 	LPVOID m_fiber;
 };
+
+inline LPVOID GpFiber_Win32::GetFiber() const
+{
+	return m_fiber;
+}
diff --git a/AerofoilSDL/AerofoilSDL.vcxproj b/AerofoilSDL/AerofoilSDL.vcxproj
@@ -40,13 +40,20 @@
     <Import Project="AerofoilSDL.props" />
     <Import Project="..\Common.props" />
     <Import Project="..\GpShell.props" />
+    <Import Project="..\GpMainApp.props" />
+    <Import Project="..\PortabilityLayer.props" />
+    <Import Project="..\GpCommon.props" />
+    <Import Project="..\Debug.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="AerofoilSDL.props" />
     <Import Project="..\Common.props" />
     <Import Project="..\GpShell.props" />
     <Import Project="..\Release.props" />
+    <Import Project="..\GpMainApp.props" />
+    <Import Project="..\PortabilityLayer.props" />
+    <Import Project="..\GpCommon.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
@@ -62,6 +69,7 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -71,9 +79,47 @@
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
+    <Link>
+      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\Aerofoil\GpColorCursor_Win32.cpp" />
+    <ClCompile Include="..\Aerofoil\GpFileStream_Win32.cpp" />
+    <ClCompile Include="..\Aerofoil\GpFileSystem_Win32.cpp" />
+    <ClCompile Include="..\Aerofoil\GpLogDriver_Win32.cpp" />
+    <ClCompile Include="..\Aerofoil\GpMutex_Win32.cpp" />
+    <ClCompile Include="..\Aerofoil\GpSystemServices_Win32.cpp" />
+    <ClCompile Include="..\Aerofoil\GpThreadEvent_Win32.cpp" />
+    <ClCompile Include="GpDisplayDriver_SDL_GL2.cpp" />
+    <ClCompile Include="GpFiberStarter_SDL.cpp" />
+    <ClCompile Include="GpFiber_SDL.cpp" />
     <ClCompile Include="GpMain_SDL_Win32.cpp" />
+    <ClCompile Include="ShaderCode\DrawQuadPaletteP.cpp" />
+    <ClCompile Include="ShaderCode\DrawQuadV.cpp" />
+    <ClCompile Include="ShaderCode\ScaleQuadP.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\GpApp\GpApp.vcxproj">
+      <Project>{6233c3f2-5781-488e-b190-4fa8836f5a77}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\GpAudioDriver_XAudio2\GpAudioDriver_XAudio2.vcxproj">
+      <Project>{e3bdc783-8646-433e-adf0-8b6390d36669}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\GpFontHandler_FreeType2\GpFontHandler_FreeType2.vcxproj">
+      <Project>{4b564030-8985-4975-91e1-e1b2c16ae2a1}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\GpInputDriver_XInput\GpInputDriver_XInput.vcxproj">
+      <Project>{17b96f07-ef92-47cd-95a5-8e6ee38ab564}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\GpShell\GpShell.vcxproj">
+      <Project>{10cf9b5f-61d0-4b5b-89f4-810b58fc053d}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="GpFiber_SDL.h" />
+    <ClInclude Include="ShaderCode\DrawQuadPixelConstants.h" />
+    <ClInclude Include="ShaderCode\Functions.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/AerofoilSDL/AerofoilSDL.vcxproj.filters b/AerofoilSDL/AerofoilSDL.vcxproj.filters
@@ -13,10 +13,63 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
+    <Filter Include="Source Files\ShaderCode">
+      <UniqueIdentifier>{85279826-1cd2-4894-a780-3f74af9c1260}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="GpMain_SDL_Win32.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\Aerofoil\GpLogDriver_Win32.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Aerofoil\GpFileSystem_Win32.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Aerofoil\GpSystemServices_Win32.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Aerofoil\GpColorCursor_Win32.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Aerofoil\GpMutex_Win32.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Aerofoil\GpThreadEvent_Win32.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Aerofoil\GpFileStream_Win32.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ShaderCode\DrawQuadV.cpp">
+      <Filter>Source Files\ShaderCode</Filter>
+    </ClCompile>
+    <ClCompile Include="ShaderCode\DrawQuadPaletteP.cpp">
+      <Filter>Source Files\ShaderCode</Filter>
+    </ClCompile>
+    <ClCompile Include="ShaderCode\ScaleQuadP.cpp">
+      <Filter>Source Files\ShaderCode</Filter>
+    </ClCompile>
+    <ClCompile Include="GpFiber_SDL.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GpFiberStarter_SDL.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GpDisplayDriver_SDL_GL2.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ShaderCode\Functions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ShaderCode\DrawQuadPixelConstants.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="GpFiber_SDL.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>