354 commits

Author	SHA1	Message	Date
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
Atlante45	a8b1a29a4a	Add support for BC7 compression	2017-05-18 13:11:41 -07:00
samcake	80b6fd65ae	Cleaning up counters and naming schemes...	2017-05-17 18:31:28 -07:00
Brad Davis	ee1fd69316	Fixing crash in texture transfer logic, again	2017-05-09 21:24:58 -07:00
Brad Hefta-Gaub	d52daf3445	Merge pull request #10378 from samcake/orange ... Adding a test to protect Uniform Buffer binding at wrong slot	2017-05-08 11:16:56 -07:00
Chris Collins	fd836dcd68	Merge pull request #10366 from Atlante45/feat/normal-map-compression ... Feat/normal map compression	2017-05-05 10:03:01 -07:00
Atlante45	10289f5423	Format non compressed normal maps to new format.	2017-05-04 10:33:34 -07:00
samcake	389d9405f9	Showing the comments	2017-05-04 10:18:14 -07:00
samcake	3f977a6743	Add a simple check on the uniform buffer slot to make sure it s valid	2017-05-04 10:16:33 -07:00
samcake	26441dbf2f	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-03 14:54:11 -07:00
Sam Gateau	8507fffcc2	Merge pull request #10313 from samcake/ambient-bis ... Fixing the the mip gpu copy for compressed format texture in GL41Backend	2017-05-03 14:50:55 -07:00
samcake	c583ffbac4	Clean up names and comments	2017-05-03 11:30:09 -07:00
samcake	84305c2049	Fixing the by region update of the compressed texture to match the 4 x 4 tiles alignment	2017-05-02 17:30:31 -07:00
samcake	0ecf599267	Adressing the warning	2017-05-02 17:19:22 -07:00
samcake	dc50db7ee5	One more warning from gcc	2017-05-02 16:27:28 -07:00