Remove Vulkan renderer

FNA-XNA · Oct 24, 2024 · 23cd054 · 23cd054
1 parent b6c8692
commit 23cd054
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 14,800 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -2,6 +2,3 @@
 	path = MojoShader
 	url = https://github.com/icculus/mojoshader
 	branch = main
-[submodule "Vulkan-Headers"]
-	path = Vulkan-Headers
-	url = https://github.com/KhronosGroup/Vulkan-Headers
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -48,7 +48,6 @@ endif()
 
 # Defines
 add_definitions(
-	-DFNA3D_DRIVER_VULKAN
 	-DFNA3D_DRIVER_OPENGL
 )
 if(BUILD_SDL3)
@@ -85,9 +84,6 @@ else()
 endif()
 
 if(EMSCRIPTEN)
-	remove_definitions(
-		-DFNA3D_DRIVER_VULKAN
-	)
 	add_definitions(
 		-DSUPPORT_PROFILE_GLSPIRV=0
 		-DSUPPORT_PROFILE_SPIRV=0
@@ -103,19 +99,13 @@ add_library(FNA3D
 	src/FNA3D_Driver.h
 	src/FNA3D_Driver_OpenGL.h
 	src/FNA3D_Driver_OpenGL_glfuncs.h
-	src/FNA3D_Driver_Vulkan_vkfuncs.h
-	src/FNA3D_CommandBuffer.h
-	src/FNA3D_Memory.h
 	src/FNA3D_PipelineCache.h
 	# Source Files
 	src/FNA3D.c
 	src/FNA3D_Driver_D3D11.c
 	src/FNA3D_Driver_OpenGL.c
 	src/FNA3D_Driver_SDL.c
-	src/FNA3D_Driver_Vulkan.c
 	src/FNA3D_Image.c
-	src/FNA3D_CommandBuffer.c
-	src/FNA3D_Memory.c
 	src/FNA3D_PipelineCache.c
 	src/FNA3D_Tracing.c
 )
@@ -125,7 +115,6 @@ add_library(mojoshader STATIC
 	MojoShader/mojoshader_common.c
 	MojoShader/mojoshader_d3d11.c
 	MojoShader/mojoshader_opengl.c
-	MojoShader/mojoshader_vulkan.c
 	MojoShader/mojoshader_sdlgpu.c
 	MojoShader/profiles/mojoshader_profile_common.c
 	MojoShader/profiles/mojoshader_profile_glsl.c
@@ -152,7 +141,6 @@ endif()
 target_include_directories(FNA3D PUBLIC
 	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
 	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers/include>
 )
 if(BUILD_DXVK_NATIVE)
 	add_definitions(-DFNA3D_DXVK_NATIVE)
@@ -161,7 +149,6 @@ if(BUILD_DXVK_NATIVE)
 endif()
 target_include_directories(mojoshader PUBLIC
 	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MojoShader>
-	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers/include>
 )
 
 # MinGW builds should statically link libgcc

diff --git a/README b/README
@@ -10,8 +10,8 @@ About FNA3D
 -----------
 FNA3D was written to be used for FNA's Graphics namespace. It carries the same
 API design as XNA 4.0, with various implementations available at runtime
-(including Vulkan, OpenGL, Metal via MoltenVK, and Direct3D). For shaders,
-we support Direct3D 9 Effect Framework binaries via MojoShader.
+(including SDL_GPU, OpenGL, and Direct3D). For shaders, we support Direct3D 9
+Effect Framework binaries via MojoShader.
 
 Note that while FNA is the main consumer of FNA3D, we do NOT provide separate C#
 bindings. If you want to use FNA3D in C#, simply use FNA instead; it's the same

diff --git a/Vulkan-Headers b/Vulkan-Headers
diff --git a/Xcode/FNA3D.xcodeproj/project.pbxproj b/Xcode/FNA3D.xcodeproj/project.pbxproj
@@ -7,10 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		021FF3972A4A764500A63B55 /* FNA3D_Memory.c in Sources */ = {isa = PBXBuildFile; fileRef = 021FF3962A4A764500A63B55 /* FNA3D_Memory.c */; };
-		021FF3982A4A764500A63B55 /* FNA3D_Memory.c in Sources */ = {isa = PBXBuildFile; fileRef = 021FF3962A4A764500A63B55 /* FNA3D_Memory.c */; };
-		02FD608F2A7B227300E1D7A5 /* FNA3D_CommandBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 02FD608E2A7B227300E1D7A5 /* FNA3D_CommandBuffer.c */; };
-		02FD60902A7B227300E1D7A5 /* FNA3D_CommandBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 02FD608E2A7B227300E1D7A5 /* FNA3D_CommandBuffer.c */; };
 		7B8B6CBE24452690001C08D6 /* mojoshader_common.c in Sources */ = {isa = PBXBuildFile; fileRef = 7B8B6CB824452690001C08D6 /* mojoshader_common.c */; };
 		7B8B6CBF24452690001C08D6 /* mojoshader_common.c in Sources */ = {isa = PBXBuildFile; fileRef = 7B8B6CB824452690001C08D6 /* mojoshader_common.c */; };
 		7B8B6CC224452690001C08D6 /* mojoshader.c in Sources */ = {isa = PBXBuildFile; fileRef = 7B8B6CBA24452690001C08D6 /* mojoshader.c */; };
