tree da2f936e8d77bb2084d2b27c8edeb8f19cd5b1da
parent f9ba2fa6a90f570dd219e91f722ac284ce3d50a2
parent 20f01e7fd04a5fa2de7b2f185b3cdc2771db506f
author David Neto <dneto@google.com> 1481649145 -0500
committer David Neto <dneto@google.com> 1481650980 -0500

Merge remote-tracking branch 'aosp/upstream-master' into update-shaderc

Includes the following:
20f01e7 Fix last commit; EOptionKeepUncalled incorrect enum bug.
906cc21 Linker: Eliminate uncalled functions, because they can be ill-defined.
bf6d7f4 Linker: Track the mangled entry-point name along with the non-mangled one.
4b6ce41 GLSL Linker: Track entry point across compilation units.
6a60c2f Linker: Walk the call graph to report an error on missing bodies.
e795cc9 Merge pull request #621 from steve-lunarg/recursive-flattening
302e619 Merge pull request #619 from steve-lunarg/opcode-specific-promote
56b4547 Merge pull request #620 from fjhenigman/foo
a2b01a0 HLSL: Recursive composite flattening
05f7514 HLSL: opcode specific promotion rules for interlocked ops
8dcf202 GLSL: Always define TShader::~Includer().
b56f4ac Merge pull request #615 from dneto0/consistent-location-for-test-files
9df6aa5 GLSL: Allow desktop shaders to call functions from outside main().
ec2e27a Merge pull request #613 from Corillian/hlslpreprocess
5cc92c5 runtests should refer to test files in current directory
205dc4e Fixed processing #include's when preprocessing HLSL
fb06e95 Don't print the "Linked stage" message unless the AST is being dumped.
09512cb Merge branch 'steve-lunarg-intrinsic-promotion'
21b11f4 Merge branch 'intrinsic-promotion' of https://github.com/steve-lunarg/glslang into steve-lunarg-intrinsic-promotion
41be1cb Merge pull request #604 from steve-lunarg/entry-rename-2
f1e0c87 allow renaming of shader entry point when creating SPIR-V
ef33ec0 HLSL: add intrinsic function implicit promotions

Test: Linux x86-64; ran Windows unit tests
Change-Id: Ia03a8b944010267019fda338436c74050bce0cb9