diff options
| author | 2016-12-28 09:28:53 -0800 | |
|---|---|---|
| committer | 2016-12-28 09:29:20 -0800 | |
| commit | c03d283e8b3f830d76dd94822b2a13872c05c730 (patch) | |
| tree | 514c1b1518ea1b3b863856857ad1cd79b88d00f1 /vulkan/tools/vkinfo.cpp | |
| parent | f38ec8abdf0a77b3e0e58dbc470a52d2f25a5eb4 (diff) | |
| parent | 525a5f2da844d1acc9e405fc4935d8a1cb2ece67 (diff) | |
resolve merge conflicts of 525a5f2 to master
Test: build
Change-Id: Id1c6d3d9dd158fb086b0d8ab74f7838ef0a51af1
Diffstat (limited to 'vulkan/tools/vkinfo.cpp')
| -rw-r--r-- | vulkan/tools/vkinfo.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/vulkan/tools/vkinfo.cpp b/vulkan/tools/vkinfo.cpp index 7cf85e683e..801eca8300 100644 --- a/vulkan/tools/vkinfo.cpp +++ b/vulkan/tools/vkinfo.cpp @@ -14,18 +14,17 @@ * limitations under the License. */ -#include <algorithm> -#include <array> #include <inttypes.h> #include <stdlib.h> +#include <unistd.h> + +#include <algorithm> +#include <array> #include <sstream> #include <vector> #include <vulkan/vulkan.h> -#define LOG_TAG "vkinfo" -#include <log/log.h> - namespace { struct Options { |