From 991784868f278b62f7e847321f0cfd7309fe2f79 Mon Sep 17 00:00:00 2001 From: gdkchan Date: Tue, 28 Jul 2020 19:01:11 -0300 Subject: Fix shader regression on Intel iGPUs by reverting layout changes (#1425) --- Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGen.cs | 2 +- Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenMemory.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions') diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGen.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGen.cs index f1537c3d..551fb229 100644 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGen.cs +++ b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGen.cs @@ -19,7 +19,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions } else if (node is AstOperand operand) { - return context.OperandManager.GetExpression(operand, context.Config.Stage); + return context.OperandManager.GetExpression(operand, context.Config); } throw new ArgumentException($"Invalid node type \"{node?.GetType().Name ?? "null"}\"."); diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenMemory.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenMemory.cs index b951798d..8866cd25 100644 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenMemory.cs +++ b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenMemory.cs @@ -113,7 +113,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions string indexExpr = GetSoureExpr(context, src2, GetSrcVarType(operation.Inst, 1)); - return OperandManager.GetAttributeName(attr, context.Config.Stage, isOutAttr: false, indexExpr); + return OperandManager.GetAttributeName(attr, context.Config, isOutAttr: false, indexExpr); } public static string LoadConstant(CodeGenContext context, AstOperation operation) -- cgit v1.2.3