diff options
| author | Chris Forbes <chrisforbes@google.com> | 2017-04-21 13:27:08 -0700 |
|---|---|---|
| committer | Chris Forbes <chrisf@ijw.co.nz> | 2017-04-23 09:53:31 +1200 |
| commit | 1623d576465a3ed85f1567184f49390f3e530b1b (patch) | |
| tree | f7b5f7dddc7cf9878b370d8f0e70f634a6f680df /layers/core_validation.cpp | |
| parent | 5144f5eb709ab09ff8c830a43563215752eb5c95 (diff) | |
| download | usermoji-1623d576465a3ed85f1567184f49390f3e530b1b.tar.xz | |
layers: Simplify ValidateCmd
Nested !=, == was needlessly weird.
Diffstat (limited to 'layers/core_validation.cpp')
| -rw-r--r-- | layers/core_validation.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index de5949e6..70888257 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -3510,19 +3510,18 @@ static bool ReportInvalidCommandBuffer(layer_data *dev_data, GLOBAL_CB_NODE *cb_ // Validate the given command being added to the specified cmd buffer, flagging errors if CB is not in the recording state or if // there's an issue with the Cmd ordering bool ValidateCmd(layer_data *dev_data, GLOBAL_CB_NODE *cb_state, const CMD_TYPE cmd, const char *caller_name) { - bool skip = false; - if (cb_state->state != CB_RECORDING) { - if (cb_state->state == CB_INVALID) { - skip |= ReportInvalidCommandBuffer(dev_data, cb_state, caller_name); - } else { - skip |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, - reinterpret_cast<uint64_t &>(cb_state->commandBuffer), __LINE__, DRAWSTATE_NO_BEGIN_COMMAND_BUFFER, - "DS", "You must call vkBeginCommandBuffer() before this call to %s", caller_name); - } - } else { - skip |= ValidateCmdSubpassState(dev_data, cb_state, cmd); + switch (cb_state->state) { + case CB_RECORDING: + return ValidateCmdSubpassState(dev_data, cb_state, cmd); + + case CB_INVALID: + return ReportInvalidCommandBuffer(dev_data, cb_state, caller_name); + + default: + return log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, + reinterpret_cast<uint64_t &>(cb_state->commandBuffer), __LINE__, DRAWSTATE_NO_BEGIN_COMMAND_BUFFER, "DS", + "You must call vkBeginCommandBuffer() before this call to %s", caller_name); } - return skip; } void UpdateCmdBufferLastCmd(GLOBAL_CB_NODE *cb_state, const CMD_TYPE cmd) { |