44using System ;
55using Stride . Core ;
66using Vortice . Vulkan ;
7- using static Vortice . Vulkan . Vulkan ;
87
98namespace Stride . Graphics
109{
@@ -153,7 +152,7 @@ public unsafe void Recreate(IntPtr dataPointer)
153152 }
154153
155154 // Create buffer
156- GraphicsDevice . CheckResult ( vkCreateBuffer ( GraphicsDevice . NativeDevice , & createInfo , null , out NativeBuffer ) ) ;
155+ GraphicsDevice . CheckResult ( GraphicsDevice . NativeDeviceApi . vkCreateBuffer ( GraphicsDevice . NativeDevice , & createInfo , null , out NativeBuffer ) ) ;
157156
158157 // Allocate memory
159158 var memoryProperties = VkMemoryPropertyFlags . DeviceLocal ;
@@ -162,31 +161,31 @@ public unsafe void Recreate(IntPtr dataPointer)
162161 memoryProperties = VkMemoryPropertyFlags . HostVisible | VkMemoryPropertyFlags . HostCoherent ;
163162 }
164163
165- vkGetBufferMemoryRequirements ( GraphicsDevice . NativeDevice , NativeBuffer , out var memoryRequirements ) ;
164+ GraphicsDevice . NativeDeviceApi . vkGetBufferMemoryRequirements ( GraphicsDevice . NativeDevice , NativeBuffer , out var memoryRequirements ) ;
166165
167166 AllocateMemory ( memoryProperties , memoryRequirements ) ;
168167
169168 if ( NativeMemory != VkDeviceMemory . Null )
170169 {
171- vkBindBufferMemory ( GraphicsDevice . NativeDevice , NativeBuffer , NativeMemory , 0 ) ;
170+ GraphicsDevice . NativeDeviceApi . vkBindBufferMemory ( GraphicsDevice . NativeDevice , NativeBuffer , NativeMemory , 0 ) ;
172171 }
173172
174173 if ( SizeInBytes > 0 )
175174 {
176175 var commandBuffer = GraphicsDevice . NativeCopyCommandPools . Value . GetObject ( GraphicsDevice . CopyFence . GetCompletedValue ( ) ) ;
177176
178177 var beginInfo = new VkCommandBufferBeginInfo { sType = VkStructureType . CommandBufferBeginInfo , flags = VkCommandBufferUsageFlags . OneTimeSubmit } ;
179- vkBeginCommandBuffer ( commandBuffer , & beginInfo ) ;
178+ GraphicsDevice . NativeDeviceApi . vkBeginCommandBuffer ( commandBuffer , & beginInfo ) ;
180179
181180 // Copy to upload buffer
182181 if ( dataPointer != IntPtr . Zero )
183182 {
184183 if ( Usage == GraphicsResourceUsage . Dynamic )
185184 {
186185 void * uploadMemory ;
187- vkMapMemory ( GraphicsDevice . NativeDevice , NativeMemory , 0 , ( ulong ) SizeInBytes , VkMemoryMapFlags . None , & uploadMemory ) ;
186+ GraphicsDevice . NativeDeviceApi . vkMapMemory ( GraphicsDevice . NativeDevice , NativeMemory , 0 , ( ulong ) SizeInBytes , VkMemoryMapFlags . None , & uploadMemory ) ;
188187 MemoryUtilities . CopyWithAlignmentFallback ( uploadMemory , ( void * ) dataPointer , ( uint ) SizeInBytes ) ;
189- vkUnmapMemory ( GraphicsDevice . NativeDevice , NativeMemory ) ;
188+ GraphicsDevice . NativeDeviceApi . vkUnmapMemory ( GraphicsDevice . NativeDevice , NativeMemory ) ;
190189 }
191190 else
192191 {
@@ -197,7 +196,7 @@ public unsafe void Recreate(IntPtr dataPointer)
197196
198197 // Barrier
199198 var memoryBarrier = new VkBufferMemoryBarrier ( uploadResource , VkAccessFlags . HostWrite , VkAccessFlags . TransferRead , ( ulong ) uploadOffset , ( ulong ) sizeInBytes ) ;
200- vkCmdPipelineBarrier ( commandBuffer , VkPipelineStageFlags . Host , VkPipelineStageFlags . Transfer , VkDependencyFlags . None , memoryBarrierCount : 0 , memoryBarriers : null , bufferMemoryBarrierCount : 1 , & memoryBarrier , imageMemoryBarrierCount : 0 , imageMemoryBarriers : null ) ;
199+ GraphicsDevice . NativeDeviceApi . vkCmdPipelineBarrier ( commandBuffer , VkPipelineStageFlags . Host , VkPipelineStageFlags . Transfer , VkDependencyFlags . None , memoryBarrierCount : 0 , memoryBarriers : null , bufferMemoryBarrierCount : 1 , & memoryBarrier , imageMemoryBarrierCount : 0 , imageMemoryBarriers : null ) ;
201200
202201 // Copy
203202 var bufferCopy = new VkBufferCopy
@@ -206,20 +205,20 @@ public unsafe void Recreate(IntPtr dataPointer)
206205 dstOffset = 0 ,
207206 size = ( uint ) sizeInBytes
208207 } ;
209- vkCmdCopyBuffer ( commandBuffer , uploadResource , NativeBuffer , 1 , & bufferCopy ) ;
208+ GraphicsDevice . NativeDeviceApi . vkCmdCopyBuffer ( commandBuffer , uploadResource , NativeBuffer , 1 , & bufferCopy ) ;
210209 }
211210 }
212211 else
213212 {
214- vkCmdFillBuffer ( commandBuffer , NativeBuffer , 0 , ( uint ) bufferDescription . SizeInBytes , 0 ) ;
213+ GraphicsDevice . NativeDeviceApi . vkCmdFillBuffer ( commandBuffer , NativeBuffer , 0 , ( uint ) bufferDescription . SizeInBytes , 0 ) ;
215214 }
216215
217216 // Barrier
218217 var bufferMemoryBarrier = new VkBufferMemoryBarrier ( NativeBuffer , VkAccessFlags . TransferWrite , NativeAccessMask ) ;
219- vkCmdPipelineBarrier ( commandBuffer , VkPipelineStageFlags . Transfer , VkPipelineStageFlags . AllCommands , VkDependencyFlags . None , memoryBarrierCount : 0 , memoryBarriers : null , bufferMemoryBarrierCount : 1 , & bufferMemoryBarrier , imageMemoryBarrierCount : 0 , imageMemoryBarriers : null ) ;
218+ GraphicsDevice . NativeDeviceApi . vkCmdPipelineBarrier ( commandBuffer , VkPipelineStageFlags . Transfer , VkPipelineStageFlags . AllCommands , VkDependencyFlags . None , memoryBarrierCount : 0 , memoryBarriers : null , bufferMemoryBarrierCount : 1 , & bufferMemoryBarrier , imageMemoryBarrierCount : 0 , imageMemoryBarriers : null ) ;
220219
221220 // Close and submit
222- GraphicsDevice . CheckResult ( vkEndCommandBuffer ( commandBuffer ) ) ;
221+ GraphicsDevice . CheckResult ( GraphicsDevice . NativeDeviceApi . vkEndCommandBuffer ( commandBuffer ) ) ;
223222
224223 var copyFenceValue = GraphicsDevice . ExecuteAndWaitCopyQueueGPU ( commandBuffer ) ;
225224 GraphicsDevice . NativeCopyCommandPools . Value . RecycleObject ( GraphicsDevice . CopyFence . NextFenceValue , commandBuffer ) ;
@@ -260,7 +259,7 @@ internal unsafe VkBufferView GetShaderResourceView(PixelFormat viewFormat)
260259 //view = (Description.BufferFlags & BufferFlags.RawBuffer) != 0 ? VkBufferViewType.Raw : VkBufferViewType.Formatted,
261260 } ;
262261
263- GraphicsDevice . CheckResult ( vkCreateBufferView ( GraphicsDevice . NativeDevice , & createInfo , allocator : null , out var bufferView ) ) ;
262+ GraphicsDevice . CheckResult ( GraphicsDevice . NativeDeviceApi . vkCreateBufferView ( GraphicsDevice . NativeDevice , & createInfo , allocator : null , out var bufferView ) ) ;
264263 return bufferView ;
265264 }
266265
0 commit comments