Add flag to log execute calls. (#483)

This CL adds a flag to the sample app and extends the Delgate to allow
logging command names before they're executed. This should allow easier
tracking down of the command which causes a segv during executing.

1 files changed, 29 insertions, 29 deletions

diff --git a/src/executor_test.cc b/src/executor_test.cc
index f1e07f8..305197b 100644
--- a/src/executor_test.cc
+++ b/src/executor_test.cc
@@ -226,7 +226,7 @@ logicOp)";
                                         script->GetRequiredDeviceExtensions());
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_TRUE(r.IsSuccess());
 
@@ -256,7 +256,7 @@ VK_KHR_variable_pointers)";
                                         script->GetRequiredDeviceExtensions());
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_TRUE(r.IsSuccess());
 
@@ -286,7 +286,7 @@ depthstencil D24_UNORM_S8_UINT)";
                                         script->GetRequiredDeviceExtensions());
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_TRUE(r.IsSuccess());
 
@@ -313,7 +313,7 @@ fence_timeout 12345)";
                                         script->GetRequiredDeviceExtensions());
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_TRUE(r.IsSuccess());
 
@@ -346,7 +346,7 @@ fence_timeout 12345)";
                                         script->GetRequiredDeviceExtensions());
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_TRUE(r.IsSuccess());
 
@@ -375,7 +375,7 @@ clear)";
   auto script = parser.GetScript();
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_TRUE(r.IsSuccess());
   EXPECT_TRUE(ToStub(engine.get())->DidClearCommand());
@@ -394,7 +394,7 @@ clear)";
   auto script = parser.GetScript();
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_FALSE(r.IsSuccess());
   EXPECT_EQ("clear command failed", r.Error());
@@ -412,7 +412,7 @@ clear color 244 123 123 13)";
   auto script = parser.GetScript();
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_TRUE(r.IsSuccess());
   ASSERT_TRUE(ToStub(engine.get())->DidClearColorCommand());
@@ -440,7 +440,7 @@ clear color 123 123 123 123)";
   auto script = parser.GetScript();
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_FALSE(r.IsSuccess());
   EXPECT_EQ("clear color command failed", r.Error());
@@ -458,7 +458,7 @@ clear depth 24)";
   auto script = parser.GetScript();
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_TRUE(r.IsSuccess());
   ASSERT_TRUE(ToStub(engine.get())->DidClearDepthCommand());
@@ -477,7 +477,7 @@ clear depth 24)";
   auto script = parser.GetScript();
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_FALSE(r.IsSuccess());
   EXPECT_EQ("clear depth command failed", r.Error());
@@ -495,7 +495,7 @@ clear stencil 24)";
   auto script = parser.GetScript();
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_TRUE(r.IsSuccess());
   ASSERT_TRUE(ToStub(engine.get())->DidClearStencilCommand());
@@ -514,7 +514,7 @@ clear stencil 24)";
   auto script = parser.GetScript();
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_FALSE(r.IsSuccess());
   EXPECT_EQ("clear stencil command failed", r.Error());
@@ -532,7 +532,7 @@ draw rect 2 4 10 20)";
   auto script = parser.GetScript();
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_TRUE(r.IsSuccess());
   ASSERT_TRUE(ToStub(engine.get())->DidDrawRectCommand());
@@ -551,7 +551,7 @@ draw rect 2 4 10 20)";
   auto script = parser.GetScript();
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_FALSE(r.IsSuccess());
   EXPECT_EQ("draw rect command failed", r.Error());
@@ -569,7 +569,7 @@ draw arrays TRIANGLE_LIST 0 0)";
   auto script = parser.GetScript();
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_TRUE(r.IsSuccess());
   ASSERT_TRUE(ToStub(engine.get())->DidDrawArraysCommand());
@@ -588,7 +588,7 @@ draw arrays TRIANGLE_LIST 0 0)";
   auto script = parser.GetScript();
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_FALSE(r.IsSuccess());
   EXPECT_EQ("draw arrays command failed", r.Error());
@@ -606,7 +606,7 @@ compute 2 3 4)";
   auto script = parser.GetScript();
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_TRUE(r.IsSuccess());
   ASSERT_TRUE(ToStub(engine.get())->DidComputeCommand());
@@ -625,7 +625,7 @@ compute 2 3 4)";
   auto script = parser.GetScript();
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_FALSE(r.IsSuccess());
   EXPECT_EQ("compute command failed", r.Error());
@@ -643,7 +643,7 @@ vertex entrypoint main)";
   auto script = parser.GetScript();
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_TRUE(r.IsSuccess());
   ASSERT_TRUE(ToStub(engine.get())->DidEntryPointCommand());
@@ -662,7 +662,7 @@ vertex entrypoint main)";
   auto script = parser.GetScript();
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_FALSE(r.IsSuccess());
   EXPECT_EQ("entrypoint command failed", r.Error());
@@ -680,7 +680,7 @@ patch parameter vertices 10)";
   auto script = parser.GetScript();
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_TRUE(r.IsSuccess());
   ASSERT_TRUE(ToStub(engine.get())->DidPatchParameterVerticesCommand());
@@ -699,7 +699,7 @@ patch parameter vertices 10)";
   auto script = parser.GetScript();
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_FALSE(r.IsSuccess());
   EXPECT_EQ("patch command failed", r.Error());
@@ -717,7 +717,7 @@ probe rect rgba 2 3 40 40 0.2 0.4 0.4 0.3)";
   auto script = parser.GetScript();
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_TRUE(r.IsSuccess());
   // ASSERT_TRUE(ToStub(engine.get())->DidProbeCommand());
@@ -736,7 +736,7 @@ probe rect rgba 2 3 40 40 0.2 0.4 0.4 0.3)";
   auto script = parser.GetScript();
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_FALSE(r.IsSuccess());
   EXPECT_EQ("probe command failed", r.Error());
@@ -754,7 +754,7 @@ ssbo 0 24)";
   auto script = parser.GetScript();
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_TRUE(r.IsSuccess());
   ASSERT_TRUE(ToStub(engine.get())->DidBufferCommand());
@@ -773,7 +773,7 @@ ssbo 0 24)";
   auto script = parser.GetScript();
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_FALSE(r.IsSuccess());
   EXPECT_EQ("buffer command failed", r.Error());
@@ -791,7 +791,7 @@ probe ssbo vec3 0 2 <= 2 3 4)";
   auto script = parser.GetScript();
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_TRUE(r.IsSuccess());
   // ASSERT_TRUE(ToStub(engine.get())->DidProbeSSBOCommand());
@@ -810,7 +810,7 @@ probe ssbo vec3 0 2 <= 2 3 4)";
   auto script = parser.GetScript();
 
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(),
+  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
                         ExecutionType::kExecute);
   ASSERT_FALSE(r.IsSuccess());
   EXPECT_EQ("probe ssbo command failed", r.Error());