Fix NRE when using buffer image array (#7159)
This commit is contained in:
parent
552c15739c
commit
460f9faf4e
@ -340,7 +340,7 @@ namespace Ryujinx.Graphics.Gpu.Image
|
|||||||
/// <returns>True if any used entries of the pool might have been modified, false otherwise</returns>
|
/// <returns>True if any used entries of the pool might have been modified, false otherwise</returns>
|
||||||
public bool SamplerPoolModified()
|
public bool SamplerPoolModified()
|
||||||
{
|
{
|
||||||
return SamplerPool.WasModified(ref _samplerPoolSequence);
|
return SamplerPool != null && SamplerPool.WasModified(ref _samplerPoolSequence);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -516,12 +516,15 @@ namespace Ryujinx.Graphics.Gpu.Image
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Check if any of our cached samplers changed on the pool.
|
// Check if any of our cached samplers changed on the pool.
|
||||||
foreach ((int samplerId, (Sampler sampler, SamplerDescriptor descriptor)) in SamplerIds)
|
if (SamplerPool != null)
|
||||||
{
|
{
|
||||||
if (SamplerPool.GetCachedItem(samplerId) != sampler ||
|
foreach ((int samplerId, (Sampler sampler, SamplerDescriptor descriptor)) in SamplerIds)
|
||||||
(sampler == null && SamplerPool.IsValidId(samplerId) && !SamplerPool.GetDescriptorRef(samplerId).Equals(descriptor)))
|
|
||||||
{
|
{
|
||||||
return true;
|
if (SamplerPool.GetCachedItem(samplerId) != sampler ||
|
||||||
|
(sampler == null && SamplerPool.IsValidId(samplerId) && !SamplerPool.GetDescriptorRef(samplerId).Equals(descriptor)))
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -899,13 +902,19 @@ namespace Ryujinx.Graphics.Gpu.Image
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Sampler sampler = samplerPool?.Get(samplerId);
|
|
||||||
|
|
||||||
entry.TextureIds[textureId] = (texture, descriptor);
|
entry.TextureIds[textureId] = (texture, descriptor);
|
||||||
entry.SamplerIds[samplerId] = (sampler, samplerPool?.GetDescriptorRef(samplerId) ?? default);
|
|
||||||
|
|
||||||
ITexture hostTexture = texture?.GetTargetTexture(bindingInfo.Target);
|
ITexture hostTexture = texture?.GetTargetTexture(bindingInfo.Target);
|
||||||
ISampler hostSampler = sampler?.GetHostSampler(texture);
|
ISampler hostSampler = null;
|
||||||
|
|
||||||
|
if (!isImage && bindingInfo.Target != Target.TextureBuffer)
|
||||||
|
{
|
||||||
|
Sampler sampler = samplerPool?.Get(samplerId);
|
||||||
|
|
||||||
|
entry.SamplerIds[samplerId] = (sampler, samplerPool?.GetDescriptorRef(samplerId) ?? default);
|
||||||
|
|
||||||
|
hostSampler = sampler?.GetHostSampler(texture);
|
||||||
|
}
|
||||||
|
|
||||||
Format format = bindingInfo.Format;
|
Format format = bindingInfo.Format;
|
||||||
|
|
||||||
|
@ -95,7 +95,7 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
{
|
{
|
||||||
_cachedCommandBufferIndex = -1;
|
_cachedCommandBufferIndex = -1;
|
||||||
_storages = null;
|
_storages = null;
|
||||||
SetDirty(_gd);
|
SetDirty(_gd, isImage: true);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void QueueWriteToReadBarriers(CommandBufferScoped cbs, PipelineStageFlags stageFlags)
|
public void QueueWriteToReadBarriers(CommandBufferScoped cbs, PipelineStageFlags stageFlags)
|
||||||
|
@ -14,13 +14,20 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
|
|
||||||
private int _bindCount;
|
private int _bindCount;
|
||||||
|
|
||||||
protected void SetDirty(VulkanRenderer gd)
|
protected void SetDirty(VulkanRenderer gd, bool isImage)
|
||||||
{
|
{
|
||||||
ReleaseDescriptorSet();
|
ReleaseDescriptorSet();
|
||||||
|
|
||||||
if (_bindCount != 0)
|
if (_bindCount != 0)
|
||||||
{
|
{
|
||||||
gd.PipelineInternal.ForceTextureDirty();
|
if (isImage)
|
||||||
|
{
|
||||||
|
gd.PipelineInternal.ForceImageDirty();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
gd.PipelineInternal.ForceTextureDirty();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -104,7 +104,7 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
{
|
{
|
||||||
_cachedCommandBufferIndex = -1;
|
_cachedCommandBufferIndex = -1;
|
||||||
_storages = null;
|
_storages = null;
|
||||||
SetDirty(_gd);
|
SetDirty(_gd, isImage: false);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void QueueWriteToReadBarriers(CommandBufferScoped cbs, PipelineStageFlags stageFlags)
|
public void QueueWriteToReadBarriers(CommandBufferScoped cbs, PipelineStageFlags stageFlags)
|
||||||
|
Loading…
Reference in New Issue
Block a user