commit | 13bb94038c9fe7ba64e2afee156448e38a31ccfe | [log] [tgz] |
---|---|---|
author | David Neto <dneto@google.com> | Tue Feb 21 15:18:15 2017 -0500 |
committer | David Neto <dneto@google.com> | Tue Feb 21 15:18:58 2017 -0500 |
tree | 9e554e65b9109977583aa72c3759a5107e1fa932 | |
parent | f8487abbd5acc68a6d51b5f64a6434b54ff2aa87 [diff] | |
parent | 849ae996cc1621d60d2c1f23bc8e29218458f067 [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into update-shaderc Include: 849ae99 Install shaderc header files. 7ae44a1 Add -fauto-bind-uniforms to glslc ea687fd Add C, C++ API option to auto bind uniforms fc60017 Add libshader_util::Compiler::SetAutoBindUniforms 26c29e4 Test compiler option to auto bind uniforms Test: checkbuild.py on Linux; unit tests on Windows Change-Id: Id5812d91c4e04a87aba565baa9e9668ee34b6120