Vulkan commit tweaks (2)

past-due · past-due · commit 10246b4ed235 · 2019-06-18T21:17:31.000-04:00
diff --git a/lib/ivis_opengl/gfx_api.h b/lib/ivis_opengl/gfx_api.h
@@ -35,13 +35,17 @@ namespace gfx_api
 {
 	// Must be implemented by backend (ex. SDL)
 	class backend_OpenGL_Impl; // see: gfx_api_gl.h
+#if defined(WZ_VULKAN_ENABLED)
 	class backend_Vulkan_Impl; // see: gfx_api_vk.h
+#endif
 	class backend_Impl_Factory
 	{
 	public:
 		virtual ~backend_Impl_Factory() {};
 		virtual std::unique_ptr<backend_OpenGL_Impl> createOpenGLBackendImpl() const = 0;
+#if defined(WZ_VULKAN_ENABLED)
 		virtual std::unique_ptr<backend_Vulkan_Impl> createVulkanBackendImpl() const = 0;
+#endif
 	};
 	//
 }
diff --git a/lib/ivis_opengl/gfx_api_vk.h b/lib/ivis_opengl/gfx_api_vk.h
@@ -467,14 +467,4 @@ struct VkRoot final : gfx_api::context
 	virtual void shutdown() override;
 };
 
-#else // !defined(WZ_VULKAN_ENABLED)
-
-namespace gfx_api
-{
-	class backend_Vulkan_Impl
-	{
-		// empty - Vulkan is disabled
-	};
-}
-
 #endif // defined(WZ_VULKAN_ENABLED)
diff --git a/lib/sdl/gfx_api_sdl.cpp b/lib/sdl/gfx_api_sdl.cpp
@@ -33,16 +33,16 @@ std::unique_ptr<gfx_api::backend_OpenGL_Impl> SDL_gfx_api_Impl_Factory::createOp
 	return std::unique_ptr<gfx_api::backend_OpenGL_Impl>(new sdl_OpenGL_Impl(window));
 }
 
+#if defined(WZ_VULKAN_ENABLED)
 std::unique_ptr<gfx_api::backend_Vulkan_Impl> SDL_gfx_api_Impl_Factory::createVulkanBackendImpl() const
 {
-#if defined(WZ_VULKAN_ENABLED) && defined(HAVE_SDL_VULKAN_H)
+#if defined(HAVE_SDL_VULKAN_H)
 	return std::unique_ptr<gfx_api::backend_Vulkan_Impl>(new sdl_Vulkan_Impl(window));
-#else
-	#if !defined(HAVE_SDL_VULKAN_H)
+#else // !defined(HAVE_SDL_VULKAN_H)
 	SDL_version compiled_version;
 	SDL_VERSION(&compiled_version);
 	debug(LOG_ERROR, "The version of SDL used for compilation (%u.%u.%u) did not have the SDL_vulkan.h header", (unsigned int)compiled_version.major, (unsigned int)compiled_version.minor, (unsigned int)compiled_version.patch);
-	#endif
 	return std::unique_ptr<gfx_api::backend_Vulkan_Impl>();
 #endif
 }
+#endif
diff --git a/lib/sdl/gfx_api_sdl.h b/lib/sdl/gfx_api_sdl.h
@@ -26,7 +26,9 @@ class SDL_gfx_api_Impl_Factory final : public gfx_api::backend_Impl_Factory
 	SDL_gfx_api_Impl_Factory(SDL_Window* window);
 
 	virtual std::unique_ptr<gfx_api::backend_OpenGL_Impl> createOpenGLBackendImpl() const override;
+#if defined(WZ_VULKAN_ENABLED)
 	virtual std::unique_ptr<gfx_api::backend_Vulkan_Impl> createVulkanBackendImpl() const override;
+#endif
 
 private:
 	SDL_Window* window;

Original file line number	Diff line number	Diff line change
`@@ -35,13 +35,17 @@ namespace gfx_api`
`35`	`35`	`{`
`36`	`36`	`// Must be implemented by backend (ex. SDL)`
`37`	`37`	`class backend_OpenGL_Impl; // see: gfx_api_gl.h`
	`38`	`+#if defined(WZ_VULKAN_ENABLED)`
`38`	`39`	`class backend_Vulkan_Impl; // see: gfx_api_vk.h`
	`40`	`+#endif`
`39`	`41`	`class backend_Impl_Factory`
`40`	`42`	`{`
`41`	`43`	`public:`
`42`	`44`	`virtual ~backend_Impl_Factory() {};`
`43`	`45`	`virtual std::unique_ptr<backend_OpenGL_Impl> createOpenGLBackendImpl() const = 0;`
	`46`	`+#if defined(WZ_VULKAN_ENABLED)`
`44`	`47`	`virtual std::unique_ptr<backend_Vulkan_Impl> createVulkanBackendImpl() const = 0;`
	`48`	`+#endif`
`45`	`49`	`};`
`46`	`50`	`//`
`47`	`51`	`}`