seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #110360 from zorbathut/pr/memorybarrierrename

Browse Source 
Rename RDD::MemoryBarrier to avoid conflicts with the Windows headers.
This commit is contained in:
Thaddeus Crews
2025-09-17 11:34:15 -05:00
parent b73ba6c58d e5ab5acd95
commit aa294bb3c8
11 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/metal/rendering_device_driver_metal.h
View File

@ -149,7 +149,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) override final;

2
drivers/metal/rendering_device_driver_metal.mm
View File

@ -830,7 +830,7 @@ void RenderingDeviceDriverMetal::command_pipeline_barrier(
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) {
WARN_PRINT_ONCE("not implemented");