Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts...
authorIan Romanick <ian.d.romanick@intel.com>
Tue, 11 Apr 2017 17:17:48 +0000 (17:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Apr 2017 17:17:48 +0000 (17:17 +0000)
commit8ca5b73a0259721d3ce901b273b6bf2521f43947
tree073d792c8dc7081572f3d547e806a3a935025624
parentab3013ef1079bda236480785b025e3e1bd98d91d
parenta4ddab16dd85338509031ac6ae4efbcf06ba8732
Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am: aeef6dd8f5
am: a4ddab16dd

Change-Id: I18fe6a8ba3ba328513afdf1f5e5d32db6de32373
modules/gles31/functional/es31fProgramInterfaceDefinitionUtil.cpp
modules/gles31/functional/es31fProgramInterfaceDefinitionUtil.hpp
modules/gles31/functional/es31fProgramInterfaceQueryTests.cpp