aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCourtney Goeltzenleuchter <courtney@LunarG.com>2015-09-21 11:44:06 -0600
committerCourtney Goeltzenleuchter <courtney@LunarG.com>2015-09-23 11:15:00 -0600
commitd6217bc20873a7d70537921e7cea9be5572bc34c (patch)
tree664d46e71fd454671fb7e68f4603da3c841e0745 /include
parent4cbf78b9e52a0e2dd3e13eccc137bb39ba8000c9 (diff)
downloadusermoji-d6217bc20873a7d70537921e7cea9be5572bc34c.tar.xz
bug 14365: make separate viewport and scissor cmds
Diffstat (limited to 'include')
-rw-r--r--include/vk_layer.h1
-rw-r--r--include/vulkan.h11
2 files changed, 9 insertions, 3 deletions
diff --git a/include/vk_layer.h b/include/vk_layer.h
index 28e3f788..82b66ffc 100644
--- a/include/vk_layer.h
+++ b/include/vk_layer.h
@@ -118,6 +118,7 @@ typedef struct VkLayerDispatchTable_
PFN_vkCmdBindVertexBuffers CmdBindVertexBuffers;
PFN_vkCmdBindIndexBuffer CmdBindIndexBuffer;
PFN_vkCmdSetViewport CmdSetViewport;
+ PFN_vkCmdSetScissor CmdSetScissor;
PFN_vkCmdSetLineWidth CmdSetLineWidth;
PFN_vkCmdSetDepthBias CmdSetDepthBias;
PFN_vkCmdSetBlendConstants CmdSetBlendConstants;
diff --git a/include/vulkan.h b/include/vulkan.h
index 5c0052d9..2a1e06d4 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -2158,7 +2158,8 @@ typedef VkResult (VKAPI *PFN_vkBeginCommandBuffer)(VkCmdBuffer cmdBuffer, const
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 vkCmdBindPipeline(
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(