@@ -25,26 +21,18 @@
 		7BC01C072B4348F300941563 /* mojoshader_profile_spirv.c in Sources */ = {isa = PBXBuildFile; fileRef = 7BF94B9F275C046100050413 /* mojoshader_profile_spirv.c */; };
 		7BC01C082B4348F300941563 /* mojoshader.c in Sources */ = {isa = PBXBuildFile; fileRef = 7B8B6CBA24452690001C08D6 /* mojoshader.c */; };
 		7BC01C092B4348F300941563 /* mojoshader_common.c in Sources */ = {isa = PBXBuildFile; fileRef = 7B8B6CB824452690001C08D6 /* mojoshader_common.c */; };
-		7BC01C0A2B4348F300941563 /* mojoshader_vulkan.c in Sources */ = {isa = PBXBuildFile; fileRef = 7BF94B9C275C044E00050413 /* mojoshader_vulkan.c */; };
 		7BC01C0B2B4348F300941563 /* mojoshader_profile_common.c in Sources */ = {isa = PBXBuildFile; fileRef = 7B8B6CC6244526A7001C08D6 /* mojoshader_profile_common.c */; };
 		7BC01C0C2B4348F300941563 /* mojoshader_effects.c in Sources */ = {isa = PBXBuildFile; fileRef = 7B8B6CBB24452690001C08D6 /* mojoshader_effects.c */; };
-		7BC01C0D2B4348F700941563 /* FNA3D_Driver_Vulkan.c in Sources */ = {isa = PBXBuildFile; fileRef = 7BF94B99275C042200050413 /* FNA3D_Driver_Vulkan.c */; };
-		7BC01C0E2B4348F700941563 /* FNA3D_CommandBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 02FD608E2A7B227300E1D7A5 /* FNA3D_CommandBuffer.c */; };
 		7BC01C0F2B4348F700941563 /* FNA3D_Image.c in Sources */ = {isa = PBXBuildFile; fileRef = 7BF8206C2445254300736AB0 /* FNA3D_Image.c */; };
 		7BC01C102B4348F700941563 /* FNA3D_PipelineCache.c in Sources */ = {isa = PBXBuildFile; fileRef = 7BF8206E2445254300736AB0 /* FNA3D_PipelineCache.c */; };
 		7BC01C112B4348F700941563 /* FNA3D.c in Sources */ = {isa = PBXBuildFile; fileRef = 7BF820682445254300736AB0 /* FNA3D.c */; };
