bug 14365: make separate viewport and scissor cmds
diff --git a/include/vk_layer.h b/include/vk_layer.h
index 28e3f78..82b66ff 100644
--- a/include/vk_layer.h
+++ b/include/vk_layer.h
@@ -118,6 +118,7 @@
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 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(
diff --git a/layers/device_limits.cpp b/layers/device_limits.cpp
index 33c4250..30e57d4 100644
--- a/layers/device_limits.cpp
+++ b/layers/device_limits.cpp
@@ -299,14 +299,26 @@
VK_LAYER_EXPORT void VKAPI vkCmdSetViewport(
VkCmdBuffer cmdBuffer,
- uint32_t viewportAndScissorCount,
- const VkViewport* pViewports,
+ uint32_t viewportCount,
+ const VkViewport* pViewports)
+{
+ VkBool32 skipCall = VK_FALSE;
+ /* TODO: Verify viewportCount < maxViewports from VkPhysicalDeviceLimits */
+ if (VK_FALSE == skipCall) {
+ get_dispatch_table(device_limits_device_table_map, cmdBuffer)->CmdSetViewport(cmdBuffer, viewportCount, pViewports);
+ }
+}
+
+VK_LAYER_EXPORT void VKAPI vkCmdSetScissor(
+ VkCmdBuffer cmdBuffer,
+ uint32_t scissorCount,
const VkRect2D* pScissors)
{
VkBool32 skipCall = VK_FALSE;
- /* TODO: Verify viewportAndScissorCount < maxViewports from VkPhysicalDeviceLimits */
+ /* TODO: Verify scissorCount < maxViewports from VkPhysicalDeviceLimits */
+ /* TODO: viewportCount and scissorCount must match at draw time */
if (VK_FALSE == skipCall) {
- get_dispatch_table(device_limits_device_table_map, cmdBuffer)->CmdSetViewport(cmdBuffer, viewportAndScissorCount, pViewports, pScissors);
+ get_dispatch_table(device_limits_device_table_map, cmdBuffer)->CmdSetScissor(cmdBuffer, scissorCount, pScissors);
}
}
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index b5035c0..f6b6a6d 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -1969,9 +1969,8 @@
VK_LAYER_EXPORT void VKAPI vkCmdSetViewport(
VkCmdBuffer cmdBuffer,
- uint32_t viewportAndScissorCount,
- const VkViewport* pViewports,
- const VkRect2D* pScissors)
+ uint32_t viewportCount,
+ const VkViewport* pViewports)
{
VkBool32 skipCall = VK_FALSE;
GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
@@ -1985,17 +1984,43 @@
}
loader_platform_thread_lock_mutex(&globalLock);
pCB->status |= CBSTATUS_VIEWPORT_SET;
- pCB->viewports.resize(viewportAndScissorCount);
- memcpy(pCB->viewports.data(), pViewports, viewportAndScissorCount);
- pCB->scissors.resize(viewportAndScissorCount);
- memcpy(pCB->scissors.data(), pScissors, viewportAndScissorCount);
+ pCB->viewports.resize(viewportCount);
+ memcpy(pCB->viewports.data(), pViewports, viewportCount);
loader_platform_thread_unlock_mutex(&globalLock);
} else {
skipCall |= report_error_no_cb_begin(cmdBuffer, "vkCmdSetViewport()");
}
}
if (VK_FALSE == skipCall)
- get_dispatch_table(draw_state_device_table_map, cmdBuffer)->CmdSetViewport(cmdBuffer, viewportAndScissorCount, pViewports, pScissors);
+ get_dispatch_table(draw_state_device_table_map, cmdBuffer)->CmdSetViewport(cmdBuffer, viewportCount, pViewports);
+}
+
+VK_LAYER_EXPORT void VKAPI vkCmdSetScissor(
+ VkCmdBuffer cmdBuffer,
+ uint32_t scissorCount,
+ const VkRect2D* pScissors)
+{
+ VkBool32 skipCall = VK_FALSE;
+ GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
+ if (pCB) {
+ if (pCB->state == CB_UPDATE_ACTIVE) {
+ updateCBTracking(cmdBuffer);
+ skipCall |= addCmd(pCB, CMD_SETSCISSORSTATE);
+ if (!pCB->activeRenderPass) {
+ skipCall |= log_msg(mdd(pCB->cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_NO_ACTIVE_RENDERPASS, "DS",
+ "Incorrect call to vkCmdSetScissor() without an active RenderPass.");
+ }
+ loader_platform_thread_lock_mutex(&globalLock);
+ pCB->status |= CBSTATUS_SCISSOR_SET;
+ pCB->scissors.resize(scissorCount);
+ memcpy(pCB->scissors.data(), pScissors, scissorCount);
+ loader_platform_thread_unlock_mutex(&globalLock);
+ } else {
+ skipCall |= report_error_no_cb_begin(cmdBuffer, "vkCmdSetScissor()");
+ }
+ }
+ if (VK_FALSE == skipCall)
+ get_dispatch_table(draw_state_device_table_map, cmdBuffer)->CmdSetScissor(cmdBuffer, scissorCount, pScissors);
}
VK_LAYER_EXPORT void VKAPI vkCmdSetLineWidth(VkCmdBuffer cmdBuffer, float lineWidth)
@@ -2307,6 +2332,7 @@
if (pCB->state == CB_UPDATE_ACTIVE) {
pCB->drawCount[DRAW]++;
skipCall |= validate_draw_state(pCB, VK_FALSE);
+ /* TODO: Check that scissor and viewport counts are the same */
// TODO : Need to pass cmdBuffer as srcObj here
skipCall |= log_msg(mdd(cmdBuffer), VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_NONE, "DS",
"vkCmdDraw() call #%lu, reporting DS state:", g_drawCount[DRAW]++);
@@ -3179,6 +3205,8 @@
return (PFN_vkVoidFunction) vkCmdBindPipeline;
if (!strcmp(funcName, "vkCmdSetViewport"))
return (PFN_vkVoidFunction) vkCmdSetViewport;
+ if (!strcmp(funcName, "vkCmdSetScissor"))
+ return (PFN_vkVoidFunction) vkCmdSetScissor;
if (!strcmp(funcName, "vkCmdSetLineWidth"))
return (PFN_vkVoidFunction) vkCmdSetLineWidth;
if (!strcmp(funcName, "vkCmdSetDepthBias"))
diff --git a/layers/draw_state.h b/layers/draw_state.h
index 4edea80..ecd9486 100644
--- a/layers/draw_state.h
+++ b/layers/draw_state.h
@@ -167,6 +167,7 @@
CMD_BINDPIPELINE,
CMD_BINDPIPELINEDELTA,
CMD_SETVIEWPORTSTATE,
+ CMD_SETSCISSORSTATE,
CMD_SETLINEWIDTHSTATE,
CMD_SETDEPTHBIASSTATE,
CMD_SETBLENDSTATE,
@@ -243,6 +244,7 @@
CBSTATUS_STENCIL_WRITE_MASK_SET = 0x00000200, // Stencil write mask has been set
CBSTATUS_STENCIL_REFERENCE_SET = 0x00000400, // Stencil reference has been set
CBSTATUS_INDEX_BUFFER_BOUND = 0x00000800, // Index buffer has been set
+ CBSTATUS_SCISSOR_SET = 0x00001000, // Scissor has been set
} CBStatusFlagBits;
typedef struct stencil_data {
diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index 80df838..36574f6 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -2237,8 +2237,25 @@
VK_LAYER_EXPORT void VKAPI vkCmdSetViewport(
VkCmdBuffer cmdBuffer,
- uint32_t viewportAndScissorCount,
- const VkViewport* pViewports,
+ uint32_t viewportCount,
+ const VkViewport* pViewports)
+{
+ VkBool32 skipCall = VK_FALSE;
+ loader_platform_thread_lock_mutex(&globalLock);
+ MT_CB_INFO *pCmdBuf = get_cmd_buf_info(cmdBuffer);
+ if (!pCmdBuf) {
+ skipCall = log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)cmdBuffer, 0,
+ MEMTRACK_INVALID_CB, "MEM", "Unable to find command buffer object %p, was it ever created?", (void*)cmdBuffer);
+ }
+ loader_platform_thread_unlock_mutex(&globalLock);
+ if (VK_FALSE == skipCall) {
+ get_dispatch_table(mem_tracker_device_table_map, cmdBuffer)->CmdSetViewport(cmdBuffer, viewportCount, pViewports);
+ }
+}
+
+VK_LAYER_EXPORT void VKAPI vkCmdSetScissor(
+ VkCmdBuffer cmdBuffer,
+ uint32_t scissorCount,
const VkRect2D* pScissors)
{
VkBool32 skipCall = VK_FALSE;
@@ -2250,7 +2267,7 @@
}
loader_platform_thread_unlock_mutex(&globalLock);
if (VK_FALSE == skipCall) {
- get_dispatch_table(mem_tracker_device_table_map, cmdBuffer)->CmdSetViewport(cmdBuffer, viewportAndScissorCount, pViewports, pScissors);
+ get_dispatch_table(mem_tracker_device_table_map, cmdBuffer)->CmdSetScissor(cmdBuffer, scissorCount, pScissors);
}
}
@@ -2949,6 +2966,8 @@
return (PFN_vkVoidFunction) vkCmdBindPipeline;
if (!strcmp(funcName, "vkCmdSetViewport"))
return (PFN_vkVoidFunction) vkCmdSetViewport;
+ if (!strcmp(funcName, "vkCmdSetScissor"))
+ return (PFN_vkVoidFunction) vkCmdSetScissor;
if (!strcmp(funcName, "vkCmdSetLineWidth"))
return (PFN_vkVoidFunction) vkCmdSetLineWidth;
if (!strcmp(funcName, "vkCmdSetDepthBias"))
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 029d085..2ffeefa 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -5497,9 +5497,14 @@
PostCmdBindPipeline(cmdBuffer, pipelineBindPoint, pipeline);
}
-VK_LAYER_EXPORT void VKAPI vkCmdSetViewport(VkCmdBuffer cmdBuffer, uint32_t viewportAndScissorCount, const VkViewport* pViewports, const VkRect2D* pScissors)
+VK_LAYER_EXPORT void VKAPI vkCmdSetViewport(VkCmdBuffer cmdBuffer, uint32_t viewportCount, const VkViewport* pViewports)
{
- get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdSetViewport(cmdBuffer, viewportAndScissorCount, pViewports, pScissors);
+ get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdSetViewport(cmdBuffer, viewportCount, pViewports);
+}
+
+VK_LAYER_EXPORT void VKAPI vkCmdSetScissor(VkCmdBuffer cmdBuffer, uint32_t scissorCount, const VkRect2D* pScissors)
+{
+ get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdSetScissor(cmdBuffer, scissorCount, pScissors);
}
VK_LAYER_EXPORT void VKAPI vkCmdSetLineWidth(VkCmdBuffer cmdBuffer, float lineWidth)
@@ -6982,6 +6987,8 @@
return (PFN_vkVoidFunction) vkAllocDescriptorSets;
if (!strcmp(funcName, "vkCmdSetViewport"))
return (PFN_vkVoidFunction) vkCmdSetViewport;
+ if (!strcmp(funcName, "vkCmdSetScissor"))
+ return (PFN_vkVoidFunction) vkCmdSetScissor;
if (!strcmp(funcName, "vkCmdSetLineWidth"))
return (PFN_vkVoidFunction) vkCmdSetLineWidth;
if (!strcmp(funcName, "vkCmdSetDepthBias"))
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"))
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"))
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)
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);
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);
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)
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]);
diff --git a/vulkan.py b/vulkan.py
index e508d01..880a107 100755
--- a/vulkan.py
+++ b/vulkan.py
@@ -953,8 +953,12 @@
Proto("void", "CmdSetViewport",
[Param("VkCmdBuffer", "cmdBuffer"),
- Param("uint32_t", "viewportAndScissorCount"),
- Param("const VkViewport*", "pViewports"),
+ Param("uint32_t", "viewportCount"),
+ Param("const VkViewport*", "pViewports")]),
+
+ Proto("void", "CmdSetScissor",
+ [Param("VkCmdBuffer", "cmdBuffer"),
+ Param("uint32_t", "scissorCount"),
Param("const VkRect2D*", "pScissors")]),
Proto("void", "CmdSetLineWidth",