From ad963b652064ef9da467db81da1a4d330b1a3f4b Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Sat, 3 Nov 2018 20:41:03 -0300
Subject: [PATCH] Add OpCompositeExtract

---
 include/sirit/sirit.h |  4 ++++
 src/insts/memory.cpp  | 22 ++++++++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/include/sirit/sirit.h b/include/sirit/sirit.h
index fc8c721..0003860 100644
--- a/include/sirit/sirit.h
+++ b/include/sirit/sirit.h
@@ -229,6 +229,10 @@ class Module {
     Id OpCompositeInsert(Id result_type, Id object, Id composite,
                          const std::vector<Literal>& indexes = {});
 
+    /// Extract a part of a composite object.
+    Id OpCompositeExtract(Id result_type, Id composite,
+                          const std::vector<Literal>& indexes = {});
+
     // Annotation
 
     /// Add a decoration to target.
diff --git a/src/insts/memory.cpp b/src/insts/memory.cpp
index bffa2c0..7306cd8 100644
--- a/src/insts/memory.cpp
+++ b/src/insts/memory.cpp
@@ -11,7 +11,7 @@
 namespace Sirit {
 
 Id Module::OpVariable(Id result_type, spv::StorageClass storage_class,
-                       Id initializer) {
+                      Id initializer) {
     auto op{std::make_unique<Op>(spv::Op::OpVariable, bound++, result_type)};
     op->Add(static_cast<u32>(storage_class));
     if (initializer) {
@@ -21,7 +21,7 @@ Id Module::OpVariable(Id result_type, spv::StorageClass storage_class,
 }
 
 Id Module::OpLoad(Id result_type, Id pointer,
-                   std::optional<spv::MemoryAccessMask> memory_access) {
+                  std::optional<spv::MemoryAccessMask> memory_access) {
     auto op{std::make_unique<Op>(spv::Op::OpLoad, bound++, result_type)};
     op->Add(pointer);
     if (memory_access) {
@@ -31,7 +31,7 @@ Id Module::OpLoad(Id result_type, Id pointer,
 }
 
 Id Module::OpStore(Id pointer, Id object,
-                    std::optional<spv::MemoryAccessMask> memory_access) {
+                   std::optional<spv::MemoryAccessMask> memory_access) {
     auto op{std::make_unique<Op>(spv::Op::OpStore)};
     op->Add(pointer);
     op->Add(object);
@@ -42,7 +42,7 @@ Id Module::OpStore(Id pointer, Id object,
 }
 
 Id Module::OpAccessChain(Id result_type, Id base,
-                          const std::vector<Id>& indexes) {
+                         const std::vector<Id>& indexes) {
     assert(indexes.size() > 0);
     auto op{std::make_unique<Op>(spv::Op::OpAccessChain, bound++, result_type)};
     op->Add(base);
@@ -51,12 +51,22 @@ Id Module::OpAccessChain(Id result_type, Id base,
 }
 
 Id Module::OpCompositeInsert(Id result_type, Id object, Id composite,
-                              const std::vector<Literal>& indexes) {
-    auto op{std::make_unique<Op>(spv::Op::OpCompositeInsert, bound++, result_type)};
+                             const std::vector<Literal>& indexes) {
+    auto op{
+        std::make_unique<Op>(spv::Op::OpCompositeInsert, bound++, result_type)};
     op->Add(object);
     op->Add(composite);
     op->Add(indexes);
     return AddCode(std::move(op));
 }
 
+Id Module::OpCompositeExtract(Id result_type, Id composite,
+                              const std::vector<Literal>& indexes) {
+    auto op{std::make_unique<Op>(spv::Op::OpCompositeExtract, bound++,
+                                 result_type)};
+    op->Add(composite);
+    op->Add(indexes);
+    return AddCode(std::move(op));
+}
+
 } // namespace Sirit