Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master
authorPyry Haulos <phaulos@google.com>
Thu, 23 Mar 2017 16:55:11 +0000 (09:55 -0700)
committerPyry Haulos <phaulos@google.com>
Thu, 23 Mar 2017 16:55:11 +0000 (09:55 -0700)
commit6e47473daf60581305dc010f1e14a7d9e5de7eff
treec874f003799d411d2e04e89d6dc9245642437808
parent6f6b792ec1a8129905b17fff724023d7357aa6bd
parent5c62a113271e1127af8dc8ec9e5691b76076b9e1
Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master

Change-Id: I125bd7ecab1b30dac632069655a0d84d2757295f
external/vulkancts/modules/vulkan/pipeline/vktPipelineImageSamplingInstance.cpp