37 commits

Author	SHA1	Message	Date
Sam Gateau	0166d7748a	Merging with master around rc76 cut time	2018-11-15 22:52:37 -08:00
SamGondelman	c10bb7d525	pointers	2018-10-08 18:05:09 -07:00
SamGondelman	de90ce5f2b	move stage frames to varyings	2018-10-01 11:26:02 -07:00
Brad Davis	cafd981744	Remove uniforms from bloom debug effect	2018-09-06 08:59:06 -07:00
Sam Gateau	3aa47a6695	Merging with master after a bunch ofchanges	2018-08-22 08:46:40 -07:00
SamGondelman	bba806f78c	merge with master, fix uniform slots, use varyings for sigma	2018-08-08 22:27:22 -07:00
SamGondelman	a0c3c09b05	Merge remote-tracking branch 'upstream/master' into bloom	2018-08-08 14:44:02 -07:00
SamGondelman	fb75b42059	working on enabling bloom	2018-08-07 22:26:30 -07:00
SamGondelman	2959a406d7	working on enabling bloom	2018-08-07 21:52:05 -07:00
Brad Davis	ae8f841912	Shader refactoring for explicit bindings	2018-08-03 14:58:11 -07:00
Brad Davis	04e84f1d23	Moving to cmake time shader compiling	2018-08-03 14:58:11 -07:00
Sam Gateau	bff372a118	Merge with master	2018-07-13 13:00:00 +02:00
Sam Gateau	66199e9aab	Cleaning up the isENabled interface andthe qml	2018-07-11 11:57:18 +02:00
Olivier Prat	63c03e79d3	BloomApply now uses uniform buffer	2018-07-06 11:52:24 +02:00
Olivier Prat	1097e666d6	Using uniform buffer for bloom threshold	2018-07-06 11:13:42 +02:00
Olivier Prat	182febe3e9	Switched to 9 tap gaussian blur to try to limit visible mach bands on larg glows	2018-04-11 08:44:02 +02:00
Olivier Prat	6dd6218b77	Reduced blur taps for better performance and limited normal attenuation distance	2018-04-10 14:30:36 +02:00
Olivier Prat	f6ffbef60d	Final intensity adjustments	2018-04-10 12:36:36 +02:00
Olivier Prat	2974e05cf2	Tweaked bloom intensity mix	2018-04-10 11:13:37 +02:00
Olivier Prat	f5a2557a2e	Merged with master	2018-02-19 17:28:39 +01:00
Olivier Prat	49549ced17	Fixed compilation with new shader system	2018-01-17 10:52:58 +01:00
Olivier Prat	3911ce59cc	Scribe now outputs .h and .cpp. Need to change how shader source is referenced in C++ code	2018-01-16 19:02:12 +01:00
Olivier Prat	814de4ab81	Scribe now outputs shaders as cpp files.	2018-01-12 11:59:19 +01:00
Olivier Prat	92e1fe8e5c	Removed jitter samples from shader and added name to batches in DEBUG mode to ease render debug	2017-12-08 18:02:27 +01:00
Olivier Prat	39604363ea	Optimized performance of bloom by reducing blur resolution and merging some downsampling passes with blur passes	2017-11-08 11:38:20 +01:00
Olivier Prat	055270df9c	Removed compilation warnings on Mac and Ubuntu	2017-10-12 19:26:05 +02:00
Olivier Prat	d3add89b3c	Adjusted bloom size range	2017-10-10 18:28:42 +02:00
Olivier Prat	f55d44dfc3	Threshold now doesn't downsample anymore. Done in separate pass	2017-10-10 17:49:35 +02:00
Olivier Prat	76305c5285	Better debugging options for bloom	2017-10-10 14:49:04 +02:00
Olivier Prat	0261265330	Working bloom but still visually unstable with geometry aliasing	2017-10-09 19:17:51 +02:00
Olivier Prat	cda48cbf67	Three blurs working	2017-10-09 15:13:32 +02:00
Olivier Prat	0d3d309bce	Quarter size debug rendering of bloom	2017-10-09 11:49:29 +02:00
Olivier Prat	50ab73009a	Working threshold mask and debug on Bloom	2017-10-09 11:09:51 +02:00
Olivier Prat	27a0fb62d3	Multiple gaussians as Unreal. First draft	2017-10-09 09:35:38 +02:00
Olivier Prat	27b9f3516d	Added mix parameter to blur and bloom	2017-09-25 18:05:30 +02:00
Olivier Prat	22b1507597	Fixed blur to work correctly on four sides of screen	2017-09-25 16:41:20 +02:00
Olivier Prat	bcec3680b6	First draft	2017-09-25 11:51:23 +02:00