1206 commits

Author	SHA1	Message	Date
Brad Davis	db121957d2	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-12 15:00:03 -08:00
Sam Gateau	9ad783135c	Bringing back brownBis to just msaa support	2019-02-11 19:42:05 -08:00
Sam Gateau	db30857b87	Merge branch 'master' of github.com:highfidelity/hifi into brown	2019-02-06 13:21:34 -08:00
Brad Davis	b1eb0b0a46	GPU tweaks	2019-01-30 16:23:21 -08:00
Brad Davis	c46d73128b	Merge branch 'feature/quest_frame_player' into feature/quest	2019-01-30 16:16:51 -08:00
Brad Davis	a310eec41e	Support relative paths in serialized frames	2019-01-30 13:15:23 -08:00
Brad Davis	f490a6c231	GPU tweaks	2019-01-30 13:15:23 -08:00
Brad Davis	f146c9fe77	Quest frame player work	2019-01-30 10:17:57 -08:00
Sam Gateau	e39a6b5a7d	Merging with master	2019-01-28 17:58:17 -08:00
Brad Davis	b1e4e17f47	Santa Cruz	2019-01-28 15:52:36 -08:00
Brad Davis	81a7fa17bf	PR feedback	2019-01-25 11:14:40 -08:00
Brad Davis	e18e3fc138	Gpu Frame serialization	2019-01-23 13:21:34 -08:00
Brad Davis	6fb869126e	GPU state cleanup	2019-01-22 10:37:08 -08:00
Sam Gateau	f9891775fc	Enabling msaa framebuffer and testing for forward	2019-01-21 23:07:59 -08:00
SamGondelman	9fc7813e24	Merge remote-tracking branch 'upstream/master' into v3	2018-12-20 16:05:06 -08:00
John Conklin II	69876bdec2	Merge pull request #14548 from SamGondelman/mirrorFix ... Case 19473 (#2): Fix Mirror tonemapping	2018-12-07 16:11:59 -08:00
John Conklin II	0a80c16686	Merge pull request #14419 from SamGondelman/splash ... Case 19740: Improve startup times by pre-compiling shaders with splash screen	2018-12-07 16:10:52 -08:00
SamGondelman	8431b3b0c1	correct order of mixes	2018-12-07 10:39:10 -08:00
Sam Gondelman	df6fbefc31	Merge branch 'master' into v3	2018-12-05 16:51:33 -08:00
SamGondelman	287878ff98	merge with master	2018-12-05 10:35:08 -08:00
SamGondelman	2acb6b6857	v3 procedurals and shader fixes	2018-11-28 17:58:27 -08:00
Sam Gondelman	4d621ba61c	Merge branch 'master' into splash	2018-11-27 16:01:07 -08:00
SamGondelman	1f354f813c	rework shader pre-compilation	2018-11-27 14:38:02 -08:00
SamGondelman	0fccb4c73c	move to batch, try to use static	2018-11-17 01:45:16 -08:00
Sam Gondelman	968ffe7ec3	Merge branch 'master' into branching	2018-11-16 10:25:02 -08:00
Sam Gondelman	a206d9e25a	Merge branch 'master' into branching	2018-11-14 17:08:08 -08:00
Olivier Prat	45e0f65972	Merge branch 'ao' of http://github.com/Zvork/hifi into ao	2018-11-14 09:48:24 +01:00
Sam Gondelman	13f650d514	Merge pull request #14093 from SamGondelman/police ... Case 19409, Case 19468: Fading fixes and shader cleanup	2018-11-13 15:00:23 -08:00
Howard Stearns	66ae01e0c3	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-12 12:55:20 -08:00
John Conklin II	9d404a6cf3	Merge pull request #14379 from Cristo86/gles_use_tbo_no_ssbo ... case 19562: GLES - Use TBO instead of SSBO and make shaders use it when it is not gl45 (master)	2018-11-12 10:45:52 -08:00
SamGondelman	1d1510e18e	Merge remote-tracking branch 'upstream/master' into police	2018-11-09 13:32:41 -08:00
Zach Fox	1b2593fd26	CR round 4	2018-11-08 11:28:07 -08:00
Zach Fox	1ab1cb95d8	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-08 09:57:10 -08:00
Roxanne Skelly	cef7000a72	Case 19754 - Remove logging URLs and related file locations. ... The goal is to strip out data that can be used by untoward users in copying models, avatars, etc.	2018-11-06 16:24:32 -08:00
Cristian Luis Duarte	c310d41af7	Change GPU_RESOURCE_BUFFER_SLOT1_TEXTURE to 36	2018-11-02 14:59:30 -03:00
Sam Gateau	fa0c58fa0e	Assign the correct binding slots for the Resource Buffers to fix the deformed mesh rendering of the Avatar in gles backend	2018-11-02 00:08:47 -07:00
SamGondelman	c4c4d2c98d	possibly fix mac issues	2018-10-31 13:28:07 -07:00
SamGondelman	e8c5324e39	start removing branching	2018-10-25 11:59:04 -07:00
Olivier Prat	69ace03919	Merged with master	2018-10-24 08:27:39 +02:00
SamGondelman	0efbdc1ab5	merge with master	2018-10-23 14:33:57 -07:00
Brad Davis	c8e664a0a1	New SPIRV Shader toolchain	2018-10-23 10:40:12 -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
John Conklin II	1f06c87580	Merge pull request #14096 from Zvork/mipgen ... Added generateTextureMipsWithPipeline function in gpu::Batch	2018-10-18 16:06:28 -07:00
SamGondelman	cce0981d6c	Merge remote-tracking branch 'upstream/master' into police	2018-10-17 11:40:01 -07:00
Olivier Prat	6abffceb43	Mip generation texture slot is higher and doesn't interfere anymore	2018-10-16 09:39:32 +02: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
sam gateau	8a05cc2ede	FIx the bad world position evaluation in the new all in one call	2018-10-04 11:49:11 -07:00