feat: address minor mistakes with ri renderer (#492)

* feat: address minor mistakes with ri renderer

Signed-off-by: Michael Pollind <[email protected]>

* feat: fix init for adapter

Signed-off-by: Michael Pollind <[email protected]>

---------

Signed-off-by: Michael Pollind <[email protected]>

Author: pollend

source/ref_nri/r_program.c

@@ -1137,20 +1137,6 @@ struct pipeline_hash_s *RP_ResolvePipeline( struct glsl_program_s *program, stru
 	return pipeline;
 }
 
-// static NriDescriptorRangeDesc *__FindAndInsertNriDescriptorRange( const SpvReflectDescriptorBinding *binding, NriDescriptorRangeDesc **ranges)
-//{
-//	assert(ranges);
-//	for( size_t i = 0; i < arrlen( *ranges ); i++ ) {
-//		if( ( *ranges )[i].baseRegisterIndex == binding->binding ) {
-//			return &( *ranges )[i];
-//		}
-//	}
-//
-//	const size_t insertIndex = arraddnindex( (*ranges), 1 );
-//	memset( &( *ranges )[insertIndex], 0, sizeof( NriDescriptorRangeDesc ) );
-//	return &( *ranges )[insertIndex];
-// }
-
 static const struct descriptor_reflection_s *__ReflectDescriptorSet( const struct glsl_program_s *program, const struct glsl_descriptor_handle_s *handle )
 {
 	for( size_t i = 0; i < program->numDescriptorReflections; i++ ) {

source/ref_nri/r_program.h

@@ -255,7 +255,6 @@ struct glsl_program_s {
 		glsl_program_stage_t stage;
 	} shaderBin[GLSL_STAGE_MAX];
 
-	//NriPipelineLayout *layout;
 	struct pipeline_hash_s {
 		uint64_t hash;
 		union {

source/ref_nri/r_vbo.c

@@ -217,7 +217,7 @@ mesh_vbo_t *R_CreateMeshVBO(const struct mesh_vbo_desc_s* desc)
 		vertexBufferCreateInfo.pNext = NULL;
 		vertexBufferCreateInfo.flags = 0;
 		vertexBufferCreateInfo.size = vertexByteStride * desc->numVerts;
-		vertexBufferCreateInfo.usage = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT;
+		vertexBufferCreateInfo.usage = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;
 
 		VmaAllocationInfo allocationInfo = { 0 };
 		VmaAllocationCreateInfo allocInfo = { 0 };
@@ -239,7 +239,7 @@ mesh_vbo_t *R_CreateMeshVBO(const struct mesh_vbo_desc_s* desc)
 		indexBufferCreateInfo.pNext = NULL;
 		indexBufferCreateInfo.flags = 0;
 		indexBufferCreateInfo.size = desc->numElems * sizeof( elem_t );
-		indexBufferCreateInfo.usage = VK_BUFFER_USAGE_INDEX_BUFFER_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT;
+		indexBufferCreateInfo.usage = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;
 
 		VmaAllocationInfo allocationInfo = { 0 };
 		VmaAllocationCreateInfo allocInfo = { 0 };

source/ref_nri/ri_renderer.c

@@ -235,10 +235,11 @@ int EnumerateRIAdapters( struct RIRenderer_s *renderer, struct RIPhysicalAdapter
 
 				R_VK_ADD_STRUCT( &features, &features11 );
 				R_VK_ADD_STRUCT( &features, &features12 );
+				R_VK_ADD_STRUCT( &features, &features13 );
 
 				VkPhysicalDevicePresentIdFeaturesKHR presentIdFeatures = { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_ID_FEATURES_KHR };
 				if( __VK_SupportExtension( extensionProperties, extensionNum, qCToStrRef( VK_KHR_PRESENT_ID_EXTENSION_NAME ) ) ) {
-					R_VK_ADD_STRUCT( &features, &features13 );
+					R_VK_ADD_STRUCT( &features, &presentIdFeatures );
 				}
 
 				VkPhysicalDeviceMemoryProperties memoryProperties = { 0 };
@@ -252,7 +253,6 @@ int EnumerateRIAdapters( struct RIRenderer_s *renderer, struct RIPhysicalAdapter
 				memcpy(physicalAdapter->name, properties.properties.deviceName, sizeof(properties.properties.deviceName));
 				assert(sizeof(physicalAdapter->name) >= sizeof(properties.properties.deviceName));
 				physicalAdapter->vendor = VendorFromID( properties.properties.vendorID );
-				physicalAdapter->vk.physicalDevice = physicalAdapter->vk.physicalDevice;
 				physicalAdapter->vk.apiVersion = properties.properties.apiVersion;
 				physicalAdapter->presetLevel = RI_GPU_PRESET_NONE;
 				// selected preset
@@ -288,7 +288,7 @@ int EnumerateRIAdapters( struct RIRenderer_s *renderer, struct RIPhysicalAdapter
 				physicalAdapter->vk.isPresentIDSupported = presentIdFeatures.presentId;
 				physicalAdapter->vk.isBufferDeviceAddressSupported =
 					physicalAdapter->vk.apiVersion >= VK_API_VERSION_1_2 || __VK_SupportExtension( extensionProperties, extensionNum, qCToStrRef( VK_KHR_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME ) );
-				physicalAdapter->vk.isBufferDeviceAddressSupported = __VK_SupportExtension( extensionProperties, extensionNum, qCToStrRef( VK_AMD_DEVICE_COHERENT_MEMORY_EXTENSION_NAME ) );
+				physicalAdapter->vk.isAMDDeviceCoherentMemorySupported = __VK_SupportExtension( extensionProperties, extensionNum, qCToStrRef( VK_AMD_DEVICE_COHERENT_MEMORY_EXTENSION_NAME ) );
 
 				const VkPhysicalDeviceLimits *limits = &properties.properties.limits;
 
@@ -316,14 +316,16 @@ int EnumerateRIAdapters( struct RIRenderer_s *renderer, struct RIPhysicalAdapter
 				physicalAdapter->textureArrayLayerMaxNum = limits->maxImageArrayLayers;
 				physicalAdapter->typedBufferMaxDim = limits->maxTexelBufferElements;
 
-				for( uint32_t i = 0; i < memoryProperties.memoryTypeCount; i++ ) {
-					// const VkMemoryType& memoryType = m_MemoryProps.memoryTypes[i];
+				for(uint32_t i = 0; i < memoryProperties.memoryHeapCount; i++) {
 					if( ( memoryProperties.memoryHeaps[i].flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT ) != 0 && physicalAdapter->type != RI_ADAPTER_TYPE_INTEGRATED_GPU )
 						physicalAdapter->videoMemorySize += memoryProperties.memoryHeaps[i].size;
 					else
 						physicalAdapter->systemMemorySize += memoryProperties.memoryHeaps[i].size;
+				}
+
+				for( uint32_t i = 0; i < memoryProperties.memoryTypeCount; i++ ) {
 					const uint32_t uploadHeapFlags = ( VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT );
-					if( ( memoryProperties.memoryHeaps[i].flags & uploadHeapFlags ) == uploadHeapFlags )
+					if( ( memoryProperties.memoryTypes[i].propertyFlags & uploadHeapFlags ) == uploadHeapFlags )
 						physicalAdapter->deviceUploadHeapSize += memoryProperties.memoryHeaps[i].size;
 				}
 
@@ -534,6 +536,13 @@ int InitRIDevice( struct RIRenderer_s *renderer, struct RIDeviceDesc_s *init, st
 		VkExtensionProperties *extensionProperties = malloc( extensionNum * sizeof( VkExtensionProperties ) );
 		vkEnumerateDeviceExtensionProperties( physicalAdapter->vk.physicalDevice, NULL, &extensionNum, extensionProperties );
 
+		for( size_t idx = 0; idx < Q_ARRAY_COUNT( DefaultDeviceExtension ); idx++ ) {
+			if( __VK_SupportExtension( extensionProperties, extensionNum, qCToStrRef( DefaultDeviceExtension[idx] ) ) ) {
+				Com_Printf("Enabled Extension: %s", extensionProperties[idx].extensionName);
+				arrpush( enabledExtensionNames, DefaultDeviceExtension[idx] );
+			}
+		}
+		
 		for(size_t i = 0; i < extensionNum; i++) {
 			Com_Printf( "VK Extension %s - %lu", extensionProperties[i].extensionName, extensionProperties[i].specVersion);
 		}
@@ -827,12 +836,6 @@ int InitRIDevice( struct RIRenderer_s *renderer, struct RIDeviceDesc_s *init, st
    // }
 
 		vkGetPhysicalDeviceFeatures2( physicalAdapter->vk.physicalDevice, &features );
-		for( size_t idx = 0; idx < Q_ARRAY_COUNT( DefaultDeviceExtension ); idx++ ) {
-			if( __VK_SupportExtension( extensionProperties, extensionNum, qCToStrRef( DefaultDeviceExtension[idx] ) ) ) {
-				Com_Printf("Enabled Extension: %s", extensionProperties[idx].extensionName);
-				arrpush( enabledExtensionNames, DefaultDeviceExtension[idx] );
-			}
-		}
 
 		deviceCreateInfo.pNext = &features;
 		deviceCreateInfo.pQueueCreateInfos = deviceQueueCreateInfo;

source/ref_nri/ri_resource_upload.c

@@ -65,7 +65,7 @@ void RI_InitResourceUploader( struct RIDevice_s *device, struct RIResourceUpload
 			stageBufferCreateInfo.pNext = NULL;
 			stageBufferCreateInfo.flags = 0;
 			stageBufferCreateInfo.size = RI_RESOURCE_STAGE_SIZE;
-			stageBufferCreateInfo.usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT;
+			stageBufferCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;
 			VK_WrapResult(vmaCreateBuffer(device->vk.vmaAllocator, &stageBufferCreateInfo, &allocInfo, &resource->vk.stageBuffer, &resource->vk.stageAlloc, &allocationInfo));
 			resource->vk.pMappedData = allocationInfo.pMappedData;
 

source/ref_nri/ri_swapchain.c

@@ -88,21 +88,6 @@ int InitRISwapchain( struct RIDevice_s *dev, struct RISwapchainDesc_s *init, str
 		}
 	}
 #endif
-	{
-		VkBool32 supported = VK_FALSE;
-		result = vkGetPhysicalDeviceSurfaceSupportKHR(dev->physicalAdapter.vk.physicalDevice, init->queue->vk.queueFamilyIdx, swapchain->vk.surface, &supported);
-		VK_WrapResult(result);
-
-		VkSurfaceCapabilitiesKHR surfaceCaps = {0};
-		result = vkGetPhysicalDeviceSurfaceCapabilitiesKHR(dev->physicalAdapter.vk.physicalDevice, swapchain->vk.surface, &surfaceCaps);
-		VK_WrapResult(result);
-    VkPhysicalDeviceSurfaceInfo2KHR surfaceInfo = {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SURFACE_INFO_2_KHR};
-    surfaceInfo.surface = swapchain->vk.surface;
-		
-		result = vkGetPhysicalDeviceSurfaceCapabilitiesKHR(dev->physicalAdapter.vk.physicalDevice, swapchain->vk.surface, &surfaceCaps);
-		VK_WrapResult(result);
-	}
-	
 	uint32_t numSurfaceFormats = 0;
 	result = vkGetPhysicalDeviceSurfaceFormatsKHR( dev->physicalAdapter.vk.physicalDevice, swapchain->vk.surface, &numSurfaceFormats, NULL );
 	VK_WrapResult(result);