alex/librashader
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

build: try to fix build for arm

Browse source
This commit is contained in:
chyyran 2024-01-17 21:34:40 -05:00 committed by Ronny Chan
parent 7586ed4633
commit 34f224cc5d
3 changed files with 31 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/build-linux-arm64.yml vendored
View file

@ -33,6 +33,7 @@ jobs:
- name: Install ARM64 cross-compilation dependencies - name: Install ARM64 cross-compilation dependencies
continue-on-error: true continue-on-error: true
run: | run: |
sudo apt-get update || true
sudo dpkg --add-architecture arm64 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 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 echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted" | sudo tee -a /etc/apt/sources.list

3
.github/workflows/build.yml vendored
View file

@ -35,9 +35,6 @@ jobs:
with: with:
version: latest version: latest
cache: true cache: true
- if: runner.os == 'Windows'
run: pip install meson ninja mako
name: Install Meson for spirv-to-dxil-sys
- name: Build dynamic library - name: Build dynamic library
run: cargo run -p librashader-build-script -- --profile ${{ matrix.profile }} run: cargo run -p librashader-build-script -- --profile ${{ matrix.profile }}
- name: Upload build artifacts - name: Upload build artifacts

61
.idea/workspace.xml
View file

@ -12,9 +12,7 @@
<cargoProject FILE="$PROJECT_DIR$/Cargo.toml" /> <cargoProject FILE="$PROJECT_DIR$/Cargo.toml" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="02471831-07cd-4975-a00c-e042450023a1" name="Changes" comment="rt(wgpu): create pipeline"> <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>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@ -56,34 +54,34 @@
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent">{ <component name="PropertiesComponent"><![CDATA[{
&quot;keyToString&quot;: { "keyToString": {
&quot;Cargo.Build `Test back::wgsl::test::test_into`.executor&quot;: &quot;Run&quot;, "Cargo.Build `Test back::wgsl::test::test_into`.executor": "Run",
&quot;Cargo.Build `Test reflect::cross::test::test_into`.executor&quot;: &quot;Run&quot;, "Cargo.Build `Test reflect::cross::test::test_into`.executor": "Run",
&quot;Cargo.Test back::wgsl::test::test_into.executor&quot;: &quot;Run&quot;, "Cargo.Test back::wgsl::test::test_into.executor": "Run",
&quot;Cargo.Test front::naga::test::naga_playground (1).executor&quot;: &quot;Run&quot;, "Cargo.Test front::naga::test::naga_playground (1).executor": "Run",
&quot;Cargo.Test front::naga::test::naga_playground.executor&quot;: &quot;Run&quot;, "Cargo.Test front::naga::test::naga_playground.executor": "Run",
&quot;Cargo.Test reflect::cross::test::test_into.executor&quot;: &quot;Run&quot;, "Cargo.Test reflect::cross::test::test_into.executor": "Run",
&quot;Cargo.Test triangle_wgpu.executor&quot;: &quot;Run&quot;, "Cargo.Test triangle_wgpu.executor": "Run",
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;, "RunOnceActivity.OpenProjectViewOnStart": "true",
&quot;RunOnceActivity.RadMigrateCodeStyle&quot;: &quot;true&quot;, "RunOnceActivity.RadMigrateCodeStyle": "true",
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;, "RunOnceActivity.ShowReadmeOnStart": "true",
&quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;, "RunOnceActivity.cidr.known.project.marker": "true",
&quot;RunOnceActivity.readMode.enableVisualFormatting&quot;: &quot;true&quot;, "RunOnceActivity.readMode.enableVisualFormatting": "true",
&quot;cf.first.check.clang-format&quot;: &quot;false&quot;, "cf.first.check.clang-format": "false",
&quot;cidr.known.project.marker&quot;: &quot;true&quot;, "cidr.known.project.marker": "true",
&quot;git-widget-placeholder&quot;: &quot;86a88bb2&quot;, "git-widget-placeholder": "feat-wgpu-runtime",
&quot;last_opened_file_path&quot;: &quot;F:/coding/librashader&quot;, "last_opened_file_path": "F:/coding/librashader",
&quot;node.js.detected.package.eslint&quot;: &quot;true&quot;, "node.js.detected.package.eslint": "true",
&quot;node.js.detected.package.tslint&quot;: &quot;true&quot;, "node.js.detected.package.tslint": "true",
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;, "node.js.selected.package.eslint": "(autodetect)",
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;, "node.js.selected.package.tslint": "(autodetect)",
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;, "nodejs_package_manager_path": "npm",
&quot;org.rust.cargo.project.model.PROJECT_DISCOVERY&quot;: &quot;true&quot;, "org.rust.cargo.project.model.PROJECT_DISCOVERY": "true",
&quot;settings.editor.selected.configurable&quot;: &quot;project.propVCSSupport.DirectoryMappings&quot;, "settings.editor.selected.configurable": "project.propVCSSupport.DirectoryMappings",
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot; "vue.rearranger.settings.migration": "true"
} }
}</component> }]]></component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="F:\coding\librashader\librashader-reflect\src\back\wgsl" /> <recent name="F:\coding\librashader\librashader-reflect\src\back\wgsl" />
@ -212,12 +210,12 @@
</configuration> </configuration>
<list> <list>
<item itemvalue="Cargo.Run librashader-build-script" /> <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 librashader" />
<item itemvalue="Cargo.Test triangle_d3d11" /> <item itemvalue="Cargo.Test triangle_d3d11" />
<item itemvalue="Cargo.Test triangle_d3d12" /> <item itemvalue="Cargo.Test triangle_d3d12" />
<item itemvalue="Cargo.Test triangle_gl46" /> <item itemvalue="Cargo.Test triangle_gl46" />
<item itemvalue="Cargo.Test triangle_vk" /> <item itemvalue="Cargo.Test triangle_vk" />
<item itemvalue="Cargo.Test back::wgsl::test::test_into" />
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
@ -261,6 +259,7 @@
<workItem from="1702484102491" duration="5258000" /> <workItem from="1702484102491" duration="5258000" />
<workItem from="1702561144428" duration="1836000" /> <workItem from="1702561144428" duration="1836000" />
<workItem from="1702640983281" duration="967000" /> <workItem from="1702640983281" duration="967000" />
<workItem from="1705541451154" duration="11000" />
</task> </task>
<task id="LOCAL-00001" summary="rt(wgpu): basic triangle example"> <task id="LOCAL-00001" summary="rt(wgpu): basic triangle example">
<option name="closed" value="true" /> <option name="closed" value="true" />