crafterpika/MeloNX
0
0
Fork 0
mirror of https://git.743378673.xyz/MeloNX/MeloNX.git synced 2025-06-27 19:06:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

Update UpdateAndBindTexturesWithoutTemplate to have the proper UE changes

Browse source
This commit is contained in:
Stossy11 2025-06-13 11:40:24 +10:00
parent 83bf8aecae
commit 2e77bb0345
2 changed files with 64 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate generated
View file

Binary file not shown.

97
src/Ryujinx.Graphics.Vulkan/DescriptorSetUpdater.cs
View file

@ -699,13 +699,20 @@ namespace Ryujinx.Graphics.Vulkan
if (_dirty.HasFlag(DirtyFlags.Texture)) if (_dirty.HasFlag(DirtyFlags.Texture))
{ {
if (false) if (true)
{ {
UpdateAndBindTexturesWithoutTemplate(cbs, program, pbp); try
{
UpdateAndBindTexturesWithoutTemplate(cbs, program, pbp);
} catch (Exception e)
{
UpdateAndBind(cbs, program, PipelineBase.TextureSetIndex, pbp);
}
} }
else else
{ {
try { try
{
UpdateAndBind(cbs, program, PipelineBase.TextureSetIndex, pbp); UpdateAndBind(cbs, program, PipelineBase.TextureSetIndex, pbp);
} }
catch (Exception e) catch (Exception e)
@ -946,23 +953,25 @@ namespace Ryujinx.Graphics.Vulkan
_gd.Api.CmdBindDescriptorSets(cbs.CommandBuffer, pbp, _program.PipelineLayout, (uint)setIndex, 1, sets, 0, ReadOnlySpan<uint>.Empty); _gd.Api.CmdBindDescriptorSets(cbs.CommandBuffer, pbp, _program.PipelineLayout, (uint)setIndex, 1, sets, 0, ReadOnlySpan<uint>.Empty);
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private void UpdateAndBindTexturesWithoutTemplate(CommandBufferScoped cbs, ShaderCollection program, PipelineBindPoint pbp) private void UpdateAndBindTexturesWithoutTemplate(CommandBufferScoped cbs, ShaderCollection program, PipelineBindPoint pbp)
{ {
int setIndex = PipelineBase.TextureSetIndex; int setIndex = PipelineBase.TextureSetIndex;
ResourceBindingSegment[] bindingSegments = program.BindingSegments[setIndex]; var bindingSegments = program.BindingSegments[setIndex];
if (bindingSegments.Length == 0) if (bindingSegments.Length == 0)
{ {
return; return;
} }
if (_updateDescriptorCacheCbIndex) var dummyImageInfo = new DescriptorImageInfo
{ {
_updateDescriptorCacheCbIndex = false; ImageView = _dummyTexture.GetImageView().Get(cbs).Value,
program.UpdateDescriptorCacheCommandBufferIndex(cbs.CommandBufferIndex); Sampler = _dummySampler.GetSampler().Get(cbs).Value,
} ImageLayout = ImageLayout.General
};
DescriptorSetCollection dsc = program.GetNewDescriptorSetCollection(setIndex, out _).Get(cbs); var dsc = program.GetNewDescriptorSetCollection(setIndex, out _).Get(cbs);
foreach (ResourceBindingSegment segment in bindingSegments) foreach (ResourceBindingSegment segment in bindingSegments)
{ {
@ -973,56 +982,78 @@ namespace Ryujinx.Graphics.Vulkan
{ {
if (segment.Type != ResourceType.BufferTexture) if (segment.Type != ResourceType.BufferTexture)
{ {
Span<DescriptorImageInfo> textures = _textures;
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
{ {
ref DescriptorImageInfo texture = ref textures[i]; int index = binding + i;
ref TextureRef refs = ref _textureRefs[binding + i]; ref var textureRef = ref _textureRefs[index];
texture.ImageView = refs.ImageView?.Get(cbs).Value ?? default; var imageView = textureRef.ImageView?.Get(cbs).Value ?? dummyImageInfo.ImageView;
texture.Sampler = refs.Sampler?.Get(cbs).Value ?? default; var sampler = textureRef.Sampler?.Get(cbs).Value ?? dummyImageInfo.Sampler;
if (texture.ImageView.Handle == 0) var imageInfo = new DescriptorImageInfo
{ {
texture.ImageView = _dummyTexture.GetImageView().Get(cbs).Value; ImageView = imageView.Handle != 0 ? imageView : dummyImageInfo.ImageView,
} Sampler = sampler.Handle != 0 ? sampler : dummyImageInfo.Sampler,
ImageLayout = ImageLayout.General
};
if (texture.Sampler.Handle == 0) dsc.UpdateImages(0, index, new[] { imageInfo }, DescriptorType.CombinedImageSampler);
{
texture.Sampler = _dummySampler.GetSampler().Get(cbs).Value;
}
} }
dsc.UpdateImages(0, binding, textures[..count], DescriptorType.CombinedImageSampler);
} }
else else
{ {
Span<BufferView> bufferTextures = _bufferTextures;
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
{ {
bufferTextures[i] = _bufferTextureRefs[binding + i]?.GetBufferView(cbs, false) ?? default; int index = binding + i;
var bufferView = _bufferTextureRefs[index]?.GetBufferView(cbs, false) ?? default;
dsc.UpdateBufferImages(0, index, new[] { bufferView }, DescriptorType.UniformTexelBuffer);
} }
dsc.UpdateBufferImages(0, binding, bufferTextures[..count], DescriptorType.UniformTexelBuffer);
} }
} }
else else
{ {
var arrayRef = _textureArrayRefs[binding];
if (segment.Type != ResourceType.BufferTexture) if (segment.Type != ResourceType.BufferTexture)
{ {
dsc.UpdateImages(0, binding, _textureArrayRefs[binding].Array.GetImageInfos(_gd, cbs, _dummyTexture, _dummySampler), DescriptorType.CombinedImageSampler); var imageInfos = arrayRef.Array.GetImageInfos(_gd, cbs, _dummyTexture, _dummySampler);
if (imageInfos != null)
{
for (int i = 0; i < imageInfos.Length && i < count; i++)
{
dsc.UpdateImages(0, binding + i, new[] { imageInfos[i] }, DescriptorType.CombinedImageSampler);
}
}
else
{
for (int i = 0; i < count; i++)
{
dsc.UpdateImages(0, binding + i, new[] { dummyImageInfo }, DescriptorType.CombinedImageSampler);
}
}
} }
else else
{ {
dsc.UpdateBufferImages(0, binding, _textureArrayRefs[binding].Array.GetBufferViews(cbs), DescriptorType.UniformTexelBuffer); var bufferViews = arrayRef.Array.GetBufferViews(cbs);
if (bufferViews != null)
{
for (int i = 0; i < bufferViews.Length && i < count; i++)
{
dsc.UpdateBufferImages(0, binding + i, new[] { bufferViews[i] }, DescriptorType.UniformTexelBuffer);
}
}
else
{
for (int i = 0; i < count; i++)
{
dsc.UpdateBufferImages(0, binding + i, new[] { default(BufferView) }, DescriptorType.UniformTexelBuffer);
}
}
} }
} }
} }
DescriptorSet[] sets = dsc.GetSets(); var sets = dsc.GetSets();
_gd.Api.CmdBindDescriptorSets(cbs.CommandBuffer, pbp, _program.PipelineLayout, (uint)setIndex, 1, sets, 0, ReadOnlySpan<uint>.Empty); _gd.Api.CmdBindDescriptorSets(cbs.CommandBuffer, pbp, _program.PipelineLayout, (uint)setIndex, 1, sets, 0, ReadOnlySpan<uint>.Empty);
} }