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

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index eab717b..3e23997 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -325,7 +325,10 @@
         cmdBuffer->SetDepthBias(m_depthBias, m_depthBiasClamp, m_slopeScaledDepthBias);
     }
     if ((failMask & BsoFailViewport) != BsoFailViewport) {
-        cmdBuffer->SetViewport(m_viewports.size(), m_viewports.data(), m_scissors.data());
+        /* TODO: Need separate test for missing scissor */
+        /* TODO: Need test for mismatched viewport and scissor count */
+        cmdBuffer->SetViewport(m_viewports.size(), m_viewports.data());
+        cmdBuffer->SetScissor(m_scissors.size(), m_scissors.data());
     }
     if ((failMask & BsoFailBlend) != BsoFailBlend) {
         cmdBuffer->SetBlendConstants(m_blendConst);

tests/render_tests.cpp

diff --git a/tests/render_tests.cpp b/tests/render_tests.cpp
index 812656d..95f0358 100644
--- a/tests/render_tests.cpp
+++ b/tests/render_tests.cpp
@@ -386,7 +386,8 @@
     cmdBuffer->PrepareAttachments();
     cmdBuffer->SetLineWidth(m_lineWidth);
     cmdBuffer->SetDepthBias(m_depthBias, m_depthBiasClamp, m_slopeScaledDepthBias);
-    cmdBuffer->SetViewport(m_viewports.size(), m_viewports.data(), m_scissors.data());
+    cmdBuffer->SetViewport(m_viewports.size(), m_viewports.data());
+    cmdBuffer->SetScissor(m_scissors.size(), m_scissors.data());
     cmdBuffer->SetBlendConstants(m_blendConst);
     cmdBuffer->SetDepthBounds(m_minDepthBounds, m_maxDepthBounds);
     cmdBuffer->SetStencilReadMask(VK_STENCIL_FACE_FRONT_BIT | VK_STENCIL_FACE_BACK_BIT, m_stencilCompareMask);

tests/vkrenderframework.cpp

diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index 6f3d6ae..6e7df3d 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -1440,11 +1440,17 @@
 }
 
 void VkCommandBufferObj::SetViewport(
-    uint32_t                            viewportAndScissorCount,
-    const VkViewport*                   pViewports,
+    uint32_t                            viewportCount,
+    const VkViewport*                   pViewports)
+{
+    vkCmdSetViewport( handle(), viewportCount, pViewports);
+}
+
+void VkCommandBufferObj::SetScissor(
+    uint32_t                            scissorCount,
     const VkRect2D*                     pScissors)
 {
-    vkCmdSetViewport( handle(), viewportAndScissorCount, pViewports, pScissors);
+    vkCmdSetScissor( handle(), scissorCount, pScissors);
 }
 
 void VkCommandBufferObj::SetLineWidth(float lineWidth)

tests/vkrenderframework.h

diff --git a/tests/vkrenderframework.h b/tests/vkrenderframework.h
index 2f515ab..d3136f2 100644
--- a/tests/vkrenderframework.h
+++ b/tests/vkrenderframework.h
@@ -189,7 +189,8 @@
     void DrawIndexed(uint32_t firstIndex, uint32_t indexCount, int32_t vertexOffset, uint32_t firstInstance, uint32_t instanceCount);
     void QueueCommandBuffer();
     void QueueCommandBuffer(VkFence fence);
-    void SetViewport(uint32_t viewportAndScissorCount, const VkViewport* pViewports, const VkRect2D* pScissors);
+    void SetViewport(uint32_t viewportCount, const VkViewport* pViewports);
+    void SetScissor(uint32_t scissorCount, const VkRect2D* pScissors);
     void SetLineWidth(float lineWidth);
     void SetDepthBias(float depthBias, float depthBiasClamp, float slopeScaledDepthBias);
     void SetBlendConstants(const float blendConst[4]);