Merging The Engine directory from //UE4/Dev-Main to //UE4/Dev-Editor upto CL 4698813

#rb none

[CL 4720826 by Chris Gagnon in Dev-Editor branch]
This commit is contained in:
Chris Gagnon
2019-01-14 16:55:55 -05:00
parent 1057c9fa07
commit 1a3bf5caf1
1291 changed files with 66495 additions and 21234 deletions

View File

@@ -1468,7 +1468,7 @@ void FOpenGLFrontend::CompileShader(const FShaderCompilerInput& Input,FShaderCom
bIsSM5 ? HSF_DomainShader : HSF_InvalidFrequency,
HSF_PixelShader,
IsES2Platform(Version) ? HSF_InvalidFrequency : HSF_GeometryShader,
bIsSM5 ? HSF_ComputeShader : HSF_InvalidFrequency
RHISupportsComputeShaders(Input.Target.GetPlatform()) ? HSF_ComputeShader : HSF_InvalidFrequency
};
const EHlslShaderFrequency Frequency = FrequencyTable[Input.Target.Frequency];