Add option to disable SPIR-V validation (#615)

This CL adds a command inline flag --disable-spirv-val which will skip the validation of the generated SPIR-V binary.

1 files changed, 58 insertions, 58 deletions

diff --git a/src/executor_test.cc b/src/executor_test.cc
index b8f4537..499ef5c 100644
--- a/src/executor_test.cc
+++ b/src/executor_test.cc
@@ -226,9 +226,9 @@ logicOp)";
                                         script->GetRequiredInstanceExtensions(),
                                         script->GetRequiredDeviceExtensions());
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_TRUE(r.IsSuccess());
 
   const auto& features = ToStub(engine.get())->GetFeatures();
@@ -257,9 +257,9 @@ VK_KHR_variable_pointers)";
                                         script->GetRequiredInstanceExtensions(),
                                         script->GetRequiredDeviceExtensions());
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_TRUE(r.IsSuccess());
 
   const auto& features = ToStub(engine.get())->GetFeatures();
@@ -288,9 +288,9 @@ depthstencil D24_UNORM_S8_UINT)";
                                         script->GetRequiredInstanceExtensions(),
                                         script->GetRequiredDeviceExtensions());
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_TRUE(r.IsSuccess());
 
   const auto& features = ToStub(engine.get())->GetFeatures();
@@ -316,9 +316,9 @@ fence_timeout 12345)";
                                         script->GetRequiredInstanceExtensions(),
                                         script->GetRequiredDeviceExtensions());
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_TRUE(r.IsSuccess());
 
   const auto& features = ToStub(engine.get())->GetFeatures();
@@ -350,9 +350,9 @@ fence_timeout 12345)";
                                         script->GetRequiredInstanceExtensions(),
                                         script->GetRequiredDeviceExtensions());
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_TRUE(r.IsSuccess());
 
   const auto& features = ToStub(engine.get())->GetFeatures();
@@ -380,9 +380,9 @@ clear)";
   auto engine = MakeEngine();
   auto script = parser.GetScript();
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_TRUE(r.IsSuccess());
   EXPECT_TRUE(ToStub(engine.get())->DidClearCommand());
 }
@@ -400,9 +400,9 @@ clear)";
   ToStub(engine.get())->FailClearCommand();
   auto script = parser.GetScript();
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_FALSE(r.IsSuccess());
   EXPECT_EQ("clear command failed", r.Error());
 }
@@ -419,9 +419,9 @@ clear color 244 123 123 13)";
   auto engine = MakeEngine();
   auto script = parser.GetScript();
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_TRUE(r.IsSuccess());
   ASSERT_TRUE(ToStub(engine.get())->DidClearColorCommand());
 
@@ -448,9 +448,9 @@ clear color 123 123 123 123)";
   ToStub(engine.get())->FailClearColorCommand();
   auto script = parser.GetScript();
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_FALSE(r.IsSuccess());
   EXPECT_EQ("clear color command failed", r.Error());
 }
@@ -467,9 +467,9 @@ clear depth 24)";
   auto engine = MakeEngine();
   auto script = parser.GetScript();
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_TRUE(r.IsSuccess());
   ASSERT_TRUE(ToStub(engine.get())->DidClearDepthCommand());
 }
@@ -487,9 +487,9 @@ clear depth 24)";
   ToStub(engine.get())->FailClearDepthCommand();
   auto script = parser.GetScript();
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_FALSE(r.IsSuccess());
   EXPECT_EQ("clear depth command failed", r.Error());
 }
@@ -506,9 +506,9 @@ clear stencil 24)";
   auto engine = MakeEngine();
   auto script = parser.GetScript();
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_TRUE(r.IsSuccess());
   ASSERT_TRUE(ToStub(engine.get())->DidClearStencilCommand());
 }
@@ -526,9 +526,9 @@ clear stencil 24)";
   ToStub(engine.get())->FailClearStencilCommand();
   auto script = parser.GetScript();
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_FALSE(r.IsSuccess());
   EXPECT_EQ("clear stencil command failed", r.Error());
 }
@@ -545,9 +545,9 @@ draw rect 2 4 10 20)";
   auto engine = MakeEngine();
   auto script = parser.GetScript();
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_TRUE(r.IsSuccess());
   ASSERT_TRUE(ToStub(engine.get())->DidDrawRectCommand());
 }
@@ -565,9 +565,9 @@ draw rect 2 4 10 20)";
   ToStub(engine.get())->FailDrawRectCommand();
   auto script = parser.GetScript();
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_FALSE(r.IsSuccess());
   EXPECT_EQ("draw rect command failed", r.Error());
 }
