manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2025-02-22 17:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix rebase build break

Browse source
This commit is contained in:
gdk 2021-11-15 14:36:07 -03:00 committed by riperiperi
parent ae783c5b5e
commit 616f14c46d
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Ryujinx.Graphics.Shader/CodeGen/Spirv/Instructions.cs
View file

@ -60,10 +60,10 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
Add(Instruction.ConditionalSelect, GenerateConditionalSelect); Add(Instruction.ConditionalSelect, GenerateConditionalSelect);
Add(Instruction.ConvertFP32ToFP64, GenerateConvertFP32ToFP64); Add(Instruction.ConvertFP32ToFP64, GenerateConvertFP32ToFP64);
Add(Instruction.ConvertFP64ToFP32, GenerateConvertFP64ToFP32); Add(Instruction.ConvertFP64ToFP32, GenerateConvertFP64ToFP32);
Add(Instruction.ConvertFP32ToS32, GenerateConvertFPToS32); Add(Instruction.ConvertFP32ToS32, GenerateConvertFP32ToS32);
Add(Instruction.ConvertFP32ToU32, GenerateConvertFPToU32); Add(Instruction.ConvertFP32ToU32, GenerateConvertFP32ToU32);
Add(Instruction.ConvertS32ToFP32, GenerateConvertS32ToFP); Add(Instruction.ConvertS32ToFP32, GenerateConvertS32ToFP32);
Add(Instruction.ConvertU32ToFP32, GenerateConvertU32ToFP); Add(Instruction.ConvertU32ToFP32, GenerateConvertU32ToFP32);
Add(Instruction.Cosine, GenerateCosine); Add(Instruction.Cosine, GenerateCosine);
Add(Instruction.Ddx, GenerateDdx); Add(Instruction.Ddx, GenerateDdx);
Add(Instruction.Ddy, GenerateDdy); Add(Instruction.Ddy, GenerateDdy);
@ -409,7 +409,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
return new OperationResult(AggregateType.FP32, context.FConvert(context.TypeFP32(), context.GetFP64(source))); return new OperationResult(AggregateType.FP32, context.FConvert(context.TypeFP32(), context.GetFP64(source)));
} }
private static OperationResult GenerateConvertFPToS32(CodeGenContext context, AstOperation operation) private static OperationResult GenerateConvertFP32ToS32(CodeGenContext context, AstOperation operation)
{ {
var source = operation.GetSource(0); var source = operation.GetSource(0);
@ -423,7 +423,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
} }
} }
private static OperationResult GenerateConvertFPToU32(CodeGenContext context, AstOperation operation) private static OperationResult GenerateConvertFP32ToU32(CodeGenContext context, AstOperation operation)
{ {
var source = operation.GetSource(0); var source = operation.GetSource(0);
@ -437,7 +437,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
} }
} }
private static OperationResult GenerateConvertS32ToFP(CodeGenContext context, AstOperation operation) private static OperationResult GenerateConvertS32ToFP32(CodeGenContext context, AstOperation operation)
{ {
var source = operation.GetSource(0); var source = operation.GetSource(0);
@ -451,7 +451,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
} }
} }
private static OperationResult GenerateConvertU32ToFP(CodeGenContext context, AstOperation operation) private static OperationResult GenerateConvertU32ToFP32(CodeGenContext context, AstOperation operation)
{ {
var source = operation.GetSource(0); var source = operation.GetSource(0);

2
Ryujinx.Graphics.Shader/Translation/EmitterContext.cs
View file

@ -234,8 +234,6 @@ namespace Ryujinx.Graphics.Shader.Translation
} }
else if (Config.Stage == ShaderStage.Fragment) else if (Config.Stage == ShaderStage.Fragment)
{ {
bool supportsBgra = Config.Options.TargetApi == TargetApi.Vulkan;
if (Config.OmapDepth) if (Config.OmapDepth)
{ {
Operand dest = Attribute(AttributeConsts.FragmentOutputDepth); Operand dest = Attribute(AttributeConsts.FragmentOutputDepth);