diff --git a/docs/src/introduction.md b/docs/src/introduction.md index 47ef61ebce..0a8ab2cc8a 100644 --- a/docs/src/introduction.md +++ b/docs/src/introduction.md @@ -11,22 +11,6 @@ how to use and develop on Rust-GPU. git clone --recurse-submodules https://github.com/EmbarkStudios/rust-gpu ``` -1. Install the prerequisites using the provided setup script. From the root of the project, run: - - MacOS, Linux: - - ```shell - sh setup.sh - ``` - - Windows: - - ```shell - setup.bat - ``` - - The setup script installs nightly Rust (required for now, see [#78](https://github.com/EmbarkStudios/rust-gpu/issues/78) for tracking issue). - 1. **optional** Install [SPIRV-Tools](https://github.com/KhronosGroup/SPIRV-Tools#downloads) and add it to your `PATH`. You can skip this step if you just want to run examples with the defaults. See [Using installed SPIRV-Tools](#using-installed-spirv-tools) if you decide to go with this option. 1. Next, look at the [examples] folder. There are two kinds of targets here: [runners] and [shaders]. The projects inside `shaders` are "GPU crates", i.e. ones that will be compiled one or more SPIR-V modules. The `runner` projects are normal, CPU crates that use some graphics backend (currently, we have a [`wgpu` runner][examples/runners/wgpu], a [Vulkan runner][examples/runners/ash] through `ash`, and a barebones pure software [CPU runner][examples/runners/cpu]) to actually run one of the "GPU crate" shaders. diff --git a/rust-toolchain b/rust-toolchain index ed4dad9a38..aca549e6e9 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1,3 @@ -nightly-2020-11-24 +[toolchain] +channel = "nightly-2020-11-24" +components = ["rust-src", "rustc-dev", "llvm-tools-preview"] \ No newline at end of file diff --git a/setup.bat b/setup.bat deleted file mode 100644 index c435d945d9..0000000000 --- a/setup.bat +++ /dev/null @@ -1,3 +0,0 @@ -setlocal - -rustup toolchain install nightly-2020-11-24 --component rust-src rustc-dev llvm-tools-preview diff --git a/setup.sh b/setup.sh deleted file mode 100755 index 40550e2069..0000000000 --- a/setup.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -rustup toolchain install nightly-2020-11-24 --component rust-src rustc-dev llvm-tools-preview