Move FreeCommands and SkipCommand to their own file
This commit is contained in:
Corentin Wallez
Corentin Wallez
parent
bcd2e8559e
commit
e909d4efe1
|
|
@ -345,6 +345,8 @@ list(APPEND BACKEND_SOURCES
|
|||
${BACKEND_DIR}/CommandAllocator.h
|
||||
${BACKEND_DIR}/CommandBuffer.cpp
|
||||
${BACKEND_DIR}/CommandBuffer.h
|
||||
${BACKEND_DIR}/Commands.cpp
|
||||
${BACKEND_DIR}/Commands.h
|
||||
${BACKEND_DIR}/ComputePipeline.cpp
|
||||
${BACKEND_DIR}/ComputePipeline.h
|
||||
${BACKEND_DIR}/DepthStencilState.cpp
|
||||
|
|
|
|||
|
|
@ -150,198 +150,6 @@ namespace backend {
|
|||
return mDevice;
|
||||
}
|
||||
|
||||
void FreeCommands(CommandIterator* commands) {
|
||||
Command type;
|
||||
while (commands->NextCommandId(&type)) {
|
||||
switch (type) {
|
||||
case Command::BeginComputePass: {
|
||||
BeginComputePassCmd* begin = commands->NextCommand<BeginComputePassCmd>();
|
||||
begin->~BeginComputePassCmd();
|
||||
} break;
|
||||
case Command::BeginRenderPass: {
|
||||
BeginRenderPassCmd* begin = commands->NextCommand<BeginRenderPassCmd>();
|
||||
begin->~BeginRenderPassCmd();
|
||||
} break;
|
||||
case Command::CopyBufferToBuffer: {
|
||||
CopyBufferToBufferCmd* copy = commands->NextCommand<CopyBufferToBufferCmd>();
|
||||
copy->~CopyBufferToBufferCmd();
|
||||
} break;
|
||||
case Command::CopyBufferToTexture: {
|
||||
CopyBufferToTextureCmd* copy = commands->NextCommand<CopyBufferToTextureCmd>();
|
||||
copy->~CopyBufferToTextureCmd();
|
||||
} break;
|
||||
case Command::CopyTextureToBuffer: {
|
||||
CopyTextureToBufferCmd* copy = commands->NextCommand<CopyTextureToBufferCmd>();
|
||||
copy->~CopyTextureToBufferCmd();
|
||||
} break;
|
||||
case Command::Dispatch: {
|
||||
DispatchCmd* dispatch = commands->NextCommand<DispatchCmd>();
|
||||
dispatch->~DispatchCmd();
|
||||
} break;
|
||||
case Command::DrawArrays: {
|
||||
DrawArraysCmd* draw = commands->NextCommand<DrawArraysCmd>();
|
||||
draw->~DrawArraysCmd();
|
||||
} break;
|
||||
case Command::DrawElements: {
|
||||
DrawElementsCmd* draw = commands->NextCommand<DrawElementsCmd>();
|
||||
draw->~DrawElementsCmd();
|
||||
} break;
|
||||
case Command::EndComputePass: {
|
||||
EndComputePassCmd* cmd = commands->NextCommand<EndComputePassCmd>();
|
||||
cmd->~EndComputePassCmd();
|
||||
} break;
|
||||
case Command::EndRenderPass: {
|
||||
EndRenderPassCmd* cmd = commands->NextCommand<EndRenderPassCmd>();
|
||||
cmd->~EndRenderPassCmd();
|
||||
} break;
|
||||
case Command::SetComputePipeline: {
|
||||
SetComputePipelineCmd* cmd = commands->NextCommand<SetComputePipelineCmd>();
|
||||
cmd->~SetComputePipelineCmd();
|
||||
} break;
|
||||
case Command::SetRenderPipeline: {
|
||||
SetRenderPipelineCmd* cmd = commands->NextCommand<SetRenderPipelineCmd>();
|
||||
cmd->~SetRenderPipelineCmd();
|
||||
} break;
|
||||
case Command::SetPushConstants: {
|
||||
SetPushConstantsCmd* cmd = commands->NextCommand<SetPushConstantsCmd>();
|
||||
commands->NextData<uint32_t>(cmd->count);
|
||||
cmd->~SetPushConstantsCmd();
|
||||
} break;
|
||||
case Command::SetStencilReference: {
|
||||
SetStencilReferenceCmd* cmd = commands->NextCommand<SetStencilReferenceCmd>();
|
||||
cmd->~SetStencilReferenceCmd();
|
||||
} break;
|
||||
case Command::SetScissorRect: {
|
||||
SetScissorRectCmd* cmd = commands->NextCommand<SetScissorRectCmd>();
|
||||
cmd->~SetScissorRectCmd();
|
||||
} break;
|
||||
case Command::SetBlendColor: {
|
||||
SetBlendColorCmd* cmd = commands->NextCommand<SetBlendColorCmd>();
|
||||
cmd->~SetBlendColorCmd();
|
||||
} break;
|
||||
case Command::SetBindGroup: {
|
||||
SetBindGroupCmd* cmd = commands->NextCommand<SetBindGroupCmd>();
|
||||
cmd->~SetBindGroupCmd();
|
||||
} break;
|
||||
case Command::SetIndexBuffer: {
|
||||
SetIndexBufferCmd* cmd = commands->NextCommand<SetIndexBufferCmd>();
|
||||
cmd->~SetIndexBufferCmd();
|
||||
} break;
|
||||
case Command::SetVertexBuffers: {
|
||||
SetVertexBuffersCmd* cmd = commands->NextCommand<SetVertexBuffersCmd>();
|
||||
auto buffers = commands->NextData<Ref<BufferBase>>(cmd->count);
|
||||
for (size_t i = 0; i < cmd->count; ++i) {
|
||||
(&buffers[i])->~Ref<BufferBase>();
|
||||
}
|
||||
commands->NextData<uint32_t>(cmd->count);
|
||||
cmd->~SetVertexBuffersCmd();
|
||||
} break;
|
||||
case Command::TransitionBufferUsage: {
|
||||
TransitionBufferUsageCmd* cmd =
|
||||
commands->NextCommand<TransitionBufferUsageCmd>();
|
||||
cmd->~TransitionBufferUsageCmd();
|
||||
} break;
|
||||
case Command::TransitionTextureUsage: {
|
||||
TransitionTextureUsageCmd* cmd =
|
||||
commands->NextCommand<TransitionTextureUsageCmd>();
|
||||
cmd->~TransitionTextureUsageCmd();
|
||||
} break;
|
||||
}
|
||||
}
|
||||
commands->DataWasDestroyed();
|
||||
}
|
||||
|
||||
void SkipCommand(CommandIterator* commands, Command type) {
|
||||
switch (type) {
|
||||
case Command::BeginComputePass:
|
||||
commands->NextCommand<BeginComputePassCmd>();
|
||||
break;
|
||||
|
||||
case Command::BeginRenderPass:
|
||||
commands->NextCommand<BeginRenderPassCmd>();
|
||||
break;
|
||||
|
||||
case Command::CopyBufferToBuffer:
|
||||
commands->NextCommand<CopyBufferToBufferCmd>();
|
||||
break;
|
||||
|
||||
case Command::CopyBufferToTexture:
|
||||
commands->NextCommand<CopyBufferToTextureCmd>();
|
||||
break;
|
||||
|
||||
case Command::CopyTextureToBuffer:
|
||||
commands->NextCommand<CopyTextureToBufferCmd>();
|
||||
break;
|
||||
|
||||
case Command::Dispatch:
|
||||
commands->NextCommand<DispatchCmd>();
|
||||
break;
|
||||
|
||||
case Command::DrawArrays:
|
||||
commands->NextCommand<DrawArraysCmd>();
|
||||
break;
|
||||
|
||||
case Command::DrawElements:
|
||||
commands->NextCommand<DrawElementsCmd>();
|
||||
break;
|
||||
|
||||
case Command::EndComputePass:
|
||||
commands->NextCommand<EndComputePassCmd>();
|
||||
break;
|
||||
|
||||
case Command::EndRenderPass:
|
||||
commands->NextCommand<EndRenderPassCmd>();
|
||||
break;
|
||||
|
||||
case Command::SetComputePipeline:
|
||||
commands->NextCommand<SetComputePipelineCmd>();
|
||||
break;
|
||||
|
||||
case Command::SetRenderPipeline:
|
||||
commands->NextCommand<SetRenderPipelineCmd>();
|
||||
break;
|
||||
|
||||
case Command::SetPushConstants: {
|
||||
auto* cmd = commands->NextCommand<SetPushConstantsCmd>();
|
||||
commands->NextData<uint32_t>(cmd->count);
|
||||
} break;
|
||||
|
||||
case Command::SetStencilReference:
|
||||
commands->NextCommand<SetStencilReferenceCmd>();
|
||||
break;
|
||||
|
||||
case Command::SetScissorRect:
|
||||
commands->NextCommand<SetScissorRectCmd>();
|
||||
break;
|
||||
|
||||
case Command::SetBlendColor:
|
||||
commands->NextCommand<SetBlendColorCmd>();
|
||||
break;
|
||||
|
||||
case Command::SetBindGroup:
|
||||
commands->NextCommand<SetBindGroupCmd>();
|
||||
break;
|
||||
|
||||
case Command::SetIndexBuffer:
|
||||
commands->NextCommand<SetIndexBufferCmd>();
|
||||
break;
|
||||
|
||||
case Command::SetVertexBuffers: {
|
||||
auto* cmd = commands->NextCommand<SetVertexBuffersCmd>();
|
||||
commands->NextData<Ref<BufferBase>>(cmd->count);
|
||||
commands->NextData<uint32_t>(cmd->count);
|
||||
} break;
|
||||
|
||||
case Command::TransitionBufferUsage:
|
||||
commands->NextCommand<TransitionBufferUsageCmd>();
|
||||
break;
|
||||
|
||||
case Command::TransitionTextureUsage:
|
||||
commands->NextCommand<TransitionTextureUsageCmd>();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
CommandBufferBuilder::CommandBufferBuilder(DeviceBase* device)
|
||||
: Builder(device), mState(std::make_unique<CommandBufferStateTracker>(this)) {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,220 @@
|
|||
// Copyright 2018 The NXT Authors
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "backend/Commands.h"
|
||||
|
||||
#include "backend/BindGroup.h"
|
||||
#include "backend/Buffer.h"
|
||||
#include "backend/CommandAllocator.h"
|
||||
#include "backend/ComputePipeline.h"
|
||||
#include "backend/RenderPipeline.h"
|
||||
#include "backend/Texture.h"
|
||||
|
||||
namespace backend {
|
||||
|
||||
void FreeCommands(CommandIterator* commands) {
|
||||
commands->Reset();
|
||||
|
||||
Command type;
|
||||
while (commands->NextCommandId(&type)) {
|
||||
switch (type) {
|
||||
case Command::BeginComputePass: {
|
||||
BeginComputePassCmd* begin = commands->NextCommand<BeginComputePassCmd>();
|
||||
begin->~BeginComputePassCmd();
|
||||
} break;
|
||||
case Command::BeginRenderPass: {
|
||||
BeginRenderPassCmd* begin = commands->NextCommand<BeginRenderPassCmd>();
|
||||
begin->~BeginRenderPassCmd();
|
||||
} break;
|
||||
case Command::CopyBufferToBuffer: {
|
||||
CopyBufferToBufferCmd* copy = commands->NextCommand<CopyBufferToBufferCmd>();
|
||||
copy->~CopyBufferToBufferCmd();
|
||||
} break;
|
||||
case Command::CopyBufferToTexture: {
|
||||
CopyBufferToTextureCmd* copy = commands->NextCommand<CopyBufferToTextureCmd>();
|
||||
copy->~CopyBufferToTextureCmd();
|
||||
} break;
|
||||
case Command::CopyTextureToBuffer: {
|
||||
CopyTextureToBufferCmd* copy = commands->NextCommand<CopyTextureToBufferCmd>();
|
||||
copy->~CopyTextureToBufferCmd();
|
||||
} break;
|
||||
case Command::Dispatch: {
|
||||
DispatchCmd* dispatch = commands->NextCommand<DispatchCmd>();
|
||||
dispatch->~DispatchCmd();
|
||||
} break;
|
||||
case Command::DrawArrays: {
|
||||
DrawArraysCmd* draw = commands->NextCommand<DrawArraysCmd>();
|
||||
draw->~DrawArraysCmd();
|
||||
} break;
|
||||
case Command::DrawElements: {
|
||||
DrawElementsCmd* draw = commands->NextCommand<DrawElementsCmd>();
|
||||
draw->~DrawElementsCmd();
|
||||
} break;
|
||||
case Command::EndComputePass: {
|
||||
EndComputePassCmd* cmd = commands->NextCommand<EndComputePassCmd>();
|
||||
cmd->~EndComputePassCmd();
|
||||
} break;
|
||||
case Command::EndRenderPass: {
|
||||
EndRenderPassCmd* cmd = commands->NextCommand<EndRenderPassCmd>();
|
||||
cmd->~EndRenderPassCmd();
|
||||
} break;
|
||||
case Command::SetComputePipeline: {
|
||||
SetComputePipelineCmd* cmd = commands->NextCommand<SetComputePipelineCmd>();
|
||||
cmd->~SetComputePipelineCmd();
|
||||
} break;
|
||||
case Command::SetRenderPipeline: {
|
||||
SetRenderPipelineCmd* cmd = commands->NextCommand<SetRenderPipelineCmd>();
|
||||
cmd->~SetRenderPipelineCmd();
|
||||
} break;
|
||||
case Command::SetPushConstants: {
|
||||
SetPushConstantsCmd* cmd = commands->NextCommand<SetPushConstantsCmd>();
|
||||
commands->NextData<uint32_t>(cmd->count);
|
||||
cmd->~SetPushConstantsCmd();
|
||||
} break;
|
||||
case Command::SetStencilReference: {
|
||||
SetStencilReferenceCmd* cmd = commands->NextCommand<SetStencilReferenceCmd>();
|
||||
cmd->~SetStencilReferenceCmd();
|
||||
} break;
|
||||
case Command::SetScissorRect: {
|
||||
SetScissorRectCmd* cmd = commands->NextCommand<SetScissorRectCmd>();
|
||||
cmd->~SetScissorRectCmd();
|
||||
} break;
|
||||
case Command::SetBlendColor: {
|
||||
SetBlendColorCmd* cmd = commands->NextCommand<SetBlendColorCmd>();
|
||||
cmd->~SetBlendColorCmd();
|
||||
} break;
|
||||
case Command::SetBindGroup: {
|
||||
SetBindGroupCmd* cmd = commands->NextCommand<SetBindGroupCmd>();
|
||||
cmd->~SetBindGroupCmd();
|
||||
} break;
|
||||
case Command::SetIndexBuffer: {
|
||||
SetIndexBufferCmd* cmd = commands->NextCommand<SetIndexBufferCmd>();
|
||||
cmd->~SetIndexBufferCmd();
|
||||
} break;
|
||||
case Command::SetVertexBuffers: {
|
||||
SetVertexBuffersCmd* cmd = commands->NextCommand<SetVertexBuffersCmd>();
|
||||
auto buffers = commands->NextData<Ref<BufferBase>>(cmd->count);
|
||||
for (size_t i = 0; i < cmd->count; ++i) {
|
||||
(&buffers[i])->~Ref<BufferBase>();
|
||||
}
|
||||
commands->NextData<uint32_t>(cmd->count);
|
||||
cmd->~SetVertexBuffersCmd();
|
||||
} break;
|
||||
case Command::TransitionBufferUsage: {
|
||||
TransitionBufferUsageCmd* cmd =
|
||||
commands->NextCommand<TransitionBufferUsageCmd>();
|
||||
cmd->~TransitionBufferUsageCmd();
|
||||
} break;
|
||||
case Command::TransitionTextureUsage: {
|
||||
TransitionTextureUsageCmd* cmd =
|
||||
commands->NextCommand<TransitionTextureUsageCmd>();
|
||||
cmd->~TransitionTextureUsageCmd();
|
||||
} break;
|
||||
}
|
||||
}
|
||||
commands->DataWasDestroyed();
|
||||
}
|
||||
|
||||
void SkipCommand(CommandIterator* commands, Command type) {
|
||||
switch (type) {
|
||||
case Command::BeginComputePass:
|
||||
commands->NextCommand<BeginComputePassCmd>();
|
||||
break;
|
||||
|
||||
case Command::BeginRenderPass:
|
||||
commands->NextCommand<BeginRenderPassCmd>();
|
||||
break;
|
||||
|
||||
case Command::CopyBufferToBuffer:
|
||||
commands->NextCommand<CopyBufferToBufferCmd>();
|
||||
break;
|
||||
|
||||
case Command::CopyBufferToTexture:
|
||||
commands->NextCommand<CopyBufferToTextureCmd>();
|
||||
break;
|
||||
|
||||
case Command::CopyTextureToBuffer:
|
||||
commands->NextCommand<CopyTextureToBufferCmd>();
|
||||
break;
|
||||
|
||||
case Command::Dispatch:
|
||||
commands->NextCommand<DispatchCmd>();
|
||||
break;
|
||||
|
||||
case Command::DrawArrays:
|
||||
commands->NextCommand<DrawArraysCmd>();
|
||||
break;
|
||||
|
||||
case Command::DrawElements:
|
||||
commands->NextCommand<DrawElementsCmd>();
|
||||
break;
|
||||
|
||||
case Command::EndComputePass:
|
||||
commands->NextCommand<EndComputePassCmd>();
|
||||
break;
|
||||
|
||||
case Command::EndRenderPass:
|
||||
commands->NextCommand<EndRenderPassCmd>();
|
||||
break;
|
||||
|
||||
case Command::SetComputePipeline:
|
||||
commands->NextCommand<SetComputePipelineCmd>();
|
||||
break;
|
||||
|
||||
case Command::SetRenderPipeline:
|
||||
commands->NextCommand<SetRenderPipelineCmd>();
|
||||
break;
|
||||
|
||||
case Command::SetPushConstants: {
|
||||
auto* cmd = commands->NextCommand<SetPushConstantsCmd>();
|
||||
commands->NextData<uint32_t>(cmd->count);
|
||||
} break;
|
||||
|
||||
case Command::SetStencilReference:
|
||||
commands->NextCommand<SetStencilReferenceCmd>();
|
||||
break;
|
||||
|
||||
case Command::SetScissorRect:
|
||||
commands->NextCommand<SetScissorRectCmd>();
|
||||
break;
|
||||
|
||||
case Command::SetBlendColor:
|
||||
commands->NextCommand<SetBlendColorCmd>();
|
||||
break;
|
||||
|
||||
case Command::SetBindGroup:
|
||||
commands->NextCommand<SetBindGroupCmd>();
|
||||
break;
|
||||
|
||||
case Command::SetIndexBuffer:
|
||||
commands->NextCommand<SetIndexBufferCmd>();
|
||||
break;
|
||||
|
||||
case Command::SetVertexBuffers: {
|
||||
auto* cmd = commands->NextCommand<SetVertexBuffersCmd>();
|
||||
commands->NextData<Ref<BufferBase>>(cmd->count);
|
||||
commands->NextData<uint32_t>(cmd->count);
|
||||
} break;
|
||||
|
||||
case Command::TransitionBufferUsage:
|
||||
commands->NextCommand<TransitionBufferUsageCmd>();
|
||||
break;
|
||||
|
||||
case Command::TransitionTextureUsage:
|
||||
commands->NextCommand<TransitionTextureUsageCmd>();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace backend
|
||||
|
|
@ -167,6 +167,9 @@ namespace backend {
|
|||
// the commands have a chance to run their destructor and remove internal references.
|
||||
class CommandIterator;
|
||||
void FreeCommands(CommandIterator* commands);
|
||||
|
||||
// Helper function to allow skipping over a command when it is unimplemented, while still
|
||||
// consuming the correct amount of data from the command iterator.
|
||||
void SkipCommand(CommandIterator* commands, Command type);
|
||||
|
||||
} // namespace backend
|
||||
|
|
|
|||
Loading…
Reference in New Issue