Skip to content

Commit

Permalink
Bump dependencies (#731)
Browse files Browse the repository at this point in the history
  • Loading branch information
@katalash
katalash authored Oct 18, 2023
1 parent 4e50210 commit 3818112
Show file tree
Hide file tree
Showing 11 changed files with 46 additions and 46 deletions.
6 changes: 3 additions & 3 deletions SoapstoneLib/SoapstoneLib/SoapstoneLib.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

<ItemGroup>
<Protobuf Include="..\Proto\*.proto" />
<PackageReference Include="Google.Protobuf" Version="3.23.3" />
<PackageReference Include="Grpc.AspNetCore" Version="2.54.0" />
<PackageReference Include="Grpc.Net.Client" Version="2.54.0" />
<PackageReference Include="Google.Protobuf" Version="3.24.4" />
<PackageReference Include="Grpc.AspNetCore" Version="2.57.0" />
<PackageReference Include="Grpc.Net.Client" Version="2.57.0" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions SoulsFormats/SoulsFormats/SoulsFormats.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

<ItemGroup>
<PackageReference Include="BouncyCastle.Cryptography" Version="2.2.1" />
<PackageReference Include="DotNext.IO" Version="4.12.4" />
<PackageReference Include="DotNext.Unsafe" Version="4.12.4" />
<PackageReference Include="DotNext.IO" Version="4.15.0" />
<PackageReference Include="DotNext.Unsafe" Version="4.14.0" />
<PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.1.2" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions StudioCore/StudioCore.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,17 +424,17 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="DotNext.IO" Version="4.12.4" />
<PackageReference Include="DotNext.IO" Version="4.15.0" />
<PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.1.2" />
<PackageReference Include="NativeFileDialogSharp" Version="0.6.0-alpha" />
<PackageReference Include="NativeLibraryLoader" Version="1.0.13" />
<PackageReference Include="Octokit" Version="7.0.0" />
<PackageReference Include="Octokit" Version="8.1.1" />
<PackageReference Include="ProcessMemoryUtilities.Net" Version="1.3.4" />
<PackageReference Include="Silk.NET.OpenGL" Version="2.17.1" />
<PackageReference Include="Silk.NET.SDL" Version="2.17.1" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="7.0.0" />
<PackageReference Include="Vortice.Vulkan" Version="1.7.2" />
<PackageReference Include="Vortice.VulkanMemoryAllocator" Version="1.3.3" />
<PackageReference Include="Vortice.Vulkan" Version="1.8.1" />
<PackageReference Include="Vortice.VulkanMemoryAllocator" Version="1.3.9" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Veldrid.SPIRV.VariantCompiler/Veldrid.SPIRV.VariantCompiler.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.0.2" />
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
16 changes: 8 additions & 8 deletions Veldrid/CommandList.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,7 @@ public void Draw(uint vertexCount, uint instanceCount, uint vertexStart, uint in
private void DrawCore(uint vertexCount, uint instanceCount, uint vertexStart, uint instanceStart)
{
PreDrawCommand();
vkCmdDraw(_cb, (int)vertexCount, (int)instanceCount, vertexStart, instanceStart);
vkCmdDraw(_cb, vertexCount, instanceCount, vertexStart, instanceStart);
}

/// <summary>
Expand Down Expand Up @@ -886,7 +886,7 @@ public void DrawIndexed(uint indexCount, uint instanceCount, uint indexStart, in
private void DrawIndexedCore(uint indexCount, uint instanceCount, uint indexStart, int vertexOffset, uint instanceStart)
{
PreDrawCommand();
vkCmdDrawIndexed(_cb, (int)indexCount, (int)instanceCount, indexStart, vertexOffset, instanceStart);
vkCmdDrawIndexed(_cb, indexCount, instanceCount, indexStart, vertexOffset, instanceStart);
}

/// <summary>
Expand Down Expand Up @@ -920,7 +920,7 @@ public void DrawIndirect(DeviceBuffer indirectBuffer, uint offset, uint drawCoun
private void DrawIndirectCore(DeviceBuffer indirectBuffer, uint offset, uint drawCount, uint stride)
{
PreDrawCommand();
vkCmdDrawIndirect(_cb, indirectBuffer.Buffer, offset, (int)drawCount, stride);
vkCmdDrawIndirect(_cb, indirectBuffer.Buffer, offset, drawCount, stride);
}

/// <summary>
Expand Down Expand Up @@ -955,7 +955,7 @@ public void DrawIndexedIndirect(DeviceBuffer indirectBuffer, uint offset, uint d
private void DrawIndexedIndirectCore(DeviceBuffer indirectBuffer, uint offset, uint drawCount, uint stride)
{
PreDrawCommand();
vkCmdDrawIndexedIndirect(_cb, indirectBuffer.Buffer, offset, (int)drawCount, stride);
vkCmdDrawIndexedIndirect(_cb, indirectBuffer.Buffer, offset, drawCount, stride);
}

[Conditional("VALIDATE_USAGE")]
Expand Down Expand Up @@ -1492,8 +1492,8 @@ private void GenerateMipmapsCore(Texture texture)

VkImage deviceImage = texture.OptimalDeviceImage;

int blitCount = (int)texture.MipLevels - 1;
VkImageBlit* regions = stackalloc VkImageBlit[blitCount];
uint blitCount = texture.MipLevels - 1;
VkImageBlit* regions = stackalloc VkImageBlit[(int)blitCount];

for (uint level = 1; level < texture.MipLevels; level++)
{
Expand Down Expand Up @@ -1776,9 +1776,9 @@ private void FlushNewResourceSets(
int setCount = resourceSets.Length;
VkDescriptorSet* descriptorSets = stackalloc VkDescriptorSet[setCount];
uint* dynamicOffsets = stackalloc uint[pipeline.DynamicOffsetsCount];
int currentBatchCount = 0;
uint currentBatchCount = 0;
uint currentBatchFirstSet = 0;
int currentBatchDynamicOffsetCount = 0;
uint currentBatchDynamicOffsetCount = 0;

for (uint currentSlot = 0; currentSlot < resourceSets.Length; currentSlot++)
{
Expand Down
36 changes: 18 additions & 18 deletions Veldrid/GraphicsDevice.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ public void Reset(GraphicsDevice device)
VkFence* fences = stackalloc VkFence[WaitFences.Count];
for (int i = 0; i < WaitFences.Count; i++)
fences[i] = WaitFences[i];
vkWaitForFences(device._device, WaitFences.Count, fences, VkBool32.True, UInt64.MaxValue);
vkResetFences(device._device, WaitFences.Count, fences);
vkWaitForFences(device._device, (uint)WaitFences.Count, fences, VkBool32.True, UInt64.MaxValue);
vkResetFences(device._device, (uint)WaitFences.Count, fences);
foreach (var fence in WaitFences)
device._availableSubmissionFences.Enqueue(fence);
WaitFences.Clear();
Expand Down Expand Up @@ -205,10 +205,10 @@ internal GraphicsDevice(GraphicsDeviceOptions options, SwapchainDescription? scD

var allocatorInfo = new VmaAllocatorCreateInfo
{
PhysicalDevice = _physicalDevice,
Device = _device,
Instance = _instance,
VulkanApiVersion = Vortice.Vulkan.VkVersion.Version_1_3
physicalDevice = _physicalDevice,
device = _device,
instance = _instance,
vulkanApiVersion = VkVersion.Version_1_3
};
var result = Vma.vmaCreateAllocator(&allocatorInfo, out _vmaAllocator);
CheckResult(result);
Expand Down Expand Up @@ -524,7 +524,7 @@ public bool WaitForFences(Fence[] fences, bool waitAll, ulong nanosecondTimeout)
fencesPtr[i] = fences[i].DeviceFence;
}

VkResult result = vkWaitForFences(_device, fenceCount, fencesPtr, waitAll, nanosecondTimeout);
VkResult result = vkWaitForFences(_device, (uint)fenceCount, fencesPtr, waitAll, nanosecondTimeout);
return result == VkResult.Success;
}

Expand Down Expand Up @@ -1741,7 +1741,7 @@ private static uint DebugCallback(VkDebugUtilsMessageSeverityFlagsEXT severity,

private void CreatePhysicalDevice()
{
int deviceCount = 0;
uint deviceCount = 0;
vkEnumeratePhysicalDevices(_instance, &deviceCount, null);
if (deviceCount == 0)
{
Expand Down Expand Up @@ -1830,22 +1830,22 @@ private void CreatePhysicalDevice()
private void CreateLogicalDevice(VkSurfaceKHR surface, bool preferStandardClipY, VulkanDeviceOptions options)
{
// Queue selection logic is largely taken from granite
int count = 0;
uint count = 0;
vkGetPhysicalDeviceQueueFamilyProperties2(_physicalDevice, &count, null);
VkQueueFamilyProperties2* props = stackalloc VkQueueFamilyProperties2[count];
VkQueueFamilyProperties2* props = stackalloc VkQueueFamilyProperties2[(int)count];
for (uint i = 0; i < count; i++)
{
props[i] = new VkQueueFamilyProperties2();
}
vkGetPhysicalDeviceQueueFamilyProperties2(_physicalDevice, &count, props);
int queueFamilyCount = count;
uint queueFamilyCount = count;

_queueFamilyIndices = new uint[(int)QueueType.QueueTypeCount];
_queueIndices = new uint[(int)QueueType.QueueTypeCount];
_queues = new VkQueue[(int)QueueType.QueueTypeCount];

var offsets = stackalloc uint[queueFamilyCount];
var priorities = stackalloc float[queueFamilyCount * (int)QueueType.QueueTypeCount];
var offsets = stackalloc uint[(int)queueFamilyCount];
var priorities = stackalloc float[(int)queueFamilyCount * (int)QueueType.QueueTypeCount];
bool FindQueue(VkQueueFlags required, VkQueueFlags ignored, float priority, ref uint family, ref uint index)
{
for (uint i = 0; i < queueFamilyCount; i++)
Expand Down Expand Up @@ -1905,7 +1905,7 @@ ref _queueFamilyIndices[(int)QueueType.Transfer], ref _queueIndices[(int)QueueTy
_queueIndices[(int)QueueType.Transfer] = _queueIndices[(int)QueueType.Compute];
}

var queueCreateInfos = stackalloc VkDeviceQueueCreateInfo[queueFamilyCount];
var queueCreateInfos = stackalloc VkDeviceQueueCreateInfo[(int)queueFamilyCount];

uint queueCreateInfosCount = 0;
for (uint i = 0; i < queueFamilyCount; i++)
Expand Down Expand Up @@ -1964,11 +1964,11 @@ ref _queueFamilyIndices[(int)QueueType.Transfer], ref _queueIndices[(int)QueueTy
deviceFeatures11.pNext = &deviceFeatures12;
deviceFeatures12.pNext = &deviceFeatures13;

int propertyCount = 0;
VkResult result = vkEnumerateDeviceExtensionProperties(_physicalDevice, (sbyte*)null, &propertyCount, null);
uint propertyCount = 0;
VkResult result = vkEnumerateDeviceExtensionProperties(_physicalDevice, null, &propertyCount, null);
CheckResult(result);
VkExtensionProperties* properties = stackalloc VkExtensionProperties[(int)propertyCount];
result = vkEnumerateDeviceExtensionProperties(_physicalDevice, (sbyte*)null, &propertyCount, properties);
result = vkEnumerateDeviceExtensionProperties(_physicalDevice, null, &propertyCount, properties);
CheckResult(result);

HashSet<string> requiredInstanceExtensions = new HashSet<string>(options.DeviceExtensions ?? Array.Empty<string>());
Expand Down Expand Up @@ -2207,7 +2207,7 @@ private static bool CheckIsSupported()
}
vkLoadInstanceOnly(testInstance);

int physicalDeviceCount = 0;
uint physicalDeviceCount = 0;
result = vkEnumeratePhysicalDevices(testInstance, &physicalDeviceCount, null);
if (result != VkResult.Success || physicalDeviceCount == 0)
{
Expand Down
2 changes: 1 addition & 1 deletion Veldrid/ResourceSet.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ internal ResourceSet(GraphicsDevice gd, ref ResourceSetDescription description)
var vkLayout = description.Layout;

BindableResource[] boundResources = description.BoundResources;
int descriptorWriteCount = vkLayout.Description.Elements.Length;
uint descriptorWriteCount = (uint)vkLayout.Description.Elements.Length;

uint desccount = 0;
foreach (var e in vkLayout.Description.Elements)
Expand Down
4 changes: 2 additions & 2 deletions Veldrid/Swapchain.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ private bool CreateSwapchain(uint width, uint height)
}

_currentImageIndex = 0;
int surfaceFormatCount = 0;
uint surfaceFormatCount = 0;
result = vkGetPhysicalDeviceSurfaceFormatsKHR(_gd.PhysicalDevice, _surface, &surfaceFormatCount, null);
CheckResult(result);
VkSurfaceFormatKHR[] formats = new VkSurfaceFormatKHR[surfaceFormatCount];
Expand Down Expand Up @@ -210,7 +210,7 @@ private bool CreateSwapchain(uint width, uint height)
}
}

int presentModeCount = 0;
uint presentModeCount = 0;
result = vkGetPhysicalDeviceSurfacePresentModesKHR(_gd.PhysicalDevice, _surface, &presentModeCount, null);
CheckResult(result);
VkPresentModeKHR[] presentModes = new VkPresentModeKHR[presentModeCount];
Expand Down
4 changes: 2 additions & 2 deletions Veldrid/Veldrid.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<PackageReference Include="System.Buffers" Version="4.5.1" />
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
<PackageReference Include="Vortice.Vulkan" Version="1.7.2" />
<PackageReference Include="Vortice.VulkanMemoryAllocator" Version="1.3.3" />
<PackageReference Include="Vortice.Vulkan" Version="1.8.1" />
<PackageReference Include="Vortice.VulkanMemoryAllocator" Version="1.3.9" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Veldrid/VkSwapchainFramebuffer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@ internal void SetNewSwapchain(
_desiredHeight = height;

// Get the images
int scImageCount = 0;
uint scImageCount = 0;
VkResult result = vkGetSwapchainImagesKHR(_gd.Device, deviceSwapchain, &scImageCount, null);
CheckResult(result);
if (_scImages == null)
{
_scImages = new VkImage[(int)scImageCount];
}
fixed (VkImage* pscImages = _scImages)
result = vkGetSwapchainImagesKHR(_gd.Device, deviceSwapchain, &scImageCount, pscImages);
result = vkGetSwapchainImagesKHR(_gd.Device, deviceSwapchain, &scImageCount, pscImages);
CheckResult(result);

_scImageFormat = surfaceFormat.format;
Expand Down
6 changes: 3 additions & 3 deletions Veldrid/VulkanUtil.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public static uint FindMemoryType(VkPhysicalDeviceMemoryProperties memProperties

public static string[] EnumerateInstanceLayers()
{
int propCount = 0;
uint propCount = 0;
VkResult result = vkEnumerateInstanceLayerProperties(&propCount, null);
CheckResult(result);
if (propCount == 0)
Expand Down Expand Up @@ -68,7 +68,7 @@ private static string[] EnumerateInstanceExtensions()
return Array.Empty<string>();
}

int propCount = 0;
uint propCount = 0;
VkResult result = vkEnumerateInstanceExtensionProperties(null, &propCount, null);
if (result != VkResult.Success)
{
Expand Down Expand Up @@ -102,7 +102,7 @@ private static bool TryLoadVulkan()
{
try
{
int propCount;
uint propCount;
vkEnumerateInstanceExtensionProperties(null, &propCount, null);
return true;
}
Expand Down

0 comments on commit 3818112

Please sign in to comment.