Merge pull request #8601 from hrydgard/vulkan

Vulkan rendering backend. Early Work-In-Progress
hrydgard · Mar 20, 2016 · 2b46ae5 · 2b46ae5
2 parents b3402ef + 0e19927
commit 2b46ae5
Show file tree

Hide file tree

Showing 130 changed files with 16,808 additions and 524 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,6 +6,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests)
 
 add_definitions(-DPPSSPP)
 
+# None of these platforms support Vulkan yet.
+add_definitions(-DNO_VULKAN)
+
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
 	set(_ARCH_64 1)
 	add_definitions(-D_ARCH_64=1)

diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj
@@ -170,6 +170,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <StringPooling>true</StringPooling>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -239,6 +240,11 @@
     <ClInclude Include="ThreadSafeList.h" />
     <ClInclude Include="Thunk.h" />
     <ClInclude Include="Timer.h" />
+    <ClInclude Include="Vulkan\SPIRVDisasm.h" />
+    <ClInclude Include="Vulkan\VulkanContext.h" />
+    <ClInclude Include="Vulkan\VulkanImage.h" />
+    <ClInclude Include="Vulkan\VulkanLoader.h" />
+    <ClInclude Include="Vulkan\VulkanMemory.h" />
     <ClInclude Include="x64Analyzer.h" />
     <ClInclude Include="x64Emitter.h" />
   </ItemGroup>
@@ -307,6 +313,11 @@
     <ClCompile Include="ThreadPools.cpp" />
     <ClCompile Include="Thunk.cpp" />
     <ClCompile Include="Timer.cpp" />
+    <ClCompile Include="Vulkan\SPIRVDisasm.cpp" />
+    <ClCompile Include="Vulkan\VulkanContext.cpp" />
+    <ClCompile Include="Vulkan\VulkanImage.cpp" />
+    <ClCompile Include="Vulkan\VulkanLoader.cpp" />
+    <ClCompile Include="Vulkan\VulkanMemory.cpp" />
     <ClCompile Include="x64Analyzer.cpp" />
     <ClCompile Include="x64Emitter.cpp" />
   </ItemGroup>

diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters
@@ -58,6 +58,21 @@
     </ClInclude>
     <ClInclude Include="GraphicsContext.h" />
     <ClInclude Include="DbgNew.h" />
+    <ClInclude Include="Vulkan\SPIRVDisasm.h">
+      <Filter>Vulkan</Filter>
+    </ClInclude>
+    <ClInclude Include="Vulkan\VulkanLoader.h">
+      <Filter>Vulkan</Filter>
+    </ClInclude>
+    <ClInclude Include="Vulkan\VulkanContext.h">
+      <Filter>Vulkan</Filter>
+    </ClInclude>
+    <ClInclude Include="Vulkan\VulkanImage.h">
+      <Filter>Vulkan</Filter>
+    </ClInclude>
+    <ClInclude Include="Vulkan\VulkanMemory.h">
+      <Filter>Vulkan</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp" />
@@ -103,6 +118,21 @@
     <ClCompile Include="GL\GLInterface\GLInterface.cpp">
       <Filter>GL\GLInterface</Filter>
     </ClCompile>
+    <ClCompile Include="Vulkan\SPIRVDisasm.cpp">
+      <Filter>Vulkan</Filter>
+    </ClCompile>
+    <ClCompile Include="Vulkan\VulkanLoader.cpp">
+      <Filter>Vulkan</Filter>
+    </ClCompile>
+    <ClCompile Include="Vulkan\VulkanContext.cpp">
+      <Filter>Vulkan</Filter>
+    </ClCompile>
+    <ClCompile Include="Vulkan\VulkanImage.cpp">
+      <Filter>Vulkan</Filter>
+    </ClCompile>
+    <ClCompile Include="Vulkan\VulkanMemory.cpp">
+      <Filter>Vulkan</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="CMakeLists.txt" />
@@ -117,5 +147,8 @@
     <Filter Include="GL\GLInterface">
       <UniqueIdentifier>{2c723cf4-75b6-406a-90c0-ebb7a13ba476}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Vulkan">
+      <UniqueIdentifier>{c14d66ef-5f7c-4565-975a-72774e7ccfb9}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
 </Project>
diff --git a/Common/GraphicsContext.h b/Common/GraphicsContext.h
@@ -22,6 +22,9 @@ class GraphicsContext {
 
 	virtual void Resize() = 0;
 
+	// Needs casting to the appropriate type, unfortunately. Should find a better solution..
+	virtual void *GetAPIContext() { return nullptr; }
+
 	virtual Thin3DContext *CreateThin3DContext() = 0;
 };