D3D12: Fix shader model check, initialization error handling

Author: KeyboardDanni

drivers/d3d12/rendering_device_driver_d3d12.cpp

@@ -5819,8 +5819,7 @@ Error RenderingDeviceDriverD3D12::_check_capabilities() {
 			D3D_SHADER_MODEL_6_4,
 			D3D_SHADER_MODEL_6_3,
 			D3D_SHADER_MODEL_6_2,
-			D3D_SHADER_MODEL_6_1,
-			D3D_SHADER_MODEL_6_0, // Determined by NIR (dxil_min_shader_model).
+			D3D_SHADER_MODEL_6_1, // Reported by users to be minimum (previously was determined by NIR (dxil_min_shader_model)).
 		};
 
 		D3D12_FEATURE_DATA_SHADER_MODEL shader_model = {};
@@ -5839,7 +5838,7 @@ Error RenderingDeviceDriverD3D12::_check_capabilities() {
 
 #define D3D_SHADER_MODEL_TO_STRING(m_sm) vformat("%d.%d", (m_sm >> 4), (m_sm & 0xf))
 
-		ERR_FAIL_COND_V_MSG(!shader_capabilities.shader_model, ERR_UNAVAILABLE,
+		ERR_FAIL_COND_V_MSG(shader_capabilities.shader_model < SMS_TO_CHECK[ARRAY_SIZE(SMS_TO_CHECK) - 1], ERR_UNAVAILABLE,
 				vformat("No support for any of the suitable shader models (%s-%s) has been found.", D3D_SHADER_MODEL_TO_STRING(SMS_TO_CHECK[ARRAY_SIZE(SMS_TO_CHECK) - 1]), D3D_SHADER_MODEL_TO_STRING(SMS_TO_CHECK[0])));
 
 		print_verbose("- Shader:");
@@ -6058,6 +6057,8 @@ Error RenderingDeviceDriverD3D12::_initialize_command_signatures() {
 }
 
 Error RenderingDeviceDriverD3D12::initialize(uint32_t p_device_index, uint32_t p_frame_count) {
+	glsl_type_singleton_init_or_ref();
+
 	context_device = context_driver->device_get(p_device_index);
 	adapter = context_driver->create_adapter(p_device_index);
 	ERR_FAIL_NULL_V(adapter, ERR_CANT_CREATE);
@@ -6087,7 +6088,5 @@ Error RenderingDeviceDriverD3D12::initialize(uint32_t p_device_index, uint32_t p
 	err = _initialize_command_signatures();
 	ERR_FAIL_COND_V(err != OK, ERR_CANT_CREATE);
 
-	glsl_type_singleton_init_or_ref();
-
 	return OK;
 }

servers/rendering/rendering_device.cpp

@@ -6688,7 +6688,6 @@ Error RenderingDevice::initialize(RenderingContextDriver *p_context, DisplayServ
 	}
 
 	frame = 0;
-	frames.resize(frame_count);
 	max_timestamp_query_elements = GLOBAL_GET("debug/settings/profiler/max_timestamp_query_elements");
 
 	device = context->device_get(device_index);
@@ -6757,6 +6756,8 @@ Error RenderingDevice::initialize(RenderingContextDriver *p_context, DisplayServ
 	// Use the processor count as the max amount of transfer workers that can be created.
 	transfer_worker_pool_max_size = OS::get_singleton()->get_processor_count();
 
+	frames.resize(frame_count);
+
 	// Create data for all the frames.
 	for (uint32_t i = 0; i < frames.size(); i++) {
 		frames[i].index = 0;
@@ -7144,7 +7145,9 @@ void RenderingDevice::finalize() {
 	_wait_for_transfer_workers();
 
 	// Delete everything the graph has created.
-	draw_graph.finalize();
+	if (!frames.is_empty()) {
+		draw_graph.finalize();
+	}
 
 	// Free all resources.
 	_free_rids(render_pipeline_owner, "Pipeline");