Merge pull request #637 from KhronosGroup/token-paste
PP: Implement token pasting for PP identifiers.
Showing
- Test/baseResults/120.vert.out 6 additions, 5 deletionsTest/baseResults/120.vert.out
- Test/baseResults/130.vert.out 5 additions, 5 deletionsTest/baseResults/130.vert.out
- Test/baseResults/tokenPaste.vert.out 60 additions, 0 deletionsTest/baseResults/tokenPaste.vert.out
- Test/tokenPaste.vert 52 additions, 0 deletionsTest/tokenPaste.vert
- glslang/Include/revision.h 2 additions, 2 deletionsglslang/Include/revision.h
- glslang/MachineIndependent/preprocessor/Pp.cpp 82 additions, 13 deletionsglslang/MachineIndependent/preprocessor/Pp.cpp
- glslang/MachineIndependent/preprocessor/PpContext.h 21 additions, 3 deletionsglslang/MachineIndependent/preprocessor/PpContext.h
- glslang/MachineIndependent/preprocessor/PpScanner.cpp 46 additions, 0 deletionsglslang/MachineIndependent/preprocessor/PpScanner.cpp
- glslang/MachineIndependent/preprocessor/PpTokens.cpp 29 additions, 6 deletionsglslang/MachineIndependent/preprocessor/PpTokens.cpp
- gtests/AST.FromFile.cpp 1 addition, 0 deletionsgtests/AST.FromFile.cpp
Loading
Please register or sign in to comment