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

lib: add wgpu dependency in runtime-wgpu

Browse source
This commit is contained in:
chyyran 2024-02-06 21:31:00 -05:00
parent f6268a621c
commit 8fb2179ae8
3 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.idea/vcs.xml
View file

@ -2,7 +2,6 @@
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/.." vcs="Git" /> <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
<mapping directory="$PROJECT_DIR$" vcs="Git" />
<mapping directory="$PROJECT_DIR$/test/shaders_slang" vcs="Git" /> <mapping directory="$PROJECT_DIR$/test/shaders_slang" vcs="Git" />
</component> </component>
</project> </project>

56
.idea/workspace.xml
View file

@ -54,35 +54,35 @@
<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;feat-wgpu-runtime&quot;, "git-widget-placeholder": "closer-stable",
&quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;, "ignore.virus.scanning.warn.message": "true",
&quot;last_opened_file_path&quot;: &quot;D:/Runtime/Rust/rustup&quot;, "last_opened_file_path": "D:/Runtime/Rust/rustup",
&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;language.rust&quot;, "settings.editor.selected.configurable": "language.rust",
&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" />

3
librashader/Cargo.toml
View file

@ -27,6 +27,7 @@ librashader-runtime-wgpu = { path = "../librashader-runtime-wgpu", version = "0.
librashader-cache = { path = "../librashader-cache", version = "0.2.0-beta.4" } librashader-cache = { path = "../librashader-cache", version = "0.2.0-beta.4" }
ash = { version = "0.37", optional = true } ash = { version = "0.37", optional = true }
wgpu = { version = "0.19.1", optional = true }
[target.'cfg(windows)'.dependencies.windows] [target.'cfg(windows)'.dependencies.windows]
version = "0.48.0" version = "0.48.0"
@ -45,7 +46,7 @@ runtime-gl = [ "runtime", "reflect-cross", "librashader-common/opengl", "librash
runtime-d3d11 = [ "runtime", "reflect-cross","librashader-common/d3d11", "librashader-runtime-d3d11", "windows/Win32_Graphics_Direct3D11" ] runtime-d3d11 = [ "runtime", "reflect-cross","librashader-common/d3d11", "librashader-runtime-d3d11", "windows/Win32_Graphics_Direct3D11" ]
runtime-d3d12 = [ "runtime", "reflect-cross", "reflect-dxil", "librashader-common/d3d12", "librashader-runtime-d3d12", "windows/Win32_Graphics_Direct3D12" ] runtime-d3d12 = [ "runtime", "reflect-cross", "reflect-dxil", "librashader-common/d3d12", "librashader-runtime-d3d12", "windows/Win32_Graphics_Direct3D12" ]
runtime-vk = ["runtime", "reflect-cross", "librashader-common/vulkan", "librashader-runtime-vk", "ash" ] runtime-vk = ["runtime", "reflect-cross", "librashader-common/vulkan", "librashader-runtime-vk", "ash" ]
runtime-wgpu = [ "runtime", "reflect-naga", "librashader-common/wgpu", "librashader-runtime-wgpu" ] runtime-wgpu = [ "runtime", "reflect-naga", "librashader-common/wgpu", "librashader-runtime-wgpu", "wgpu" ]
# reflection # reflection
reflect-cross = ["reflect", "librashader-reflect/cross"] reflect-cross = ["reflect", "librashader-reflect/cross"]