1183 commits

Author	SHA1	Message	Date
SamGondelman	8431b3b0c1	correct order of mixes	2018-12-07 10:39:10 -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
sam gateau	ff24a99032	Unify the the packing of the blendshape offset for simplicity and settle on the name DrawcallUniform	2018-10-02 11:18:20 -07:00
Olivier Prat	4c84ae02fa	Merge branch 'master' of http://github.com/highfidelity/hifi into ao	2018-10-02 18:13:57 +02:00
Sam Gateau	c593f00839	Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis	2018-10-01 19:10:18 -07:00
Seth Alves	cb04894e33	try another way of fixing _spare warning	2018-09-28 14:53:05 -07:00
Seth Alves	b69d0f3997	get interface building and working with clang-7 on ubuntu 18	2018-09-28 13:46:51 -07:00
SamGondelman	e069817978	more fixes	2018-09-27 14:18:43 -07:00
Olivier Prat	9cd963af95	Added generateTextureMipsWithPipeline function in batch	2018-09-27 10:26:51 +02:00
Sam Gateau	8923055e91	Exploring the bad peroformances	2018-09-27 00:15:34 -07:00
sam gateau	7cf7eaa7c8	Exposing the drawcall user info just a uint16 right now and use it for the skinning and blendshape	2018-09-24 17:34:42 -07:00
sam gateau	609bc6385e	Merge branch 'black' of github.com:samcake/hifi into black-bis	2018-09-18 17:40:45 -07:00
sam gateau	ec6117e9bb	bringing the blendshape in skin shader only work in master	2018-09-18 17:40:29 -07:00
Olivier Prat	acab748f57	Merge with master	2018-09-17 14:29:54 +02:00
Sam Gateau	986dece4ec	Add name of the batch during tracing and introduce detailed tracing if needed and one error message in the case the materialMap is detected in an fst file but not understood	2018-09-14 20:24:22 -07:00
Brad Davis	cfff28ad0a	More shared pointer deduplication	2018-09-12 15:04:35 -07:00
Olivier Prat	f12cd2e55a	Merged with master	2018-09-11 10:19:40 +02:00
Sam Gateau	47cea49f78	Merge pull request #13922 from samcake/black-bis ... Optimize the vertex formats of meshes for less input buffer bindings	2018-09-10 16:58:40 -07:00
Sam Gateau	082d47d20f	Set the correct assert in replacment of the unecessary if branch	2018-09-10 14:31:49 -07:00
sam gateau	7349562111	Removing commented code	2018-09-06 15:50:31 -07:00
Bradley Austin Davis	fade3a8de0	Fixing shader implicit type conversions	2018-09-06 09:08:36 -07:00
Brad Davis	9a28e04e37	Remove all tabs from shaders	2018-09-06 08:59:07 -07:00
Brad Davis	271651737b	Cleanup gpu shader constants	2018-09-06 08:59:06 -07:00
Brad Davis	cafd981744	Remove uniforms from bloom debug effect	2018-09-06 08:59:06 -07:00
Brad Davis	c8eb4da6b6	Remove simple draw task uniforms	2018-09-06 08:59:05 -07:00