Merge branch 'master' into 12.0

Browse Source

...

This commit is contained in:

Alex Szpakowski

2020-01-30 20:03:24 -04:00

parent 9ebb6a5c44 5a27742c34

commit 7684920f19

25 changed files with 4325 additions and 2182 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

src/libraries/glslang/glslang/MachineIndependent/preprocessor/Pp.cpp

Executable → Regular

src/libraries/glslang/glslang/MachineIndependent/preprocessor/PpContext.cpp

Executable → Regular

src/libraries/glslang/glslang/MachineIndependent/preprocessor/PpScanner.cpp

Executable → Regular

src/libraries/glslang/glslang/MachineIndependent/preprocessor/PpTokens.cpp

Executable → Regular

src/libraries/glslang/glslang/Public/ShaderLang.h

Executable → Regular