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

loader/gpa_helper.h

diff --git a/loader/gpa_helper.h b/loader/gpa_helper.h
index 212e93e..bc5c7b6 100644
--- a/loader/gpa_helper.h
+++ b/loader/gpa_helper.h
@@ -235,6 +235,8 @@
         return (void*) vkCmdBindPipeline;
     if (!strcmp(name, "CmdSetViewport"))
         return (void*) vkCmdSetViewport;
+    if (!strcmp(name, "CmdSetScissor"))
+        return (void*) vkCmdSetScissor;
     if (!strcmp(name, "CmdSetLineWidth"))
         return (void*) vkCmdSetLineWidth;
     if (!strcmp(name, "CmdSetDepthBias"))

loader/table_ops.h

diff --git a/loader/table_ops.h b/loader/table_ops.h
index 7024532..6c732d0 100644
--- a/loader/table_ops.h
+++ b/loader/table_ops.h
@@ -123,6 +123,7 @@
     table->ResetCommandBuffer = (PFN_vkResetCommandBuffer) gpa(dev, "vkResetCommandBuffer");
     table->CmdBindPipeline = (PFN_vkCmdBindPipeline) gpa(dev, "vkCmdBindPipeline");
     table->CmdSetViewport = (PFN_vkCmdSetViewport) gpa(dev, "vkCmdSetViewport");
+    table->CmdSetScissor = (PFN_vkCmdSetScissor) gpa(dev, "vkCmdSetScissor");
     table->CmdSetLineWidth = (PFN_vkCmdSetLineWidth) gpa(dev, "vkCmdSetLineWidth");
     table->CmdSetDepthBias = (PFN_vkCmdSetDepthBias) gpa(dev, "vkCmdSetDepthBias");
     table->CmdSetBlendConstants = (PFN_vkCmdSetBlendConstants) gpa(dev, "vkCmdSetBlendConstants");
@@ -360,6 +361,8 @@
         return (void *) table->CmdBindPipeline;
     if (!strcmp(name, "CmdSetViewport"))
         return (void *) table->CmdSetViewport;
+    if (!strcmp(name, "CmdSetScissor"))
+        return (void *) table->CmdSetScissor;
     if (!strcmp(name, "CmdSetLineWidth"))
         return (void *) table->CmdSetLineWidth;
     if (!strcmp(name, "CmdSetDepthBias"))

loader/trampoline.c

diff --git a/loader/trampoline.c b/loader/trampoline.c
index bd6f43b..5074f3b 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -1112,13 +1112,22 @@
     disp->CmdBindPipeline(cmdBuffer, pipelineBindPoint, pipeline);
 }
 
-LOADER_EXPORT void VKAPI vkCmdSetViewport(VkCmdBuffer cmdBuffer, uint32_t viewportAndScissorCount, const VkViewport* pViewports, const VkRect2D* pScissors)
+LOADER_EXPORT void VKAPI vkCmdSetViewport(VkCmdBuffer cmdBuffer, uint32_t viewportCount, const VkViewport* pViewports)
 {
     const VkLayerDispatchTable *disp;
 
     disp = loader_get_dispatch(cmdBuffer);
 
-    disp->CmdSetViewport(cmdBuffer, viewportAndScissorCount, pViewports, pScissors);
+    disp->CmdSetViewport(cmdBuffer, viewportCount, pViewports);
+}
+
+LOADER_EXPORT void VKAPI vkCmdSetScissor(VkCmdBuffer cmdBuffer, uint32_t scissorCount, const VkRect2D* pScissors)
+{
+    const VkLayerDispatchTable *disp;
+
+    disp = loader_get_dispatch(cmdBuffer);
+
+    disp->CmdSetScissor(cmdBuffer, scissorCount, pScissors);
 }
 
 LOADER_EXPORT void VKAPI vkCmdSetLineWidth(VkCmdBuffer cmdBuffer, float lineWidth)