53 commits

Author	SHA1	Message	Date
Bradley Austin Davis	0455fb37b6	Merge remote-tracking branch 'upstream/master' into fix/shader_length	2018-02-06 15:55:01 -08:00
Bradley Austin Davis	f291715f87	Merge remote-tracking branch 'zvork/scribe' into fix/shader_length	2018-02-06 10:36:15 -08:00
Andrew Meadows	96c97547f9	Merge pull request #12205 from jherico/no_widgets ... Remove some unneeded Qt dependencies	2018-02-05 15:32:54 -08:00
Bradley Austin Davis	f611990b10	Fix overlimit shader char strings	2018-02-05 15:27:19 -08:00
Olivier Prat	92279b5939	Merged with master	2018-02-05 18:24:05 +01:00
samcake	f078ff611a	Refining the declaraion signatures and adding the binary capture	2018-01-30 15:10:52 -08:00
Brad Davis	0781d8eaf0	Remove some unneeded Qt dependencies	2018-01-28 22:18:24 -08:00
Olivier Prat	95882e0cde	Merged with master	2018-01-24 10:51:54 +01:00
Olivier Prat	efa6a8c0b5	Merged with master	2018-01-17 15:49:46 +01:00
Olivier Prat	49549ced17	Fixed compilation with new shader system	2018-01-17 10:52:58 +01:00
Brad Davis	6a06bf405a	Merge remote-tracking branch 'upstream/master' into android	2018-01-16 18:24:44 -08: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
humbletim	08ccda9cfc	rename libraries/model(src/model) -> libraries/graphics(src/graphics)	2018-01-16 12:44:44 -05:00
Brad Davis	c924cbf2a7	Remove explicit gpu-gl dependencies	2018-01-13 12:20:41 -08:00
Olivier Prat	814de4ab81	Scribe now outputs shaders as cpp files.	2018-01-12 11:59:19 +01:00
luiscuenca	bda63e38a9	Updating all wasapi dependencies	2017-10-27 13:38:13 -07:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00
Sam Gateau	49779754ff	Remove unecessary shaders and apply the custom shader pipeline to polyvox	2017-07-12 15:50:06 +02:00
Seth Alves	5af07dfb62	more memory-debugger	2017-06-23 08:16:48 -07:00
Sam Cake	f9aa400b95	Refining the stencil configuration and triggering only in hmd mode	2017-06-02 00:22:38 -07:00
samcake	6f7f949343	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-10-06 09:35:48 -07:00
Brad Davis	488d191428	Remove all oglplus usage and references	2016-10-02 11:44:34 -07:00
samcake	139ba1b71c	REnaming the shaders correctly	2016-09-07 14:56:01 -07:00
Brad Davis	617633b85c	Moving to custom context creation	2016-08-29 11:21:54 -07:00
Bradley Austin Davis	d2fd7f88fd	Enabling OSX Oculus plugin	2016-08-12 22:28:43 -07:00
Ryan Huffman	6854f9fda4	Remove stars shaders and renderable	2016-08-08 16:03:03 -07:00
Brad Davis	5ba8372c21	Moving GL backend out of GPU	2016-05-16 12:54:17 -07:00
samcake	1ec9ef560e	Fixing the srgb color format conversion for web entities	2016-05-11 10:46:54 -07:00
Zach Pomerantz	755efd1840	Update test shaders	2016-03-10 23:03:03 -08:00
Zach Pomerantz	11867aa71d	Compile shaders to their own folders	2016-03-10 20:10:54 -08:00
Brad Hefta-Gaub	e1c369dc10	Merge pull request #6766 from samcake/hdr ... Ambient Occlusion	2016-01-21 18:10:52 -08:00
Brad Davis	f9f9ddd8bd	Yet more atmosphere removal	2016-01-21 15:15:17 -08:00
Brad Davis	b8109af196	Ignite the atmosphere	2016-01-21 15:15:15 -08:00
samcake	387706ea64	Fix shader-test compilation	2016-01-04 19:45:43 -04:00
samcake	3554f54e17	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-14 17:38:56 -08:00
Atlante45	146581714a	More warning fixes	2015-12-11 16:17:41 -08:00
Sam Cake	7e59d5cc04	Fixing the failing test for shader compilations (because we removed the shadowing shaders)	2015-12-07 01:27:50 -08:00
Brad Hefta-Gaub	15c4dbfb11	Merge pull request #6554 from Atlante45/warnings ... Last of the OpenGL warnings on OS X	2015-12-04 11:24:28 -08:00
Brad Hefta-Gaub	d07629489c	Merge pull request #6543 from Atlante45/pointer ... gpu::Shader::create* return shared_ptr	2015-12-04 11:17:02 -08:00
Atlante45	528a17422d	Last of the OpenGL warnings on OS X	2015-12-04 10:33:10 -08:00
Atlante45	3da80f5861	gpu::Shader::create* return shared_ptr	2015-12-03 14:56:07 -08:00
Brad Davis	cc80dfb9e1	Fixing case on gl surface format helper	2015-12-03 13:08:26 -08:00
Leonardo Murillo	9ad865c7f0	checkpoint	2015-11-20 15:19:45 -06:00
Brad Davis	5cbb2562cd	Move GL utilities out to their own library	2015-10-27 15:53:42 -07:00
Atlante45	9bead94fae	Remove cmake debug code	2015-10-26 12:07:12 -07:00
Seth Alves	695ffa29c7	call setup_memory_debugger from common macros rather than from every CMakeLists.txt file	2015-08-26 11:09:59 -07:00
Seth Alves	c25082d86f	use -fsanitize=address in all code rather than just the top-level links	2015-08-20 10:14:16 -07:00
Brad Davis	a61d9501c8	Add polyvox to shader tests and clean up test code	2015-08-17 02:04:23 -07:00
ericrius1	d735c85806	moving polyLineEntity over to core profile	2015-08-07 11:41:55 -07:00
Atlante45	3dc8bd47ae	Fix warning and remove unused headers	2015-08-05 16:46:44 -07:00