From 5ec7cf50fc19317666d311fa1770f82db03b0f99 Mon Sep 17 00:00:00 2001
From: chyyran <ronny@ronnychan.ca>
Date: Wed, 17 Jan 2024 21:34:40 -0500
Subject: [PATCH] build: try to fix build for arm

---
 .github/workflows/build-linux-arm64.yml |  1 +
 .github/workflows/build.yml             |  3 --
 .idea/workspace.xml                     | 61 ++++++++++++-------------
 3 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/build-linux-arm64.yml b/.github/workflows/build-linux-arm64.yml
index 1dc42c18..40b8b0e2 100644
--- a/.github/workflows/build-linux-arm64.yml
+++ b/.github/workflows/build-linux-arm64.yml
@@ -33,6 +33,7 @@ jobs:
     - name: Install ARM64 cross-compilation dependencies
       continue-on-error: true
       run: |
+        sudo apt-get update || true
         sudo dpkg --add-architecture arm64
         echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy main restricted" | sudo tee -a /etc/apt/sources.list
         echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted" | sudo tee -a /etc/apt/sources.list
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 77b8f0c5..36733b0a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -35,9 +35,6 @@ jobs:
       with:
         version: latest
         cache: true
-    - if: runner.os == 'Windows'
-      run: pip install meson ninja mako
-      name: Install Meson for spirv-to-dxil-sys
     - name: Build dynamic library
       run: cargo run -p librashader-build-script -- --profile ${{ matrix.profile }}
     - name: Upload build artifacts
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9b88ff3f..f0849112 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -12,9 +12,7 @@
     <cargoProject FILE="$PROJECT_DIR$/Cargo.toml" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="02471831-07cd-4975-a00c-e042450023a1" name="Changes" comment="rt(wgpu): create pipeline">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-    </list>
+    <list default="true" id="02471831-07cd-4975-a00c-e042450023a1" name="Changes" comment="rt(wgpu): create pipeline" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -56,34 +54,34 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;Cargo.Build `Test back::wgsl::test::test_into`.executor&quot;: &quot;Run&quot;,
-    &quot;Cargo.Build `Test reflect::cross::test::test_into`.executor&quot;: &quot;Run&quot;,
-    &quot;Cargo.Test back::wgsl::test::test_into.executor&quot;: &quot;Run&quot;,
-    &quot;Cargo.Test front::naga::test::naga_playground (1).executor&quot;: &quot;Run&quot;,
-    &quot;Cargo.Test front::naga::test::naga_playground.executor&quot;: &quot;Run&quot;,
-    &quot;Cargo.Test reflect::cross::test::test_into.executor&quot;: &quot;Run&quot;,
-    &quot;Cargo.Test triangle_wgpu.executor&quot;: &quot;Run&quot;,
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.RadMigrateCodeStyle&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.readMode.enableVisualFormatting&quot;: &quot;true&quot;,
-    &quot;cf.first.check.clang-format&quot;: &quot;false&quot;,
-    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;86a88bb2&quot;,
-    &quot;last_opened_file_path&quot;: &quot;F:/coding/librashader&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;org.rust.cargo.project.model.PROJECT_DISCOVERY&quot;: &quot;true&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;project.propVCSSupport.DirectoryMappings&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "Cargo.Build `Test back::wgsl::test::test_into`.executor": "Run",
+    "Cargo.Build `Test reflect::cross::test::test_into`.executor": "Run",
+    "Cargo.Test back::wgsl::test::test_into.executor": "Run",
+    "Cargo.Test front::naga::test::naga_playground (1).executor": "Run",
+    "Cargo.Test front::naga::test::naga_playground.executor": "Run",
+    "Cargo.Test reflect::cross::test::test_into.executor": "Run",
+    "Cargo.Test triangle_wgpu.executor": "Run",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.RadMigrateCodeStyle": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.cidr.known.project.marker": "true",
+    "RunOnceActivity.readMode.enableVisualFormatting": "true",
+    "cf.first.check.clang-format": "false",
+    "cidr.known.project.marker": "true",
+    "git-widget-placeholder": "feat-wgpu-runtime",
+    "last_opened_file_path": "F:/coding/librashader",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "org.rust.cargo.project.model.PROJECT_DISCOVERY": "true",
+    "settings.editor.selected.configurable": "project.propVCSSupport.DirectoryMappings",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
       <recent name="F:\coding\librashader\librashader-reflect\src\back\wgsl" />
@@ -212,12 +210,12 @@
     </configuration>
     <list>
       <item itemvalue="Cargo.Run librashader-build-script" />
+      <item itemvalue="Cargo.Test back::wgsl::test::test_into" />
       <item itemvalue="Cargo.Test librashader" />
       <item itemvalue="Cargo.Test triangle_d3d11" />
       <item itemvalue="Cargo.Test triangle_d3d12" />
       <item itemvalue="Cargo.Test triangle_gl46" />
       <item itemvalue="Cargo.Test triangle_vk" />
-      <item itemvalue="Cargo.Test back::wgsl::test::test_into" />
     </list>
     <recent_temporary>
       <list>
@@ -261,6 +259,7 @@
       <workItem from="1702484102491" duration="5258000" />
       <workItem from="1702561144428" duration="1836000" />
       <workItem from="1702640983281" duration="967000" />
+      <workItem from="1705541451154" duration="11000" />
     </task>
     <task id="LOCAL-00001" summary="rt(wgpu): basic triangle example">
       <option name="closed" value="true" />