Create SwapChain based on display/cvars, clean-up

Also get SwapChain images.

Author: VReaperV

src/engine/renderer-vulkan/GraphicsCore/CapabilityPack.h

@@ -81,7 +81,10 @@ constexpr Array instanceExtensions {
 
 constexpr Array extensionsMinimal {
 	"VK_EXT_descriptor_indexing",
-	"VK_KHR_swapchain"
+	"VK_KHR_swapchain",
+	#ifdef _MSC_VER
+		"VK_EXT_full_screen_exclusive"
+	#endif
 };
 
 constexpr Array featuresMinimal {

src/engine/renderer-vulkan/GraphicsCore/GraphicsCoreCVars.cpp

@@ -39,18 +39,41 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "SwapChain.h"
 
+#include "Memory/EngineAllocator.h"
+
 #include "GraphicsCoreCVars.h"
 
-Cvar::Cvar<int> r_rendererApi( "r_rendererAPI", "Renderer API: 0: OpenGL, 1: Vulkan", Cvar::ROM, 1 );
+Cvar::Cvar<int>              r_rendererApi( "r_rendererAPI", "Renderer API: 0: OpenGL, 1: Vulkan", Cvar::ROM, 1 );
 
-Cvar::Cvar<std::string> r_vkVersion( "r_vkVersion", "Daemon-vulkan version", Cvar::ROM, DAEMON_VULKAN_VERSION.FormatVersion() );
+Cvar::Cvar<std::string>      r_vkVersion( "r_vkVersion", "Daemon-vulkan version", Cvar::ROM, DAEMON_VULKAN_VERSION.FormatVersion() );
 
 Cvar::Range<Cvar::Cvar<int>> r_vkCapabilityPack( "r_vkCapabilityPack", "CapabilityPack override",
 	Cvar::NONE, CapabilityPackType::MINIMAL, CapabilityPackType::MINIMAL, CapabilityPackType::EXPERIMENTAL );
 
-Cvar::Cvar<int> r_vkDevice( "r_vkDevice", "Use specific GPU (-1: auto)", Cvar::NONE, -1 );
+Cvar::Cvar<int>              r_vkDevice( "r_vkDevice", "Use specific GPU (-1: auto)", Cvar::NONE, -1 );
+
+Cvar::Cvar<int>              r_displayIndex( "r_displayIndex", "Display index to create the window in", Cvar::NONE, 0 );
 
 Cvar::Range<Cvar::Cvar<int>> r_vkPresentMode( "r_vkPresentMode",
 	"Presentation mode: 0 - immediate, 1 - vsync on last frame, 2 - vsync on first new frame, "
 	"3 - relaxed vsync on first new frame, 4 - vsync on the closest frame to scanout",
-	Cvar::NONE, PresentMode::IMMEDIATE, PresentMode::IMMEDIATE, PresentMode::SCANOUT_SYNC_LATEST );
+	Cvar::NONE, PresentMode::IMMEDIATE, PresentMode::IMMEDIATE, PresentMode::SCANOUT_SYNC_LATEST );
+
+Cvar::Range<Cvar::Cvar<int>> r_mode( "r_mode",
+	"Window mode: -2: use display size, -1: use r_customWidth / r_customHeight",
+	Cvar::NONE, -2, -2, -1 );
+
+Cvar::Cvar<int>              r_customWidth( "r_customWidth", "Window width when using r_mode -1", Cvar::NONE, 1920 );
+Cvar::Cvar<int>              r_customHeight( "r_customHeight", "Window height when using r_mode -1", Cvar::NONE, 1080 );
+
+// Cvar::Cvar<bool>             r_fullscreen( "r_fullscreen", "Fullscreen", Cvar::ARCHIVE, true );
+Cvar::Cvar<bool>             r_noBorder( "r_noBorder", "Borderless window", Cvar::ARCHIVE, false );
+// Cvar::Cvar<bool>             r_allowResize( "r_allowResize", "Resizable window", Cvar::ARCHIVE, false );
+
+Cvar::Range<Cvar::Cvar<int>> r_vkGraphicsMaxMemory( "r_vkGraphicsMaxMemory",
+	"Select memory allocation size for graphics engine; requires r_vkGraphicsMaxMemoryAuto",
+	Cvar::NONE, EngineAllocator::minGraphicsMemorySize, EngineAllocator::minGraphicsMemorySize, EngineAllocator::maxGraphicsMemorySize );
+
+Cvar::Cvar<bool>             r_vkGraphicsMaxMemoryAuto( "r_vkGraphicsMaxMemoryAuto",
+	"Automatically select memory allocation size based on available memory; use r_vkResourceSystemMaxMemory to set size manually",
+	Cvar::NONE, true );

src/engine/renderer-vulkan/GraphicsCore/GraphicsCoreCVars.h

@@ -38,14 +38,27 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "common/Common.h"
 
-extern Cvar::Cvar<int> r_rendererAPI;
+#include "../Math/NumberTypes.h"
 
-extern Cvar::Cvar<std::string> r_vkVersion;
+extern Cvar::Cvar<int>              r_rendererAPI;
+
+extern Cvar::Cvar<std::string>      r_vkVersion;
 
 extern Cvar::Range<Cvar::Cvar<int>> r_vkCapabilityPack;
 
-extern Cvar::Cvar<int> r_vkDevice;
+extern Cvar::Cvar<int>              r_vkDevice;
+
+extern Cvar::Cvar<int>              r_displayIndex;
 
 extern Cvar::Range<Cvar::Cvar<int>> r_vkPresentMode;
+extern Cvar::Range<Cvar::Cvar<int>> r_mode;
+extern Cvar::Cvar<int>              r_customWidth;
+extern Cvar::Cvar<int>              r_customHeight;
+extern Cvar::Modified<Cvar::Cvar<bool>> r_fullscreen;
+extern Cvar::Cvar<bool>             r_noBorder;
+// extern cvar_t*                      r_allowResize;
+
+extern Cvar::Range<Cvar::Cvar<int>> r_vkGraphicsMaxMemory;
+extern Cvar::Cvar<bool>             r_vkGraphicsMaxMemoryAuto;
 
 #endif // GRAPHICS_CORE_CVARS_H

src/engine/renderer-vulkan/GraphicsCore/SwapChain.cpp

@@ -63,7 +63,7 @@ static std::unordered_map<VkFormat, int, VkFormatHasher> surfaceFormatPriorities
 };
 
 static VkSurfaceFormat2KHR SelectSurfaceFormat( DynamicArray<VkSurfaceFormat2KHR>& formats ) {
-	VkFormat bestFormat = VK_FORMAT_UNDEFINED;
+	VkFormat bestFormat          = VK_FORMAT_UNDEFINED;
 	VkSurfaceFormat2KHR* bestFmt = &formats[0];
 
 	for ( VkSurfaceFormat2KHR& format : formats ) {
@@ -79,7 +79,7 @@ static VkSurfaceFormat2KHR SelectSurfaceFormat( DynamicArray<VkSurfaceFormat2KHR
 
 		if ( surfaceFormatPriorities[surfaceFormat] > surfaceFormatPriorities[bestFormat] ) {
 			bestFormat = surfaceFormat;
-			bestFmt = &format;
+			bestFmt    = &format;
 		}
 	}
 
@@ -106,6 +106,7 @@ static std::unordered_map<VkPresentModeKHR, uint32, VkPresentModeKHRHasher> pres
 
 static VkPresentModeKHR SelectPresentMode( DynamicArray<VkPresentModeKHR>& presentModes ) {
 	VkPresentModeKHR bestMode = presentModes[0];
+
 	for ( VkPresentModeKHR mode : presentModes ) {
 		if ( mode == r_vkPresentMode.Get() ) {
 			return mode;
@@ -127,7 +128,7 @@ void SwapChain::Init( const VkInstance instance ) {
 
 	#ifdef _MSC_VER
 		VkSurfaceFullScreenExclusiveInfoEXT fullscreenInfo {
-			.fullScreenExclusive = VK_FULL_SCREEN_EXCLUSIVE_ALLOWED_EXT
+			.fullScreenExclusive = VK_FULL_SCREEN_EXCLUSIVE_APPLICATION_CONTROLLED_EXT
 		};
 
 		surfaceInfo.pNext = &fullscreenInfo;
@@ -164,24 +165,36 @@ void SwapChain::Init( const VkInstance instance ) {
 	}
 
 	VkSurfaceCapabilitiesKHR& capabilities = capabilities2.surfaceCapabilities;
-	imageCount =
+	const uint32 minImageCount =
 		capabilities.minImageCount > 2
-		?   capabilities.minImageCount
+		? capabilities.minImageCount
 		: ( 2 <= capabilities.maxImageCount ? 2 : capabilities.maxImageCount );
 
 	minImages = capabilities.minImageCount;
 	maxImages = capabilities.maxImageCount;
 
+	VkExtent2D swapChainSize;
+
+	switch ( r_mode.Get() ) {
+		case -2:
+		default:
+			swapChainSize = capabilities.minImageExtent;
+			break;
+		case -1:
+			swapChainSize = { ( uint32 ) r_customWidth.Get(), ( uint32 ) r_customHeight.Get() };
+			break;
+	}
+
 	VkSwapchainCreateInfoKHR swapChainInfo {
-		.flags = 0,
+		.flags            = 0,
 
-		.surface = surface,
+		.surface          = surface,
 
-		.minImageCount    = imageCount,
+		.minImageCount    = minImageCount,
 		.imageFormat      = format.surfaceFormat.format,
 		.imageColorSpace  = format.surfaceFormat.colorSpace,
 
-		.imageExtent      = capabilities.minImageExtent,
+		.imageExtent      = swapChainSize,
 		.imageArrayLayers = 1,
 		.imageUsage       = capabilities.supportedUsageFlags,
 		.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE,
@@ -193,10 +206,24 @@ void SwapChain::Init( const VkInstance instance ) {
 
 		.clipped          = VK_TRUE,
 
-		.oldSwapchain = nullptr
+		.oldSwapchain     = nullptr
 	};
 
 	vkCreateSwapchainKHR( device, &swapChainInfo, nullptr, &swapChain );
+
+	#ifdef _MSC_VER
+		/* VkResult res = vkAcquireFullScreenExclusiveModeEXT( device, swapChain );
+
+		if ( res == VK_SUCCESS ) {
+			Log::Notice( "SwapChain: acquired exclusive fullscreen" );
+		} */
+	#endif
+
+	vkGetSwapchainImagesKHR( device, swapChain, &imageCount, nullptr );
+
+	images.Resize( mainSwapChain.imageCount );
+
+	vkGetSwapchainImagesKHR( device, swapChain, &imageCount, images.memory );
 }
 
 void SwapChain::Free() {

src/engine/renderer-vulkan/GraphicsCore/SwapChain.h

@@ -40,6 +40,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "../Math/NumberTypes.h"
 
+#include "../Memory/DynamicArray.h"
+
 #include "GraphicsResource.h"
 
 namespace PresentMode {
@@ -53,12 +55,14 @@ namespace PresentMode {
 }
 
 struct SwapChain : public GraphicsResource {
-	VkSurfaceKHR surface;
+	VkSurfaceKHR   surface;
 	VkSwapchainKHR swapChain;
 
-	uint32 minImages;
-	uint32 maxImages;
-	uint32 imageCount;
+	uint32         minImages;
+	uint32         maxImages;
+	uint32         imageCount;
+
+	DynamicArray<VkImage> images;
 
 	void Init( const VkInstance instance );
 	void Free() override;

src/engine/renderer-vulkan/RefAPI.cpp

@@ -44,10 +44,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "Thread/ThreadMemory.h"
 #include "Thread/ThreadUplink.h"
 
-Cvar::Modified<Cvar::Cvar<bool>> r_fullscreen( "r_fullscreen", "use full-screen window", CVAR_ARCHIVE, true );
-
-cvar_t* r_allowResize;
-
 // struct SDL_Window* window;
 
 #include "Surface/Surface.h"
@@ -56,8 +52,13 @@ cvar_t* r_allowResize;
 #include "engine/framework/System.h"
 #include "Thread/SyncTask.h"
 
+#include "GraphicsCore/GraphicsCoreCVars.h"
+
 SDL_Window* window;
 
+Cvar::Modified<Cvar::Cvar<bool>> r_fullscreen( "r_fullscreen", "Fullscreen", Cvar::ARCHIVE, true );
+cvar_t*                          r_allowResize;
+
 static Cvar::Cvar<int> r_width( "r_width", "width", Cvar::NONE, 0 );
 static Cvar::Cvar<int> r_height( "r_height", "height", Cvar::NONE, 0 );
 

src/engine/renderer-vulkan/Surface/Surface.cpp

@@ -35,11 +35,78 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "engine/qcommon/q_shared.h"
 
+#include "../GraphicsCore/GraphicsCoreCVars.h"
+
 #include "Surface.h"
 
 Surface::Surface() {
-	window = SDL_CreateWindow( CLIENT_WINDOW_TITLE, 1920, 1080, SDL_WINDOW_VULKAN );
 	SDL_InitSubSystem( SDL_INIT_VIDEO );
+
+	// See the SDL wiki page for details: https://wiki.libsdl.org/SDL3/SDL_SetAppMetadataProperty
+	SDL_SetAppMetadataProperty( SDL_PROP_APP_METADATA_NAME_STRING, PRODUCT_NAME );
+	SDL_SetAppMetadataProperty( SDL_PROP_APP_METADATA_VERSION_STRING, PRODUCT_VERSION );
+	SDL_SetAppMetadataProperty( SDL_PROP_APP_METADATA_TYPE_STRING, "game" );
+
+	/* Let X11 and Wayland desktops (Linux, FreeBSD…) associate the game
+	window with the XDG .desktop file, with the proper name and icon.
+	The .desktop file should have PRODUCT_APPID as base name or set the
+	StartupWMClass variable to PRODUCT_APPID. */
+	SDL_SetAppMetadataProperty( SDL_PROP_APP_METADATA_IDENTIFIER_STRING, PRODUCT_APPID );
+
+	/* Disable DPI scaling.
+	See the SDL wiki page for details: https://wiki.libsdl.org/SDL3/SDL_HINT_VIDEO_WAYLAND_SCALE_TO_DISPLAY */
+	SDL_SetHint( SDL_HINT_VIDEO_WAYLAND_SCALE_TO_DISPLAY, "1" );
+
+	int displayCount;
+	SDL_DisplayID* displayIDs = SDL_GetDisplays( &displayCount );
+
+	if ( !displayIDs ) {
+		Sys::Error( "SDL_GetDisplays failed: %s", SDL_GetError() );
+	}
+
+	if ( displayCount <= 0 ) {
+		Sys::Error( "SDL_GetDisplays returned 0 displays" );
+	}
+
+	const int displayID = r_displayIndex.Get() >= 0 && r_displayIndex.Get() < displayCount ? displayIDs[r_displayIndex.Get()] : 0;
+
+	SDL_free( displayIDs );
+
+	int width;
+	int height;
+	const SDL_DisplayMode* displayMode = SDL_GetDesktopDisplayMode( displayID );
+
+	switch ( r_mode.Get() ) {
+		case -2:
+		default:
+			width  = displayMode->w;
+			height = displayMode->h;
+
+			break;
+
+		case -1:
+			width  = r_customWidth.Get();
+			height = r_customHeight.Get();
+			break;
+	}
+
+	SDL_WindowFlags flags = SDL_WINDOW_VULKAN;
+
+	if ( r_fullscreen.Get() ) {
+		flags |= SDL_WINDOW_FULLSCREEN;
+	} else if ( r_noBorder.Get() ) {
+		flags |= SDL_WINDOW_BORDERLESS;
+	}
+
+	/* if ( r_allowResize.Get() ) {
+		flags |= SDL_WINDOW_RESIZABLE;
+	} */
+
+	window = SDL_CreateWindow( CLIENT_WINDOW_TITLE, width, height, flags );
+
+	if ( !window ) {
+		Sys::Drop( "SDL: failed to create window" );
+	}
 }
 
 Surface::~Surface() {