projects / platform / upstream / glslang.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c47024 6256146)
Merge pull request #406 from steve-lunarg/pp_line
authorJohn Kessenich <johnkslang@users.noreply.github.com>
Tue, 26 Jul 2016 15:39:48 +0000 (09:39 -0600)
committerGitHub <noreply@github.com>
Tue, 26 Jul 2016 15:39:48 +0000 (09:39 -0600)
HLSL: enable #line extension by default for HLSL source.

1  2 
gtests/Hlsl.FromFile.cpp patch | diff1 | diff2 | blob | history
hlsl/hlslParseHelper.cpp patch | diff1 | diff2 | blob | history
hlsl/hlslParseHelper.h patch | diff1 | diff2 | blob | history

diff --cc gtests/Hlsl.FromFile.cpp
Simple merge
diff --cc hlsl/hlslParseHelper.cpp
Simple merge
diff --cc hlsl/hlslParseHelper.h
Simple merge
Domain: Graphics System / GL;