From 450dd2c719e95b17fa60b29d6290ddf5809fd7c6 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@lunarg.com>
Date: Mon, 26 Oct 2015 19:40:27 +0800
Subject: bug 14868: Replace VkTimestampType with VkPipelineStageFlagBits (WIP)

https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14868
---
 layers/param_checker.cpp | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'layers/param_checker.cpp')

diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index d0d96558..5317f76c 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -6435,33 +6435,25 @@ VK_LAYER_EXPORT void VKAPI vkCmdResetQueryPool(
 
 bool PostCmdWriteTimestamp(
     VkCmdBuffer cmdBuffer,
-    VkTimestampType timestampType,
+    VkPipelineStageFlagBits pipelineStage,
     VkBuffer destBuffer,
     VkDeviceSize destOffset)
 {
 
-    if(timestampType < VK_TIMESTAMP_TYPE_BEGIN_RANGE ||
-        timestampType > VK_TIMESTAMP_TYPE_END_RANGE)
-    {
-        log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
-        "vkCmdWriteTimestamp parameter, VkTimestampType timestampType, is an unrecognized enumerator");
-        return false;
-    }
-
-
+    ValidateEnumerator(pipelineStage);
 
     return true;
 }
 
 VK_LAYER_EXPORT void VKAPI vkCmdWriteTimestamp(
     VkCmdBuffer cmdBuffer,
-    VkTimestampType timestampType,
+    VkPipelineStageFlagBits pipelineStage,
     VkBuffer destBuffer,
     VkDeviceSize destOffset)
 {
-    get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdWriteTimestamp(cmdBuffer, timestampType, destBuffer, destOffset);
+    get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdWriteTimestamp(cmdBuffer, pipelineStage, destBuffer, destOffset);
 
-    PostCmdWriteTimestamp(cmdBuffer, timestampType, destBuffer, destOffset);
+    PostCmdWriteTimestamp(cmdBuffer, pipelineStage, destBuffer, destOffset);
 }
 
 bool PostCmdCopyQueryPoolResults(
-- 
cgit v1.2.3