Commit graph

1809 commits

Author SHA1 Message Date
Sascha Willems
ec8d9698e9 Add HLSL shaders to project file
GLSL and HLSL shaders get their own folders per sample in the project structure
2020-06-05 21:11:28 +02:00
Sascha Willems
020a7186f7
Merge pull request #725 from ben-clayton/shader-dirs
Make glsl and hlsl shader directories sit side-by-side
2020-06-05 19:21:46 +02:00
Sascha Willems
4818f85916 Take Recipients for Travis build notifications from environment 2020-06-03 06:04:21 +02:00
Ben Clayton
3d49863bc7 Rename multisampling shaders: scene -> mesh
Possibly went unnoticed use to the rebase of the HLSL shaders and 10a1ecaf7.
2020-06-01 12:22:28 +01:00
Ben Clayton
301e8abf12 Add command flag for picking between shaders
The new `-s`, `--shaders` command line flag allows you to specify whether you want to load the glsl or hlsl shaders.
Defaults to glsl.

Issue: #723
2020-06-01 12:22:28 +01:00
Ben Clayton
8c35694de9 Add pre-built HLSL shaders
Mirrors those found in `data/shaders/glsl/`

Issue: #723
2020-06-01 12:22:28 +01:00
Ben Clayton
a4bbe18399 Have dxc generate hlsl shaders into hlsl directory
Instead of overwriting the glsl binaries.

Issue: #723
2020-06-01 12:22:28 +01:00
Ben Clayton
ca884587a4 Move shaders into glsl and hlsl directories
Move `data/shaders` to `data/shaders/glsl`
Move `data/hlsl` to `data/shaders/hlsl`

Fix up shader paths in the cpp files to point to the new glsl location.

`data/shaders/hlsl/compile.py` still overwrites the glsl .spv files (for
now).

Issue: #723
2020-06-01 12:22:28 +01:00
Sascha Willems
cac1d2e850 Moved ktx submodule to tag 3.0.1 2020-05-24 21:27:33 +02:00
Sascha Willems
2973aad014 Added note on HLSL shaders 2020-05-23 11:26:07 +02:00
Sascha Willems
37d58e371a
Merge pull request #718 from ben-clayton/hlsl
Add shaders re-implemented in HLSL
2020-05-23 10:58:02 +02:00
Ben Clayton
8af406090e Remove the HLSL status table, everything now works 2020-05-21 16:29:48 +01:00
Ben Clayton
0da96cfc63 Add missing push constant to fix HLSL computeparticles 2020-05-21 16:29:48 +01:00
Ben Clayton
e3234db041 Add inverseModelView UBO to fix texturecubemap sample 2020-05-21 16:29:47 +01:00
Ben Clayton
13c081664e Add missing inverseModelView UBO to fix hdr sample 2020-05-21 16:29:19 +01:00
Ben Clayton
b6f2577174 Update HLSL skeletalanimation shaders with latest changes 2020-05-21 16:19:27 +01:00
Ben Clayton
7b12f89deb Apply ab38f8b1's changes to offscreen HLSL shaders 2020-05-21 16:19:27 +01:00
Ben Clayton
8cacf0b4e9 Add HLSL shaders for multisampling sample 2020-05-21 16:19:27 +01:00
Ben Clayton
e9ab033b5e Add HLSL shaders for glftscene sample 2020-05-21 16:07:54 +01:00
Ben Clayton
9c06c4eea7 Fix data/hlsl/README.md table header
The right most column header SHA was wrong.
2020-05-21 16:07:13 +01:00
Ben Clayton
cce75f1859 Add shaders re-implemented in HLSL
These were written against the shaders at revision eddd724e7.
There have been changes made since then, which will need to be mirrored.

