Skip to content

Commit cba4e2a

Browse files
authored
Updated Vortice.Vulkan package to the latest version 2.1.2 -> 3.0.3 (#2991)
* Changed Vortice.Vulkan package version * Updated Vortice.Vulkan package to the latest version 2.1.2 -> 3.0.3 * Missing Vortice.Vulkan API adjustments
1 parent 12c8b25 commit cba4e2a

16 files changed

+298
-258
lines changed

samples/Tests/Stride.Samples.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project>
1+
<Project>
22
<!-- NuGet resolved needed for StrideDefaultAssetsPlugin.LoadDefaultTemplates() -->
33
<Import Project="..\..\sources\targets\Stride.UnitTests.props" />
44
<PropertyGroup>

sources/Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<PackageVersion Include="System.Memory" Version="4.6.3" />
4141
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="10.0.0" />
4242
<PackageVersion Include="System.ValueTuple" Version="4.6.1" />
43-
<PackageVersion Include="Vortice.Vulkan" Version="2.1.2" />
43+
<PackageVersion Include="Vortice.Vulkan" Version="3.0.3" />
4444
<PackageVersion Include="WinPixEventRuntime" Version="1.0.240308001" />
4545
</ItemGroup>
4646
<!-- Other dependencies -->
@@ -123,4 +123,4 @@
123123
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="all" />
124124
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" PrivateAssets="all" />
125125
</ItemGroup>
126-
</Project>
126+
</Project>

sources/engine/Stride.Graphics/Vulkan/Buffer.Vulkan.cs

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using System;
55
using Stride.Core;
66
using Vortice.Vulkan;
7-
using static Vortice.Vulkan.Vulkan;
87

98
namespace 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

Comments
 (0)