commit 932cdb54a622f4ca69a25071eecbac235b4dc16f
author Courtney Goeltzenleuchter <courtney@LunarG.com> Mon Sep 21 11:44:06 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Sep 23 11:15:00 2015 -0600
tree d639f223db94affb0c9dfaf0a305d4ceec1af1d4
parent 09772bb64bc1c6577edef89074cbd9132191f402

bug 14365: make separate viewport and scissor cmds

include/vulkan.h

diff --git a/include/vulkan.h b/include/vulkan.h
index 5c0052d..2a1e06d 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -2158,7 +2158,8 @@
 typedef VkResult (VKAPI *PFN_vkEndCommandBuffer)(VkCmdBuffer cmdBuffer);
 typedef VkResult (VKAPI *PFN_vkResetCommandBuffer)(VkCmdBuffer cmdBuffer, VkCmdBufferResetFlags flags);
 typedef void (VKAPI *PFN_vkCmdBindPipeline)(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline);
-typedef void (VKAPI *PFN_vkCmdSetViewport)(VkCmdBuffer cmdBuffer, uint32_t viewportAndScissorCount, const VkViewport* pViewports, const VkRect2D* pScissors);
+typedef void (VKAPI *PFN_vkCmdSetViewport)(VkCmdBuffer cmdBuffer, uint32_t viewportCount, const VkViewport* pViewports);
+typedef void (VKAPI *PFN_vkCmdSetScissor)(VkCmdBuffer cmdBuffer, uint32_t scissorCount, const VkRect2D* pScissors);
 typedef void (VKAPI *PFN_vkCmdSetLineWidth)(VkCmdBuffer cmdBuffer, float lineWidth);
 typedef void (VKAPI *PFN_vkCmdSetDepthBias)(VkCmdBuffer cmdBuffer, float depthBias, float depthBiasClamp, float slopeScaledDepthBias);
 typedef void (VKAPI *PFN_vkCmdSetBlendConstants)(VkCmdBuffer cmdBuffer, const float blendConst[4]);
@@ -2700,8 +2701,12 @@
 
 void VKAPI vkCmdSetViewport(
     VkCmdBuffer                                 cmdBuffer,
-    uint32_t                                    viewportAndScissorCount,
-    const VkViewport*                           pViewports,
+    uint32_t                                    viewportCount,
+    const VkViewport*                           pViewports);
+
+void VKAPI vkCmdSetScissor(
+    VkCmdBuffer                                 cmdBuffer,
+    uint32_t                                    scissorCount,
     const VkRect2D*                             pScissors);
 
 void VKAPI vkCmdSetLineWidth(