Update naga and gfx, move the shader validation into a shader descrip…

…tor bit

.github/workflows/ci.yml

@@ -26,11 +26,7 @@ jobs:
       PKG_CONFIG_ALLOW_CROSS: 1
     steps:
       - uses: actions/checkout@v2
-      - name: Prepare
-        run: |
-          sudo apt-get update -y -qq
-          sudo apt-get install -y -qq libegl1-mesa-dev
-          echo "$ANDROID_HOME/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin" >> $GITHUB_PATH
+      - run: echo "$ANDROID_HOME/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin" >> $GITHUB_PATH
       - run: rustup component add clippy
       - run: rustup target add ${{ env.TARGET }}
       - run: cargo clippy --target ${{ env.TARGET }}
@@ -61,18 +57,14 @@ jobs:
           - name: Ubuntu Stable
             os: ubuntu-18.04
             channel: stable
-            prepare_command: |
-              sudo apt-get update -y -qq
-              sudo apt-get install -y -qq libegl1-mesa-dev
+            prepare_command:
             additional_core_features: trace,replay
             additional_player_features:
           - name: Ubuntu Nightly
             os: ubuntu-18.04
             channel: nightly
             prepare_command: |
               sudo apt-get update -y -qq
-              echo "Installing EGL"
-              sudo apt-get install -y -qq libegl1-mesa-dev
               echo "Installing Vulkan"
               sudo apt-get install -y -qq mesa-vulkan-drivers
             additional_core_features: serial-pass

.gitignore

@@ -1,6 +1,7 @@
 /target
 **/*.rs.bk
 #Cargo.lock
+.fuse_hidden*
 .DS_Store
 .vscode
 .vs

Cargo.toml

@@ -8,9 +8,9 @@ members = [
 
 #[patch."https://github.com/gfx-rs/gfx"]
 #hal = { package = "gfx-hal", path = "../gfx/src/hal" }
-#gfx-backend-vulkan = { path = "../gfx/src/backend/vulkan" }
+#gfx-backend-vulkan = { path = "../gfx/src/backend/vulkan", features = ["naga"] }
 #gfx-backend-metal = { path = "../gfx/src/backend/metal", features = ["naga"] }
-#gfx-backend-gl = { path = "../gfx/src/backend/gl" }
+#gfx-backend-gl = { path = "../gfx/src/backend/gl", features = ["naga"] }
 #gfx-backend-dx12 = { path = "../gfx/src/backend/dx12" }
 #gfx-backend-dx11 = { path = "../gfx/src/backend/dx11" }
 #gfx-backend-empty = { path = "../gfx/src/backend/empty" }

player/Cargo.toml

@@ -36,7 +36,7 @@ features = ["replay", "raw-window-handle"]
 
 #[target.'cfg(any(target_os = "ios", target_os = "macos"))'.dependencies.gfx-backend-metal]
 #git = "https://github.com/gfx-rs/gfx"
-#rev = "f1398d29c7ad726968723a37187bd3932c539783"
+#rev = "" # insert revision here
 #features = ["auto-capture"]
 
 [dependencies.wgpu-subscriber]

player/tests/test.rs

@@ -93,7 +93,6 @@ impl Test<'_> {
                 label: None,
                 features: self.features | wgt::Features::MAPPABLE_PRIMARY_BUFFERS,
                 limits: wgt::Limits::default(),
-                shader_validation: true,
             },
             None,
             device

wgpu-core/Cargo.toml

@@ -32,28 +32,29 @@ serde = { version = "1.0", features = ["serde_derive"], optional = true }
 smallvec = "1"
 tracing = { version = "0.1", default-features = false, features = ["std"] }
 thiserror = "1"
-gpu-alloc = { git = "https://github.com/zakarumych/gpu-alloc", rev = "d07be73f9439a37c89f5b72f2500cbf0eb4ff613" }
-gpu-descriptor = { git = "https://github.com/zakarumych/gpu-descriptor", rev = "df74fd8c7bea03149058a41aab0e4fe04077b266"}
+#TODO: enable "tracing", blocked by https://github.com/zakarumych/gpu-alloc/issues/30
+gpu-alloc = { git = "https://github.com/zakarumych/gpu-alloc", rev = "d07be73f9439a37c89f5b72f2500cbf0eb4ff613", features = [] }
+gpu-descriptor = { git = "https://github.com/zakarumych/gpu-descriptor", rev = "df74fd8c7bea03149058a41aab0e4fe04077b266", features = ["tracing"] }
 
-hal = { package = "gfx-hal", git = "https://github.com/gfx-rs/gfx", rev = "f1398d29c7ad726968723a37187bd3932c539783" }
-gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", rev = "f1398d29c7ad726968723a37187bd3932c539783" }
+hal = { package = "gfx-hal", git = "https://github.com/gfx-rs/gfx", rev = "0244e3401e9f127617cb8636397048584e7bfe8a" }
+gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", rev = "0244e3401e9f127617cb8636397048584e7bfe8a" }
 
 [target.'cfg(all(unix, not(target_os = "ios"), not(target_os = "macos")))'.dependencies]
-gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "f1398d29c7ad726968723a37187bd3932c539783" }
-gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "f1398d29c7ad726968723a37187bd3932c539783" }
+gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "0244e3401e9f127617cb8636397048584e7bfe8a", features = ["naga"] }
+gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "0244e3401e9f127617cb8636397048584e7bfe8a", features = ["naga"] }
 
 [target.'cfg(any(target_os = "ios", target_os = "macos"))'.dependencies]
-gfx-backend-metal = { git = "https://github.com/gfx-rs/gfx", rev = "f1398d29c7ad726968723a37187bd3932c539783", features = ["naga"] }
-gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "f1398d29c7ad726968723a37187bd3932c539783", optional = true }
+gfx-backend-metal = { git = "https://github.com/gfx-rs/gfx", rev = "0244e3401e9f127617cb8636397048584e7bfe8a", features = ["naga"] }
+gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "0244e3401e9f127617cb8636397048584e7bfe8a", optional = true }
 
 [target.'cfg(windows)'.dependencies]
-gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx", rev = "f1398d29c7ad726968723a37187bd3932c539783" }
-gfx-backend-dx11 = { git = "https://github.com/gfx-rs/gfx", rev = "f1398d29c7ad726968723a37187bd3932c539783" }
-gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "f1398d29c7ad726968723a37187bd3932c539783" }
+gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx", rev = "0244e3401e9f127617cb8636397048584e7bfe8a" }
+gfx-backend-dx11 = { git = "https://github.com/gfx-rs/gfx", rev = "0244e3401e9f127617cb8636397048584e7bfe8a" }
+gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "0244e3401e9f127617cb8636397048584e7bfe8a" }
 
 [dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-tag = "gfx-4"
+tag = "gfx-5"
 features = ["spv-in", "spv-out", "wgsl-in"]
 
 [dependencies.wgt]