-		7BC01C122B4348F700941563 /* FNA3D_Memory.c in Sources */ = {isa = PBXBuildFile; fileRef = 021FF3962A4A764500A63B55 /* FNA3D_Memory.c */; };
 		7BC01C142B43490100941563 /* FNA3D_Driver_OpenGL.c in Sources */ = {isa = PBXBuildFile; fileRef = 7BC01C132B43490100941563 /* FNA3D_Driver_OpenGL.c */; };
 		7BF820702445254300736AB0 /* FNA3D.c in Sources */ = {isa = PBXBuildFile; fileRef = 7BF820682445254300736AB0 /* FNA3D.c */; };
 		7BF820712445254300736AB0 /* FNA3D.c in Sources */ = {isa = PBXBuildFile; fileRef = 7BF820682445254300736AB0 /* FNA3D.c */; };
 		7BF820782445254300736AB0 /* FNA3D_Image.c in Sources */ = {isa = PBXBuildFile; fileRef = 7BF8206C2445254300736AB0 /* FNA3D_Image.c */; };
 		7BF820792445254300736AB0 /* FNA3D_Image.c in Sources */ = {isa = PBXBuildFile; fileRef = 7BF8206C2445254300736AB0 /* FNA3D_Image.c */; };
 		7BF8207C2445254300736AB0 /* FNA3D_PipelineCache.c in Sources */ = {isa = PBXBuildFile; fileRef = 7BF8206E2445254300736AB0 /* FNA3D_PipelineCache.c */; };
 		7BF8207D2445254300736AB0 /* FNA3D_PipelineCache.c in Sources */ = {isa = PBXBuildFile; fileRef = 7BF8206E2445254300736AB0 /* FNA3D_PipelineCache.c */; };
-		7BF94B9A275C042200050413 /* FNA3D_Driver_Vulkan.c in Sources */ = {isa = PBXBuildFile; fileRef = 7BF94B99275C042200050413 /* FNA3D_Driver_Vulkan.c */; };
-		7BF94B9B275C042200050413 /* FNA3D_Driver_Vulkan.c in Sources */ = {isa = PBXBuildFile; fileRef = 7BF94B99275C042200050413 /* FNA3D_Driver_Vulkan.c */; };
-		7BF94B9D275C044E00050413 /* mojoshader_vulkan.c in Sources */ = {isa = PBXBuildFile; fileRef = 7BF94B9C275C044E00050413 /* mojoshader_vulkan.c */; };
-		7BF94B9E275C044E00050413 /* mojoshader_vulkan.c in Sources */ = {isa = PBXBuildFile; fileRef = 7BF94B9C275C044E00050413 /* mojoshader_vulkan.c */; };
 		7BF94BA0275C046100050413 /* mojoshader_profile_spirv.c in Sources */ = {isa = PBXBuildFile; fileRef = 7BF94B9F275C046100050413 /* mojoshader_profile_spirv.c */; };
 		7BF94BA1275C046100050413 /* mojoshader_profile_spirv.c in Sources */ = {isa = PBXBuildFile; fileRef = 7BF94B9F275C046100050413 /* mojoshader_profile_spirv.c */; };
 /* End PBXBuildFile section */
