diff options
| author | Tobin Ehlis <tobin@lunarg.com> | 2015-10-01 11:44:50 -0400 |
|---|---|---|
| committer | Tobin Ehlis <tobin@lunarg.com> | 2015-10-01 11:44:50 -0400 |
| commit | e0a9560403e97d1ca3f7ee72d0267884cdbc3765 (patch) | |
| tree | f264ef2e043023392f556c255eab8fe9802f48cb /layers/mem_tracker.cpp | |
| parent | ba839d1977fd08371f0924f73e9b052325c978cd (diff) | |
| parent | 6c0002b9d17d2b61ed537290c8a4eacb169e18d1 (diff) | |
| download | usermoji-e0a9560403e97d1ca3f7ee72d0267884cdbc3765.tar.xz | |
Merge branch 'mlentine_layers4' into 'master'
Make reseting an unsignaled fence a warning.
See merge request !38
Diffstat (limited to 'layers/mem_tracker.cpp')
| -rw-r--r-- | layers/mem_tracker.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp index f42b686f..f08adf1f 100644 --- a/layers/mem_tracker.cpp +++ b/layers/mem_tracker.cpp @@ -2,6 +2,7 @@ * Vulkan * * Copyright (C) 2015 LunarG, Inc. + * 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"), @@ -1888,7 +1889,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkResetFences( if (fence_item != fenceMap.end()) { // Validate fences in SIGNALED state if (!(fence_item->second.createInfo.flags & VK_FENCE_CREATE_SIGNALED_BIT)) { - skipCall = log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_FENCE, pFences[i].handle, 0, MEMTRACK_INVALID_FENCE_STATE, "MEM", + skipCall = log_msg(mdd(device), VK_DBG_REPORT_WARN_BIT, VK_OBJECT_TYPE_FENCE, pFences[i].handle, 0, MEMTRACK_INVALID_FENCE_STATE, "MEM", "Fence %#" PRIxLEAST64 " submitted to VkResetFences in UNSIGNALED STATE", pFences[i].handle); } else { |