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:35:53 +0000 (17:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Apr 2017 17:35:53 +0000 (17:35 +0000)
commit32f90d863cb1c9179ff1f0feaba2170466de63fa
tree073d792c8dc7081572f3d547e806a3a935025624
parente801ea59949950167902ddd2fe48445d8524f9f9
parent995657a4be7f4d46729de8ff4998a0f6dc3255b5
Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am: aeef6dd8f5 am: fdc198ba11 am: c7970bbd83 am: 8bb630d3e5 am: d76c57f2b6
am: 995657a4be

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