@@ -151,9 +139,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		021FF3962A4A764500A63B55 /* FNA3D_Memory.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = FNA3D_Memory.c; path = ../src/FNA3D_Memory.c; sourceTree = "<group>"; };
-		02FD608D2A7B226300E1D7A5 /* FNA3D_CommandBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FNA3D_CommandBuffer.h; path = ../src/FNA3D_CommandBuffer.h; sourceTree = "<group>"; };
-		02FD608E2A7B227300E1D7A5 /* FNA3D_CommandBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = FNA3D_CommandBuffer.c; path = ../src/FNA3D_CommandBuffer.c; sourceTree = "<group>"; };
 		7B1CDD452190C0A200175C7B /* libFNA3D.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libFNA3D.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		7B7E140D2190E0CB00616654 /* libFNA3D.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libFNA3D.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		7B81CE172B434A04007EC76D /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = ../../SDL2/Xcode/SDL/SDL.xcodeproj; sourceTree = "<group>"; };
@@ -171,8 +156,6 @@
 		7BF820682445254300736AB0 /* FNA3D.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = FNA3D.c; path = ../src/FNA3D.c; sourceTree = "<group>"; };
 		7BF8206C2445254300736AB0 /* FNA3D_Image.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = FNA3D_Image.c; path = ../src/FNA3D_Image.c; sourceTree = "<group>"; };
 		7BF8206E2445254300736AB0 /* FNA3D_PipelineCache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = FNA3D_PipelineCache.c; path = ../src/FNA3D_PipelineCache.c; sourceTree = "<group>"; };
-		7BF94B99275C042200050413 /* FNA3D_Driver_Vulkan.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = FNA3D_Driver_Vulkan.c; path = ../src/FNA3D_Driver_Vulkan.c; sourceTree = "<group>"; };
-		7BF94B9C275C044E00050413 /* mojoshader_vulkan.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mojoshader_vulkan.c; path = ../MojoShader/mojoshader_vulkan.c; sourceTree = "<group>"; };
 		7BF94B9F275C046100050413 /* mojoshader_profile_spirv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mojoshader_profile_spirv.c; path = ../MojoShader/profiles/mojoshader_profile_spirv.c; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -227,9 +210,6 @@
 		7B1CDDA62190C50300175C7B /* Library Source */ = {
 			isa = PBXGroup;
 			children = (
-				02FD608E2A7B227300E1D7A5 /* FNA3D_CommandBuffer.c */,
-				021FF3962A4A764500A63B55 /* FNA3D_Memory.c */,
-				7BF94B99275C042200050413 /* FNA3D_Driver_Vulkan.c */,
 				7BC01C132B43490100941563 /* FNA3D_Driver_OpenGL.c */,
 				7BF8206C2445254300736AB0 /* FNA3D_Image.c */,
 				7BF8206E2445254300736AB0 /* FNA3D_PipelineCache.c */,
@@ -241,7 +221,6 @@
 		7B1CDDA72190C52900175C7B /* Public Headers */ = {
 			isa = PBXGroup;
 			children = (
-				02FD608D2A7B226300E1D7A5 /* FNA3D_CommandBuffer.h */,
 				7BF820652445251D00736AB0 /* FNA3D_SysRenderer.h */,
 				7BF820662445251D00736AB0 /* FNA3D_Image.h */,
 				7BF820672445251D00736AB0 /* FNA3D.h */,
@@ -273,7 +252,6 @@
 				7BC01C052B4348EC00941563 /* mojoshader_profile_glsl.c */,
 				7BC01C032B4348CD00941563 /* mojoshader_opengl.c */,
 				7BF94B9F275C046100050413 /* mojoshader_profile_spirv.c */,
-				7BF94B9C275C044E00050413 /* mojoshader_vulkan.c */,
 				7B8B6CC6244526A7001C08D6 /* mojoshader_profile_common.c */,
 				7B8B6CB824452690001C08D6 /* mojoshader_common.c */,
 				7B8B6CBB24452690001C08D6 /* mojoshader_effects.c */,
@@ -483,14 +461,10 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				021FF3972A4A764500A63B55 /* FNA3D_Memory.c in Sources */,
 				7BF94BA0275C046100050413 /* mojoshader_profile_spirv.c in Sources */,
 				7B8B6CC9244526A7001C08D6 /* mojoshader_profile_common.c in Sources */,
-				7BF94B9A275C042200050413 /* FNA3D_Driver_Vulkan.c in Sources */,
 				7B8B6CC224452690001C08D6 /* mojoshader.c in Sources */,
 				7B8B6CC424452690001C08D6 /* mojoshader_effects.c in Sources */,
-				02FD608F2A7B227300E1D7A5 /* FNA3D_CommandBuffer.c in Sources */,
-				7BF94B9D275C044E00050413 /* mojoshader_vulkan.c in Sources */,
 				7BF820702445254300736AB0 /* FNA3D.c in Sources */,
 				7B8B6CBE24452690001C08D6 /* mojoshader_common.c in Sources */,
 				7BF8207C2445254300736AB0 /* FNA3D_PipelineCache.c in Sources */,
@@ -502,14 +476,10 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				021FF3982A4A764500A63B55 /* FNA3D_Memory.c in Sources */,
 				7BF94BA1275C046100050413 /* mojoshader_profile_spirv.c in Sources */,
 				7B8B6CCA244526A7001C08D6 /* mojoshader_profile_common.c in Sources */,
-				7BF94B9B275C042200050413 /* FNA3D_Driver_Vulkan.c in Sources */,
 				7B8B6CC324452690001C08D6 /* mojoshader.c in Sources */,
 				7B8B6CC524452690001C08D6 /* mojoshader_effects.c in Sources */,
-				02FD60902A7B227300E1D7A5 /* FNA3D_CommandBuffer.c in Sources */,
-				7BF94B9E275C044E00050413 /* mojoshader_vulkan.c in Sources */,
 				7BF820712445254300736AB0 /* FNA3D.c in Sources */,
 				7B8B6CBF24452690001C08D6 /* mojoshader_common.c in Sources */,
 				7BF8207D2445254300736AB0 /* FNA3D_PipelineCache.c in Sources */,
@@ -523,18 +493,14 @@
 			files = (
 				7BC01C0C2B4348F300941563 /* mojoshader_effects.c in Sources */,
 				7BC01C0B2B4348F300941563 /* mojoshader_profile_common.c in Sources */,
-				7BC01C0E2B4348F700941563 /* FNA3D_CommandBuffer.c in Sources */,
 				7BC01C112B4348F700941563 /* FNA3D.c in Sources */,
 				7BC01C0F2B4348F700941563 /* FNA3D_Image.c in Sources */,
-				7BC01C122B4348F700941563 /* FNA3D_Memory.c in Sources */,
 				7BC01C042B4348CD00941563 /* mojoshader_opengl.c in Sources */,
 				7BC01C082B4348F300941563 /* mojoshader.c in Sources */,
-				7BC01C0D2B4348F700941563 /* FNA3D_Driver_Vulkan.c in Sources */,
 				7BC01C142B43490100941563 /* FNA3D_Driver_OpenGL.c in Sources */,
 				7BC01C102B4348F700941563 /* FNA3D_PipelineCache.c in Sources */,
 				7BC01C062B4348ED00941563 /* mojoshader_profile_glsl.c in Sources */,
 				7BC01C072B4348F300941563 /* mojoshader_profile_spirv.c in Sources */,
-				7BC01C0A2B4348F300941563 /* mojoshader_vulkan.c in Sources */,
 				7BC01C092B4348F300941563 /* mojoshader_common.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -584,7 +550,6 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
-					FNA3D_DRIVER_VULKAN,
 					MOJOSHADER_NO_VERSION_INCLUDE,
 					MOJOSHADER_USE_SDL_STDLIB,
 					MOJOSHADER_EFFECT_SUPPORT,
@@ -610,7 +575,6 @@
 				HEADER_SEARCH_PATHS = (
 					../../SDL2/include,
 					../mojoshader/,
-					"../Vulkan-Headers/include",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
@@ -661,7 +625,6 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
-					FNA3D_DRIVER_VULKAN,
 					MOJOSHADER_NO_VERSION_INCLUDE,
 					MOJOSHADER_USE_SDL_STDLIB,
 					MOJOSHADER_EFFECT_SUPPORT,
@@ -687,7 +650,6 @@
 				HEADER_SEARCH_PATHS = (
 					../../SDL2/include,
 					../mojoshader/,
-					"../Vulkan-Headers/include",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;

diff --git a/include/FNA3D_SysRenderer.h b/include/FNA3D_SysRenderer.h
@@ -44,7 +44,7 @@ extern "C" {
 typedef enum FNA3D_SysRendererTypeEXT
 {
 	FNA3D_RENDERER_TYPE_OPENGL_EXT,
-	FNA3D_RENDERER_TYPE_VULKAN_EXT,
+	FNA3D_RENDERER_TYPE_VULKAN_EXT, /* REMOVED, DO NOT USE */
 	FNA3D_RENDERER_TYPE_D3D11_EXT,
 	FNA3D_RENDERER_TYPE_METAL_EXT, /* REMOVED, DO NOT USE */
 	FNA3D_RENDERER_TYPE_SDL_GPU_EXT,