Add a PipelineCommand class. (#380)

This CL adds a new subclass of Command, PipelineCommand. The Probe
commands do not have pipelines so they inherit from Command. Other
commands inherit from PipelineCommand.

2 files changed, 39 insertions, 27 deletions

diff --git a/src/command.cc b/src/command.cc
index d5a8429..7202fae 100644
--- a/src/command.cc
+++ b/src/command.cc
@@ -18,8 +18,7 @@
 
 namespace amber {
 
-Command::Command(Type type, Pipeline* pipeline)
-    : command_type_(type), pipeline_(pipeline) {}
+Command::Command(Type type) : command_type_(type) {}
 
 Command::~Command() = default;
 
@@ -71,23 +70,27 @@ ProbeSSBOCommand* Command::AsProbeSSBO() {
   return static_cast<ProbeSSBOCommand*>(this);
 }
 
+PipelineCommand::PipelineCommand(Type type, Pipeline* pipeline)
+    : Command(type), pipeline_(pipeline) {}
+
+PipelineCommand::~PipelineCommand() = default;
+
 DrawRectCommand::DrawRectCommand(Pipeline* pipeline, PipelineData data)
-    : Command(Type::kDrawRect, pipeline), data_(data) {}
+    : PipelineCommand(Type::kDrawRect, pipeline), data_(data) {}
 
 DrawRectCommand::~DrawRectCommand() = default;
 
 DrawArraysCommand::DrawArraysCommand(Pipeline* pipeline, PipelineData data)
-    : Command(Type::kDrawArrays, pipeline), data_(data) {}
+    : PipelineCommand(Type::kDrawArrays, pipeline), data_(data) {}
 
 DrawArraysCommand::~DrawArraysCommand() = default;
 
 ComputeCommand::ComputeCommand(Pipeline* pipeline)
-    : Command(Type::kCompute, pipeline) {}
+    : PipelineCommand(Type::kCompute, pipeline) {}
 
 ComputeCommand::~ComputeCommand() = default;
 
-Probe::Probe(Type type, Buffer* buffer)
-    : Command(type, nullptr), buffer_(buffer) {}
+Probe::Probe(Type type, Buffer* buffer) : Command(type), buffer_(buffer) {}
 
 Probe::~Probe() = default;
 
@@ -101,37 +104,37 @@ ProbeSSBOCommand::ProbeSSBOCommand(Buffer* buffer)
 ProbeSSBOCommand::~ProbeSSBOCommand() = default;
 
 BufferCommand::BufferCommand(BufferType type, Pipeline* pipeline)
-    : Command(Type::kBuffer, pipeline), buffer_type_(type) {}
+    : PipelineCommand(Type::kBuffer, pipeline), buffer_type_(type) {}
 
 BufferCommand::~BufferCommand() = default;
 
 ClearCommand::ClearCommand(Pipeline* pipeline)
-    : Command(Type::kClear, pipeline) {}
+    : PipelineCommand(Type::kClear, pipeline) {}
 
 ClearCommand::~ClearCommand() = default;
 
 ClearColorCommand::ClearColorCommand(Pipeline* pipeline)
-    : Command(Type::kClearColor, pipeline) {}
+    : PipelineCommand(Type::kClearColor, pipeline) {}
 
 ClearColorCommand::~ClearColorCommand() = default;
 
 ClearDepthCommand::ClearDepthCommand(Pipeline* pipeline)
-    : Command(Type::kClearDepth, pipeline) {}
+    : PipelineCommand(Type::kClearDepth, pipeline) {}
 
 ClearDepthCommand::~ClearDepthCommand() = default;
 
 ClearStencilCommand::ClearStencilCommand(Pipeline* pipeline)
-    : Command(Type::kClearStencil, pipeline) {}
+    : PipelineCommand(Type::kClearStencil, pipeline) {}
 
 ClearStencilCommand::~ClearStencilCommand() = default;
 
 PatchParameterVerticesCommand::PatchParameterVerticesCommand(Pipeline* pipeline)
-    : Command(Type::kPatchParameterVertices, pipeline) {}
+    : PipelineCommand(Type::kPatchParameterVertices, pipeline) {}
 
 PatchParameterVerticesCommand::~PatchParameterVerticesCommand() = default;
 
 EntryPointCommand::EntryPointCommand(Pipeline* pipeline)
-    : Command(Type::kEntryPoint, pipeline) {}
+    : PipelineCommand(Type::kEntryPoint, pipeline) {}
 
 EntryPointCommand::~EntryPointCommand() = default;
 
diff --git a/src/command.h b/src/command.h
index 29b29a3..02d7761 100644
--- a/src/command.h
+++ b/src/command.h
@@ -94,17 +94,26 @@ class Command {
   void SetLine(size_t line) { line_ = line; }
   size_t GetLine() const { return line_; }
 
+ protected:
+  explicit Command(Type type);
+
+  Type command_type_;
+  size_t line_ = 1;
+};
+
+class PipelineCommand : public Command {
+ public:
+  ~PipelineCommand() override;
+
   Pipeline* GetPipeline() const { return pipeline_; }
 
  protected:
-  explicit Command(Type type, Pipeline* pipeline);
+  explicit PipelineCommand(Type type, Pipeline* pipeline);
 
-  Type command_type_;
   Pipeline* pipeline_;
-  size_t line_ = 1;
 };
 
-class DrawRectCommand : public Command {
+class DrawRectCommand : public PipelineCommand {
  public:
   explicit DrawRectCommand(Pipeline* pipeline, PipelineData data);
   ~DrawRectCommand() override;
@@ -139,7 +148,7 @@ class DrawRectCommand : public Command {
   float height_ = 0.0;
 };
 
-class DrawArraysCommand : public Command {
+class DrawArraysCommand : public PipelineCommand {
  public:
   explicit DrawArraysCommand(Pipeline* pipeline, PipelineData data);
   ~DrawArraysCommand() override;
@@ -174,7 +183,7 @@ class DrawArraysCommand : public Command {
   uint32_t instance_count_ = 0;
 };
 
-class ComputeCommand : public Command {
+class ComputeCommand : public PipelineCommand {
  public:
   explicit ComputeCommand(Pipeline* pipeline);
   ~ComputeCommand() override;
@@ -324,7 +333,7 @@ class ProbeSSBOCommand : public Probe {
   std::vector<Value> values_;
 };
 
-class BufferCommand : public Command {
+class BufferCommand : public PipelineCommand {
  public:
   enum class BufferType {
     kSSBO,
@@ -381,13 +390,13 @@ class BufferCommand : public Command {
   std::vector<Value> values_;
 };
 
-class ClearCommand : public Command {
+class ClearCommand : public PipelineCommand {
  public:
   explicit ClearCommand(Pipeline* pipeline);
   ~ClearCommand() override;
 };
 
-class ClearColorCommand : public Command {
+class ClearColorCommand : public PipelineCommand {
  public:
   explicit ClearColorCommand(Pipeline* pipeline);
   ~ClearColorCommand() override;
@@ -411,7 +420,7 @@ class ClearColorCommand : public Command {
   float a_ = 0.0;
 };
 
-class ClearDepthCommand : public Command {
+class ClearDepthCommand : public PipelineCommand {
  public:
   explicit ClearDepthCommand(Pipeline* pipeline);
   ~ClearDepthCommand() override;
@@ -423,7 +432,7 @@ class ClearDepthCommand : public Command {
   float value_ = 0.0;
 };
 
-class ClearStencilCommand : public Command {
+class ClearStencilCommand : public PipelineCommand {
  public:
   explicit ClearStencilCommand(Pipeline* pipeline);
   ~ClearStencilCommand() override;
@@ -435,7 +444,7 @@ class ClearStencilCommand : public Command {
   uint32_t value_ = 0;
 };
 
-class PatchParameterVerticesCommand : public Command {
+class PatchParameterVerticesCommand : public PipelineCommand {
  public:
   explicit PatchParameterVerticesCommand(Pipeline* pipeline);
   ~PatchParameterVerticesCommand() override;
@@ -447,7 +456,7 @@ class PatchParameterVerticesCommand : public Command {
   uint32_t control_point_count_ = 0;
 };
 
-class EntryPointCommand : public Command {
+class EntryPointCommand : public PipelineCommand {
  public:
   explicit EntryPointCommand(Pipeline* pipeline);
   ~EntryPointCommand() override;