@@ -584,9 +584,9 @@ draw arrays TRIANGLE_LIST 0 0)";
   auto engine = MakeEngine();
   auto script = parser.GetScript();
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_TRUE(r.IsSuccess());
   ASSERT_TRUE(ToStub(engine.get())->DidDrawArraysCommand());
 }
@@ -604,9 +604,9 @@ draw arrays TRIANGLE_LIST 0 0)";
   ToStub(engine.get())->FailDrawArraysCommand();
   auto script = parser.GetScript();
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_FALSE(r.IsSuccess());
   EXPECT_EQ("draw arrays command failed", r.Error());
 }
@@ -623,9 +623,9 @@ compute 2 3 4)";
   auto engine = MakeEngine();
   auto script = parser.GetScript();
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_TRUE(r.IsSuccess());
   ASSERT_TRUE(ToStub(engine.get())->DidComputeCommand());
 }
@@ -643,9 +643,9 @@ compute 2 3 4)";
   ToStub(engine.get())->FailComputeCommand();
   auto script = parser.GetScript();
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_FALSE(r.IsSuccess());
   EXPECT_EQ("compute command failed", r.Error());
 }
@@ -662,9 +662,9 @@ vertex entrypoint main)";
   auto engine = MakeEngine();
   auto script = parser.GetScript();
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_TRUE(r.IsSuccess());
   ASSERT_TRUE(ToStub(engine.get())->DidEntryPointCommand());
 }
@@ -682,9 +682,9 @@ vertex entrypoint main)";
   ToStub(engine.get())->FailEntryPointCommand();
   auto script = parser.GetScript();
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_FALSE(r.IsSuccess());
   EXPECT_EQ("entrypoint command failed", r.Error());
 }
@@ -701,9 +701,9 @@ patch parameter vertices 10)";
   auto engine = MakeEngine();
   auto script = parser.GetScript();
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_TRUE(r.IsSuccess());
   ASSERT_TRUE(ToStub(engine.get())->DidPatchParameterVerticesCommand());
 }
@@ -721,9 +721,9 @@ patch parameter vertices 10)";
   ToStub(engine.get())->FailPatchParameterVerticesCommand();
   auto script = parser.GetScript();
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_FALSE(r.IsSuccess());
   EXPECT_EQ("patch command failed", r.Error());
 }
@@ -739,9 +739,9 @@ probe rect rgba 2 3 40 40 0.2 0.4 0.4 0.3)";
   auto engine = MakeEngine();
   auto script = parser.GetScript();
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_TRUE(r.IsSuccess());
   // ASSERT_TRUE(ToStub(engine.get())->DidProbeCommand());
 }
@@ -758,9 +758,9 @@ probe rect rgba 2 3 40 40 0.2 0.4 0.4 0.3)";
   // ToStub(engine.get())->FailProbeCommand();
   auto script = parser.GetScript();
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_FALSE(r.IsSuccess());
   EXPECT_EQ("probe command failed", r.Error());
 }
@@ -777,9 +777,9 @@ ssbo 0 24)";
   auto engine = MakeEngine();
   auto script = parser.GetScript();
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_TRUE(r.IsSuccess());
   ASSERT_TRUE(ToStub(engine.get())->DidBufferCommand());
 }
@@ -797,9 +797,9 @@ ssbo 0 24)";
   ToStub(engine.get())->FailBufferCommand();
   auto script = parser.GetScript();
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_FALSE(r.IsSuccess());
   EXPECT_EQ("buffer command failed", r.Error());
 }
@@ -815,9 +815,9 @@ probe ssbo vec3 0 2 <= 2 3 4)";
   auto engine = MakeEngine();
   auto script = parser.GetScript();
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_TRUE(r.IsSuccess());
   // ASSERT_TRUE(ToStub(engine.get())->DidProbeSSBOCommand());
 }
@@ -834,9 +834,9 @@ probe ssbo vec3 0 2 <= 2 3 4)";
   // ToStub(engine.get())->FailProbeSSBOCommand();
   auto script = parser.GetScript();
 
+  Options options;
   Executor ex;
-  Result r = ex.Execute(engine.get(), script.get(), nullptr, ShaderMap(),
-                        ExecutionType::kExecute);
+  Result r = ex.Execute(engine.get(), script.get(), ShaderMap(), &options);
   ASSERT_FALSE(r.IsSuccess());
   EXPECT_EQ("probe ssbo command failed", r.Error());
 }