368 commits

Author	SHA1	Message	Date
Bradley Austin Davis	25b778be1d	Tracking down remaining SOX crashes	2018-01-17 12:18:39 -08:00
Brad Davis	acb95d1355	GLAD polish	2018-01-14 00:10:05 -08:00
Olivier Prat	b296b96e5e	Merged with master	2018-01-06 10:01:00 +01:00
Sam Gateau	db4f9909c7	Merge pull request #12017 from Zvork/glcolor ... Removed glColor reset hack in MeshPartPayload	2017-12-22 14:25:51 -08:00
Olivier Prat	72ef716b13	Fixed warnings on Mac and Ubuntu	2017-12-21 09:52:06 +01:00
Olivier Prat	0d34569b1a	Merge branch 'master' of git://github.com/highfidelity/hifi into compactvb	2017-12-21 08:22:35 +01:00
Olivier Prat	bd666406f4	Removed glColor reset hack in MeshPartPayload and replaced it by a reset of the color attribute to white in the execution of the setInputFormat command of the various GLBackends	2017-12-19 14:17:17 +01:00
Sam Gondelman	6990dda48d	cr and cleanup	2017-12-17 16:11:55 -08:00
SamGondelman	3ae52c0e0e	clear all _cacheFiles on recycle	2017-12-15 17:52:48 -08:00
Olivier Prat	4abc428518	Merge branch 'master' of git://github.com/highfidelity/hifi into compactvb	2017-12-14 17:57:47 +01:00
Olivier Prat	5ad69afa8a	Added support for INT_2_10_10_10_REV format	2017-12-14 14:18:56 +01:00
Sam Gateau	a75010fb94	Merge pull request #11938 from Zvork/csm ... Cascaded Shadow Maps and bug fix	2017-12-14 00:32:43 +07:00
SamGondelman	ae625306ff	remove getDedicatedMemory	2017-12-11 14:54:29 -08:00
Olivier Prat	ac0e816f8c	Cascade selection working on shadow but not in Luci debug mode	2017-11-13 18:42:34 +01:00
Olivier Prat	7011fd3731	Removed Mac and Ubuntu warnings	2017-10-23 15:46:11 +02:00
Olivier Prat	049e3d47b6	Preparing for support of multiple concurrent outlines by adding mask id buffer	2017-10-13 10:23:42 +02:00
Olivier Prat	db9a9e723c	Merged with master	2017-10-10 12:11:23 +02:00
Olivier Prat	5ec9c5bb45	Fixed some coding standard issues	2017-09-21 09:32:34 +02:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00
Olivier Prat	aab63bf109	Added support for R11G11B10F and RGB9E5 cubemaps. Weird colors though but it doesn't crash	2017-09-13 14:32:22 +02:00
Bradley Austin Davis	eb8b892571	Various Mac fixes	2017-09-07 14:45:35 -07:00
Sam Gateau	79f3be1efe	Merge pull request #11021 from Zvork/fade2 ... Fade dissolve effect JUST AVATARS	2017-08-10 13:48:30 -07:00
Seth Alves	6f9460162d	avoid calling a pure virtual function from GLBackend dtor	2017-08-06 12:47:45 -07:00
Olivier Prat	490aad2a06	Merged from master	2017-07-31 12:00:35 +02:00
Brad Davis	3a31805dff	Fix warnings in Qt 59 / VS 2017 build	2017-07-20 11:57:12 -07:00
Olivier Prat	10a6ad2ac9	Added 3 more texture coord vec4f stream attributes	2017-07-18 10:58:49 +02:00
Olivier Prat	d9a83539b2	Merged with master	2017-07-03 15:32:30 +02:00
Olivier Prat	6a31dc2659	Selection of edited object working	2017-06-29 12:13:55 +02:00
Sam Gateau	93963b3257	Apply the projection and deferred transform fixes found while working on spectator camera	2017-06-28 15:44:17 +02:00
Brad Davis	416852c0cd	Fix warnings about creating QObjects with parents in different thread	2017-06-23 10:19:16 -07:00
Zach Fox	cbdffce88e	Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619	2017-06-19 13:53:29 -07:00
Brad Davis	ed6620fc51	Merge pull request #10718 from jherico/frame_thread ... Cleanup and refactoring	2017-06-19 13:31:44 -07:00
Brad Davis	1d4b443113	Prevent cache ejection of textures in use	2017-06-19 09:51:11 -07:00
Brad Davis	fece438602	Cleanup and refactoring	2017-06-15 18:58:56 -07:00
Zach Fox	0d86d4f0cb	It's working!	2017-06-13 14:30:32 -07:00
Sam Cake	f4ed635725	Fix bug in clearFramebuffer with Stencil Buffer	2017-06-12 22:59:42 -07:00
Sam Cake	f973f7b5e3	Fix the background not rendering on the second frame, this was imply due to a bug in the GLBackend	2017-06-12 21:25:27 -07:00
samcake	4c8eec4e16	Introducing a way to prevent a frame to render in stereo accross batches	2017-06-08 17:38:26 -07:00
Sam Cake	d19956f93c	Fixing warnings	2017-05-31 22:02:47 -07:00
samcake	f2f4ad28e8	removing comments not needed anymore	2017-05-23 14:16:42 -07:00
samcake	2be1e36c47	fixing the gl41 bug	2017-05-23 14:14:45 -07:00
samcake	542ec3dc46	More clean up per review request	2017-05-23 11:36:06 -07:00
Sam Cake	2301954d62	fixing the Populated metric	2017-05-22 23:40:23 -07:00
samcake	653abf0ee3	brining the new counters to 4.1	2017-05-22 17:34:06 -07:00
samcake	e0487f7e04	Solving the size evaluation for compressed format	2017-05-22 16:51:54 -07:00
Brad Davis	3995f539cf	Merge pull request #10500 from Atlante45/feat/bc7 ... Add BC7 compression support	2017-05-22 16:47:27 -07:00
samcake	e4f9f2935e	Solving the size evaluation for compressed format	2017-05-22 15:42:18 -07:00
Brad Davis	afee753570	Prevent ping-ponging of texture quality when oversubscribed	2017-05-22 09:52:18 -07:00
Sam Cake	1f090d8148	Debugging the size problem and fixing the compression size evaluation	2017-05-22 01:00:34 -07:00
samcake	c449229850	Cleaned up the counters for memory	2017-05-19 17:52:56 -07:00