Skip to content

Commit 1f7e7de

Browse files
Fix D3D12 driver returning internal types to RenderingDevice's texture_get_native_handle/get_driver_resource
1 parent 0400b70 commit 1f7e7de

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

doc/classes/RenderingDevice.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1163,6 +1163,7 @@
11631163
<constant name="DRIVER_RESOURCE_COMMAND_QUEUE" value="3" enum="DriverResource">
11641164
The main graphics-compute command queue ([code]rid[/code] parameter is ignored).
11651165
- Vulkan: [code]VkQueue[/code].
1166+
- D3D12: [code]ID3D12CommandQueue[/code].
11661167
- Metal: [code]MTLCommandQueue[/code].
11671168
</constant>
11681169
<constant name="DRIVER_RESOURCE_QUEUE_FAMILY" value="4" enum="DriverResource">
@@ -1171,6 +1172,7 @@
11711172
</constant>
11721173
<constant name="DRIVER_RESOURCE_TEXTURE" value="5" enum="DriverResource">
11731174
- Vulkan: [code]VkImage[/code].
1175+
- D3D12: [code]ID3D12Resource[/code].
11741176
</constant>
11751177
<constant name="DRIVER_RESOURCE_TEXTURE_VIEW" value="6" enum="DriverResource">
11761178
The view of an owned or shared texture.

drivers/d3d12/rendering_device_driver_d3d12.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5679,14 +5679,18 @@ uint64_t RenderingDeviceDriverD3D12::get_resource_native_handle(DriverResource p
56795679
return 0;
56805680
}
56815681
case DRIVER_RESOURCE_COMMAND_QUEUE: {
5682-
return (uint64_t)p_driver_id.id;
5682+
const CommandQueueInfo *cmd_queue_info = (const CommandQueueInfo *)p_driver_id.id;
5683+
return (uint64_t)cmd_queue_info->d3d_queue.Get();
56835684
}
56845685
case DRIVER_RESOURCE_QUEUE_FAMILY: {
56855686
return 0;
56865687
}
56875688
case DRIVER_RESOURCE_TEXTURE: {
56885689
const TextureInfo *tex_info = (const TextureInfo *)p_driver_id.id;
5689-
return (uint64_t)tex_info->main_texture;
5690+
if (tex_info->main_texture) {
5691+
tex_info = tex_info->main_texture;
5692+
}
5693+
return (uint64_t)tex_info->resource;
56905694
} break;
56915695
case DRIVER_RESOURCE_TEXTURE_VIEW: {
56925696
const TextureInfo *tex_info = (const TextureInfo *)p_driver_id.id;

0 commit comments

Comments
 (0)