diff options
Diffstat (limited to 'Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions')
| -rw-r--r-- | Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenMemory.cs | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenMemory.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenMemory.cs index cb99bdcc..f6aab74d 100644 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenMemory.cs +++ b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenMemory.cs @@ -55,15 +55,13 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions string ApplyScaling(string vector) { - int index = context.FindImageDescriptorIndex(texOp); - if ((context.Config.Stage == ShaderStage.Fragment || context.Config.Stage == ShaderStage.Compute) && texOp.Inst == Instruction.ImageLoad && !isBindless && !isIndexed) { // Image scales start after texture ones. - int scaleIndex = context.Config.GetTextureDescriptors().Length + index; + int scaleIndex = context.Config.GetTextureDescriptors().Length + context.FindImageDescriptorIndex(texOp); if (pCount == 3 && isArray) { @@ -461,12 +459,12 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions { if (intCoords) { - int index = context.FindTextureDescriptorIndex(texOp); - if ((context.Config.Stage == ShaderStage.Fragment || context.Config.Stage == ShaderStage.Compute) && !isBindless && !isIndexed) { + int index = context.FindTextureDescriptorIndex(texOp); + if (pCount == 3 && isArray) { // The array index is not scaled, just x and y. @@ -608,7 +606,18 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions } else { - return $"textureSize({samplerName}, {lodExpr}){GetMask(texOp.Index)}"; + string texCall = $"textureSize({samplerName}, {lodExpr}){GetMask(texOp.Index)}"; + + if ((context.Config.Stage == ShaderStage.Fragment || context.Config.Stage == ShaderStage.Compute) && + !isBindless && + !isIndexed) + { + int index = context.FindTextureDescriptorIndex(texOp); + + texCall = "Helper_TextureSizeUnscale(" + texCall + ", " + index + ")"; + } + + return texCall; } } |