Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libs/cauldron
12 changes: 6 additions & 6 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# glTFSample

This is a fork of [glTFSample](https://github.com/GPUOpen-LibrariesAndSDKs/glTFSample), originally developed by AMD to show off the capabilities of the [Cauldron framework](https://github.com/GPUOpen-LibrariesAndSDKs/Cauldron).
This fork has been modified to serve as the CPU host app for sample shaders generated by https://github.com/ppenenko/metashade-glTFSample in order to demonstrate [Metashade](https://github.com/ppenenko/metashade) in action.
It is a submodule of https://github.com/ppenenko/metashade-glTFSample.
This fork has been modified to serve as the CPU host app for sample shaders generated by https://github.com/metashade/metashade-glTFSample in order to demonstrate [Metashade](https://github.com/metashade/metashade) in action.
It is a submodule of https://github.com/metashade/metashade-glTFSample.

The original [glTFSample](https://github.com/GPUOpen-LibrariesAndSDKs/glTFSample) uses the traditional ubershader/preprocessor approach for its scene/PBR pass shaders: HLSL for DX12 and GLSL for Vulkan. In this fork, the HLSL ubershader can be overridden with concrete shader permutations generated by https://github.com/ppenenko/metashade-glTFSample per glTF material and mesh primitive. See [Command-line interface](#command-line-interface) for instructions.
The original [glTFSample](https://github.com/GPUOpen-LibrariesAndSDKs/glTFSample) uses the traditional ubershader/preprocessor approach for its scene/PBR pass shaders: HLSL for DX12 and GLSL for Vulkan. In this fork, the HLSL ubershader can be overridden with concrete shader permutations generated by https://github.com/metashade/metashade-glTFSample per glTF material and mesh primitive. See [Command-line interface](#command-line-interface) for instructions.

![Screenshot](screenshot.png)

Expand All @@ -22,9 +22,9 @@ To build glTFSample, you must first install the following tools:

## Build steps

1) If you haven't done so in the parent repo, clone the repo with its submodules, including our [fork of the Cauldron framework](https://github.com/ppenenko/Cauldron):
1) If you haven't done so in the parent repo, clone the repo with its submodules, including our [fork of the Cauldron framework](https://github.com/metashade/Cauldron):
```
> git clone https://github.com/ppenenko/glTFSample.git --recurse-submodules --branch metashade_demo
> git clone https://github.com/metashade/glTFSample.git --recurse-submodules --branch metashade_demo
```

2) Generate the solutions. Please note that compared to the original [glTFSample](https://github.com/GPUOpen-LibrariesAndSDKs/glTFSample), we need to make sure that CMake can find Boost:
Expand All @@ -43,4 +43,4 @@ To build glTFSample, you must first install the following tools:
--dx12-validation Enable DX12 debug validation.
```

To start the app with shaders generated by https://github.com/ppenenko/metashade-glTFSample, point `--metashade-out-dir` at its output directory. If `--metashade-out-dir` is omitted, the original HLSL ubershader is used for rendering, which can be used as a reference.
To start the app with shaders generated by https://github.com/metashade/metashade-glTFSample, point `--metashade-out-dir` at its output directory. If `--metashade-out-dir` is omitted, the original HLSL ubershader is used for rendering, which can be used as a reference.