godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #111658 from brycehutchings/bryceh_d3d12_native_handle_fixes

Browse Source 
Fix D3D12 rendering device driver returning pointers to internal types for get_resource_native_handle instead of proper D3D12 primitives
This commit is contained in:
Thaddeus Crews
2025-10-16 12:48:04 -05:00
parent 13404515fb 1f7e7de82b
commit 2edad6860a
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/classes/RenderingDevice.xml
View File

@@ -1163,6 +1163,7 @@
<constant name="DRIVER_RESOURCE_COMMAND_QUEUE" value="3" enum="DriverResource"> <constant name="DRIVER_RESOURCE_COMMAND_QUEUE" value="3" enum="DriverResource">
The main graphics-compute command queue ([code]rid[/code] parameter is ignored). The main graphics-compute command queue ([code]rid[/code] parameter is ignored).
- Vulkan: [code]VkQueue[/code]. - Vulkan: [code]VkQueue[/code].
- D3D12: [code]ID3D12CommandQueue[/code].
- Metal: [code]MTLCommandQueue[/code]. - Metal: [code]MTLCommandQueue[/code].
</constant> </constant>
<constant name="DRIVER_RESOURCE_QUEUE_FAMILY" value="4" enum="DriverResource"> <constant name="DRIVER_RESOURCE_QUEUE_FAMILY" value="4" enum="DriverResource">
@@ -1171,6 +1172,7 @@
</constant> </constant>
<constant name="DRIVER_RESOURCE_TEXTURE" value="5" enum="DriverResource"> <constant name="DRIVER_RESOURCE_TEXTURE" value="5" enum="DriverResource">
- Vulkan: [code]VkImage[/code]. - Vulkan: [code]VkImage[/code].
- D3D12: [code]ID3D12Resource[/code].
</constant> </constant>
<constant name="DRIVER_RESOURCE_TEXTURE_VIEW" value="6" enum="DriverResource"> <constant name="DRIVER_RESOURCE_TEXTURE_VIEW" value="6" enum="DriverResource">
The view of an owned or shared texture. The view of an owned or shared texture.

8
drivers/d3d12/rendering_device_driver_d3d12.cpp
View File

@@ -5751,14 +5751,18 @@ uint64_t RenderingDeviceDriverD3D12::get_resource_native_handle(DriverResource p
return 0; return 0;
} }
case DRIVER_RESOURCE_COMMAND_QUEUE: { case DRIVER_RESOURCE_COMMAND_QUEUE: {
return (uint64_t)p_driver_id.id; const CommandQueueInfo *cmd_queue_info = (const CommandQueueInfo *)p_driver_id.id;
return (uint64_t)cmd_queue_info->d3d_queue.Get();
} }
case DRIVER_RESOURCE_QUEUE_FAMILY: { case DRIVER_RESOURCE_QUEUE_FAMILY: {
return 0; return 0;
} }
case DRIVER_RESOURCE_TEXTURE: { case DRIVER_RESOURCE_TEXTURE: {
const TextureInfo *tex_info = (const TextureInfo *)p_driver_id.id; const TextureInfo *tex_info = (const TextureInfo *)p_driver_id.id;
return (uint64_t)tex_info->main_texture; if (tex_info->main_texture) {
tex_info = tex_info->main_texture;
}
return (uint64_t)tex_info->resource;
} break; } break;
case DRIVER_RESOURCE_TEXTURE_VIEW: { case DRIVER_RESOURCE_TEXTURE_VIEW: {
const TextureInfo *tex_info = (const TextureInfo *)p_driver_id.id; const TextureInfo *tex_info = (const TextureInfo *)p_driver_id.id;