Logical some device features removed, more device checks.

EQMG · Mar 13, 2019 · 040ae47 · 040ae47
1 parent 77aae1c
commit 040ae47
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 32 deletions.
diff --git a/Libraries/bullet3 b/Libraries/bullet3
diff --git a/Libraries/glslang b/Libraries/glslang
diff --git a/Sources/Devices/LogicalDevice.cpp b/Sources/Devices/LogicalDevice.cpp
@@ -142,56 +142,84 @@ namespace acid
 			m_transferFamily = m_graphicsFamily;
 		}
 
-		VkPhysicalDeviceFeatures deviceFeatures = {};
-		deviceFeatures.sampleRateShading = VK_TRUE;
-		deviceFeatures.fillModeNonSolid = VK_TRUE;
-		deviceFeatures.wideLines = VK_TRUE;
-		deviceFeatures.samplerAnisotropy = VK_TRUE;
-		deviceFeatures.vertexPipelineStoresAndAtomics = VK_TRUE;
-		deviceFeatures.fragmentStoresAndAtomics = VK_TRUE;
-		deviceFeatures.shaderStorageImageExtendedFormats = VK_TRUE;
-		deviceFeatures.shaderStorageImageWriteWithoutFormat = VK_TRUE;
-		deviceFeatures.shaderClipDistance = VK_TRUE;
-		deviceFeatures.shaderCullDistance = VK_TRUE;
+		VkPhysicalDeviceFeatures enabledFeatures = {};
 
-		if (physicalDeviceFeatures.geometryShader)
+		// Enable sample rate shading filtering if supported.
+		if (physicalDeviceFeatures.sampleRateShading)
 		{
-			deviceFeatures.geometryShader = VK_TRUE;
-		}
-		else
-		{
-			Log::Error("Selected GPU does not support geometry shaders!");
+			enabledFeatures.sampleRateShading = VK_TRUE;
 		}
 
-		if (physicalDeviceFeatures.tessellationShader)
+		// Fill mode non solid is required for wireframe display.
+		if (physicalDeviceFeatures.fillModeNonSolid)
 		{
-			deviceFeatures.tessellationShader = VK_TRUE;
+			enabledFeatures.fillModeNonSolid = VK_TRUE;
+
+			// Wide lines must be present for line width > 1.0f.
+			if (physicalDeviceFeatures.wideLines)
+			{
+				enabledFeatures.wideLines = VK_TRUE;
+			}
 		}
 		else
 		{
-			Log::Error("Selected GPU does not support tessellation shaders!");
+			Log::Error("Selected GPU does not support wireframe pipelines!");
 		}
 
-		if (physicalDeviceFeatures.multiViewport)
+		if (physicalDeviceFeatures.samplerAnisotropy)
 		{
-			deviceFeatures.multiViewport = VK_TRUE;
+			enabledFeatures.samplerAnisotropy = VK_TRUE;
 		}
 		else
 		{
-			Log::Error("Selected GPU does not support multi viewports!");
+			Log::Error("Selected GPU does not support sampler anisotropy!");
 		}
 
 		if (physicalDeviceFeatures.textureCompressionBC)
 		{
-			deviceFeatures.textureCompressionBC = VK_TRUE;
+			enabledFeatures.textureCompressionBC = VK_TRUE;
 		}
 		else if (physicalDeviceFeatures.textureCompressionASTC_LDR)
 		{
-			deviceFeatures.textureCompressionASTC_LDR = VK_TRUE;
+			enabledFeatures.textureCompressionASTC_LDR = VK_TRUE;
 		}
 		else if (physicalDeviceFeatures.textureCompressionETC2)
 		{
-			deviceFeatures.textureCompressionETC2 = VK_TRUE;
+			enabledFeatures.textureCompressionETC2 = VK_TRUE;
+		}
+
+	//	enabledFeatures.vertexPipelineStoresAndAtomics = VK_TRUE;
+	//	enabledFeatures.fragmentStoresAndAtomics = VK_TRUE;
+	//	enabledFeatures.shaderStorageImageExtendedFormats = VK_TRUE;
+	//	enabledFeatures.shaderStorageImageWriteWithoutFormat = VK_TRUE;
+	//	enabledFeatures.shaderClipDistance = VK_TRUE;
+	//	enabledFeatures.shaderCullDistance = VK_TRUE;
+
+		if (physicalDeviceFeatures.geometryShader)
+		{
+			enabledFeatures.geometryShader = VK_TRUE;
+		}
+		else
+		{
+			Log::Error("Selected GPU does not support geometry shaders!");
+		}
+
+		if (physicalDeviceFeatures.tessellationShader)
+		{
+			enabledFeatures.tessellationShader = VK_TRUE;
+		}
+		else
+		{
+			Log::Error("Selected GPU does not support tessellation shaders!");
+		}
+
+		if (physicalDeviceFeatures.multiViewport)
+		{
+			enabledFeatures.multiViewport = VK_TRUE;
+		}
+		else
+		{
+			Log::Error("Selected GPU does not support multi viewports!");
 		}
 
 		VkDeviceCreateInfo deviceCreateInfo = {};
