Commit graph

4119 commits

Author SHA1 Message Date
Brad Davis
c8e664a0a1 New SPIRV Shader toolchain 2018-10-23 10:40:12 -07:00
SamGondelman
09ea32dcc0 fix fading and highlighting issues 2018-10-22 14:12:43 -07:00
SamGondelman
5652fa0b1e merge with master 2018-10-22 10:18:52 -07:00
Olivier Prat
5f3a299fd9 Merge with master 2018-10-22 14:02:24 +02:00
Seth Alves
2ce8ed25f8
Merge pull request #14125 from Atlante45/fix/mac-warnings
Fix new Mac warnings
2018-10-20 13:40:53 -07:00
Sam Gateau
388b31acf7
Merge pull request #14169 from SamGondelman/highlight
Fix highlight not working after HMD switch
2018-10-19 11:58:25 -07:00
John Conklin II
9c841db9fb
Merge pull request #14184 from SamGondelman/blendshape
Move blendshape buffers to render thread
2018-10-19 11:55:44 -07:00
SamGondelman
47c6825aea CR 2018-10-18 11:08:53 -07:00
SamGondelman
de4dff5202 fix highlight weirdness 2018-10-17 16:18:55 -07:00
SamGondelman
cce0981d6c Merge remote-tracking branch 'upstream/master' into police 2018-10-17 11:40:01 -07:00
John Conklin II
72c9f697ab
Merge pull request #14119 from SamGondelman/varying
Move stage frames to Varyings
2018-10-17 11:16:28 -07:00
John Conklin II
9f0b4fb437
Merge pull request #14122 from SamGondelman/skybox
Rebake default skybox for all platforms
2018-10-17 09:50:00 -07:00
Sam Gondelman
121fc7205c Delete Default-Sky-9-cubemap.texmeta 2018-10-14 22:36:22 -07:00
Sam Gondelman
39c828fad8
please 2018-10-10 19:07:49 -07:00
Sam Gondelman
2421f9388c
FIX BUILD ERRORS? 2018-10-10 17:09:35 -07:00
Sam Gondelman
6ed38ea333
fix build errors 2018-10-10 16:16:56 -07:00
Sam Gondelman
296bd65c9b
fix build errors 2018-10-10 16:05:14 -07:00
SamGondelman
327c2f4e3d move blendshape buffers to render thread 2018-10-10 15:32:53 -07:00
Clement
8983fe2bcf Fix new Mac warnings 2018-10-09 12:11:55 -07:00
Olivier Prat
cfcf6f05a2 Merge with master 2018-10-09 14:18:02 +02:00
SamGondelman
c10bb7d525 pointers 2018-10-08 18:05:09 -07:00
Sam
87efeb1a70 make sure that we compile, dah 2018-10-03 16:15:07 -07:00
sam gateau
81e0d5ced0 Merge branch 'black-bis' of github.com:samcake/hifi into black-bis 2018-10-03 16:03:33 -07:00
sam gateau
702d26d2bd Addressing the bug on Mac AMD 2018-10-03 16:03:09 -07:00
Sam Gateau
c194e795ac Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-10-03 12:12:15 -07:00
Olivier Prat
1322302b6b Default parameter tweaking 2018-10-03 14:17:24 +02:00
Olivier Prat
fe15063459 Another compilation fix 2018-10-03 09:34:31 +02:00
Olivier Prat
7124474b0e Fix ubuntu compilation 2018-10-03 09:33:40 +02:00
Olivier Prat
b131de9e51 Added some comments 2018-10-03 08:43:51 +02:00
Olivier Prat
8ad58754da Fixed compilation on Mac, Ubuntu and Android 2018-10-03 08:41:03 +02:00
sam gateau
5d0f2e3035 And more changes for better syntax and less useless stuff 2018-10-02 13:09:04 -07:00
sam gateau
ff24a99032 Unify the the packing of the blendshape offset for simplicity and settle on the name DrawcallUniform 2018-10-02 11:18:20 -07:00
Olivier Prat
72d0693252 Clean up for stereo 2018-10-02 18:46:01 +02:00
Olivier Prat
4c84ae02fa Merge branch 'master' of http://github.com/highfidelity/hifi into ao 2018-10-02 18:13:57 +02:00
Olivier Prat
dfe9deb154 Two group of config settings for SSAO and HBAO 2018-10-02 17:47:33 +02:00
Olivier Prat
6fcd63ed64 Improved acnee issues 2018-10-02 15:08:39 +02:00
Olivier Prat
1ed0bd68b9 Small bilateral blur optim 2018-10-02 12:25:00 +02:00
Olivier Prat
6420d96149 Tried to limit banding effect 2018-10-02 11:16:23 +02:00
Olivier Prat
454531e3c3 Switched back to cos HBAO 2018-10-02 10:26:55 +02:00
Sam Gateau
c95c736b1f FOUnd a working path for gl41 2018-10-01 22:50:29 -07:00
Sam Gateau
d1d4920c35 Check and fixed the shader for nvidia regarding the unpacked variable name, adjust luci.js to be able to move the viewport 2018-10-01 21:35:18 -07:00
David Rowe
f7fd76b316 Merge branch 'master' into M18586
# Conflicts:
#	interface/src/scripting/HMDScriptingInterface.h
2018-10-02 16:49:16 +13:00
David Rowe
2f3a9412f3 Make highlight occlusion match overlay occlusion 2018-10-02 15:36:18 +13:00
Sam Gateau
c593f00839 Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-10-01 19:10:18 -07:00
sam gateau
392e2ff535 trying and failing andad trying and rince and repeat 2018-10-01 17:45:16 -07:00
John Conklin II
0ef407a45c
Merge pull request #14116 from sethalves/fix-bad-render-downcasts
get asan to not complain about invalid downcasts during transaction.updateItem
2018-10-01 16:57:03 -07:00
SamGondelman
49553e0285 bake default skybox 2018-10-01 14:05:15 -07:00
sam gateau
c12115bfda Addressing the 4.1 pass and make sure it works on windows pc and mac 2018-10-01 11:51:46 -07:00
SamGondelman
de90ce5f2b move stage frames to varyings 2018-10-01 11:26:02 -07:00
Olivier Prat
7f6c9a6cc1 Switched to sin based HBAO 2018-10-01 19:22:54 +02:00
Sam Gateau
5842416ae6 Exploring the possible packing schemes and trying to debug the tangent 2018-09-30 23:11:36 -07:00
Seth Alves
90d9af35b5 minimize diff 2018-09-30 16:05:08 -07:00
Seth Alves
e30497595c static_cast can be used here rather than dynamic 2018-09-30 15:49:42 -07:00
Seth Alves
749b02cfb8 get asan to not complain about invalid downcast of CauterizedMeshPartPayload UpdateFunctor 2018-09-30 15:12:49 -07:00
sam gateau
1ff4c54c1c Packing normal and tangents 2018-09-28 17:49:52 -07:00
Seth Alves
b69d0f3997 get interface building and working with clang-7 on ubuntu 18 2018-09-28 13:46:51 -07:00
Olivier Prat
abc415c5ad Put back temporal jitter of SSAO (but without filtering) 2018-09-28 19:33:34 +02:00
Olivier Prat
9f9fe909b0 Fixed bugs in stereo 2018-09-28 19:22:20 +02:00
Olivier Prat
086ba998c8 Some small cleanups 2018-09-28 16:41:18 +02:00
Olivier Prat
fbd158938b Put some bilateral blur computation on CPU 2018-09-28 11:31:09 +02:00
Sam Gateau
faf489855c Packing the offsets and catching up performances 2018-09-28 02:13:08 -07:00
Olivier Prat
6240454c55 Switched back to half res depth when resolutionLevel>1 2018-09-28 10:33:47 +02:00
Olivier Prat
8e914fa565 Bilateral blur shader cleanup and quad split normal at occlusion resolution 2018-09-28 10:25:57 +02:00
sam gateau
215818e313 adjusting page size but still seeing a perf drop 2018-09-27 17:18:43 -07:00
SamGondelman
e069817978 more fixes 2018-09-27 14:18:43 -07:00
Olivier Prat
135e10eaa2 Packed occlusion depth for faster bilateral filtering 2018-09-27 19:51:01 +02:00
Olivier Prat
1998096630 On single bilateral blur shader 2018-09-27 17:03:14 +02:00
Olivier Prat
349a8b39ad Added config parameter to switch between HBAO / SSAO 2018-09-27 16:39:42 +02:00
Olivier Prat
94a162893a Finally, a clean HBAO! 2018-09-27 10:44:06 +02:00
Sam Gateau
8923055e91 Exploring the bad peroformances 2018-09-27 00:15:34 -07:00
sam gateau
4078be3df5 Better naming and simpler template maybe 2018-09-26 17:58:06 -07:00
sam gateau
34203c67b0 Addressing the merge with master 2018-09-26 15:42:13 -07:00
John Conklin II
b02e2c8123
Merge pull request #14081 from SamGondelman/blendshapes
Improve ModelBlender queuing
2018-09-26 15:10:02 -07:00
SamGondelman
0f24c18de5 slightly fix forward pipelines 2018-09-26 15:01:46 -07:00
sam gateau
1e112d3c84 bringing back a bug fix from samuel 2018-09-26 14:15:42 -07:00
sam gateau
b5a47b2e76 Finalizing the renaming from Skinned to Deformed 2018-09-26 14:11:22 -07:00
SamGondelman
09a6053044 cleaning up fragment shaders 2018-09-26 14:10:47 -07:00
sam gateau
09dae5aee3 Addressing merge conflict in HighlightEffect.cpp 2018-09-26 13:24:21 -07:00
Olivier Prat
dee0a6afa2 Found bug with low res depth fetch in occlusion 2018-09-26 16:59:01 +02:00
sam gateau
efa1dd0274 rename the files from skin to deformed 2018-09-25 17:32:04 -07:00
sam gateau
cc0019479a fixing review comments 2018-09-25 14:07:07 -07:00
sam gateau
e41b8f06e1 Cleaning up the pipeline and checking that it is working for all cases 2018-09-25 13:57:50 -07:00
SamGondelman
21cd3948ae improve blender queuing 2018-09-25 12:07:05 -07:00
Olivier Prat
9899eb6d3f Concentrating on resolution level 1 2018-09-25 15:46:07 +02:00
Olivier Prat
60f5913002 Bilateral blur taps are evaluated in shader 2018-09-25 11:06:05 +02:00
Olivier Prat
0c586edeeb Fixed for stereo 2018-09-25 10:31:24 +02:00
Olivier Prat
190996e670 Switched to full screen depth and normals 2018-09-25 10:01:30 +02:00
Sam Gateau
69734ce21b Getting better' 2018-09-24 22:34:43 -07:00
sam gateau
7cf7eaa7c8 Exposing the drawcall user info just a uint16 right now and use it for the skinning and blendshape 2018-09-24 17:34:42 -07:00
SamGondelman
ad73cb3996 fix avatar highlighting 2018-09-24 14:02:35 -07:00
SamGondelman
d772cdb34a please 2018-09-24 10:16:35 -07:00
Olivier Prat
9cebdbd507 Separate frame buffers for each AO split 2018-09-24 19:08:37 +02:00
Olivier Prat
6704a27b12 Back to one batch 2018-09-24 14:59:57 +02:00
Olivier Prat
2e40a5f3ff Using UVs for buildNormals 2018-09-24 14:38:03 +02:00
Sam Gateau
4210ce46aa bringing the tex corrd transform in the Material struct and shaving one ubo 2018-09-23 23:10:56 -07:00
sam gateau
d8984dafa0 ui allows to enable/disable the deformer componenets 2018-09-21 16:45:21 -07:00
sam gateau
aa02dcb087 Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-09-21 08:19:50 -07:00
Olivier Prat
9f0201878d Some work to try to find the odd resolution bug 2018-09-21 17:14:39 +02:00
sam gateau
d3ff4b8630 Factorizing the deformer code in a separate file, and now trying to control dynamically the blend shape on off 2018-09-20 17:26:26 -07:00
John Conklin II
0560b8678c
Merge pull request #14022 from jherico/fix/amd_highlight
Fix AMD highlighting effect
2018-09-20 16:17:10 -07:00
sam gateau
5d80a89094 Apply fix to gl41 backend needed for proper Resource BUffer on gl41 2018-09-20 16:09:08 -07:00
Olivier Prat
cf739db3a5 Added AO normal to Luci 2018-09-20 18:01:02 +02:00
Olivier Prat
1c2da13309 Much better face normal reconstruction 2018-09-20 15:34:28 +02:00
Olivier Prat
64b72e3538 Removed normal from bilateral blur... again 2018-09-20 11:27:00 +02:00
Olivier Prat
d5d0f056a9 Fixed for any resolution level in stereo 2018-09-20 11:15:25 +02:00
Olivier Prat
b1db7ab403 Fixed for stereo rendering with resolution level 0 2018-09-20 10:18:06 +02:00
Sam Gateau
377464f5a2 Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-09-19 19:00:30 -07:00
sam gateau
6b6551c8bd the missing file 2018-09-19 17:29:10 -07:00
sam gateau
4fc6466250 update shaders 2018-09-19 17:27:58 -07:00
John Conklin II
60c07280f8
Merge pull request #13971 from SamGondelman/parabola
Correct transparent parabola shader
2018-09-19 11:46:24 -07:00
Brad Davis
783ea21951 Fix AMD highlighting effect 2018-09-19 11:21:12 -07:00
sam gateau
c05cbf065b fixing the texcoord1 input in skined vertex shader 2018-09-19 10:13:14 -07:00
Sam Gateau
61644c48f0 Update the slp tp reflect the chanes in the vertex shaders 2018-09-19 09:18:09 -07:00
Olivier Prat
6921e71a9a Added normal distance to bilateral filtering 2018-09-19 17:49:01 +02:00
Olivier Prat
8a11d18f0d Quarter resolution with split rendering 2018-09-19 17:24:31 +02:00
Olivier Prat
3493d40fd7 Added gather to split AO 2018-09-19 10:37:27 +02:00
sam gateau
ec6117e9bb bringing the blendshape in skin shader only work in master 2018-09-18 17:40:29 -07:00
Olivier Prat
03814e7653 Preparing for split rendering of HBAO directions 2018-09-18 18:33:28 +02:00
Olivier Prat
3d096d0644 Added shared header 2018-09-18 16:10:39 +02:00
Olivier Prat
9141be9124 Shader compile fix 2018-09-18 15:29:27 +02:00
Olivier Prat
60418b36d7 Preparing for halton taps 2018-09-18 15:18:06 +02:00
Olivier Prat
fb7a8bdd4d Mip depth sampling in HBAO now works 2018-09-18 12:13:49 +02:00
Olivier Prat
f7379dfcc9 Switched AO buffer to single R8 component 2018-09-18 11:54:39 +02:00
Olivier Prat
a2abf33669 Removed falloff distance as we're directly using the radius 2018-09-18 11:45:58 +02:00
Olivier Prat
acc6d0b79e Fixed wrong AO with far objects! 2018-09-18 10:22:35 +02:00
Olivier Prat
c27f3dcafe Some cleanup, still trying to solve the problem 2018-09-18 08:45:04 +02:00
Olivier Prat
0f467ceeb9 Border clamping for linear depth texture 2018-09-17 17:19:07 +02:00
Olivier Prat
d0eef1b8d0 Some cleanup 2018-09-17 16:12:54 +02:00
Olivier Prat
d9e2c8df69 Fixed uniform buffer slot index in DebugAmbientOcclusion 2018-09-17 15:06:00 +02:00
Olivier Prat
ad5064b045 Removed falloff distance from shader 2018-09-17 14:33:48 +02:00
Olivier Prat
acab748f57 Merge with master 2018-09-17 14:29:54 +02:00
Olivier Prat
6b8f47c75a Added some tweaking parameters to try to limit silhouette AO 2018-09-13 18:39:02 +02:00
Olivier Prat
8006d7c052 Blur is now at occlusion resolution and added some bias to prevent AO on silhouettes 2018-09-13 15:33:44 +02:00
SamGondelman
2b2091290e fix everything 2018-09-12 15:32:35 -07:00
Olivier Prat
45b4881edc Bilateral blur 2018-09-12 17:59:57 +02:00
SamGondelman
1a36693161 I hate blendshapes 2018-09-11 16:58:38 -07:00
Olivier Prat
6c0309402f Some fixes for HBAO. Need performance improvements 2018-09-11 16:14:54 +02:00
Olivier Prat
fd9d05bdbf First 'working' version of HBAO 2018-09-11 15:30:18 +02:00
Olivier Prat
f12cd2e55a Merged with master 2018-09-11 10:19:40 +02:00
SamGondelman
0e079e78e6 correct transparent parabola shader 2018-09-10 16:20:50 -07:00
John Conklin II
ae547f8950
Merge pull request #13881 from jherico/feature/no_uniforms
Remove all uniforms from our shaders
2018-09-10 15:42:01 -07:00
SamGondelman
f9ec53a2e6 fix bloom on edges 2018-09-07 10:25:26 -07:00
Olivier Prat
fec59e8b95 WIP HBAO 2018-09-07 16:12:03 +02:00
John Conklin II
8c77749fb6
Merge pull request #13947 from SamGondelman/perf
Fix blendshapes crash one last time, one last time
2018-09-06 14:21:18 -07:00
Bradley Austin Davis
fade3a8de0 Fixing shader implicit type conversions 2018-09-06 09:08:36 -07:00
Brad Davis
650f112f16 Fix keyword in shader layout 2018-09-06 09:08:36 -07:00
Brad Davis
50f4932d9c PR feedback: structure alignement and size 2018-09-06 09:07:53 -07:00
Brad Davis
9a28e04e37 Remove all tabs from shaders 2018-09-06 08:59:07 -07:00
Brad Davis
2df2bbef46 Adding missing locations 2018-09-06 08:59:07 -07:00
Brad Davis
730cdb4257 Remove uniforms from unused shaders 2018-09-06 08:59:06 -07:00