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

Rename RDD::MemoryBarrier to avoid conflicts with the Windows headers.

Browse Source
This commit is contained in:
Ben Rog-Wilhelm
2025-09-07 16:14:33 -05:00
committed by Ben Rog-Wilhelm
parent 3c7f9b9372
commit e5ab5acd95
11 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
servers/rendering/rendering_device_driver.h
View File

@@ -339,7 +339,8 @@ public:
BARRIER_ACCESS_STORAGE_CLEAR_BIT = (1 << 27),
};
struct MemoryBarrier {
// https://github.com/godotengine/godot/pull/110360 - "MemoryBarrier" conflicts with Windows header defines
struct MemoryAccessBarrier {
BitField<BarrierAccessBits> src_access = {};
BitField<BarrierAccessBits> dst_access = {};
};
@@ -365,7 +366,7 @@ public:
CommandBufferID p_cmd_buffer,
BitField<PipelineStageBits> p_src_stages,
BitField<PipelineStageBits> p_dst_stages,
VectorView<MemoryBarrier> p_memory_barriers,
VectorView<MemoryAccessBarrier> p_memory_barriers,
VectorView<BufferBarrier> p_buffer_barriers,
VectorView<TextureBarrier> p_texture_barriers) = 0;