diff --git a/src/SharpEmu.Libs/VideoOut/VulkanVideoPresenter.CachedImages.cs b/src/SharpEmu.Libs/VideoOut/VulkanVideoPresenter.CachedImages.cs index c5146dc..e0472ca 100644 --- a/src/SharpEmu.Libs/VideoOut/VulkanVideoPresenter.CachedImages.cs +++ b/src/SharpEmu.Libs/VideoOut/VulkanVideoPresenter.CachedImages.cs @@ -106,7 +106,6 @@ internal static unsafe partial class VulkanVideoPresenter public ulong Address; public ResourceSlotIdentifier ImageIdentifier; public ImageRequest Request; - public TextureRequestResolution Resolution; public CachedImage? CachedImage; public uint MipLevel; public Image Image; @@ -521,7 +520,6 @@ internal static unsafe partial class VulkanVideoPresenter Address = texture.Address, ImageIdentifier = imageIdentifier, Request = request, - Resolution = resolution, MipLevel = texture.MipLevel, IsStorage = texture.IsStorage, SamplerState = texture.Sampler, diff --git a/src/SharpEmu.Libs/VideoOut/VulkanVideoPresenter.Descriptors.cs b/src/SharpEmu.Libs/VideoOut/VulkanVideoPresenter.Descriptors.cs index 78ff2d1..aa0ed50 100644 --- a/src/SharpEmu.Libs/VideoOut/VulkanVideoPresenter.Descriptors.cs +++ b/src/SharpEmu.Libs/VideoOut/VulkanVideoPresenter.Descriptors.cs @@ -146,7 +146,6 @@ internal static unsafe partial class VulkanVideoPresenter Address = descriptor.BaseAddress, ImageIdentifier = imageIdentifier, Request = request, - Resolution = resolution, IsStorage = storage, DestinationSelect = words[3] & 0xFFFu, Width = descriptor.Width, diff --git a/tests/SharpEmu.Libs.Tests/VideoOut/PresenterImageBindingTests.cs b/tests/SharpEmu.Libs.Tests/VideoOut/PresenterImageBindingTests.cs index 9553512..5592b49 100644 --- a/tests/SharpEmu.Libs.Tests/VideoOut/PresenterImageBindingTests.cs +++ b/tests/SharpEmu.Libs.Tests/VideoOut/PresenterImageBindingTests.cs @@ -428,9 +428,14 @@ public sealed class PresenterImageBindingTests : IClassFixture AcquireTexture(presenter, texture)); Assert.NotEqual(0UL, ((ImageView)GetFieldValue(resource, "View")).Handle); - var resolution = (TextureRequestResolution)GetFieldValue(resource, "Resolution"); - Assert.Equal(resolution.Request.View.Format, resolution.ViewFormat); - Assert.NotEqual(Format.Undefined, resolution.ViewFormat); + var request = (ImageRequest)GetFieldValue(resource, "Request"); + var expected = numericClass switch + { + TextureNumericClass.Uint => Format.R32Uint, + TextureNumericClass.Sint => Format.R32Sint, + _ => Format.R32Sfloat, + }; + Assert.Equal(expected, request.View.Format); presenter.Run(() => presenter.InvokeMethod("ResetImageBindings")); presenter.Harness.Finish(); presenter.Harness.Shutdown(); @@ -446,8 +451,8 @@ public sealed class PresenterImageBindingTests : IClassFixture AcquireTexture(presenter, texture)); Assert.NotEqual(0UL, ((ImageView)GetFieldValue(resource, "View")).Handle); - var resolution = (TextureRequestResolution)GetFieldValue(resource, "Resolution"); - Assert.Equal(Format.D32Sfloat, resolution.ViewFormat); + var request = (ImageRequest)GetFieldValue(resource, "Request"); + Assert.Equal(Format.D32Sfloat, request.View.Format); presenter.Run(() => presenter.InvokeMethod("ResetImageBindings")); presenter.Harness.Finish(); presenter.Harness.Shutdown();