Vulkan: Boilerplace for vkCmdSetScissor

src/libANGLE/renderer/vulkan/SecondaryCommandBuffer.cpp

@@ -116,6 +116,8 @@ const char *GetCommandString(CommandID id)
             return "ResolveImage";
         case CommandID::SetEvent:
             return "SetEvent";
+        case CommandID::SetScissor:
+            return "SetScissor";
         case CommandID::WaitEvents:
             return "WaitEvents";
         case CommandID::WriteTimestamp:
@@ -549,6 +551,12 @@ void SecondaryCommandBuffer::executeCommands(VkCommandBuffer cmdBuffer)
                     vkCmdSetEvent(cmdBuffer, params->event, params->stageMask);
                     break;
                 }
+                case CommandID::SetScissor:
+                {
+                    const SetScissorParams *params = getParamPtr<SetScissorParams>(currentCommand);
+                    vkCmdSetScissor(cmdBuffer, 0, 1, &params->scissor);
+                    break;
+                }
                 case CommandID::WaitEvents:
                 {
                     const WaitEventsParams *params = getParamPtr<WaitEventsParams>(currentCommand);

src/libANGLE/renderer/vulkan/SecondaryCommandBuffer.h

@@ -78,6 +78,7 @@ enum class CommandID : uint16_t
     ResetQueryPool,
     ResolveImage,
     SetEvent,
+    SetScissor,
     WaitEvents,
     WriteTimestamp,
 };
@@ -416,6 +417,12 @@ struct SetEventParams
 };
 VERIFY_4_BYTE_ALIGNMENT(SetEventParams)
 
+struct SetScissorParams
+{
+    VkRect2D scissor;
+};
+VERIFY_4_BYTE_ALIGNMENT(SetScissorParams)
+
 struct WaitEventsParams
 {
     uint32_t eventCount;
@@ -641,6 +648,8 @@ class SecondaryCommandBuffer final : angle::NonCopyable
 
     void setEvent(VkEvent event, VkPipelineStageFlags stageMask);
 
+    void setScissor(uint32_t firstScissor, uint32_t scissorCount, const VkRect2D *scissors);
+
     void waitEvents(uint32_t eventCount,
                     const VkEvent *events,
                     VkPipelineStageFlags srcStageMask,
@@ -1389,6 +1398,17 @@ ANGLE_INLINE void SecondaryCommandBuffer::setEvent(VkEvent event, VkPipelineStag
     paramStruct->stageMask      = stageMask;
 }
 
+ANGLE_INLINE void SecondaryCommandBuffer::setScissor(uint32_t firstScissor,
+                                                     uint32_t scissorCount,
+                                                     const VkRect2D *scissors)
+{
+    ASSERT(firstScissor == 0);
+    ASSERT(scissorCount == 1);
+    ASSERT(scissors != nullptr);
+    SetScissorParams *paramStruct = initCommand<SetScissorParams>(CommandID::SetScissor);
+    paramStruct->scissor          = scissors[0];
+}
+
 ANGLE_INLINE void SecondaryCommandBuffer::waitEvents(
     uint32_t eventCount,
     const VkEvent *events,

src/libANGLE/renderer/vulkan/vk_wrapper.h

@@ -343,6 +343,7 @@ class CommandBuffer : public WrappedObject<CommandBuffer, VkCommandBuffer>
                        const void *data);
 
     void setEvent(VkEvent event, VkPipelineStageFlags stageMask);
+    void setScissor(uint32_t firstScissor, uint32_t scissorCount, const VkRect2D *scissors);
     VkResult reset();
     void resetEvent(VkEvent event, VkPipelineStageFlags stageMask);
     void resetQueryPool(const QueryPool &queryPool, uint32_t firstQuery, uint32_t queryCount);
@@ -968,6 +969,14 @@ ANGLE_INLINE void CommandBuffer::setEvent(VkEvent event, VkPipelineStageFlags st
     vkCmdSetEvent(mHandle, event, stageMask);
 }
 
+ANGLE_INLINE void CommandBuffer::setScissor(uint32_t firstScissor,
+                                            uint32_t scissorCount,
+                                            const VkRect2D *scissors)
+{
+    ASSERT(valid() && scissors != nullptr);
+    vkCmdSetScissor(mHandle, firstScissor, scissorCount, scissors);
+}
+
 ANGLE_INLINE void CommandBuffer::resetEvent(VkEvent event, VkPipelineStageFlags stageMask)
 {
     ASSERT(valid() && event != VK_NULL_HANDLE);