548 commits

Author	SHA1	Message	Date
Brad Davis	28103cf5ef	Migrate composition of the overlay and pointer to the present thread	2016-03-07 17:14:41 -08:00
samcake	5401149713	Cleaning the tlist of textures in the NetworkTexture and in FBXMaterial	2016-02-26 12:10:13 -08:00
samcake	3ee6f9d6f2	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2016-02-25 23:48:53 -08:00
samcake	96fb9c4466	cleaning up macos warnings, separating Metallic maps from the default, gamma corrected gray textures	2016-02-25 14:13:35 -08:00
Brad Davis	ef33d297e2	Fix framebuffer behavior when changing attachments	2016-02-24 19:57:00 -08:00
samcake	9d0803e6b8	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2016-02-23 09:33:54 -08:00
samcake	00782b0e76	GOing home, this is in the middle of adding the Roughness texture and potentially cleaning up the different compinations of shaders regarding the material textures	2016-02-22 18:19:36 -08:00
samcake	39a7852979	MOving forward with PBR rendering, cleaning up the lighting shaders and the packi/unpack deferredBuffer shaders	2016-02-19 18:43:07 -08:00
Zach Pomerantz	791d295578	Move paint shader functions to Paint.slh	2016-02-19 11:48:44 -08:00
samcake	b88501784c	Making progress toward the PBR material	2016-02-17 18:47:52 -08:00
samcake	7cb0108457	Merge branch 'master' of https://github.com/highfidelity/hifi into red	2016-02-01 15:17:58 -08:00
Atlante45	ad215f23c6	Deactivate SSBOs for now	2016-02-01 22:41:01 +01:00
Atlante45	5ac0350993	Don't fall through in switch case	2016-02-01 18:50:01 +01:00
Atlante45	52885545ea	Use feature name for ifdef	2016-02-01 18:50:01 +01:00
Atlante45	838b637591	Don't capture raw draw calls during named calls processing	2016-02-01 18:50:01 +01:00
Atlante45	a5603140de	Fix for mac	2016-02-01 18:50:01 +01:00
Atlante45	8cf393bb59	Mac compatibility	2016-02-01 18:50:01 +01:00
Atlante45	8d4dab19c7	Only bind once per render batch	2016-02-01 18:50:01 +01:00
Atlante45	9e8a3f19e9	Revert max input slot changes	2016-02-01 18:50:01 +01:00
Atlante45	38a223b270	Split declareStandardTransform	2016-02-01 18:50:01 +01:00
Atlante45	71ecd1662c	Add correct vertex attrib divisor	2016-02-01 18:50:01 +01:00
Atlante45	6ee88c15ec	Use vbo for draw call infos	2016-02-01 18:50:01 +01:00
Atlante45	7471646569	Disable attrib vertex on normal passes	2016-02-01 18:50:01 +01:00
Atlante45	d639a838ad	set currentNamedCall during setupNamedCalls	2016-02-01 18:50:01 +01:00
Atlante45	670cfc263b	Capture draw call info and model xfm in batch	2016-02-01 18:50:01 +01:00
Atlante45	1658c15cca	Reserve last input slot for draw call info	2016-02-01 18:50:01 +01:00
Atlante45	78cd4407db	Don't pass binding manually, link named call correctly	2016-02-01 18:50:01 +01:00
Atlante45	eb55e55367	Clear buffers between each batch render	2016-02-01 18:50:01 +01:00
Atlante45	6ff38bc32f	Make sure _currentDraw has correct value	2016-02-01 18:50:01 +01:00
Atlante45	3e027fc5c5	Use ssbo for model transforms	2016-02-01 18:50:01 +01:00
Atlante45	23cf72bd6c	Add multi draw to factored setup	2016-02-01 18:50:01 +01:00
Atlante45	6464fabd71	Update current draw call	2016-02-01 18:50:01 +01:00
Atlante45	ccb183e518	Unify Named/Normal calls	2016-02-01 18:50:01 +01:00
Atlante45	9e0af63441	Bind model transform as single buffer	2016-02-01 18:50:01 +01:00
Atlante45	bff2a2a8e5	Factor draw call updates	2016-02-01 18:50:01 +01:00
Atlante45	6463136240	start/stopNamedCall run in renderPassTransfer too	2016-02-01 18:50:01 +01:00
Atlante45	bd8f62504d	Capture DrawCallInfo during renderPassTransfer	2016-02-01 18:50:01 +01:00
Atlante45	4d6931c5a8	Add private start/stopNamedCall batch commands	2016-02-01 18:50:01 +01:00
samcake	972d4cda77	Adding better octree visualization	2016-01-28 15:31:24 -08:00
Zach Pomerantz	dee8e0ba9d	Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows	2016-01-22 10:03:06 -08:00
samcake	16573357d8	FIxing the AO results at the border of the frame by guarding the fetch out of the frame	2016-01-21 15:50:38 -08:00
Zach Pomerantz	398f83be3f	Change shadow debug buffer to reuse shadowMap tex	2016-01-19 12:01:18 -08:00
samcake	df496b065c	Merging with master	2016-01-18 16:40:34 -08:00
samcake	93c7c182b3	Exposing the gpu RangeTimer counter for the AO effect	2016-01-18 14:10:59 -08:00
samcake	bc579f2605	Clening up the gpu::Timer behavior, now need a way to show it	2016-01-18 09:53:41 -08:00
samcake	483c28dc2d	Adding gpu timer feature to actually the GPU cost of rendering	2016-01-15 19:00:18 -08:00
samcake	577666da6e	Merging upstream master	2016-01-14 15:10:54 -08:00
Zach Pomerantz	7744b89ba5	Prepare shadowMap pipeline to debug in color	2016-01-14 12:56:28 -08:00
Zach Pomerantz	e471dcc90e	Fix GLBackend::do_setDepthRangeTransform by swapping hither/yon	2016-01-13 17:50:34 -08:00
Atlante45	ef5af45acd	Replce GPUObjectWrapper by public const member	2016-01-13 15:01:54 -08:00