浏览代码

Merge pull request #10465 from Calinou/compiling-for-macos-vulkan-install-script

Mention Vulkan and Direct3D 12 SDK install scripts in Compiling for macOS/Windows
Max Hilbrunner 6 月之前
父节点
当前提交
cb6eb02112

+ 2 - 0
contributing/development/compiling/compiling_for_macos.rst

@@ -21,6 +21,8 @@ For compiling under macOS, the following is required:
   (or the more lightweight Command Line Tools for Xcode).
   (or the more lightweight Command Line Tools for Xcode).
 - `Vulkan SDK <https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.dmg>`_
 - `Vulkan SDK <https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.dmg>`_
   for MoltenVK (macOS doesn't support Vulkan out of the box).
   for MoltenVK (macOS doesn't support Vulkan out of the box).
+  The latest Vulkan SDK version can be installed quickly by running
+  ``misc/scripts/install_vulkan_sdk_macos.sh`` within the Godot source repository.
 
 
 .. note:: If you have `Homebrew <https://brew.sh/>`_ installed, you can easily
 .. note:: If you have `Homebrew <https://brew.sh/>`_ installed, you can easily
           install SCons using the following command::
           install SCons using the following command::

+ 10 - 2
contributing/development/compiling/compiling_for_windows.rst

@@ -148,7 +148,7 @@ the engine source code (using ``cd``) and type:
 
 
 .. tip::
 .. tip::
     If you are compiling Godot to make changes or contribute to the engine,
     If you are compiling Godot to make changes or contribute to the engine,
-    you may want to use the SCons options ``dev_build=yes`` or ``dev_mode=yes``. 
+    you may want to use the SCons options ``dev_build=yes`` or ``dev_mode=yes``.
     See :ref:`doc_introduction_to_the_buildsystem_development_and_production_aliases`
     See :ref:`doc_introduction_to_the_buildsystem_development_and_production_aliases`
     for more info.
     for more info.
 
 
@@ -182,7 +182,15 @@ Compiling with support for Direct3D 12
 By default, builds of Godot do not contain support for the Direct3D 12 graphics
 By default, builds of Godot do not contain support for the Direct3D 12 graphics
 API.
 API.
 
 
-To compile Godot with Direct3D 12 support you need at least the following item:
+You can install the required dependencies by running
+``python misc/scripts/install_d3d12_sdk_windows.py``
+in the Godot source repository. After running this script, add the ``d3d12=yes``
+SCons option to enable Direct3D 12 support. This will use the default paths for
+the various dependencies, which match the ones used in the script.
+
+You can find the detailed steps below if you wish to set up dependencies
+manually, but the above script handles everything for you (including the
+optional PIX and Agility SDK components).
 
 
 - `godot-nir-static library <https://github.com/godotengine/godot-nir-static/releases/>`_.
 - `godot-nir-static library <https://github.com/godotengine/godot-nir-static/releases/>`_.
   We compile the Mesa libraries you will need into a static library. Download it
   We compile the Mesa libraries you will need into a static library. Download it