See `data/hlsl/README.md` for the current status of each sample.
2020-05-21 12:58:13 +01:00
Sascha Willems
10a1ecaf7b Re-Added missing shaders
Fixes #703
2020-04-29 18:39:15 +02:00
Sascha Willems
f5dbf162a7 Added helper function to get vertex input attribute descriptions from requested vertexattributes as a vector
That vector can directly be used for a pipeline's vertex attribute setup
2020-04-25 17:09:31 +02:00
Sascha Willems
2b28a60e17 Added flag to flip vertex position y coordinates 2020-04-25 12:28:16 +02:00
Sascha Willems
7b46e71f33 Added flag to flip vertex position y coordinates 2020-04-25 12:01:21 +02:00
Sascha Willems
5df36d7b19 Added flag to pre-multiply vertex colors by material base color 2020-04-25 10:50:24 +02:00
Sascha Willems
d28d9279f5 Merge branch 'master' of https://github.com/SaschaWillems/Vulkan 2020-04-25 08:23:39 +02:00
Sascha Willems
107aa35b9e Extracted vertex into separate class with easy component to Vulkan vertex attribute mappings
Load vertex colors if present
Added flag to pre-transform vertices
2020-04-25 08:23:32 +02:00
Sascha Willems
cb50a95547
Merge pull request #626 from VZout/master
Cleaned up the createShaderBindingTable for the raytracing examples
2020-04-23 07:45:26 +02:00
Sascha Willems
b47e5ada7c
Merge pull request #680 from hevrard/fix-packagename
Fix typo in package name vulkanDeferredmultisampling
2020-04-23 07:43:27 +02:00
Sascha Willems
424de5fab3 Validation fixes 2020-04-22 21:01:33 +02:00
Sascha Willems
48e7952fbf Code-Cleanup: All samples now use the camera class and it's matrices
Cleaned up base class
2020-04-22 21:01:17 +02:00
Sascha Willems
ab38f8b150 Code-Cleanup: All samples now use the camera class and it's matrices
Cleaned up base class
2020-04-22 20:58:24 +02:00
Sascha Willems
27d5abc038
Merge pull request #695 from SaschaWillems/gltf
Code cleanup
2020-04-20 22:32:05 +02:00
Sascha Willems
53846d8b1d Code cleanup 2020-04-20 22:13:51 +02:00
Sascha Willems
4b9f10d644 Code cleanup 2020-04-20 21:39:30 +02:00
Sascha Willems
458c149c71 Code cleanup 2020-04-20 20:29:15 +02:00
Sascha Willems
84a458cae5
Merge pull request #694 from SaschaWillems/gltf
Replace model loading sample using ASSIMP with glTF scene loading sample
2020-04-19 19:21:07 +02:00
Sascha Willems
9fc8b0032c Error handling 2020-04-19 18:55:51 +02:00
Sascha Willems
55243e6773 Added rules for ignoring certain assets 2020-04-19 18:43:34 +02:00
Sascha Willems
7bf8db098c Merge branch 'master' into gltf 2020-04-19 18:28:39 +02:00
Sascha Willems
44413ff57e Updated CMAKE C++ standard flags
Fixes #688
2020-04-19 18:26:24 +02:00
Sascha Willems
2d636eda2c Android asset loading 2020-04-19 16:43:25 +02:00
Sascha Willems
4e610c56ce Also apply vertical flip option on aspect ratio change 2020-04-19 16:42:38 +02:00
Sascha Willems
a192a685b7 Update tinyglTF 2020-04-19 16:42:14 +02:00
Sascha Willems
e0c15f62da Renamed mesh example to glTF scene 2020-04-19 11:50:46 +02:00
Sascha Willems
3ae053d005 Code-Cleanup
Use flight helmet glTF 2.0 sample model
2020-04-19 10:59:16 +02:00
Sascha Willems
0ca5f41308 Added missing include 2020-04-19 10:11:50 +02:00
Sascha Willems
cbe751d26e Base class cleanup and restructuring 2020-04-19 10:05:47 +02:00
Sascha Willems
e9b9332d04 glTF model loading and rendering sample uses default frame submit function from base class 2020-04-19 09:18:48 +02:00