layers: MR221: rename threading test

The threading validation layer has been basically
re-written, so updating the vendor name accordingly

6 files changed, 17 insertions, 18 deletions

diff --git a/demos/cube.c b/demos/cube.c
index d729fb8a..9b84cccf 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -2129,14 +2129,14 @@ static void demo_init_vk(struct demo *demo) {
     uint32_t enabled_layer_count = 0;
 
     char *instance_validation_layers[] = {
-        "VK_LAYER_LUNARG_threading",      "VK_LAYER_LUNARG_mem_tracker",
+        "VK_LAYER_GOOGLE_threading",      "VK_LAYER_LUNARG_mem_tracker",
         "VK_LAYER_LUNARG_object_tracker", "VK_LAYER_LUNARG_draw_state",
         "VK_LAYER_LUNARG_param_checker",  "VK_LAYER_LUNARG_swapchain",
         "VK_LAYER_LUNARG_device_limits",  "VK_LAYER_LUNARG_image",
         "VK_LAYER_GOOGLE_unique_objects",
     };
 
-    demo->device_validation_layers[0] = "VK_LAYER_LUNARG_threading";
+    demo->device_validation_layers[0] = "VK_LAYER_GOOGLE_threading";
     demo->device_validation_layers[1] = "VK_LAYER_LUNARG_mem_tracker";
     demo->device_validation_layers[2] = "VK_LAYER_LUNARG_object_tracker";
     demo->device_validation_layers[3] = "VK_LAYER_LUNARG_draw_state";
diff --git a/layers/README.md b/layers/README.md
index 7bea75c6..b6dc298e 100644
--- a/layers/README.md
+++ b/layers/README.md
@@ -49,7 +49,7 @@ layers/param_checker.cpp (name=VK_LAYER_LUNARG_param_checker) - Check the input
 layers/image.cpp (name=VK_LAYER_LUNARG_image) - The Image layer is intended to validate image parameters, formats, and correct use. Images are a significant enough area that they were given a separate layer. If a Dbg callback function is registered, this layer will use callback function(s) for reporting, otherwise uses stdout.
 
 ### Check threading
-<build dir>/layers/threading.cpp (name=VK_LAYER_LUNARG_threading) - Check multithreading of API calls for validity. Currently this checks that only one thread at a time uses an object in free-threaded API calls. If a Dbg callback function is registered, this layer will use callback function(s) for reporting, otherwise uses stdout.
+<build dir>/layers/threading.cpp (name=VK_LAYER_GOOGLE_threading) - Check multithreading of API calls for validity. Currently this checks that only one thread at a time uses an object in free-threaded API calls. If a Dbg callback function is registered, this layer will use callback function(s) for reporting, otherwise uses stdout.
 
 ### Swapchain
 <build dir>/layer/swapchain.cpp (name=VK_LAYER_LUNARG_swapchain) - Check that WSI extensions are being used correctly.
diff --git a/layers/linux/VkLayer_threading.json b/layers/linux/VkLayer_threading.json
index b7f7c26c..1558e5f7 100644
--- a/layers/linux/VkLayer_threading.json
+++ b/layers/linux/VkLayer_threading.json
@@ -1,12 +1,12 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "VK_LAYER_LUNARG_threading",
+        "name": "VK_LAYER_GOOGLE_threading",
         "type": "GLOBAL",
         "library_path": "./libVkLayer_threading.so",
         "api_version": "1.0.3",
         "implementation_version": "1",
-        "description": "LunarG Validation Layer",
+        "description": "Google Validation Layer",
         "instance_extensions": [
              {
                  "name": "VK_EXT_debug_report",
diff --git a/layers/threading.cpp b/layers/threading.cpp
index ef23a80d..b110bbf0 100644
--- a/layers/threading.cpp
+++ b/layers/threading.cpp
@@ -207,9 +207,9 @@ VK_LAYER_EXPORT VkResult VKAPI_CALL vkEnumerateInstanceExtensionProperties(const
 
 static const VkLayerProperties globalLayerProps[] = {
     {
-        "Threading",
+        "VK_LAYER_GOOGLE_threading",
         VK_API_VERSION, // specVersion
-        VK_MAKE_VERSION(0, 1, 0), // implVersion
+        1,
         "Google Validation Layer",
     }
 };
@@ -222,9 +222,9 @@ VK_LAYER_EXPORT VkResult VKAPI_CALL vkEnumerateInstanceLayerProperties(uint32_t
 
 static const VkLayerProperties deviceLayerProps[] = {
     {
-        "Threading",
-        VK_API_VERSION,
-        VK_MAKE_VERSION(0, 1, 0),
+        "VK_LAYER_GOOGLE_threading",
+        VK_API_VERSION, // specVersion
+        1,
         "Google Validation Layer",
     }
 };
@@ -256,7 +256,6 @@ VK_LAYER_EXPORT VkResult VKAPI_CALL vkEnumerateDeviceLayerProperties(VkPhysicalD
     return util_GetLayerProperties(ARRAY_SIZE(deviceLayerProps), deviceLayerProps, pCount, pProperties);
 }
 
-
 static inline PFN_vkVoidFunction layer_intercept_proc(const char *name)
 {
     for (int i=0; i<sizeof(procmap)/sizeof(procmap[0]); i++) {
diff --git a/layers/vk_validation_layer_details.md b/layers/vk_validation_layer_details.md
index 4ad2abe3..2e56f296 100644
--- a/layers/vk_validation_layer_details.md
+++ b/layers/vk_validation_layer_details.md
@@ -268,11 +268,11 @@ The VK_LAYER_LUNARG_object_tracker layer maintains a record of all Vulkan object
  9. Use reference counting for non-dispatchable objects.  Multiple object creation calls may return identical handles.
  10. Update codegen for destroy_obj & validate_obj to generate all of the correct signatures and use the generated code
 
-## VK_LAYER_LUNARG_threading
+## VK_LAYER_GOOGLE_threading
 
-### VK_LAYER_LUNARG_threading Overview
+### VK_LAYER_GOOGLE_threading Overview
 
-The VK_LAYER_LUNARG_threading layer checks for simultaneous use of objects by calls from multiple threads.
+The VK_LAYER_GOOGLE_threading layer checks for simultaneous use of objects by calls from multiple threads.
 Application code is responsible for preventing simultaneous use of the same objects by certain calls that modify objects.
 See [bug 13433](https://cvs.khronos.org/bugzilla/show_bug.cgi?id=13433) and
 <https://cvs.khronos.org/svn/repos/oglc/trunk/nextgen/vulkan/function_properties.csv>
@@ -293,7 +293,7 @@ But the layer cannot prevent such a reentrant use of an object.
 The layer can only observe when a mutual exclusion rule is actually violated.
 It cannot insure that there is no latent race condition.
 
-### VK_LAYER_LUNARG_threading Details Table
+### VK_LAYER_GOOGLE_threading Details Table
 
 | Check | Overview | ENUM THREADING_CHECKER_* | Relevant API | Testname | Notes/TODO |
 | ----- | -------- | ---------------- | ---------------- | -------- | ---------- |
@@ -301,7 +301,7 @@ It cannot insure that there is no latent race condition.
 | Thread Reentrancy | Detects cases of a single thread calling Vulkan reentrantly | SINGLE_THREAD_REUSE | vkQueueSubmit vkFreeMemory vkMapMemory vkUnmapMemory vkFlushMappedMemoryRanges vkInvalidateMappedMemoryRanges vkBindBufferMemory vkBindImageMemory vkQueueBindSparse vkDestroySemaphore vkDestroyBuffer vkDestroyImage vkDestroyDescriptorPool vkResetDescriptorPool vkAllocateDescriptorSets vkFreeDescriptorSets vkFreeCommandBuffers vkBeginCommandBuffer vkEndCommandBuffer vkResetCommandBuffer vkCmdBindPipeline vkCmdSetViewport vkCmdSetBlendConstants vkCmdSetLineWidth vkCmdSetDepthBias vkCmdSetDepthBounds vkCmdSetStencilCompareMask vkCmdSetStencilWriteMask vkCmdSetStencilReference vkCmdBindDescriptorSets vkCmdBindIndexBuffer vkCmdBindVertexBuffers vkCmdDraw vkCmdDrawIndexed vkCmdDrawIndirect vkCmdDrawIndexedIndirect vkCmdDispatch vkCmdDispatchIndirect vkCmdCopyBuffer vkCmdCopyImage vkCmdBlitImage vkCmdCopyBufferToImage vkCmdCopyImageToBuffer vkCmdUpdateBuffer vkCmdFillBuffer vkCmdClearColorImage vkCmdClearDepthStencilImage vkCmdClearAttachments vkCmdResolveImage vkCmdSetEvent vkCmdResetEvent vkCmdWaitEvents vkCmdPipelineBarrier vkCmdBeginQuery vkCmdEndQuery vkCmdResetQueryPool vkCmdWriteTimestamp vkCmdCopyQueryPoolResults vkCmdBeginRenderPass vkCmdNextSubpass vkCmdPushConstants vkCmdEndRenderPass vkCmdExecuteCommands | ??? | NA |
 | NA | Enum used for informational messages | NONE | | NA | None |
 
-### VK_LAYER_LUNARG_threading Pending Work
+### VK_LAYER_GOOGLE_threading Pending Work
 Additional work to be done
 
 ## VK_LAYER_LUNARG_device_limits
diff --git a/layers/windows/VkLayer_threading.json b/layers/windows/VkLayer_threading.json
index 52c8e361..24fb65e9 100644
--- a/layers/windows/VkLayer_threading.json
+++ b/layers/windows/VkLayer_threading.json
@@ -1,12 +1,12 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "VK_LAYER_LUNARG_threading",
+        "name": "VK_LAYER_GOOGLE_threading",
         "type": "GLOBAL",
         "library_path": ".\\VkLayer_threading.dll",
         "api_version": "1.0.3",
         "implementation_version": "1",
-        "description": "LunarG Validation Layer",
+        "description": "Google Validation Layer",
         "instance_extensions": [
              {
                  "name": "VK_EXT_debug_report",