tree 9c7db4d76530ecd859826e79956b3b549539c9da
parent afc5254e01bc9269487510cddb7861532987a465
parent 1a149f612bbbf41e31c9a482f9ce9b96d25ec0e3
author David Neto <dneto@google.com> 1489071602 -0500
committer David Neto <dneto@google.com> 1489071626 -0500

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

Includes:
1a149f6 Fix shaderc_compile_to_spv examples in shaderc.h
cb4f0f6 Describe includer error convention in the struct.
48b5f88 Add comment to explain how to return an error in callback
9c3a4ee Use OpenCL extended instruction set from SPIRV-Headers
5c6247c Add validate_type_unique.cpp to SPIRV-Tools

Test: checkbuild.py on Linux; unit tests on Windows
Change-Id: Ic7c9daf661581eb7d3a573265be931afbe0b61a7