Merge branch 'master' into BugPoint

This commit is contained in:
Greg Fischer 2021-07-29 14:48:24 -06:00 committed by GitHub
commit 9ff6cd0bd6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
72 changed files with 34633 additions and 28297 deletions

View file

@ -1739,7 +1739,7 @@ bool TIntermediate::canImplicitlyPromote(TBasicType from, TBasicType to, TOperat
case EbtUint:
switch (from) {
case EbtInt:
return version >= 400 || getSource() == EShSourceHlsl;
return version >= 400 || getSource() == EShSourceHlsl || IsRequestedExtension(E_GL_ARB_gpu_shader5);
case EbtBool:
return getSource() == EShSourceHlsl;
case EbtInt16: