diff options
| author | Michael Lentine <mlentine@google.com> | 2015-12-11 10:49:51 -0800 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2015-12-29 17:12:14 -0700 |
| commit | c68df9cd7c308ea5484b3309e99bd5ad933943c8 (patch) | |
| tree | 3b0ec2881e047868eb8b704455b07fdedf817b34 /layers/device_limits.cpp | |
| parent | fd18d28f99c3b2b8f788a840522c4a9eab03057e (diff) | |
| download | usermoji-c68df9cd7c308ea5484b3309e99bd5ad933943c8.tar.xz | |
layers: MR89, Fix gtests for android
Conflicts:
layers/draw_state.cpp
layers/image.cpp
layers/mem_tracker.cpp
Diffstat (limited to 'layers/device_limits.cpp')
| -rw-r--r-- | layers/device_limits.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/layers/device_limits.cpp b/layers/device_limits.cpp index e89dd668..f6bbacef 100644 --- a/layers/device_limits.cpp +++ b/layers/device_limits.cpp @@ -1,6 +1,7 @@ /* * * Copyright (C) 2015 Valve Corporation + * Copyright (C) 2015 Google Inc. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -43,7 +44,7 @@ #include "vk_struct_size_helper.h" #include "device_limits.h" #include "vk_layer_config.h" -#include "vk_debug_marker_layer.h" +#include "vulkan/vk_debug_marker_layer.h" #include "vk_layer_table.h" #include "vk_layer_debug_marker_table.h" #include "vk_layer_data.h" @@ -164,7 +165,7 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateInstanceExtensionPrope static const VkLayerProperties dl_global_layers[] = { { - "DeviceLimits", + "VK_LAYER_LUNARG_device_limits", VK_API_VERSION, VK_MAKE_VERSION(0, 1, 0), "Validation layer: Device Limits", |