diff options
| author | George L. Albany <Megacake1234@gmail.com> | 2024-10-19 02:18:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-19 02:18:31 +0000 |
| commit | a480a0518a0ab12e3ccbdbc42f1072883c82bdb7 (patch) | |
| tree | 075435b3a1b3ac57a75f1ca90865f61697c053f4 /drivers/d3d12/rendering_device_driver_d3d12.cpp | |
| parent | edb8e2b1b2b09236bdcd76cb6c8b40b6fbb2abaf (diff) | |
| parent | ebbe3e8c51fcf89f6b19a74497cedb5a8c448979 (diff) | |
| download | redot-engine-a480a0518a0ab12e3ccbdbc42f1072883c82bdb7.tar.gz | |
Merge pull request #759 from Spartan322/merge/80f0b33
Merge commit godotengine/godot@80f0b33
Diffstat (limited to 'drivers/d3d12/rendering_device_driver_d3d12.cpp')
| -rw-r--r-- | drivers/d3d12/rendering_device_driver_d3d12.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/d3d12/rendering_device_driver_d3d12.cpp b/drivers/d3d12/rendering_device_driver_d3d12.cpp index 8f4079c2d9..cbe4d8b1ef 100644 --- a/drivers/d3d12/rendering_device_driver_d3d12.cpp +++ b/drivers/d3d12/rendering_device_driver_d3d12.cpp @@ -2005,6 +2005,8 @@ static D3D12_BARRIER_LAYOUT _rd_texture_layout_to_d3d12_barrier_layout(RDD::Text switch (p_texture_layout) { case RDD::TEXTURE_LAYOUT_UNDEFINED: return D3D12_BARRIER_LAYOUT_UNDEFINED; + case RDD::TEXTURE_LAYOUT_GENERAL: + return D3D12_BARRIER_LAYOUT_COMMON; case RDD::TEXTURE_LAYOUT_STORAGE_OPTIMAL: return D3D12_BARRIER_LAYOUT_UNORDERED_ACCESS; case RDD::TEXTURE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL: @@ -6177,6 +6179,8 @@ uint64_t RenderingDeviceDriverD3D12::api_trait_get(ApiTrait p_trait) { return false; case API_TRAIT_CLEARS_WITH_COPY_ENGINE: return false; + case API_TRAIT_USE_GENERAL_IN_COPY_QUEUES: + return true; default: return RenderingDeviceDriver::api_trait_get(p_trait); } |