BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into BugPoint

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
glslang/MachineIndependent/Intermediate.cpp
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:

5
glslang/MachineIndependent/localintermediate.h
View file

@ -926,6 +926,11 @@ public:
return false;
}
bool IsRequestedExtension(const char* extension) const
{
return (requestedExtensions.find(extension) != requestedExtensions.end());
}
void addToCallGraph(TInfoSink&, const TString& caller, const TString& callee);
void merge(TInfoSink&, TIntermediate&);
void finalCheck(TInfoSink&, bool keepUncalled);