Merge vk-gl-cts/master into aosp/deqp-dev
authorPyry Haulos <phaulos@google.com>
Thu, 6 Apr 2017 22:05:11 +0000 (15:05 -0700)
committerPyry Haulos <phaulos@google.com>
Thu, 6 Apr 2017 22:05:11 +0000 (15:05 -0700)
commit27c798b30278db76ee1e34154e54054bebeb6a3e
tree783ad2c63b64e0d24cd7d037d83527f39efd5c88
parent775c1378eeac7ba2d6eebcd494411b85d078d46c
parente2676bfc58169cf925500eb3242c55600845a495
Merge vk-gl-cts/master into aosp/deqp-dev
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
modules/gles31/functional/es31fNegativeComputeTests.cpp