@@ -202,7 +230,7 @@ namespace acid
 		deviceCreateInfo.ppEnabledLayerNames = m_instance->GetInstanceLayers().data();
 		deviceCreateInfo.enabledExtensionCount = static_cast<uint32_t>(m_instance->GetDeviceExtensions().size());
 		deviceCreateInfo.ppEnabledExtensionNames = m_instance->GetDeviceExtensions().data();
-		deviceCreateInfo.pEnabledFeatures = &deviceFeatures;
+		deviceCreateInfo.pEnabledFeatures = &enabledFeatures;
 		Renderer::CheckVk(vkCreateDevice(m_physicalDevice->GetPhysicalDevice(), &deviceCreateInfo, nullptr, &m_logicalDevice));
 
 		vkGetDeviceQueue(m_logicalDevice, m_graphicsFamily, 0, &m_graphicsQueue);

diff --git a/Sources/Devices/LogicalDevice.hpp b/Sources/Devices/LogicalDevice.hpp
@@ -15,9 +15,11 @@ namespace acid
 		LogicalDevice(const Instance *instance, const PhysicalDevice *physicalDevice, const Surface *surface);
 
 		~LogicalDevice();
-
+		
 		const VkDevice &GetLogicalDevice() const { return m_logicalDevice; }
 
+		const VkPhysicalDeviceFeatures &GetEnabledFeatures() const { return m_enabledFeatures; }
+
 		const VkQueue &GetGraphicsQueue() const { return m_graphicsQueue; }
 
 		const VkQueue &GetPresentQueue() const { return m_presentQueue; }
@@ -45,6 +47,7 @@ namespace acid
 		const Surface *m_surface;
 
 		VkDevice m_logicalDevice;
+		VkPhysicalDeviceFeatures m_enabledFeatures;
 
 		VkQueueFlags m_supportedQueues;
 		uint32_t m_graphicsFamily;

diff --git a/Sources/Renderer/Pipelines/PipelineGraphics.cpp b/Sources/Renderer/Pipelines/PipelineGraphics.cpp
@@ -235,6 +235,12 @@ namespace acid
 	void PipelineGraphics::CreateAttributes()
 	{
 		auto physicalDevice = Renderer::Get()->GetPhysicalDevice();
+		auto logicalDevice = Renderer::Get()->GetLogicalDevice();
+
+		if (m_polygonMode == VK_POLYGON_MODE_LINE && !logicalDevice->GetEnabledFeatures().fillModeNonSolid)
+		{
+			throw std::runtime_error("Cannot create graphics pipeline with line polygon mode when logical device does not support non solid fills.");
+		}
 
 		m_inputAssemblyState.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO;
 		m_inputAssemblyState.topology = m_topology;

diff --git a/Sources/Textures/Texture.cpp b/Sources/Textures/Texture.cpp
@@ -576,7 +576,7 @@ namespace acid
 		samplerCreateInfo.addressModeW = addressMode;
 		samplerCreateInfo.mipLodBias = 0.0f;
 		samplerCreateInfo.anisotropyEnable = static_cast<VkBool32>(anisotropic);
-		samplerCreateInfo.maxAnisotropy = anisotropic ? std::min(ANISOTROPY, physicalDevice->GetProperties().limits.maxSamplerAnisotropy) : 1.0f;
+		samplerCreateInfo.maxAnisotropy = (anisotropic && logicalDevice->GetEnabledFeatures().samplerAnisotropy) ? std::min(ANISOTROPY, physicalDevice->GetProperties().limits.maxSamplerAnisotropy) : 1.0f;
 	//	samplerCreateInfo.compareEnable = VK_FALSE;
 	//	samplerCreateInfo.compareOp = VK_COMPARE_OP_ALWAYS;
 		samplerCreateInfo.minLod = 0.0f;

diff --git a/_clang-format b/_clang-format
@@ -1,7 +1,7 @@
 ---
 Language:        Cpp
 # BasedOnStyle:  LLVM
-AccessModifierOffset: -2
+AccessModifierOffset: 0
 AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false