commit 70b7c0fe69fc37bf005118386060f202c646d480
author Po-Hsien Wang <pwang@chromium.org> Wed Sep 01 18:54:41 2021 -0700
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Sat Sep 03 01:47:04 2022 +0000
tree 68ad9dc667dbfc05950eff08092c1b76cb752d3c
parent 0cb34bf9ec768f7c61a2cbf013b424a94acb48eb

draw: Rename draw.drawSize to draw.Triangle

BUG=b:177290952
TEST=./vkbench -t draw.Triangle.64 --verbose --vlayer

Change-Id: I6763514d5bb0b003d97676359b1c86b1a222dbe0
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vkbench/+/3139059
Commit-Queue: Po-Hsien Wang <pwang@chromium.org>
Auto-Submit: Po-Hsien Wang <pwang@chromium.org>
Reviewed-by: Ilja Friedel <ihf@chromium.org>
Tested-by: Po-Hsien Wang <pwang@chromium.org>

src/shaders/triangle.frag

diff --git a/src/shaders/drawSizeTest.frag b/src/shaders/triangle.frag
similarity index 100%
rename from src/shaders/drawSizeTest.frag
rename to src/shaders/triangle.frag

src/shaders/triangle.vert

diff --git a/src/shaders/drawSizeTest.vert b/src/shaders/triangle.vert
similarity index 100%
rename from src/shaders/drawSizeTest.vert
rename to src/shaders/triangle.vert

src/tests/draw.cc

diff --git a/src/tests/draw.cc b/src/tests/draw.cc
index 8192d3f..1cdb156 100644
--- a/src/tests/draw.cc
+++ b/src/tests/draw.cc
@@ -13,13 +13,14 @@
 namespace draw {
 const char* TEST_PREFIX = "draw";
 
-DrawSize::DrawSize(uint64_t width, vkBase* base) {
+Triangle::Triangle(uint64_t width, vkBase* base) {
   vk = base;
   img_extent_.setHeight(width).setWidth(width);
-  name_ = fmt::format("{}.DrawSize.{}", TEST_PREFIX, width);
+  name_ = fmt::format("{}.Triangle.{}", TEST_PREFIX, width);
   desp_ = fmt::format("Draws {}x{} size image with solid color.", width, width);
 }
-void DrawSize::Initialize() {
+
+void Triangle::Initialize() {
   CreateRenderPass();
   CreateGraphicsPipeline();
   img_ = new vkbench::vkImage(vk, img_extent_, img_format_,
@@ -45,7 +46,7 @@
   cmd.end();
 }
 
-void DrawSize::Destroy() {
+void Triangle::Destroy() {
   vkbench::commandTestBase::Destroy();
 
   vk::Device device = vk->GetDevice();
@@ -56,7 +57,7 @@
   device.destroyPipelineLayout(pipeline_layout_);
 }
 
-void DrawSize::CreateRenderPass() {
+void Triangle::CreateRenderPass() {
   vk::AttachmentDescription att_description;
   att_description.setSamples(vk::SampleCountFlagBits::e1)
       .setFormat(img_format_)
@@ -81,9 +82,9 @@
   render_pass_ = vk->GetDevice().createRenderPass(render_pass_info);
 }
 
-void DrawSize::CreateGraphicsPipeline() {
-  std::string vert_shader_code = readShaderFile("drawSizeTest.vert.spv");
-  std::string frag_shader_code = readShaderFile("drawSizeTest.frag.spv");
+void Triangle::CreateGraphicsPipeline() {
+  std::string vert_shader_code = readShaderFile("triangle.vert");
+  std::string frag_shader_code = readShaderFile("triangle.frag");
   vk::Device device = vk->GetDevice();
 
   vk::ShaderModule vert_shader_module =
@@ -142,7 +143,7 @@
       std::move(device.createGraphicsPipeline({}, pipelineInfo).value);
 }
 
-Image DrawSize::GetImage() const {
+Image Triangle::GetImage() const {
   const vk::Device device = vk->GetDevice();
   vkImage* dest = img_->GetReadableImage(vk::ImageLayout::eGeneral);
   DEFER(delete dest);
@@ -154,11 +155,11 @@
 
 std::vector<testBase*> GenTests() {
   return std::vector<testBase*>{
-      new DrawSize(16, vkBase::GetInstance()),
-      new DrawSize(64, vkBase::GetInstance()),
-      new DrawSize(128, vkBase::GetInstance()),
-      new DrawSize(512, vkBase::GetInstance()),
-      new DrawSize(1024, vkBase::GetInstance()),
+      new Triangle(16, vkBase::GetInstance()),
+      new Triangle(64, vkBase::GetInstance()),
+      new Triangle(128, vkBase::GetInstance()),
+      new Triangle(512, vkBase::GetInstance()),
+      new Triangle(1024, vkBase::GetInstance()),
   };
 }
 

src/tests/draw.h

diff --git a/src/tests/draw.h b/src/tests/draw.h
index 9355a67..a250e82 100644
--- a/src/tests/draw.h
+++ b/src/tests/draw.h
@@ -14,10 +14,10 @@
 namespace vkbench {
 namespace draw {
 
-class DrawSize : public commandTestBase {
+class Triangle : public commandTestBase {
  public:
-  DrawSize(uint64_t width, vkBase* base);
-  ~DrawSize() override = default;
+  Triangle(uint64_t width, vkBase* base);
+  ~Triangle() override = default;
 
   const char* Unit() const override { return "us"; }
   Image GetImage() const override;
@@ -38,7 +38,7 @@
   vk::PipelineLayout pipeline_layout_;
   vk::Framebuffer frame_buffer_;
   vkImage* img_;
-  DISALLOW_COPY_AND_ASSIGN(DrawSize);
+  DISALLOW_COPY_AND_ASSIGN(Triangle);
 };
 
 // GenTests generate all the draw tests.

src/utils.cc

diff --git a/src/utils.cc b/src/utils.cc
index 177584d..743567a 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -133,7 +133,7 @@
 }
 
 std::string readShaderFile(const std::string& filename) {
-  FilePath file_path = g_spirv_dir.Append(FilePath(filename));
+  FilePath file_path = g_spirv_dir.Append(FilePath(filename + ".spv"));
   std::ifstream file(file_path.value(), std::ios::ate | std::ios::binary);
   if (!file.is_open()) {
     RUNTIME_ERROR("Failed to open {}", file_path);